java-0.8.0 - fix adapters initialization, add pojo adapter, fix jsonorg adapter, fix uuid func to return string instead of UUID

Author: elisherer

java/json-transform/build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 group 'co.nlighten'
-version = '0.7.0'
+version = '0.8.0'
 
 ext {
     gsonVersion = "2.10.1"

java/json-transform/src/main/java/co/nlighten/jsontransform/JsonTransformerConfiguration.java

@@ -1,6 +1,7 @@
 package co.nlighten.jsontransform;
 
 import co.nlighten.jsontransform.adapters.JsonAdapter;
+import co.nlighten.jsontransform.adapters.pojo.PojoJsonTransformerConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -10,7 +11,7 @@ public abstract class JsonTransformerConfiguration {
     static volatile JsonTransformerConfiguration current = null;
 
     public synchronized static void set(JsonTransformerConfiguration configuration) {
-        if(configuration == null) {
+        if (configuration == null) {
             throw new ExceptionInInitializerError("Cannot set empty configuration");
         }
         log.debug("Setting configuration to {}", configuration);
@@ -19,7 +20,8 @@ public synchronized static void set(JsonTransformerConfiguration configuration)
 
     public static JsonTransformerConfiguration get() {
         if (current == null) {
-            throw new ExceptionInInitializerError("Configuration not set");
+            log.debug("Json transformers configuration was not set. Using default Pojo implementation.");
+            set(new PojoJsonTransformerConfiguration());
         }
         return current;
     }

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/JsonAdapter.java

@@ -10,7 +10,6 @@
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -31,17 +30,16 @@ public abstract class JsonAdapter<JE, JA extends Iterable<JE>, JO extends JE> {
 
     private final JsonObjectAdapter<JE, JA, JO> jObject;
     private final JsonArrayAdapter<JE, JA, JO> jArray;
-    public final Class<JE> type;
 
     public JsonAdapter(
-            Class<JE> jsonElementType,
-            Function<JsonAdapter<JE, JA, JO>, JsonObjectAdapter<JE, JA, JO>> objectAdapterSupplier,
-            Function<JsonAdapter<JE, JA, JO>, JsonArrayAdapter<JE, JA, JO>> arrayAdapterSupplier) {
-        this.jObject = objectAdapterSupplier.apply(this);
-        this.jArray = arrayAdapterSupplier.apply(this);
-        this.type = jsonElementType;
+            Supplier<JsonObjectAdapter<JE, JA, JO>> objectAdapterSupplier,
+            Supplier<JsonArrayAdapter<JE, JA, JO>> arrayAdapterSupplier) {
+        this.jObject = objectAdapterSupplier.get();
+        this.jArray = arrayAdapterSupplier.get();
     }
 
+    public abstract String getName();
+
     /**
      * Checks if the given object is a Json element
      * @param value the object to check
@@ -621,7 +619,7 @@ public ParameterResolver createPayloadResolver(Object payload, Map<String, Objec
                     res = json.read(name);
                 }
                 if (unwrap) {
-                    res = unwrap(type.cast(res), true);
+                    res = unwrap(res, true);
                 }
                 return res;
             }

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/JsonArrayAdapter.java

@@ -3,13 +3,6 @@
 import java.util.stream.Stream;
 
 public abstract class JsonArrayAdapter<JE, JA extends Iterable<JE>, JO extends JE> {
-    public final Class<JA> type;
-    protected JsonAdapter<JE, JA, JO> adapter;
-
-    public JsonArrayAdapter(Class<JA> type, JsonAdapter<JE, JA, JO> adapter) {
-        this.type = type;
-        this.adapter = adapter;
-    }
 
     public abstract JA create();
     public abstract JA create(int capacity);

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/JsonObjectAdapter.java

@@ -4,17 +4,7 @@
 import java.util.Set;
 
 public abstract class JsonObjectAdapter<JE, JA extends Iterable<JE>, JO extends JE> {
-    public final Class<JO> type;
-    protected JsonAdapter<JE, JA, JO> adapter;
 
-    public JsonObjectAdapter(Class<JO> type, JsonAdapter<JE, JA, JO> adapter) {
-        this.type = type;
-        this.adapter = adapter;
-    }
-
-    public void setAdapter(JsonAdapter<JE, JA, JO> adapter) {
-        this.adapter = adapter;
-    }
     public abstract JO create();
 
     public abstract void add(JO object, String key, String value);
@@ -34,7 +24,6 @@ public boolean isEmpty(JO object) {
 
     public abstract boolean is(Object value);
 
-    public abstract JO convert(Object value);
     public abstract Set<Map.Entry<String, JE>> entrySet(JO object);
     public abstract Set<String> keySet(JO object);
 }

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/gson/GsonArrayAdapter.java

@@ -1,6 +1,5 @@
 package co.nlighten.jsontransform.adapters.gson;
 
-import co.nlighten.jsontransform.adapters.JsonAdapter;
 import co.nlighten.jsontransform.adapters.JsonArrayAdapter;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -10,11 +9,6 @@
 import java.util.stream.StreamSupport;
 
 public class GsonArrayAdapter extends JsonArrayAdapter<JsonElement, JsonArray, JsonObject> {
-
-    public GsonArrayAdapter(JsonAdapter<JsonElement, JsonArray, JsonObject> adapter) {
-        super(JsonArray.class, adapter);
-    }
-
     @Override
     public JsonArray create() {
         return new JsonArray();

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/gson/GsonHelpers.java

@@ -15,6 +15,7 @@ public static Gson GSON() {
 
     public static void setGson(Supplier<Gson> supplier) {
         GsonHelpers.threadSafeGsonBuilder = ThreadLocal.withInitial(supplier);
+        GsonJsonPathConfigurator.setConfigurationDefaults(new GsonJsonPathConfigurator.JaywayGSONConfiguration(GSON()));
     }
 
     public static JsonElement wrap(final Object value) {

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/gson/GsonJsonAdapter.java

@@ -1,11 +1,17 @@
 package co.nlighten.jsontransform.adapters.gson;
 
 import co.nlighten.jsontransform.adapters.JsonAdapter;
+import co.nlighten.jsontransform.adapters.gson.adapters.ISODateAdapter;
+import co.nlighten.jsontransform.adapters.gson.adapters.InstantTypeAdapter;
+import co.nlighten.jsontransform.adapters.gson.adapters.LocalDateTypeAdapter;
 import com.google.gson.*;
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
 
 import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.Date;
 
 public class GsonJsonAdapter extends JsonAdapter<JsonElement, JsonArray, JsonObject> {
 
@@ -14,12 +20,20 @@ public class GsonJsonAdapter extends JsonAdapter<JsonElement, JsonArray, JsonObj
     public static GsonBuilder gsonBuilder() {
         return new GsonBuilder()
                 .setDateFormat(ISO_DATETIME_FORMAT)
+                .registerTypeAdapter(Date.class, new ISODateAdapter())
+                .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter())
+                .registerTypeAdapter(Instant.class, new InstantTypeAdapter())
                 .setNumberToNumberStrategy(ToNumberPolicy.BIG_DECIMAL)
                 .setObjectToNumberStrategy(ToNumberPolicy.BIG_DECIMAL);
     }
 
     public GsonJsonAdapter() {
-        super(JsonElement.class, GsonObjectAdapter::new, GsonArrayAdapter::new);
+        super(GsonObjectAdapter::new, GsonArrayAdapter::new);
+    }
+
+    @Override
+    public String getName() {
+        return "gson";
     }
 
     @Override
@@ -64,7 +78,7 @@ public Object unwrap(Object value, boolean reduceBigDecimals) {
 
     @Override
     public JsonElement parse(String value) {
-        return GsonHelpers.GSON().fromJson(value, JsonElement.class);
+        return (JsonElement)GsonJsonPathConfigurator.configuration().jsonProvider().parse(value);
     }
 
     @Override
@@ -103,6 +117,6 @@ public DocumentContext getDocumentContext(Object payload) {
     }
     @Override
     public String toString(Object value) {
-        return GsonHelpers.GSON().toJson(value);
+        return GsonJsonPathConfigurator.configuration().jsonProvider().toJson(value);
     }
 }

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/gson/GsonJsonPathConfigurator.java

@@ -1,5 +1,7 @@
 package co.nlighten.jsontransform.adapters.gson;
 
+import com.google.gson.Gson;
+import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.spi.json.GsonJsonProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
@@ -16,13 +18,19 @@ public class GsonJsonPathConfigurator {
 
     private static boolean initialized = false;
 
-    private static class JaywayGSONConfiguration implements com.jayway.jsonpath.Configuration.Defaults {
+    public static class JaywayGSONConfiguration implements com.jayway.jsonpath.Configuration.Defaults {
 
-        private static final JsonProvider jsonProvider = new GsonJsonProvider();
-        private static final Set<Option> options = Set.of(
-                Option.SUPPRESS_EXCEPTIONS
-        );
-        private static final MappingProvider mappingProvider = new GsonMappingProvider();
+        private final JsonProvider jsonProvider;
+        private final Set<Option> options;
+        private final MappingProvider mappingProvider;
+
+        public JaywayGSONConfiguration(Gson gson) {
+            jsonProvider = new GsonJsonProvider(gson);
+            options = Set.of(
+                    Option.SUPPRESS_EXCEPTIONS
+            );
+            mappingProvider = new GsonMappingProvider();
+        }
 
         @Override
         public JsonProvider jsonProvider() {
@@ -40,9 +48,10 @@ public MappingProvider mappingProvider() {
         }
     }
 
-    private static com.jayway.jsonpath.Configuration.Defaults configurationDefaults = new JaywayGSONConfiguration();
+    private static com.jayway.jsonpath.Configuration.Defaults configurationDefaults = new JaywayGSONConfiguration(GsonHelpers.GSON());
+    private static com.jayway.jsonpath.Configuration configuration = createConfiguration();
 
-    public static void setup() {
+    public static synchronized void setup() {
         if (initialized) return;
         log.info("Setting com.jayway.jsonpath defaults with {}", configurationDefaults.getClass());
         com.jayway.jsonpath.Configuration.setDefaults(configurationDefaults);
@@ -52,8 +61,20 @@ public static void setup() {
     /**
      * Override the default com.jayway.jsonpath configuration (and reset initialization)
      */
-    public static void setConfigurationDefaults(com.jayway.jsonpath.Configuration.Defaults configurationDefaults) {
-        GsonJsonPathConfigurator.configurationDefaults = configurationDefaults;
+    public static synchronized void setConfigurationDefaults(com.jayway.jsonpath.Configuration.Defaults defaults) {
+        configurationDefaults = defaults;
+        configuration = createConfiguration();
         initialized = false;
     }
+
+    public static com.jayway.jsonpath.Configuration createConfiguration() {
+        return new Configuration.ConfigurationBuilder().jsonProvider(configurationDefaults.jsonProvider())
+                .mappingProvider(configurationDefaults.mappingProvider())
+                .options(configurationDefaults.options())
+                .build();
+    }
+
+    public static com.jayway.jsonpath.Configuration configuration() {
+        return configuration;
+    }
 }

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/gson/GsonObjectAdapter.java

@@ -1,6 +1,5 @@
 package co.nlighten.jsontransform.adapters.gson;
 
-import co.nlighten.jsontransform.adapters.JsonAdapter;
 import co.nlighten.jsontransform.adapters.JsonObjectAdapter;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -10,11 +9,6 @@
 import java.util.Set;
 
 public class GsonObjectAdapter extends JsonObjectAdapter<JsonElement, JsonArray, JsonObject> {
-
-    public GsonObjectAdapter(JsonAdapter<JsonElement, JsonArray, JsonObject> adapter) {
-        super(JsonObject.class, adapter);
-    }
-
     @Override
     public JsonObject create() {
         return new JsonObject();
@@ -74,13 +68,6 @@ public int size(JsonObject object) {
     public boolean is(Object value) {
         return value instanceof JsonObject;
     }
-    
-    @Override
-    public JsonObject convert(Object value) {
-        if (value instanceof JsonObject jo) return jo;
-        var je = adapter.wrap(value);
-        return je instanceof JsonObject jo ? jo : null;
-    }
 
     @Override
     public Set<Map.Entry<String, JsonElement>> entrySet(JsonObject object) {