Minor fixes

Author: robvadai

config/spotbugs/excludeFilter.xml

@@ -8,4 +8,10 @@
     <Match>
         <Class name="com.segence.kafka.connect.kafka.stubs.EnhancedKafkaSinkTask"/>
     </Match>
+    <Match>
+        <Class name="com.segence.kafka.connect.kafka.schema.TestMessageKey"/>
+    </Match>
+    <Match>
+        <Class name="com.segence.kafka.connect.kafka.schema.TestMessageValue"/>
+    </Match>
 </FindBugsFilter>

src/main/java/com/segence/kafka/connect/kafka/ConnectorConfiguration.java

@@ -1,6 +1,10 @@
 package com.segence.kafka.connect.kafka;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.kafka.common.config.AbstractConfig;

src/main/java/com/segence/kafka/connect/kafka/KafkaSinkTask.java

@@ -1,12 +1,10 @@
 package com.segence.kafka.connect.kafka;
 
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
 
 import org.apache.kafka.clients.producer.Callback;
 import org.apache.kafka.clients.producer.KafkaProducer;

src/test/java/com/segence/kafka/connect/kafka/ConnectorConfigurationTest.java

@@ -1,6 +1,8 @@
 package com.segence.kafka.connect.kafka;
 
-import static com.segence.kafka.connect.kafka.ConnectorConfiguration.*;
+import static com.segence.kafka.connect.kafka.ConnectorConfiguration.getKeyConverterProperties;
+import static com.segence.kafka.connect.kafka.ConnectorConfiguration.getProducerProperties;
+import static com.segence.kafka.connect.kafka.ConnectorConfiguration.getValueConverterProperties;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 

src/test/java/com/segence/kafka/connect/kafka/KafkaSinkTaskTest.java

@@ -14,6 +14,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -189,10 +190,10 @@ public void shouldProduceNonTransactionalMessageAndNotUseCallbackWhenNotDefined(
 
         assertThat(capturedProducerRecords.size(), is(2));
 
-        assertThat(capturedProducerRecords.get(0).key(), is("key1".getBytes()));
-        assertThat(capturedProducerRecords.get(0).value(), is("value1".getBytes()));
-        assertThat(capturedProducerRecords.get(1).key(), is("key2".getBytes()));
-        assertThat(capturedProducerRecords.get(1).value(), is("value2".getBytes()));
+        assertThat(capturedProducerRecords.get(0).key(), is("key1".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(0).value(), is("value1".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(1).key(), is("key2".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(1).value(), is("value2".getBytes(Charset.defaultCharset())));
     }
 
     @Test
@@ -214,10 +215,10 @@ public void shouldProduceNonTransactionalMessageAndUseCallback() {
 
         assertThat(capturedProducerRecords.size(), is(2));
 
-        assertThat(capturedProducerRecords.get(0).key(), is("key1".getBytes()));
-        assertThat(capturedProducerRecords.get(0).value(), is("value1".getBytes()));
-        assertThat(capturedProducerRecords.get(1).key(), is("key2".getBytes()));
-        assertThat(capturedProducerRecords.get(1).value(), is("value2".getBytes()));
+        assertThat(capturedProducerRecords.get(0).key(), is("key1".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(0).value(), is("value1".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(1).key(), is("key2".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(1).value(), is("value2".getBytes(Charset.defaultCharset())));
 
         assertThat(capturedCallbacks.size(), is(2));
 
@@ -245,10 +246,10 @@ public void shouldProduceTransactionalMessageAndNotUseCallbackWhenNotDefined() {
 
         assertThat(capturedProducerRecords.size(), is(2));
 
-        assertThat(capturedProducerRecords.get(0).key(), is("key1".getBytes()));
-        assertThat(capturedProducerRecords.get(0).value(), is("value1".getBytes()));
-        assertThat(capturedProducerRecords.get(1).key(), is("key2".getBytes()));
-        assertThat(capturedProducerRecords.get(1).value(), is("value2".getBytes()));
+        assertThat(capturedProducerRecords.get(0).key(), is("key1".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(0).value(), is("value1".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(1).key(), is("key2".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(1).value(), is("value2".getBytes(Charset.defaultCharset())));
     }
 
     @Test
@@ -272,10 +273,10 @@ public void shouldProduceTransactionalMessageAndUseCallback() {
 
         assertThat(capturedProducerRecords.size(), is(2));
 
-        assertThat(capturedProducerRecords.get(0).key(), is("key1".getBytes()));
-        assertThat(capturedProducerRecords.get(0).value(), is("value1".getBytes()));
-        assertThat(capturedProducerRecords.get(1).key(), is("key2".getBytes()));
-        assertThat(capturedProducerRecords.get(1).value(), is("value2".getBytes()));
+        assertThat(capturedProducerRecords.get(0).key(), is("key1".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(0).value(), is("value1".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(1).key(), is("key2".getBytes(Charset.defaultCharset())));
+        assertThat(capturedProducerRecords.get(1).value(), is("value2".getBytes(Charset.defaultCharset())));
 
         assertThat(capturedCallbacks.size(), is(2));