diff --git a/legend-sdlc-server-shared/pom.xml b/legend-sdlc-server-shared/pom.xml index f189f08d98..5e32e34502 100644 --- a/legend-sdlc-server-shared/pom.xml +++ b/legend-sdlc-server-shared/pom.xml @@ -98,6 +98,10 @@ io.dropwizard.metrics metrics-healthchecks + + io.dropwizard + dropwizard-jackson + io.prometheus @@ -158,10 +162,6 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - diff --git a/legend-sdlc-server-shared/src/main/java/org/finos/legend/sdlc/server/BaseServerJacksonJsonProvider.java b/legend-sdlc-server-shared/src/main/java/org/finos/legend/sdlc/server/BaseServerJacksonJsonProvider.java index 6934d709a0..aa22bd58e5 100644 --- a/legend-sdlc-server-shared/src/main/java/org/finos/legend/sdlc/server/BaseServerJacksonJsonProvider.java +++ b/legend-sdlc-server-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 { - 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 index 933fd4a3d3..feff7e3f62 100644 --- a/legend-sdlc-server/pom.xml +++ b/legend-sdlc-server/pom.xml @@ -177,10 +177,6 @@ - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - com.google.inject @@ -231,6 +227,10 @@ io.dropwizard.metrics metrics-healthchecks + + io.dropwizard + dropwizard-jackson + io.swagger diff --git a/legend-sdlc-server/src/test/java/org/finos/legend/sdlc/server/LegendSDLCServerForTestJacksonJsonProvider.java b/legend-sdlc-server/src/test/java/org/finos/legend/sdlc/server/LegendSDLCServerForTestJacksonJsonProvider.java index cf2b556d72..1760b8de96 100644 --- a/legend-sdlc-server/src/test/java/org/finos/legend/sdlc/server/LegendSDLCServerForTestJacksonJsonProvider.java +++ b/legend-sdlc-server/src/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 { - 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/legend-sdlc-server/src/test/java/org/finos/legend/sdlc/server/resources/SDLCServerClientRule.java b/legend-sdlc-server/src/test/java/org/finos/legend/sdlc/server/resources/SDLCServerClientRule.java index c78ef2fcf4..17d694eff9 100644 --- a/legend-sdlc-server/src/test/java/org/finos/legend/sdlc/server/resources/SDLCServerClientRule.java +++ b/legend-sdlc-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 { - 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 index 4e8163299f..cf03c76366 100644 --- a/pom.xml +++ b/pom.xml @@ -832,11 +832,6 @@ ${legend.engine.version} - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - com.fasterxml.jackson.core jackson-annotations