concord-server: replace Siesta's ObjectMapperProvider

With a local version.

Author: ibodrov

server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServerModule.java

@@ -20,6 +20,7 @@
  * =====
  */
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.walmartlabs.concord.db.DatabaseModule;
@@ -52,6 +53,8 @@ public class ConcordServerModule implements Module {
 
     @Override
     public void configure(Binder binder) {
+        binder.bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class);
+
         binder.install(new ConfigurationModule());
         binder.install(new MetricModule());
 

server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperInitializer.java server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperProvider.java

@@ -24,20 +24,17 @@
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.eclipse.sisu.EagerSingleton;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import javax.inject.Provider;
 
-@Named
-@EagerSingleton
-public class ObjectMapperInitializer {
+public class ObjectMapperProvider implements Provider<ObjectMapper> {
 
-    @Inject
-    public ObjectMapperInitializer(@Named("siesta") javax.inject.Provider<ObjectMapper> mapperProvider) {
-        ObjectMapper om = mapperProvider.get();
+    @Override
+    public ObjectMapper get() {
+        ObjectMapper om = new ObjectMapper();
         om.registerModule(new GuavaModule());
         om.registerModule(new Jdk8Module());
         om.registerModule(new JavaTimeModule());
+        return om;
     }
 }

server/impl/src/test/java/com/walmartlabs/concord/server/TestObjectMapper.java

@@ -21,15 +21,14 @@
  */
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.sonatype.siesta.jackson2.ObjectMapperProvider;
 
 public final class TestObjectMapper {
 
     public static final ObjectMapper INSTANCE = createObjectMapper();
 
     private static ObjectMapper createObjectMapper() {
-        ObjectMapper om = new ObjectMapperProvider().get();
-        new ObjectMapperInitializer(() -> om);
+        ObjectMapper om = new org.sonatype.siesta.jackson2.ObjectMapperProvider().get();
+        new ObjectMapperProvider(() -> om);
         return om;
     }