changes based on review comments

Author: rswalmart

src/main/java/com/ibm/eventstreams/connect/mqsource/processor/JMSReader.java renamed to src/main/java/com/ibm/eventstreams/connect/mqsource/JMSReader.java

@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ibm.eventstreams.connect.mqsource.processor;
+package com.ibm.eventstreams.connect.mqsource;
 
-import com.ibm.eventstreams.connect.mqsource.MQSourceConnector;
 import com.ibm.eventstreams.connect.mqsource.builders.RecordBuilder;
 import com.ibm.mq.MQException;
 import com.ibm.mq.constants.MQConstants;

src/main/java/com/ibm/eventstreams/connect/mqsource/MQSourceTask.java

@@ -15,7 +15,6 @@
  */
 package com.ibm.eventstreams.connect.mqsource;
 
-import com.ibm.eventstreams.connect.mqsource.processor.JMSReader;
 import org.apache.kafka.connect.source.SourceRecord;
 import org.apache.kafka.connect.source.SourceTask;
 import org.slf4j.Logger;

src/main/java/com/ibm/eventstreams/connect/mqsource/builders/BaseRecordBuilder.java

@@ -70,10 +70,10 @@ public void configure(Map<String, String> props) {
 		}
 
 		String str = props.get(MQSourceConnector.CONFIG_NAME_MQ_JMS_PROPERTY_COPY_TO_KAFKA_HEADER);
-		if (str != null && ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str))) {
+
 			copyJmsPropertiesFlag = Boolean.parseBoolean(str);
 			jmsToKafkaHeaderConverter = new JmsToKafkaHeaderConverter();
-		}
+
 
 		log.trace("[{}]  Exit {}.configure", Thread.currentThread().getId(), this.getClass().getName());
 	}
@@ -160,9 +160,8 @@ public SourceRecord toSourceRecord(JMSContext context, String topic, boolean mes
 		SchemaAndValue key = this.getKey(context, topic, message);
 		SchemaAndValue value = this.getValue(context, topic, messageBodyJms, message);
 
-		if (copyJmsPropertiesFlag)
-			return new SourceRecord(null, null, topic, (Integer) null, key.schema(), key.value(), value.schema(), value.value(), message.getJMSTimestamp(), jmsToKafkaHeaderConverter.convertJmsPropertiesToKafkaHeaders(messageBodyJms, message));
-
+		if (copyJmsPropertiesFlag && messageBodyJms)
+			return new SourceRecord(null, null, topic, (Integer) null, key.schema(), key.value(), value.schema(), value.value(), message.getJMSTimestamp(), jmsToKafkaHeaderConverter.convertJmsPropertiesToKafkaHeaders(message));
 		else
 			return new SourceRecord(null, null, topic, key.schema(), key.value(), value.schema(), value.value());
 

src/main/java/com/ibm/eventstreams/connect/mqsource/processor/JmsToKafkaHeaderConverter.java

@@ -21,14 +21,13 @@ public class JmsToKafkaHeaderConverter {
 	 * Copies the JMS properties to Kafka headers.
 	 *
 	 * @param message        JMS message.
-	 * @param messageBodyJms flag whether incoming message is treated as jms message.
+	 *
 	 * @return Kafka connect headers.
 	 */
-	public ConnectHeaders convertJmsPropertiesToKafkaHeaders(boolean messageBodyJms, Message message) {
+	public ConnectHeaders convertJmsPropertiesToKafkaHeaders(Message message) {
 
 		ConnectHeaders connectHeaders = new ConnectHeaders();
 
-		if (messageBodyJms) {
 
 
 			ArrayList jmsPropertyKeys = null;
@@ -47,8 +46,6 @@ public ConnectHeaders convertJmsPropertiesToKafkaHeaders(boolean messageBodyJms,
 				log.error("JMS message properties could not be read", e);
 			}
 
-		}
-
 		return connectHeaders;
 
 	}