refactor(filters): rellocate json packages

streamthoughts · Oct 1, 2021 · 2b8d260 · 2b8d260
1 parent 499abd0
commit 2b8d260
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/connect-file-pulse-dataformat/pom.xml b/connect-file-pulse-dataformat/pom.xml
@@ -36,5 +36,9 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.jsoniter</groupId>
+            <artifactId>jsoniter</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...ulse/json/DefaultJSONStructConverter.java → ...ulse/json/DefaultJSONStructConverter.java b/...ulse/json/DefaultJSONStructConverter.java → ...ulse/json/DefaultJSONStructConverter.java
@@ -41,7 +41,7 @@ public class DefaultJSONStructConverter implements JSONStructConverter {
     /**
      * Creates a new {@link DefaultJSONStructConverter} instance.
      */
-    public DefaultJSONStructConverter() {
+    DefaultJSONStructConverter() {
         ACCESSORS.put(ValueType.ARRAY, new ArrayJsonFieldAccessor());
         ACCESSORS.put(ValueType.STRING, new StringJsonFieldAccessor());
         ACCESSORS.put(ValueType.OBJECT, new ObjectJsonFieldAccessor());

diff --git a/...t/filepulse/json/JSONStructConverter.java → ...t/filepulse/json/JSONStructConverter.java b/...t/filepulse/json/JSONStructConverter.java → ...t/filepulse/json/JSONStructConverter.java
@@ -26,6 +26,10 @@
  */
 public interface JSONStructConverter {
 
+    static JSONStructConverter createDefault() {
+        return new DefaultJSONStructConverter();
+    }
+
     /**
      * Gets a {@link TypedStruct} instance for the specified value.
      *

diff --git a/.../json/DefaultJSONStructConverterTest.java → .../json/DefaultJSONStructConverterTest.java b/.../json/DefaultJSONStructConverterTest.java → .../json/DefaultJSONStructConverterTest.java
diff --git a/...se-filters/src/main/java/io/streamthoughts/kafka/connect/filepulse/filter/JSONFilter.java b/...se-filters/src/main/java/io/streamthoughts/kafka/connect/filepulse/filter/JSONFilter.java
@@ -23,7 +23,7 @@
 import io.streamthoughts.kafka.connect.filepulse.data.Type;
 import io.streamthoughts.kafka.connect.filepulse.data.TypedStruct;
 import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
-import io.streamthoughts.kafka.connect.filepulse.json.DefaultJSONStructConverter;
+import io.streamthoughts.kafka.connect.filepulse.json.JSONStructConverter;
 import io.streamthoughts.kafka.connect.filepulse.reader.RecordsIterable;
 import org.apache.kafka.common.config.ConfigDef;
 
@@ -36,7 +36,7 @@
 
 public class JSONFilter extends AbstractMergeRecordFilter<JSONFilter> {
 
-    private final DefaultJSONStructConverter converter = new DefaultJSONStructConverter();
+    private final JSONStructConverter converter = JSONStructConverter.createDefault();
 
     private JSONFilterConfig configs;