Merge pull request #142 from graphql-java-kickstart/bugfix/140-object-mapper

Bugfix/140 object mapper

Author: oliemansm

example-graphql-tools/build.gradle

@@ -29,6 +29,7 @@ repositories {
 dependencies {
     compile(project(":graphql-spring-boot-starter"))
     compile(project(":graphiql-spring-boot-starter"))
+    compile(project(":voyager-spring-boot-starter"))
     compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 
     compile("org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER")

example-graphql-tools/src/main/resources/application.yml

@@ -3,6 +3,8 @@ spring:
     name: graphql-java-tools-app
 server:
   port: 9000
+  servlet:
+    context-path: /abc
 graphiql:
   headers:
     Authorization: "Bearer 05bd9a5f3fe0408f89520946b0fe1b06"

graphiql-spring-boot-autoconfigure/build.gradle

@@ -17,7 +17,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies{
-    compile "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    
     compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
     compile "org.apache.commons:commons-text:1.1"
     compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"

graphql-spring-boot-autoconfigure/build.gradle

@@ -18,13 +18,14 @@
  */
 
 dependencies {
-    compile "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    
     compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
     compile "org.springframework.boot:spring-boot-starter-websocket:$LIB_SPRING_BOOT_VER"
     compile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
     compile "commons-io:commons-io:$LIB_COMMONS_IO_VER"
     compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
-    
+
     compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
 
     testCompile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"

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

@@ -8,16 +8,17 @@
 import graphql.schema.GraphQLSchema;
 import graphql.servlet.GraphQLSchemaProvider;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Optional;
 
 import static com.coxautodev.graphql.tools.SchemaParserOptions.newOptions;
 
@@ -26,6 +27,7 @@
  */
 @Configuration
 @ConditionalOnClass(SchemaParser.class)
+@AutoConfigureAfter({JacksonAutoConfiguration.class})
 public class GraphQLJavaToolsAutoConfiguration {
 
     @Autowired(required = false)
@@ -43,19 +45,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 +64,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

@@ -19,7 +19,6 @@
 
 package com.oembedler.moon.graphql.boot;
 
-import com.coxautodev.graphql.tools.PerFieldObjectMapperProvider;
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.execution.AsyncExecutionStrategy;
@@ -29,28 +28,10 @@
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLSchema;
-import graphql.servlet.AbstractGraphQLHttpServlet;
-import graphql.servlet.DefaultExecutionStrategyProvider;
-import graphql.servlet.DefaultGraphQLSchemaProvider;
-import graphql.servlet.ExecutionStrategyProvider;
-import graphql.servlet.GraphQLContextBuilder;
-import graphql.servlet.GraphQLErrorHandler;
-import graphql.servlet.GraphQLInvocationInputFactory;
-import graphql.servlet.GraphQLObjectMapper;
-import graphql.servlet.GraphQLQueryInvoker;
-import graphql.servlet.GraphQLRootObjectBuilder;
-import graphql.servlet.GraphQLSchemaProvider;
-import graphql.servlet.GraphQLServletListener;
-import graphql.servlet.ObjectMapperConfigurer;
-import graphql.servlet.ObjectMapperProvider;
-import graphql.servlet.SimpleGraphQLHttpServlet;
+import graphql.servlet.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.condition.*;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
@@ -205,15 +186,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 +237,4 @@ private MultipartConfigElement multipartConfigElement() {
         return Optional.ofNullable(multipartConfigElement).orElse(new MultipartConfigElement(""));
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public ObjectMapper objectMapper() {
-        return new ObjectMapper();
-    }
 }

graphql-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/graphql/boot/test/AbstractAutoConfigurationTest.java

@@ -1,6 +1,7 @@
 package com.oembedler.moon.graphql.boot.test;
 
 import org.junit.After;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigRegistry;
@@ -55,6 +56,7 @@ protected void load(Class<?> config, String... environment) {
 
         getRegistry().register(config);
         getRegistry().register(autoConfiguration);
+        getRegistry().register(JacksonAutoConfiguration.class);
 
         loadServletContext();
         getContext().refresh();

graphql-spring-boot-test-autoconfigure/src/main/java/com/graphql/spring/boot/test/GraphQLTest.java

@@ -13,6 +13,7 @@
 import graphql.schema.idl.SchemaParser;
 import graphql.servlet.*;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
 import org.springframework.boot.autoconfigure.websocket.servlet.WebSocketServletAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration;
@@ -92,7 +93,8 @@ Class<?>[] classes() default {
             GraphQLWebAutoConfiguration.class,
             GraphQLTestAutoConfiguration.class,
             PropertySourcesPlaceholderConfigurer.class,
-            WebSocketServletAutoConfiguration.class
+            WebSocketServletAutoConfiguration.class,
+            JacksonAutoConfiguration.class
     };
 
     @AliasFor(

voyager-spring-boot-autoconfigure/build.gradle

@@ -17,7 +17,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies{
-    compile "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    
     compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
     compile "org.apache.commons:commons-text:1.1"
     compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"