Data serialization and deserialization fixes

Author: maciek365

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>pl.wtx.symfonia</groupId>
 	<artifactId>symfonia-erp-webapi-client</artifactId>
-	<version>0.1.1</version>
+	<version>0.1.2</version>
 	<packaging>jar</packaging>
 
 	<name>Symfonia ERP WebAPI Client</name>

src/main/java/pl/wtx/symfonia/api/client/config/GsonConfig.java

@@ -13,7 +13,6 @@ public static Gson createGson() {
 
         return new GsonBuilder()
                 .setStrictness(Strictness.LENIENT)
-                .serializeNulls()
                 .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeAdapter())
                 .registerTypeAdapter(LocalDate.class, new LocalDateAdapter())
                 .create();

src/main/java/pl/wtx/symfonia/api/client/config/LocalDateAdapter.java

@@ -14,16 +14,16 @@
 
 public class LocalDateAdapter implements JsonSerializer<LocalDate>, JsonDeserializer<LocalDate> {
 
-    private static final DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE;
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE;
 
     @Override
     public JsonElement serialize(LocalDate localDate, Type typeOfSrc, JsonSerializationContext context) {
-        return (localDate == null) ? null : new JsonPrimitive(localDate.format(formatter));
+        return (localDate == null) ? null : new JsonPrimitive(localDate.format(FORMATTER));
     }
 
     @Override
     public LocalDate deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        return (json == null || json.getAsString().isEmpty()) ? null : LocalDate.parse(json.getAsString(), formatter);
+        return (json == null || json.getAsString().isEmpty()) ? null : LocalDate.parse(json.getAsString(), FORMATTER);
     }
 
 }

src/main/java/pl/wtx/symfonia/api/client/config/OffsetDateTimeAdapter.java

@@ -12,7 +12,7 @@
 
 public class OffsetDateTimeAdapter extends TypeAdapter<OffsetDateTime> {
 
-    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
 
     @Override
     public void write(JsonWriter out, OffsetDateTime value) throws IOException {

src/main/java/pl/wtx/symfonia/api/client/model/PriceOrderCriteria.java

@@ -20,6 +20,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -72,7 +73,7 @@ public class PriceOrderCriteria {
   public static final String SERIALIZED_NAME_DATE = "Date";
   @SerializedName(SERIALIZED_NAME_DATE)
   @javax.annotation.Nullable
-  private String date;
+  private LocalDate date;
 
   public static final String SERIALIZED_NAME_CURRENCY = "Currency";
   @SerializedName(SERIALIZED_NAME_CURRENCY)
@@ -154,7 +155,7 @@ public void setDepartment(@javax.annotation.Nullable String department) {
   }
 
 
-  public PriceOrderCriteria date(@javax.annotation.Nullable String date) {
+  public PriceOrderCriteria date(@javax.annotation.Nullable LocalDate date) {
     this.date = date;
     return this;
   }
@@ -164,11 +165,11 @@ public PriceOrderCriteria date(@javax.annotation.Nullable String date) {
    * @return date
    */
   @javax.annotation.Nullable
-  public String getDate() {
+  public LocalDate getDate() {
     return date;
   }
 
-  public void setDate(@javax.annotation.Nullable String date) {
+  public void setDate(@javax.annotation.Nullable LocalDate date) {
     this.date = date;
   }
 
@@ -359,9 +360,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
       if ((jsonObj.get("Department") != null && !jsonObj.get("Department").isJsonNull()) && !jsonObj.get("Department").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format("Expected the field `Department` to be a primitive type in the JSON string but got `%s`", jsonObj.get("Department").toString()));
       }
-      if ((jsonObj.get("Date") != null && !jsonObj.get("Date").isJsonNull()) && !jsonObj.get("Date").isJsonPrimitive()) {
-        throw new IllegalArgumentException(String.format("Expected the field `Date` to be a primitive type in the JSON string but got `%s`", jsonObj.get("Date").toString()));
-      }
       if ((jsonObj.get("Currency") != null && !jsonObj.get("Currency").isJsonNull()) && !jsonObj.get("Currency").isJsonPrimitive()) {
         throw new IllegalArgumentException(String.format("Expected the field `Currency` to be a primitive type in the JSON string but got `%s`", jsonObj.get("Currency").toString()));
       }