Removed creation of custom ObjectMapper and rely on Jackson (fix #140)

Author: oliemansm

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLJavaToolsAutoConfiguration.java

@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Optional;
 
 import static com.coxautodev.graphql.tools.SchemaParserOptions.newOptions;
 
@@ -43,19 +42,13 @@ public SchemaStringProvider schemaStringProvider() {
         return new ClasspathResourceSchemaStringProvider();
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public ObjectMapper objectMapper() {
-        return new ObjectMapper();
-    }
-
     @Bean
     @ConditionalOnBean({GraphQLResolver.class})
     @ConditionalOnMissingBean
     public SchemaParser schemaParser(
             List<GraphQLResolver<?>> resolvers,
             SchemaStringProvider schemaStringProvider,
-            Optional<PerFieldObjectMapperProvider> perFieldObjectMapperProvider
+            PerFieldObjectMapperProvider perFieldObjectMapperProvider
     ) throws IOException {
         SchemaParserBuilder builder = dictionary != null ? new SchemaParserBuilder(dictionary) : new SchemaParserBuilder();
 
@@ -68,9 +61,9 @@ public SchemaParser schemaParser(
 
         if (options != null) {
             builder.options(options);
-        } else if (perFieldObjectMapperProvider.isPresent()) {
+        } else if (perFieldObjectMapperProvider != null) {
             final SchemaParserOptions.Builder optionsBuilder =
-                    newOptions().objectMapperProvider(perFieldObjectMapperProvider.get());
+                    newOptions().objectMapperProvider(perFieldObjectMapperProvider);
             builder.options(optionsBuilder.build());
         }
 

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebAutoConfiguration.java

@@ -56,6 +56,7 @@
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.DispatcherServlet;
@@ -205,15 +206,15 @@ public GraphQLQueryInvoker queryInvoker(ExecutionStrategyProvider executionStrat
 
     @Bean
     @ConditionalOnMissingBean
-    public GraphQLObjectMapper graphQLObjectMapper(Optional<ObjectMapperProvider> objectMapperProvider) {
+    public GraphQLObjectMapper graphQLObjectMapper(ObjectMapperProvider objectMapperProvider) {
         GraphQLObjectMapper.Builder builder = newBuilder();
 
         if (errorHandler != null) {
             builder.withGraphQLErrorHandler(errorHandler);
         }
 
-        if (objectMapperProvider.isPresent()){
-            builder.withObjectMapperProvider(objectMapperProvider.get());
+        if (objectMapperProvider != null){
+            builder.withObjectMapperProvider(objectMapperProvider);
         } else if (objectMapperConfigurer != null) {
             builder.withObjectMapperConfigurer(objectMapperConfigurer);
         }
@@ -256,9 +257,4 @@ private MultipartConfigElement multipartConfigElement() {
         return Optional.ofNullable(multipartConfigElement).orElse(new MultipartConfigElement(""));
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public ObjectMapper objectMapper() {
-        return new ObjectMapper();
-    }
 }