Changes based on review comments

Author: rswalmart

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

@@ -285,7 +285,7 @@ public class MQSourceConnector extends SourceConnector {
                       CONFIG_DOCUMENTATION_MQ_MESSAGE_MQMD_READ, CONFIG_GROUP_MQ, 19, Width.SHORT,
                       CONFIG_DISPLAY_MQ_MESSAGE_MQMD_READ);
 
-        config.define(CONFIG_NAME_MQ_JMS_PROPERTY_COPY_TO_KAFKA_HEADER, Type.BOOLEAN, Boolean.TRUE, Importance.LOW,
+        config.define(CONFIG_NAME_MQ_JMS_PROPERTY_COPY_TO_KAFKA_HEADER, Type.BOOLEAN, Boolean.FALSE, Importance.LOW,
                       CONFIG_DOCUMENTATION_MQ_JMS_PROPERTY_COPY_TO_KAFKA_HEADER, CONFIG_GROUP_MQ, 20, Width.MEDIUM,
                       CONFIG_DISPLAY_MQ_JMS_PROPERTY_COPY_TO_KAFKA_HEADER);
 

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

@@ -29,6 +29,7 @@
 import javax.jms.JMSException;
 import javax.jms.Message;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * Builds Kafka Connect SourceRecords from messages.
@@ -40,7 +41,7 @@ public enum KeyHeader {NONE, MESSAGE_ID, CORRELATION_ID, CORRELATION_ID_AS_BYTES
     protected KeyHeader keyheader = KeyHeader.NONE;
 
 
-	private Boolean copyJmsPropertiesFlag = Boolean.FALSE;
+	private boolean copyJmsPropertiesFlag = Boolean.FALSE;
 	private JmsToKafkaHeaderConverter jmsToKafkaHeaderConverter;
 
     /**
@@ -79,7 +80,10 @@ else if (kh.equals(MQSourceConnector.CONFIG_VALUE_MQ_RECORD_BUILDER_KEY_HEADER_J
 
 		String str = props.get(MQSourceConnector.CONFIG_NAME_MQ_JMS_PROPERTY_COPY_TO_KAFKA_HEADER);
 
-		copyJmsPropertiesFlag = Boolean.parseBoolean(str);
+        if (Optional.of(str).isPresent()) {
+            copyJmsPropertiesFlag = Boolean.parseBoolean(str);
+        }
+
 		jmsToKafkaHeaderConverter = new JmsToKafkaHeaderConverter();
 
 

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

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2017, 2018, 2019 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package com.ibm.eventstreams.connect.mqsource.processor;
 
 import org.apache.kafka.connect.header.ConnectHeaders;

src/test/java/com/ibm/eventstreams/connect/mqsource/JmsToKafkaHeaderConverterTest.java

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2017, 2018, 2019 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package com.ibm.eventstreams.connect.mqsource;
 
 import com.ibm.eventstreams.connect.mqsource.processor.JmsToKafkaHeaderConverter;