Merge pull request #263 from jmccaull/upgrade_servlet_version

Update to version of servlet with context settings

Author: oliemansm

README.md

@@ -172,6 +172,7 @@ graphql:
            corsEnabled: true
            # if you want to @ExceptionHandler annotation for custom GraphQLErrors
            exception-handlers-enabled: true
+           contextSetting: PER_REQUEST_WITH_INSTRUMENTATION
 ```
 
 By default a global CORS filter is enabled for `/graphql/**` context.

example-graphql-tools/src/main/java/com/graphql/sample/boot/GraphQLToolsSampleApplication.java

@@ -1,7 +1,7 @@
 package com.graphql.sample.boot;
 
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import graphql.servlet.ObjectMapperConfigurer;
+import graphql.servlet.config.ObjectMapperConfigurer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;

example-request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/CustomGraphQLContextBuilder.java

@@ -1,7 +1,10 @@
 package graphql.servlet.examples.dataloader.requestscope;
 
-import graphql.servlet.GraphQLContext;
-import graphql.servlet.GraphQLContextBuilder;
+import graphql.servlet.context.DefaultGraphQLContext;
+import graphql.servlet.context.DefaultGraphQLServletContext;
+import graphql.servlet.context.DefaultGraphQLWebSocketContext;
+import graphql.servlet.context.GraphQLContext;
+import graphql.servlet.context.GraphQLContextBuilder;
 import org.dataloader.DataLoader;
 import org.dataloader.DataLoaderRegistry;
 import org.springframework.stereotype.Component;
@@ -23,26 +26,17 @@ public CustomGraphQLContextBuilder(CustomerRepository customerRepository) {
 
     @Override
     public GraphQLContext build(HttpServletRequest req, HttpServletResponse response) {
-        GraphQLContext context = new GraphQLContext(req, response);
-        context.setDataLoaderRegistry(buildDataLoaderRegistry());
-
-        return context;
+        return DefaultGraphQLServletContext.createServletContext(buildDataLoaderRegistry(), null).with(req).with(response).build();
     }
 
     @Override
     public GraphQLContext build() {
-        GraphQLContext context = new GraphQLContext();
-        context.setDataLoaderRegistry(buildDataLoaderRegistry());
-
-        return context;
+        return new DefaultGraphQLContext(buildDataLoaderRegistry(), null);
     }
 
     @Override
     public GraphQLContext build(Session session, HandshakeRequest request) {
-        GraphQLContext context = new GraphQLContext(session, request);
-        context.setDataLoaderRegistry(buildDataLoaderRegistry());
-
-        return context;
+        return DefaultGraphQLWebSocketContext.createWebSocketContext(buildDataLoaderRegistry(), null).with(session).with(request).build();
     }
 
     private DataLoaderRegistry buildDataLoaderRegistry() {

example-request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/CustomerResolver.java

@@ -2,7 +2,7 @@
 
 import com.coxautodev.graphql.tools.GraphQLResolver;
 import graphql.schema.DataFetchingEnvironment;
-import graphql.servlet.GraphQLContext;
+import graphql.servlet.context.GraphQLContext;
 import org.dataloader.DataLoader;
 import org.springframework.stereotype.Component;
 

example-spring-common/src/main/java/com/oembedler/moon/graphql/boot/sample/schema/TodoSchema.java

@@ -32,7 +32,7 @@
 import com.oembedler.moon.graphql.engine.stereotype.GraphQLOut;
 import com.oembedler.moon.graphql.engine.stereotype.GraphQLSchema;
 import com.oembedler.moon.graphql.engine.stereotype.GraphQLSchemaQuery;
-import graphql.servlet.GraphQLContext;
+import graphql.servlet.context.GraphQLServletContext;
 import org.apache.commons.fileupload.FileItem;
 
 import javax.servlet.http.Part;
@@ -155,8 +155,8 @@ TodoObjectType.TodoEdgeObjectType addTodoMutation(@GraphQLIn("addTodoInput") Add
     @GraphQLMutation
     public
     @GraphQLOut("filename")
-    String uploadFile(GraphQLContext graphQLContext) {
-        return graphQLContext.getFiles().orElse(new HashMap<>()).values().stream().flatMap(Collection::stream).map(Part::getName).collect(Collectors.joining(", "));
+    String uploadFile(GraphQLServletContext graphQLContext) {
+        return graphQLContext.getParts().values().stream().flatMap(Collection::stream).map(Part::getName).collect(Collectors.joining(", "));
     }
 
     @GraphQLMutation

gradle.properties

@@ -17,7 +17,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-version = 5.9.1-SNAPSHOT
+version = 5.10.0
 PROJECT_GROUP = com.graphql-java-kickstart
 PROJECT_NAME = graphql-spring-boot
 PROJECT_DESC = GraphQL Spring Framework Boot
@@ -39,8 +39,8 @@ TARGET_COMPATIBILITY = 1.8
 LIB_GRAPHQL_JAVA_VER = 13.0
 LIB_JUNIT_VER = 4.12
 LIB_SPRING_CORE_VER = 5.0.4.RELEASE
-LIB_SPRING_BOOT_VER = 2.1.5.RELEASE
-LIB_GRAPHQL_SERVLET_VER = 7.5.1-SNAPSHOT
+LIB_SPRING_BOOT_VER = 2.1.6.RELEASE
+LIB_GRAPHQL_SERVLET_VER = 8.0.0
 LIB_GRAPHQL_JAVA_TOOLS_VER = 5.6.1
 LIB_COMMONS_IO_VER = 2.6
 kotlin.version=1.3.31

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

@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.module.kotlin.KotlinModule;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
-import graphql.servlet.GraphQLSchemaProvider;
+import graphql.servlet.config.GraphQLSchemaProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

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

@@ -19,6 +19,7 @@
 
 package com.oembedler.moon.graphql.boot;
 
+import graphql.servlet.context.ContextSetting;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.context.annotation.Configuration;
@@ -38,6 +39,8 @@ public class GraphQLServletProperties {
 
     private long subscriptionTimeout = 0;
 
+    private ContextSetting contextSetting = ContextSetting.PER_QUERY_WITH_INSTRUMENTATION;
+
     public String getMapping() {
         return mapping != null ? mapping : "/graphql";
     }
@@ -105,4 +108,12 @@ public long getSubscriptionTimeout() {
     public void setSubscriptionTimeout(long subscriptionTimeout) {
         this.subscriptionTimeout = subscriptionTimeout;
     }
+
+    public ContextSetting getContextSetting() {
+        return contextSetting;
+    }
+
+    public void setContextSetting(ContextSetting contextSetting) {
+        this.contextSetting = contextSetting;
+    }
 }

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

@@ -31,22 +31,22 @@
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLSchema;
 import graphql.servlet.AbstractGraphQLHttpServlet;
-import graphql.servlet.BatchExecutionHandler;
-import graphql.servlet.DefaultExecutionStrategyProvider;
-import graphql.servlet.DefaultGraphQLSchemaProvider;
-import graphql.servlet.ExecutionStrategyProvider;
-import graphql.servlet.GraphQLConfiguration;
-import graphql.servlet.GraphQLContextBuilder;
-import graphql.servlet.GraphQLErrorHandler;
 import graphql.servlet.GraphQLHttpServlet;
-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.config.DefaultExecutionStrategyProvider;
+import graphql.servlet.config.DefaultGraphQLSchemaProvider;
+import graphql.servlet.config.ExecutionStrategyProvider;
+import graphql.servlet.config.GraphQLConfiguration;
+import graphql.servlet.config.GraphQLSchemaProvider;
+import graphql.servlet.config.ObjectMapperConfigurer;
+import graphql.servlet.config.ObjectMapperProvider;
+import graphql.servlet.context.GraphQLContextBuilder;
+import graphql.servlet.core.GraphQLErrorHandler;
+import graphql.servlet.core.GraphQLObjectMapper;
+import graphql.servlet.core.GraphQLQueryInvoker;
+import graphql.servlet.core.GraphQLRootObjectBuilder;
+import graphql.servlet.core.GraphQLServletListener;
+import graphql.servlet.input.BatchInputPreProcessor;
+import graphql.servlet.input.GraphQLInvocationInputFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +73,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static graphql.servlet.GraphQLObjectMapper.newBuilder;
+import static graphql.servlet.core.GraphQLObjectMapper.*;
 
 
 /**
@@ -127,7 +127,7 @@ public class GraphQLWebAutoConfiguration {
     private MultipartConfigElement multipartConfigElement;
 
     @Autowired(required = false)
-    private BatchExecutionHandler batchExecutionHandler;
+    private BatchInputPreProcessor batchInputPreProcessor;
 
     @PostConstruct
     void postConstruct() {
@@ -228,10 +228,6 @@ public GraphQLQueryInvoker queryInvoker(ExecutionStrategyProvider executionStrat
             builder.withPreparsedDocumentProvider(preparsedDocumentProvider);
         }
 
-        if (batchExecutionHandler != null) {
-            builder.withBatchExeuctionHandler(batchExecutionHandler);
-        }
-
         return builder.build();
     }
 
@@ -273,6 +269,8 @@ public GraphQLConfiguration graphQLServletConfiguration(GraphQLInvocationInputFa
                 .with(listeners)
                 .with(graphQLServletProperties.isAsyncModeEnabled())
                 .with(graphQLServletProperties.getSubscriptionTimeout())
+                .with(batchInputPreProcessor)
+                .with(graphQLServletProperties.getContextSetting())
                 .build();
     }
 

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

@@ -1,11 +1,11 @@
 package com.oembedler.moon.graphql.boot;
 
-import graphql.servlet.ApolloSubscriptionConnectionListener;
-import graphql.servlet.GraphQLInvocationInputFactory;
-import graphql.servlet.GraphQLObjectMapper;
-import graphql.servlet.GraphQLQueryInvoker;
 import graphql.servlet.GraphQLWebsocketServlet;
-import graphql.servlet.SubscriptionConnectionListener;
+import graphql.servlet.core.ApolloSubscriptionConnectionListener;
+import graphql.servlet.core.GraphQLObjectMapper;
+import graphql.servlet.core.GraphQLQueryInvoker;
+import graphql.servlet.core.SubscriptionConnectionListener;
+import graphql.servlet.input.GraphQLInvocationInputFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;

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

@@ -1,7 +1,7 @@
 package com.oembedler.moon.graphql.boot;
 
 import graphql.schema.GraphQLSchema;
-import graphql.servlet.GraphQLSchemaProvider;
+import graphql.servlet.config.GraphQLSchemaProvider;
 import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 

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

@@ -1,6 +1,6 @@
 package com.oembedler.moon.graphql.boot.error;
 
-import graphql.servlet.GraphQLErrorHandler;
+import graphql.servlet.core.GraphQLErrorHandler;
 
 import java.util.Objects;
 import java.util.function.Supplier;

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

@@ -4,8 +4,8 @@
 import graphql.GraphQLError;
 import graphql.GraphQLException;
 import graphql.SerializationError;
-import graphql.servlet.DefaultGraphQLErrorHandler;
-import graphql.servlet.GenericGraphQLError;
+import graphql.servlet.core.DefaultGraphQLErrorHandler;
+import graphql.servlet.core.GenericGraphQLError;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;

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

@@ -1,8 +1,8 @@
 package com.oembedler.moon.graphql.boot.error;
 
 import graphql.GraphQLError;
-import graphql.servlet.DefaultGraphQLErrorHandler;
-import graphql.servlet.GraphQLErrorHandler;
+import graphql.servlet.core.DefaultGraphQLErrorHandler;
+import graphql.servlet.core.GraphQLErrorHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;

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

@@ -1,6 +1,6 @@
 package com.oembedler.moon.graphql.boot.error;
 
-import graphql.servlet.GraphQLErrorHandler;
+import graphql.servlet.core.GraphQLErrorHandler;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.event.ContextRefreshedEvent;

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

@@ -1,7 +1,7 @@
 package com.oembedler.moon.graphql.boot.error;
 
 import graphql.GraphQLError;
-import graphql.servlet.GenericGraphQLError;
+import graphql.servlet.core.GenericGraphQLError;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 

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

@@ -1,6 +1,6 @@
 package com.oembedler.moon.graphql.boot.error;
 
-import graphql.servlet.GenericGraphQLError;
+import graphql.servlet.core.GenericGraphQLError;
 
 import java.util.Objects;
 

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

@@ -9,9 +9,8 @@
 import graphql.GraphQLError;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
-import graphql.servlet.GenericGraphQLError;
-import graphql.servlet.GraphQLErrorHandler;
-import graphql.servlet.GraphQLObjectMapper;
+import graphql.servlet.core.GraphQLErrorHandler;
+import graphql.servlet.core.GraphQLObjectMapper;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.annotation.Bean;

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

@@ -1,5 +1,6 @@
 package com.oembedler.moon.graphql.boot;
 
+import graphql.servlet.context.ContextSetting;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +11,7 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(properties = {"graphql.servlet.mapping=/test"})
+@SpringBootTest(properties = {"graphql.servlet.mapping=/test", "graphql.servlet.contextSetting=PER_REQUEST_WITH_INSTRUMENTATION"})
 public class GraphQLServletPropertiesTest {
 
     @Autowired
@@ -23,4 +24,9 @@ public void contains_custom_servlet_endpoint() {
         assertEquals("/test", mapping);
     }
 
+    @Test
+    public void containsCorrectContextSetting() {
+        ContextSetting contextSetting = properties.getContextSetting();
+        assertEquals(ContextSetting.PER_REQUEST_WITH_INSTRUMENTATION, contextSetting);
+    }
 }

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

@@ -10,8 +10,8 @@
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
 import graphql.servlet.AbstractGraphQLHttpServlet;
-import graphql.servlet.DefaultGraphQLSchemaProvider;
-import graphql.servlet.GraphQLSchemaProvider;
+import graphql.servlet.config.DefaultGraphQLSchemaProvider;
+import graphql.servlet.config.GraphQLSchemaProvider;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.context.annotation.Bean;

graphql-spring-boot-autoconfigure/src/test/resources/application.yml

@@ -1 +1 @@
-graphql.servlet.mapping: /test
+graphql.servlet.mapping: /test

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

@@ -13,6 +13,16 @@
 import graphql.schema.GraphQLSchema;
 import graphql.schema.idl.SchemaParser;
 import graphql.servlet.*;
+import graphql.servlet.config.ExecutionStrategyProvider;
+import graphql.servlet.config.GraphQLSchemaProvider;
+import graphql.servlet.config.ObjectMapperConfigurer;
+import graphql.servlet.context.GraphQLContextBuilder;
+import graphql.servlet.core.GraphQLErrorHandler;
+import graphql.servlet.core.GraphQLObjectMapper;
+import graphql.servlet.core.GraphQLQueryInvoker;
+import graphql.servlet.core.GraphQLRootObjectBuilder;
+import graphql.servlet.core.GraphQLServletListener;
+import graphql.servlet.input.GraphQLInvocationInputFactory;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;

graphql-spring-boot-test/src/main/java/com/graphql/spring/boot/test/TestUtils.java

@@ -6,7 +6,7 @@
 import graphql.ExecutionResult;
 import graphql.GraphQL;
 import graphql.GraphQLError;
-import graphql.servlet.GraphQLObjectMapper;
+import graphql.servlet.core.GraphQLObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;