fix: use of config in tests

Some of the existing tests create a JsonRecordBuilder and start
using it without configuring it. This is not valid and would not
happen in real use as configure() is a required step in the
Connect lifecycle.

As I want to introduce new config for the record builder, I need
to correct this mistake first.

Signed-off-by: Dale Lane <[email protected]>

Author: dalelane

src/integration/java/com/ibm/eventstreams/connect/mqsource/AbstractJMSContextIT.java

@@ -19,6 +19,7 @@
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
+import com.ibm.eventstreams.connect.mqsource.builders.DefaultRecordBuilder;
 import com.ibm.eventstreams.connect.mqsource.utils.MQTestUtil;
 import com.ibm.mq.jms.MQConnectionFactory;
 import com.ibm.msg.client.wmq.WMQConstants;
@@ -102,6 +103,7 @@ public static Map<String, String> getDefaultConnectorProperties() {
         props.put("mq.channel.name", CHANNEL_NAME);
         props.put("mq.queue", DEFAULT_SOURCE_QUEUE);
         props.put("mq.user.authentication.mqcsp", "false");
+        props.put("mq.record.builder", DefaultRecordBuilder.class.getCanonicalName());
         props.put("topic", "mytopic");
         return props;
     }

src/integration/java/com/ibm/eventstreams/connect/mqsource/builders/JsonRecordBuilderIT.java

