Allow custom graphql exception handlers fix #493

Author: oliemansm

gradle.properties

@@ -16,7 +16,7 @@
 # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-version=8.1.0-SNAPSHOT
+version=8.1.1-SNAPSHOT
 ### Project Metadata
 PROJECT_GROUP=com.graphql-java-kickstart
 PROJECT_NAME=graphql-spring-boot

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-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/GraphQLErrorFromExceptionHandler.java

@@ -22,7 +22,7 @@
 @Getter
 class GraphQLErrorFromExceptionHandler extends DefaultGraphQLErrorHandler {
 
-  private List<GraphQLErrorFactory> factories;
+  private final List<GraphQLErrorFactory> factories;
 
   GraphQLErrorFromExceptionHandler(List<GraphQLErrorFactory> factories) {
     this.factories = factories;

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();
   }
 

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/spring/web/boot/GraphQLErrorHandlerTest.java

@@ -17,7 +17,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
-public class GraphQLErrorHandlerTest extends AbstractAutoConfigurationTest {
+class GraphQLErrorHandlerTest extends AbstractAutoConfigurationTest {
 
   private GraphQL gql;
   private GraphQLObjectMapper objectMapper;
@@ -39,7 +39,7 @@ public void setUp() {
   }
 
   @Test
-  public void illegalArgumentExceptionShouldBeHandledConcretely() {
+  void illegalArgumentExceptionShouldBeHandledConcretely() {
     TestUtils.assertGraphQLError(
         gql,
         "query { illegalArgumentException }",
@@ -49,7 +49,7 @@ public void illegalArgumentExceptionShouldBeHandledConcretely() {
   }
 
   @Test
-  public void illegalStateExceptionShouldBeHandledByCatchAll() {
+  void illegalStateExceptionShouldBeHandledByCatchAll() {
     TestUtils.assertGraphQLError(gql, "query { illegalStateException }",
         new ThrowableGraphQLError(new IllegalStateException("Illegal state"), "Catch all handler"),
         objectMapper);
@@ -58,7 +58,7 @@ public void illegalStateExceptionShouldBeHandledByCatchAll() {
   @Configuration
   static class BaseConfiguration {
 
-    public class Query implements GraphQLQueryResolver {
+    public static class Query implements GraphQLQueryResolver {
 
       boolean illegalArgumentException() {
         throw new IllegalArgumentException("Illegal argument");