attempt to use Jackson.newObjectMapper()

finos · Apr 14, 2023 · e345555 · e345555
1 parent 4fcb18c
commit e345555
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 22 deletions.
diff --git a/legend-sdlc-server-shared/pom.xml b/legend-sdlc-server-shared/pom.xml
@@ -98,6 +98,10 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-healthchecks</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-jackson</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.prometheus</groupId>
@@ -158,10 +162,6 @@
             <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,15 +16,14 @@
 
 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 io.dropwizard.jackson.Jackson;
 
 import javax.ws.rs.ext.ContextResolver;
 
 public class BaseServerJacksonJsonProvider extends JacksonJsonProvider implements ContextResolver<ObjectMapper>
 {
-    private final ObjectMapper objectMapper = new ObjectMapper()
-            .registerModule(new JavaTimeModule())
+    private final ObjectMapper objectMapper = Jackson.newObjectMapper()
             .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
 
     @Override

diff --git a/legend-sdlc-server/pom.xml b/legend-sdlc-server/pom.xml
@@ -177,10 +177,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.google.inject</groupId>
@@ -231,6 +227,10 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-healthchecks</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-jackson</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.swagger</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,8 +16,8 @@
 
 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 io.dropwizard.jackson.Jackson;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
 import org.finos.legend.sdlc.domain.model.project.Project;
 import org.finos.legend.sdlc.domain.model.project.configuration.ProjectDependency;
@@ -33,8 +33,7 @@
 
 public class LegendSDLCServerForTestJacksonJsonProvider extends JacksonJsonProvider implements ContextResolver<ObjectMapper>
 {
-    private final ObjectMapper objectMapper = new ObjectMapper()
-            .registerModule(new JavaTimeModule())
+    private final ObjectMapper objectMapper = Jackson.newObjectMapper()
             .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,8 +17,8 @@
 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 io.dropwizard.jackson.Jackson;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
 import org.finos.legend.sdlc.domain.model.project.Project;
 import org.finos.legend.sdlc.domain.model.project.configuration.ProjectDependency;
@@ -74,8 +74,7 @@ private Client createClient()
 
     static class SDLCServerClientRuleJacksonJsonProvider extends JacksonJsonProvider implements ContextResolver<ObjectMapper>
     {
-        private final ObjectMapper objectMapper = new ObjectMapper()
-                .registerModule(new JavaTimeModule())
+        private final ObjectMapper objectMapper = Jackson.newObjectMapper()
                 .enable(SerializationFeature.INDENT_OUTPUT)
                 .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
                 .setSerializationInclusion(JsonInclude.Include.NON_NULL)

diff --git a/pom.xml b/pom.xml
@@ -832,11 +832,6 @@
                 <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>