Merge pull request #494 from graphql-java-kickstart/release/8.1.1

Release/8.1.1

Author: oliemansm

.github/workflows/ci.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - release/**
 
 jobs:
   validation:

graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ErrorHandlerSupplier.java

@@ -1,7 +1,6 @@
 package graphql.kickstart.spring.error;
 
 import graphql.kickstart.execution.error.GraphQLErrorHandler;
-import java.util.Objects;
 import java.util.function.Supplier;
 
 public class ErrorHandlerSupplier implements Supplier<GraphQLErrorHandler> {
@@ -22,7 +21,7 @@ public boolean isPresent() {
   }
 
   public void setErrorHandler(GraphQLErrorHandler errorHandler) {
-    this.errorHandler = Objects.requireNonNull(errorHandler);
+    this.errorHandler = errorHandler;
   }
 
 }

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWebAutoConfiguration.java

@@ -104,11 +104,13 @@ public class GraphQLWebAutoConfiguration {
   public static final String SUBSCRIPTION_EXECUTION_STRATEGY = "subscriptionExecutionStrategy";
 
   private final GraphQLServletProperties graphQLServletProperties;
+  private final ErrorHandlerSupplier errorHandlerSupplier = new ErrorHandlerSupplier(null);
 
   @Bean
   public GraphQLErrorStartupListener graphQLErrorStartupListener(
       @Autowired(required = false) GraphQLErrorHandler errorHandler) {
-    return new GraphQLErrorStartupListener(new ErrorHandlerSupplier(errorHandler),
+    errorHandlerSupplier.setErrorHandler(errorHandler);
+    return new GraphQLErrorStartupListener(errorHandlerSupplier,
         graphQLServletProperties.isExceptionHandlersEnabled());
   }
 
@@ -257,13 +259,9 @@ public GraphQLInvoker graphQLInvoker(GraphQLBuilder graphQLBuilder,
   @ConditionalOnMissingBean
   public GraphQLObjectMapper graphQLObjectMapper(
       ObjectProvider<ObjectMapperProvider> objectMapperProviderObjectProvider,
-      @Autowired(required = false) GraphQLServletObjectMapperConfigurer objectMapperConfigurer,
-      @Autowired(required = false) GraphQLErrorHandler errorHandler) {
+      @Autowired(required = false) GraphQLServletObjectMapperConfigurer objectMapperConfigurer) {
     GraphQLObjectMapper.Builder builder = newBuilder();
-
-    if (errorHandler != null) {
-      builder.withGraphQLErrorHandler(new ErrorHandlerSupplier(errorHandler));
-    }
+    builder.withGraphQLErrorHandler(errorHandlerSupplier);
 
     ObjectMapperProvider objectMapperProvider = objectMapperProviderObjectProvider.getIfAvailable();
 
@@ -272,7 +270,6 @@ public GraphQLObjectMapper graphQLObjectMapper(
     } else if (objectMapperConfigurer != null) {
       builder.withObjectMapperConfigurer(objectMapperConfigurer);
     }
-    log.info("Building GraphQLObjectMapper including errorHandler: {}", errorHandler);
     return builder.build();
   }