@@ -65,6 +65,7 @@ public void buildFromJmsTextMessage() throws Exception {
 
         // use the builder to convert it to a Kafka record
         final JsonRecordBuilder builder = new JsonRecordBuilder();
+        builder.configure(getDefaultConnectorProperties());
         final SourceRecord record = builder.toSourceRecord(getJmsContext(), topic, isJMS, message);
 
         // verify the Kafka record
@@ -82,6 +83,7 @@ public void buildFromJmsBytesMessage() throws Exception {
 
         // use the builder to convert it to a Kafka record
         final JsonRecordBuilder builder = new JsonRecordBuilder();
+        builder.configure(getDefaultConnectorProperties());
         final SourceRecord record = builder.toSourceRecord(getJmsContext(), topic, isJMS, message);
 
         // verify the Kafka record
@@ -100,6 +102,7 @@ public void buildFromJmsMapMessage() throws Exception {
 
         // use the builder to convert it to a Kafka record
         final JsonRecordBuilder builder = new JsonRecordBuilder();
+        builder.configure(getDefaultConnectorProperties());
         final RecordBuilderException exc = assertThrows(RecordBuilderException.class, () -> {
             builder.toSourceRecord(getJmsContext(), topic, isJMS, message);
         });
@@ -115,6 +118,7 @@ public void buildFromJmsTestJsonError() throws Exception {
 
         // use the builder to convert it to a Kafka record
         final JsonRecordBuilder builder = new JsonRecordBuilder();
+        builder.configure(getDefaultConnectorProperties());
         final DataException exec = assertThrows(DataException.class, () -> builder.toSourceRecord(getJmsContext(), topic, isJMS, message));
         assertEquals("Converting byte[] to Kafka Connect data failed due to serialization error: ", exec.getMessage());
     }
@@ -143,7 +147,7 @@ public void buildFromJmsTestErrorToleranceNone() throws Exception {
 
         // use the builder to convert it to a Kafka record
         final JsonRecordBuilder builder = new JsonRecordBuilder();
-        final HashMap<String, String> config = new HashMap<String, String>();
+        final Map<String, String> config = getDefaultConnectorProperties();
         config.put("errors.tolerance", "none");
         config.put("mq.message.body.jms", "true");
         config.put("mq.record.builder", "com.ibm.eventstreams.connect.mqsource.builders.JsonRecordBuilder");
@@ -187,7 +191,7 @@ public void testToSourceRecord_JsonRecordBuilder_JsonMessage() throws Exception
             assertThat(sourceRecord).isNotNull();
             assertThat(sourceRecord.value()).isInstanceOf(Map.class);
             assertNull(sourceRecord.valueSchema()); // JSON with no schema
-            
+
             // Verify JSON data
             @SuppressWarnings("unchecked")
             Map<String, Object> value = (Map<String, Object>) sourceRecord.value();

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

@@ -32,15 +32,15 @@ public static RecordBuilder getRecordBuilder(final Map<String, String> props) {
         );
     }
 
-    protected static RecordBuilder getRecordBuilder(final String builderClass, final Map<String, String> props) {
+    private static RecordBuilder getRecordBuilder(final String builderClass, final Map<String, String> props) {
 
         final RecordBuilder builder;
 
         try {
             final Class<? extends RecordBuilder> c = Class.forName(builderClass).asSubclass(RecordBuilder.class);
             builder = c.newInstance();
             builder.configure(props);
-        } catch (ClassNotFoundException | ClassCastException | IllegalAccessException | InstantiationException | NullPointerException exc) {
+        } catch (ClassNotFoundException | ClassCastException | IllegalAccessException | InstantiationException exc) {
             log.error("Could not instantiate message builder {}", builderClass);
             throw new RecordBuilderException("Could not instantiate message builder", exc);
         }

src/test/java/com/ibm/eventstreams/connect/mqsource/builders/RecordBuilderFactoryTest.java

@@ -18,32 +18,42 @@
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
+import com.ibm.eventstreams.connect.mqsource.MQSourceConnector;
+
 import java.util.HashMap;
 import java.util.Map;
 
 public class RecordBuilderFactoryTest {
 
-    final Map<String, String> emptyProps = new HashMap<>();
+    final Map<String, String> placeholderProps = Map.of(
+        "mq.queue.manager", "placeholder",
+        "mq.queue", "placeholder",
+        "topic", "placeholder"
+    );
 
     @Test
     public void testGetRecordBuilder_ForJsonRecordBuilder() {
-        RecordBuilder recordBuilder = RecordBuilderFactory.getRecordBuilder("com.ibm.eventstreams.connect.mqsource.builders.JsonRecordBuilder", emptyProps);
+        Map<String, String> props = new HashMap<>(placeholderProps);
+        props.put(MQSourceConnector.CONFIG_NAME_MQ_RECORD_BUILDER, "com.ibm.eventstreams.connect.mqsource.builders.JsonRecordBuilder");
+
+        RecordBuilder recordBuilder = RecordBuilderFactory.getRecordBuilder(props);
         Assertions.assertThat(recordBuilder).isInstanceOf(JsonRecordBuilder.class);
     }
 
     @Test
     public void testGetRecordBuilder_ForDefaultRecordBuilder() {
-        RecordBuilder recordBuilder = RecordBuilderFactory.getRecordBuilder("com.ibm.eventstreams.connect.mqsource.builders.DefaultRecordBuilder", emptyProps);
+        Map<String, String> props = new HashMap<>(placeholderProps);
+        props.put(MQSourceConnector.CONFIG_NAME_MQ_RECORD_BUILDER, "com.ibm.eventstreams.connect.mqsource.builders.DefaultRecordBuilder");
+
+        RecordBuilder recordBuilder = RecordBuilderFactory.getRecordBuilder(props);
         Assertions.assertThat(recordBuilder).isInstanceOf(DefaultRecordBuilder.class);
     }
 
     @Test(expected = RecordBuilderException.class)
     public void testGetRecordBuilder_JunkClass() {
-        RecordBuilderFactory.getRecordBuilder("casjsajhasdhusdo;iasd", emptyProps);
-    }
+        Map<String, String> props = new HashMap<>(placeholderProps);
+        props.put(MQSourceConnector.CONFIG_NAME_MQ_RECORD_BUILDER, "casjsajhasdhusdo;iasd");
 
-    @Test(expected = RecordBuilderException.class)
-    public void testGetRecordBuilder_NullProps() {
-        RecordBuilderFactory.getRecordBuilder("casjsajhasdhusdo;iasd", null);
+        RecordBuilderFactory.getRecordBuilder(props);
     }
 }