Refactored construction of servlet

Author: oliemansm

example-graphql-subscription/build.gradle

@@ -5,6 +5,7 @@ plugins {
 sourceCompatibility = 1.8
 
 repositories {
+    jcenter()
     mavenCentral()
 }
 

gradle.properties

@@ -40,7 +40,7 @@ LIB_GRAPHQL_JAVA_VER = 11.0
 LIB_JUNIT_VER = 4.12
 LIB_SPRING_CORE_VER = 5.0.4.RELEASE
 LIB_SPRING_BOOT_VER = 2.1.0.RELEASE
-LIB_GRAPHQL_SERVLET_VER = 7.1.0
+LIB_GRAPHQL_SERVLET_VER = 7.1.1-SNAPSHOT
 LIB_GRAPHQL_JAVA_TOOLS_VER = 5.4.0
 LIB_COMMONS_IO_VER = 2.6
 kotlin.version=1.3.10

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

@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.module.kotlin.KotlinModule;
-import com.oembedler.moon.graphql.boot.error.GraphQLErrorHandlerFactory;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
-import graphql.servlet.GraphQLErrorHandler;
 import graphql.servlet.GraphQLSchemaProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;

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

@@ -25,7 +25,6 @@
 import graphql.execution.AsyncExecutionStrategy;
 import graphql.execution.ExecutionStrategy;
 import graphql.execution.SubscriptionExecutionStrategy;
-import graphql.execution.instrumentation.ChainedInstrumentation;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLSchema;
@@ -182,13 +181,8 @@ public GraphQLQueryInvoker queryInvoker(ExecutionStrategyProvider executionStrat
         GraphQLQueryInvoker.Builder builder = GraphQLQueryInvoker.newBuilder()
                 .withExecutionStrategyProvider(executionStrategyProvider);
 
-        if (instrumentations != null && !instrumentations.isEmpty()) {
-            if (instrumentations.size() == 1) {
-                builder.withInstrumentation(instrumentations.get(0));
-            } else {
-                Instrumentation instrumentation = new ChainedInstrumentation(instrumentations);
-                builder.withInstrumentation(instrumentation);
-            }
+        if (instrumentations != null) {
+            builder.with(instrumentations);
         }
 
         if (preparsedDocumentProvider != null) {
@@ -207,7 +201,7 @@ public GraphQLObjectMapper graphQLObjectMapper(ObjectMapperProvider objectMapper
             builder.withGraphQLErrorHandler(errorHandler);
         }
 
-        if (objectMapperProvider != null){
+        if (objectMapperProvider != null) {
             builder.withObjectMapperProvider(objectMapperProvider);
         } else if (objectMapperConfigurer != null) {
             builder.withObjectMapperConfigurer(objectMapperConfigurer);
@@ -218,7 +212,7 @@ public GraphQLObjectMapper graphQLObjectMapper(ObjectMapperProvider objectMapper
 
     @Bean
     @ConditionalOnMissingBean
-    @ConditionalOnProperty(value="graphql.servlet.use-default-objectmapper", havingValue = "true",
+    @ConditionalOnProperty(value = "graphql.servlet.use-default-objectmapper", havingValue = "true",
             matchIfMissing = true)
     public ObjectMapperProvider objectMapperProvider(ObjectMapper objectMapper) {
         InjectableValues.Std injectableValues = new InjectableValues.Std();
@@ -228,16 +222,16 @@ public ObjectMapperProvider objectMapperProvider(ObjectMapper objectMapper) {
     }
 
 
-
     @Bean
     @ConditionalOnMissingBean
-    public SimpleGraphQLHttpServlet graphQLHttpServlet(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQLObjectMapper) {
-        return SimpleGraphQLHttpServlet.newBuilder(invocationInputFactory)
-                .withQueryInvoker(queryInvoker)
-                .withObjectMapper(graphQLObjectMapper)
-                .withListeners(listeners)
-                .withAsyncServletMode(graphQLServletProperties.isAsyncModeEnabled())
+    public GraphQLHttpServlet graphQLHttpServlet(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQLObjectMapper) {
+        GraphQLConfiguration configuration = GraphQLConfiguration.with(invocationInputFactory)
+                .with(queryInvoker)
+                .with(graphQLObjectMapper)
+                .with(listeners)
+                .with(graphQLServletProperties.isAsyncModeEnabled())
                 .build();
+        return GraphQLHttpServlet.with(configuration);
     }
 
     @Bean

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

@@ -93,7 +93,6 @@ GraphQLSchema schema() {
                 .resolvers(queryResolver())
                 .build();
         return schemaParser.makeExecutableSchema();
-//        return GraphQLSchema.newSchema().query(GraphQLObjectType.newObject().name("Query").build()).build();
       }
     }