fix: #34 Initialize new (de)serializersParameters from using the defa…

…ult (de)serializerParameters
DominoKit · Apr 18, 2020 · 4ce5e9e · 4ce5e9e
1 parent 413e342
commit 4ce5e9e
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 2 deletions.
diff --git a/jackson-apt/src/main/java/org/dominokit/jacksonapt/GwtJacksonJsonDeserializerParameters.java b/jackson-apt/src/main/java/org/dominokit/jacksonapt/GwtJacksonJsonDeserializerParameters.java
@@ -19,10 +19,13 @@
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import org.dominokit.jacksonapt.deser.bean.IdentityDeserializationInfo;
 import org.dominokit.jacksonapt.deser.bean.TypeDeserializationInfo;
+import org.gwtproject.i18n.client.TimeZone;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import static java.util.Objects.nonNull;
+
 /**
  * This class includes parameters defined through properties annotations like {@link com.fasterxml.jackson.annotation.JsonIgnoreProperties}. They are specific to one
  * {@link org.dominokit.jacksonapt.JsonDeserializer} and that's why they are not contained inside {@link org.dominokit.jacksonapt.JsonDeserializationContext}.
@@ -84,6 +87,18 @@ public final class GwtJacksonJsonDeserializerParameters implements JsonDeseriali
      */
     private TypeDeserializationInfo typeInfo;
 
+    public GwtJacksonJsonDeserializerParameters() {
+    }
+
+    public GwtJacksonJsonDeserializerParameters(JsonDeserializerParameters jsonDeserializerParameters) {
+        this.identityInfo = jsonDeserializerParameters.getIdentityInfo();
+        this.ignoredProperties = jsonDeserializerParameters.getIgnoredProperties();
+        this.locale = jsonDeserializerParameters.getLocale();
+        this.pattern = jsonDeserializerParameters.getPattern();
+        this.shape = jsonDeserializerParameters.getShape();
+        this.typeInfo = jsonDeserializerParameters.getTypeInfo();
+    }
+
     /**
      * {@inheritDoc}
      *

diff --git a/jackson-apt/src/main/java/org/dominokit/jacksonapt/GwtJacksonJsonSerializerParameters.java b/jackson-apt/src/main/java/org/dominokit/jacksonapt/GwtJacksonJsonSerializerParameters.java
@@ -25,6 +25,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import static java.util.Objects.nonNull;
+
 /**
  * This class includes parameters defined through properties annotations like {@link com.fasterxml.jackson.annotation.JsonFormat}. They are specific to one
  * {@link org.dominokit.jacksonapt.JsonSerializer} and that's why they are not contained inside {@link org.dominokit.jacksonapt.JsonSerializationContext}.
@@ -90,6 +92,23 @@ public final class GwtJacksonJsonSerializerParameters implements JsonSerializerP
      */
     private boolean unwrapped = false;
 
