Address review comments

finos · Apr 14, 2023 · abaf714 · abaf714
1 parent af29110
commit abaf714
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 45 deletions.
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
@@ -22,18 +22,13 @@
 
 public class BaseServerJacksonJsonProvider extends JacksonJsonProvider implements ContextResolver<ObjectMapper>
 {
-    private final ObjectMapper objectMapper;
-
-    public BaseServerJacksonJsonProvider()
-    {
-        objectMapper = new ObjectMapper();
-        objectMapper.findAndRegisterModules();
-        objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
-    }
+    private final ObjectMapper objectMapper = new ObjectMapper()
+            .findAndRegisterModules()
+            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
 
     @Override
     public ObjectMapper getContext(Class<?> type)
     {
-        return objectMapper;
+        return this.objectMapper;
     }
 }
diff --git a/...rc/test/java/org/finos/legend/sdlc/server/LegendSDLCServerForTestJacksonJsonProvider.java b/...rc/test/java/org/finos/legend/sdlc/server/LegendSDLCServerForTestJacksonJsonProvider.java
@@ -32,25 +32,20 @@
 
 public class LegendSDLCServerForTestJacksonJsonProvider extends JacksonJsonProvider implements ContextResolver<ObjectMapper>
 {
-    private final ObjectMapper objectMapper;
-
-    public LegendSDLCServerForTestJacksonJsonProvider()
-    {
-        objectMapper = new ObjectMapper();
-        objectMapper.findAndRegisterModules();
-        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        objectMapper.addMixIn(Project.class, InMemoryMixins.Project.class);
-        objectMapper.addMixIn(Workspace.class, InMemoryMixins.Workspace.class);
-        objectMapper.addMixIn(Entity.class, InMemoryMixins.Entity.class);
-        objectMapper.addMixIn(Revision.class, InMemoryMixins.Revision.class);
-        objectMapper.addMixIn(ProjectDependency.class, ProjectDependencyMixin.class);
-        objectMapper.addMixIn(VersionId.class, VersionIdMixin.class);
-        objectMapper.addMixIn(Review.class, InMemoryMixins.Review.class);
-    }
+    private final ObjectMapper objectMapper = new ObjectMapper()
+            .findAndRegisterModules()
+            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+            .addMixIn(Project.class, InMemoryMixins.Project.class)
+            .addMixIn(Workspace.class, InMemoryMixins.Workspace.class)
+            .addMixIn(Entity.class, InMemoryMixins.Entity.class)
+            .addMixIn(Revision.class, InMemoryMixins.Revision.class)
+            .addMixIn(ProjectDependency.class, ProjectDependencyMixin.class)
+            .addMixIn(VersionId.class, VersionIdMixin.class)
+            .addMixIn(Review.class, InMemoryMixins.Review.class);
 
     @Override
     public ObjectMapper getContext(Class<?> type)
     {
-        return objectMapper;
+        return this.objectMapper;
     }
 }
diff --git a/...nd-sdlc-server/src/test/java/org/finos/legend/sdlc/server/gitlab/TestGitLabProjectId.java b/...nd-sdlc-server/src/test/java/org/finos/legend/sdlc/server/gitlab/TestGitLabProjectId.java
@@ -87,6 +87,6 @@ public void testParseProjectId()
 
     private long[] getGitLabIdsForTest()
     {
-        return new long[]{0, 1, 2, 3, 4, 5, 64, 127, 511, 1024, 17_560_438, 1_030_991_200, Integer.MAX_VALUE};
+        return new long[]{0, 1, 2, 3, 4, 5, 64, 127, 511, 1024, 17_560_438, 1_030_991_200, Integer.MAX_VALUE, Long.MAX_VALUE};
     }
 }
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
@@ -73,29 +73,24 @@ private Client createClient()
 
     static class SDLCServerClientRuleJacksonJsonProvider extends JacksonJsonProvider implements ContextResolver<ObjectMapper>
     {
-        private final ObjectMapper objectMapper;
-
-        public SDLCServerClientRuleJacksonJsonProvider()
-        {
-            objectMapper = new ObjectMapper();
-            this.objectMapper.findAndRegisterModules();
-            this.objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
-            this.objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-            this.objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-            this.objectMapper.addMixIn(Project.class, InMemoryMixins.Project.class);
-            this.objectMapper.addMixIn(Workspace.class, InMemoryMixins.Workspace.class);
-            this.objectMapper.addMixIn(Entity.class, InMemoryMixins.Entity.class);
-            this.objectMapper.addMixIn(Revision.class, InMemoryMixins.Revision.class);
-            this.objectMapper.addMixIn(Review.class, InMemoryMixins.Review.class);
-            this.objectMapper.addMixIn(ProjectRevision.class, ProjectRevisionMixin.class);
-            this.objectMapper.addMixIn(ProjectDependency.class, ProjectDependencyMixin.class);
-            this.objectMapper.addMixIn(VersionId.class, VersionIdMixin.class);
-        }
+        private final ObjectMapper objectMapper = new ObjectMapper()
+                .findAndRegisterModules()
+                .enable(SerializationFeature.INDENT_OUTPUT)
+                .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+                .addMixIn(Project.class, InMemoryMixins.Project.class)
+                .addMixIn(Workspace.class, InMemoryMixins.Workspace.class)
+                .addMixIn(Entity.class, InMemoryMixins.Entity.class)
+                .addMixIn(Revision.class, InMemoryMixins.Revision.class)
+                .addMixIn(Review.class, InMemoryMixins.Review.class)
+                .addMixIn(ProjectRevision.class, ProjectRevisionMixin.class)
+                .addMixIn(ProjectDependency.class, ProjectDependencyMixin.class)
+                .addMixIn(VersionId.class, VersionIdMixin.class);
 
         @Override
         public ObjectMapper getContext(Class<?> type)
         {
-            return objectMapper;
+            return this.objectMapper;
         }
     }
 }