Merge pull request #93 from mxab/wip/unify-objectmapper

Introduce ObjectMapperProvider

Author: oliemansm

src/main/java/graphql/servlet/ConfiguringObjectMapperProvider.java

@@ -0,0 +1,32 @@
+package graphql.servlet;
+
+import com.fasterxml.jackson.databind.InjectableValues;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+
+public class ConfiguringObjectMapperProvider implements ObjectMapperProvider {
+
+  private final ObjectMapperConfigurer objectMapperConfigurer;
+
+  public ConfiguringObjectMapperProvider(ObjectMapperConfigurer objectMapperConfigurer) {
+    this.objectMapperConfigurer = objectMapperConfigurer;
+  }
+
+  public ConfiguringObjectMapperProvider() {
+    this.objectMapperConfigurer = new DefaultObjectMapperConfigurer();
+  }
+
+  @Override
+  public ObjectMapper provide() {
+    ObjectMapper mapper = new ObjectMapper().disable(
+      SerializationFeature.FAIL_ON_EMPTY_BEANS).registerModule(new Jdk8Module());
+    objectMapperConfigurer.configure(mapper);
+
+    InjectableValues.Std injectableValues = new InjectableValues.Std();
+    injectableValues.addValue(ObjectMapper.class, mapper);
+    mapper.setInjectableValues(injectableValues);
+
+    return mapper;
+  }
+}

src/main/java/graphql/servlet/GraphQLObjectMapper.java

@@ -25,13 +25,13 @@
  * @author Andrew Potter
  */
 public class GraphQLObjectMapper {
-    private final Supplier<ObjectMapperConfigurer> objectMapperConfigurerSupplier;
+    private final ObjectMapperProvider objectMapperProvider;
     private final Supplier<GraphQLErrorHandler> graphQLErrorHandlerSupplier;
 
     private volatile ObjectMapper mapper;
 
-    protected GraphQLObjectMapper(Supplier<ObjectMapperConfigurer> objectMapperConfigurerSupplier, Supplier<GraphQLErrorHandler> graphQLErrorHandlerSupplier) {
-        this.objectMapperConfigurerSupplier = objectMapperConfigurerSupplier;
+    protected GraphQLObjectMapper(ObjectMapperProvider objectMapperProvider, Supplier<GraphQLErrorHandler> graphQLErrorHandlerSupplier) {
+        this.objectMapperProvider = objectMapperProvider;
         this.graphQLErrorHandlerSupplier = graphQLErrorHandlerSupplier;
     }
 
@@ -42,24 +42,13 @@ public ObjectMapper getJacksonMapper() {
             synchronized(this) {
                 result = mapper;
                 if (result == null) // Second check (with locking)
-                    mapper = result = createObjectMapper();
+                    mapper = result = objectMapperProvider.provide();
             }
         }
 
         return result;
     }
 
-    private ObjectMapper createObjectMapper() {
-        ObjectMapper mapper = new ObjectMapper().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS).registerModule(new Jdk8Module());
-        objectMapperConfigurerSupplier.get().configure(mapper);
-
-        InjectableValues.Std injectableValues = new InjectableValues.Std();
-        injectableValues.addValue(ObjectMapper.class, mapper);
-        mapper.setInjectableValues(injectableValues);
-
-        return mapper;
-    }
-
     /**
      * @return an {@link ObjectReader} for deserializing {@link GraphQLRequest}
      */
@@ -163,15 +152,20 @@ public static Builder newBuilder() {
     }
 
     public static class Builder {
-        private Supplier<ObjectMapperConfigurer> objectMapperConfigurer = DefaultObjectMapperConfigurer::new;
+        private ObjectMapperProvider objectMapperProvider = new ConfiguringObjectMapperProvider();
         private Supplier<GraphQLErrorHandler> graphQLErrorHandler = DefaultGraphQLErrorHandler::new;
 
         public Builder withObjectMapperConfigurer(ObjectMapperConfigurer objectMapperConfigurer) {
             return withObjectMapperConfigurer(() -> objectMapperConfigurer);
         }
 
         public Builder withObjectMapperConfigurer(Supplier<ObjectMapperConfigurer> objectMapperConfigurer) {
-            this.objectMapperConfigurer = objectMapperConfigurer;
+            this.objectMapperProvider = new ConfiguringObjectMapperProvider(objectMapperConfigurer.get());
+            return this;
+        }
+
+        public Builder withObjectMapperProvider(ObjectMapperProvider objectMapperProvider) {
+            this.objectMapperProvider = objectMapperProvider;
             return this;
         }
 
@@ -185,7 +179,7 @@ public Builder withGraphQLErrorHandler(Supplier<GraphQLErrorHandler> graphQLErro
         }
 
         public GraphQLObjectMapper build() {
-            return new GraphQLObjectMapper(objectMapperConfigurer, graphQLErrorHandler);
+            return new GraphQLObjectMapper(objectMapperProvider, graphQLErrorHandler);
         }
     }
 }

src/main/java/graphql/servlet/ObjectMapperProvider.java

@@ -0,0 +1,7 @@
+package graphql.servlet;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public interface ObjectMapperProvider {
+	ObjectMapper provide();
+}