Specifically register JavaTimeModule rather than depending on findAnd…

…RegisterModules()
finos · Apr 14, 2023 · 4fcb18c · 4fcb18c
1 parent abaf714
commit 4fcb18c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/legend-sdlc-server-shared/pom.xml b/legend-sdlc-server-shared/pom.xml
@@ -158,6 +158,10 @@
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
 
         <!-- TEST -->
         <dependency>

diff --git a/...rver-shared/src/main/java/org/finos/legend/sdlc/server/BaseServerJacksonJsonProvider.java b/...rver-shared/src/main/java/org/finos/legend/sdlc/server/BaseServerJacksonJsonProvider.java
@@ -16,14 +16,15 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 
 import javax.ws.rs.ext.ContextResolver;
 
 public class BaseServerJacksonJsonProvider extends JacksonJsonProvider implements ContextResolver<ObjectMapper>
 {
     private final ObjectMapper objectMapper = new ObjectMapper()
-            .findAndRegisterModules()
+            .registerModule(new JavaTimeModule())
             .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
 
     @Override

diff --git a/legend-sdlc-server/pom.xml b/legend-sdlc-server/pom.xml
@@ -177,6 +177,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.google.inject</groupId>

diff --git a/...rc/test/java/org/finos/legend/sdlc/server/LegendSDLCServerForTestJacksonJsonProvider.java b/...rc/test/java/org/finos/legend/sdlc/server/LegendSDLCServerForTestJacksonJsonProvider.java
@@ -16,6 +16,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
 import org.finos.legend.sdlc.domain.model.project.Project;
@@ -33,7 +34,7 @@
 public class LegendSDLCServerForTestJacksonJsonProvider extends JacksonJsonProvider implements ContextResolver<ObjectMapper>
 {
     private final ObjectMapper objectMapper = new ObjectMapper()
-            .findAndRegisterModules()
+            .registerModule(new JavaTimeModule())
             .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
             .addMixIn(Project.class, InMemoryMixins.Project.class)
             .addMixIn(Workspace.class, InMemoryMixins.Workspace.class)

diff --git a/...dlc-server/src/test/java/org/finos/legend/sdlc/server/resources/SDLCServerClientRule.java b/...dlc-server/src/test/java/org/finos/legend/sdlc/server/resources/SDLCServerClientRule.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
 import org.finos.legend.sdlc.domain.model.project.Project;
@@ -74,7 +75,7 @@ private Client createClient()
     static class SDLCServerClientRuleJacksonJsonProvider extends JacksonJsonProvider implements ContextResolver<ObjectMapper>
     {
         private final ObjectMapper objectMapper = new ObjectMapper()
-                .findAndRegisterModules()
+                .registerModule(new JavaTimeModule())
                 .enable(SerializationFeature.INDENT_OUTPUT)
                 .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
                 .setSerializationInclusion(JsonInclude.Include.NON_NULL)

diff --git a/pom.xml b/pom.xml
@@ -832,6 +832,11 @@
                 <version>${legend.engine.version}</version>
             </dependency>
             <!-- External dependencies -->
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jsr310</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>