GSON Datetime (de)serializers (#589)

* Proposed serialization fix * Bumping to a higher version to ensure version match
openraven · Mar 20, 2024 · a2bbaf3 · a2bbaf3
1 parent 9527562
commit a2bbaf3
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 14 deletions.
diff --git a/magpie-api/pom.xml b/magpie-api/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/magpie-aws/pom.xml b/magpie-aws/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/magpie-azure/pom.xml b/magpie-azure/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>io.openraven.magpie</groupId>
  <artifactId>magpie-parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
 
  <artifactId>magpie-azure</artifactId>

diff --git a/magpie-cli/pom.xml b/magpie-cli/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/magpie-core/pom.xml b/magpie-core/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -54,7 +54,7 @@
  <dependency>
  <groupId>io.openraven.magpie</groupId>
  <artifactId>magpie-persist</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  <scope>compile</scope>
  </dependency>
 

diff --git a/magpie-data/pom.xml b/magpie-data/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/magpie-gcp/pom.xml b/magpie-gcp/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/magpie-gcp/src/main/java/io/openraven/magpie/plugins/gcp/discovery/GCPUtils.java b/magpie-gcp/src/main/java/io/openraven/magpie/plugins/gcp/discovery/GCPUtils.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.appengine.repackaged.com.google.common.base.Pair;
+import com.google.appengine.repackaged.org.joda.time.LocalDate;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializer;
@@ -38,7 +39,9 @@
 import java.lang.reflect.Type;
 import java.time.Duration;
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
 
 public class GCPUtils {
 
@@ -49,12 +52,34 @@ public JsonElement serialize(Duration duration, Type type, JsonSerializationCont
  return new JsonPrimitive(duration.toString());
  }
  }
+
+ static class LocalDateTimeSerializer implements JsonSerializer <LocalDateTime> {
+ private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MMM-dd HH:mm:ss");
+
+ @Override
+ public JsonElement serialize(LocalDateTime localDateTime, Type srcType, JsonSerializationContext context) {
+ return new JsonPrimitive(formatter.format(localDateTime));
+ }
+ }
+
+ static class OffsetDateTimeSerializer implements JsonSerializer <OffsetDateTime> {
+ private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MMM-dd HH:mm:ss");
+
+ @Override
+ public JsonElement serialize(OffsetDateTime offsetDateTime, Type srcType, JsonSerializationContext context) {
+ return new JsonPrimitive(formatter.format(offsetDateTime));
+ }
+ }
+
  private static final Logger logger = LoggerFactory.getLogger(GCPUtils.class);
  private static final ObjectMapper mapper = createObjectMapper();
 
  private static final Gson GSON = new GsonBuilder()
  .setPrettyPrinting()
  .registerTypeAdapter(OffsetDateTime.class, (JsonDeserializer<OffsetDateTime>) (json, type, context) -> OffsetDateTime.parse(json.getAsString()))
+ .registerTypeAdapter(LocalDateTime.class, (JsonDeserializer<LocalDateTime>) (json, type, context) -> LocalDateTime.parse(json.getAsString()))
+ .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
+ .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeSerializer())
  .registerTypeAdapter(Duration.class, new DurationSerializer())
  .create();
 

diff --git a/magpie-json/pom.xml b/magpie-json/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/magpie-persist/pom.xml b/magpie-persist/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/magpie-policy-output-csv/pom.xml b/magpie-policy-output-csv/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/magpie-policy-output-json/pom.xml b/magpie-policy-output-json/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/magpie-policy-output-text/pom.xml b/magpie-policy-output-text/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>magpie-parent</artifactId>
  <groupId>io.openraven.magpie</groupId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
  <groupId>io.openraven.magpie</groupId>
  <artifactId>magpie-parent</artifactId>
  <packaging>pom</packaging>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
  <name>Open Raven Magpie</name>
  <url>https://github.com/openraven/magpie</url>
  <description>Open Raven's Magpie Project</description>