+    public GwtJacksonJsonSerializerParameters() {
+    }
+
+    public GwtJacksonJsonSerializerParameters(JsonSerializerParameters jsonSerializerParameters) {
+        this.identityInfo = jsonSerializerParameters.getIdentityInfo();
+        this.ignoredProperties = jsonSerializerParameters.getIgnoredProperties();
+        this.include = jsonSerializerParameters.getInclude();
+        this.locale = jsonSerializerParameters.getLocale();
+        this.pattern = jsonSerializerParameters.getPattern();
+        this.shape = jsonSerializerParameters.getShape();
+        if(nonNull(jsonSerializerParameters.getTimezone())) {
+            this.timezone = (TimeZone) jsonSerializerParameters.getTimezone();
+        }
+        this.typeInfo = jsonSerializerParameters.getTypeInfo();
+        this.unwrapped = jsonSerializerParameters.isUnwrapped();
+    }
+
     /**
      * {@inheritDoc}
      *

diff --git a/jackson-apt/src/main/java/org/dominokit/jacksonapt/JsJacksonContext.java b/jackson-apt/src/main/java/org/dominokit/jacksonapt/JsJacksonContext.java
@@ -77,11 +77,11 @@ public JsonDeserializerParameters defaultDeserializerParameters() {
 
     @Override
     public JsonSerializerParameters newSerializerParameters() {
-        return new GwtJacksonJsonSerializerParameters();
+        return new GwtJacksonJsonSerializerParameters(defaultSerializerParameters());
     }
 
     @Override
     public JsonDeserializerParameters newDeserializerParameters() {
-        return new GwtJacksonJsonDeserializerParameters();
+        return new GwtJacksonJsonDeserializerParameters(defaultDeserializerParameters());
     }
 }
diff --git a/...n-apt/src/main/java/org/dominokit/jacksonapt/ServerJacksonJsonDeserializerParameters.java b/...n-apt/src/main/java/org/dominokit/jacksonapt/ServerJacksonJsonDeserializerParameters.java
@@ -85,6 +85,19 @@ public final class ServerJacksonJsonDeserializerParameters implements JsonDeseri
      */
     private TypeDeserializationInfo typeInfo;
 
+    public ServerJacksonJsonDeserializerParameters() {
+    }
+
+    public ServerJacksonJsonDeserializerParameters(JsonDeserializerParameters jsonDeserializerParameters) {
+        this.identityInfo = jsonDeserializerParameters.getIdentityInfo();
+        this.ignoredProperties = jsonDeserializerParameters.getIgnoredProperties();
+        this.locale = jsonDeserializerParameters.getLocale();
+        this.pattern = jsonDeserializerParameters.getPattern();
+        this.shape = jsonDeserializerParameters.getShape();
+        this.typeInfo = jsonDeserializerParameters.getTypeInfo();
+    }
+
+
     /**
      * {@inheritDoc}
      *

diff --git a/...son-apt/src/main/java/org/dominokit/jacksonapt/ServerJacksonJsonSerializerParameters.java b/...son-apt/src/main/java/org/dominokit/jacksonapt/ServerJacksonJsonSerializerParameters.java
@@ -20,11 +20,14 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import org.dominokit.jacksonapt.ser.bean.IdentitySerializationInfo;
 import org.dominokit.jacksonapt.ser.bean.TypeSerializationInfo;
+import org.gwtproject.i18n.client.TimeZone;
 
 import java.time.ZoneId;
 import java.util.HashSet;
 import java.util.Set;
 
+import static java.util.Objects.nonNull;
+
 /**
  * This class includes parameters defined through properties annotations like {@link com.fasterxml.jackson.annotation.JsonFormat}. They are specific to one
  * {@link org.dominokit.jacksonapt.JsonSerializer} and that's why they are not contained inside {@link org.dominokit.jacksonapt.JsonSerializationContext}.
@@ -91,6 +94,23 @@ public final class ServerJacksonJsonSerializerParameters implements JsonSerializ
      */
     private boolean unwrapped = false;
 
+    public ServerJacksonJsonSerializerParameters() {
+    }
+
+    public ServerJacksonJsonSerializerParameters(JsonSerializerParameters jsonSerializerParameters) {
+        this.identityInfo = jsonSerializerParameters.getIdentityInfo();
+        this.ignoredProperties = jsonSerializerParameters.getIgnoredProperties();
+        this.include = jsonSerializerParameters.getInclude();
+        this.locale = jsonSerializerParameters.getLocale();
+        this.pattern = jsonSerializerParameters.getPattern();
+        this.shape = jsonSerializerParameters.getShape();
+        if(nonNull(jsonSerializerParameters.getTimezone())) {
+            this.timezone = (ZoneId) jsonSerializerParameters.getTimezone();
+        }
+        this.typeInfo = jsonSerializerParameters.getTypeInfo();
+        this.unwrapped = jsonSerializerParameters.isUnwrapped();
+    }
+
     /**
      * {@inheritDoc}
      *