Merge pull request #202 from graphql-java-kickstart/feature/batch-handler-update

Updated batch execution handling

Author: oliemansm

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.6.0
+version = 5.6.1
 PROJECT_GROUP = com.graphql-java-kickstart
 PROJECT_NAME = graphql-spring-boot
 PROJECT_DESC = GraphQL Spring Framework Boot
@@ -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.3.RELEASE
-LIB_GRAPHQL_SERVLET_VER = 7.3.0
+LIB_GRAPHQL_SERVLET_VER = 7.3.2
 LIB_GRAPHQL_JAVA_TOOLS_VER = 5.5.0
 LIB_COMMONS_IO_VER = 2.6
 kotlin.version=1.3.10

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

@@ -31,10 +31,10 @@
 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.GraphQLBatchExecutionHandlerFactory;
 import graphql.servlet.GraphQLConfiguration;
 import graphql.servlet.GraphQLContextBuilder;
 import graphql.servlet.GraphQLErrorHandler;
@@ -128,7 +128,7 @@ public class GraphQLWebAutoConfiguration implements ApplicationContextAware {
     private MultipartConfigElement multipartConfigElement;
 
     @Autowired(required = false)
-    private GraphQLBatchExecutionHandlerFactory graphQLBatchExecutionHandlerFactory;
+    private BatchExecutionHandler batchExecutionHandler;
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
@@ -223,6 +223,10 @@ public GraphQLQueryInvoker queryInvoker(ExecutionStrategyProvider executionStrat
             builder.withPreparsedDocumentProvider(preparsedDocumentProvider);
         }
 
+        if (batchExecutionHandler != null) {
+            builder.withBatchExeuctionHandler(batchExecutionHandler);
+        }
+
         return builder.build();
     }
 
@@ -257,14 +261,13 @@ public ObjectMapperProvider objectMapperProvider(ObjectMapper objectMapper) {
 
     @Bean
     @ConditionalOnMissingBean
-    public GraphQLConfiguration graphQLConfiguration(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQLObjectMapper) {
+    public GraphQLConfiguration graphQLServletConfiguration(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQLObjectMapper) {
         return GraphQLConfiguration.with(invocationInputFactory)
             .with(queryInvoker)
             .with(graphQLObjectMapper)
             .with(listeners)
             .with(graphQLServletProperties.isAsyncModeEnabled())
             .with(graphQLServletProperties.getSubscriptionTimeout())
-            .with(graphQLBatchExecutionHandlerFactory)
             .build();
     }