Move error handlers to be reused by webflux starter too

oliemansm · oliemansm · commit 5316fba8158b · 2019-11-24T22:33:01.000+01:00
diff --git a/graphql-kickstart-spring-boot-autoconfigure-webflux/src/main/java/graphql/kickstart/spring/webflux/boot/GraphQLSpringWebfluxAutoConfiguration.java b/graphql-kickstart-spring-boot-autoconfigure-webflux/src/main/java/graphql/kickstart/spring/webflux/boot/GraphQLSpringWebfluxAutoConfiguration.java
@@ -10,6 +10,8 @@
 import graphql.kickstart.execution.subscriptions.GraphQLSubscriptionInvocationInputFactory;
 import graphql.kickstart.execution.subscriptions.apollo.ApolloSubscriptionConnectionListener;
 import graphql.kickstart.execution.subscriptions.apollo.KeepAliveSubscriptionConnectionListener;
+import graphql.kickstart.spring.error.ErrorHandlerSupplier;
+import graphql.kickstart.spring.error.GraphQLErrorStartupListener;
 import graphql.kickstart.spring.webflux.DefaultGraphQLSpringWebfluxContextBuilder;
 import graphql.kickstart.spring.webflux.DefaultGraphQLSpringWebfluxRootObjectBuilder;
 import graphql.kickstart.spring.webflux.GraphQLController;
@@ -45,9 +47,20 @@ public class GraphQLSpringWebfluxAutoConfiguration {
 
   @Bean
   @ConditionalOnMissingBean
-  public GraphQLObjectMapper graphQLObjectMapper(ObjectProvider<ObjectMapperProvider> provider) {
+  public ErrorHandlerSupplier errorHandlerSupplier() {
+    return new ErrorHandlerSupplier(null);
+  }
+
+  @Bean
+  public GraphQLErrorStartupListener graphQLErrorStartupListener(ErrorHandlerSupplier errorHandlerSupplier) {
+    return new GraphQLErrorStartupListener(errorHandlerSupplier, true);
+  }
+
+  @Bean
+  @ConditionalOnMissingBean
+  public GraphQLObjectMapper graphQLObjectMapper(ObjectProvider<ObjectMapperProvider> provider, ErrorHandlerSupplier errorHandlerSupplier) {
     GraphQLObjectMapper.Builder builder = newBuilder();
-//    builder.withGraphQLErrorHandler(errorHandlerSupplier);
+    builder.withGraphQLErrorHandler(errorHandlerSupplier);
     provider.ifAvailable(builder::withObjectMapperProvider);
     return builder.build();
   }
diff --git a/graphql-kickstart-spring-support/build.gradle b/graphql-kickstart-spring-support/build.gradle
@@ -1,4 +1,11 @@
 dependencies {
     compileOnly "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
     compileOnly "org.springframework:spring-web:$LIB_SPRING_CORE_VER"
+    compileOnly "org.springframework:spring-context:$LIB_SPRING_CORE_VER"
+
+    testCompile "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
+    testCompile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
+    testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
+    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
+    testCompile(project(":graphql-spring-boot-test"))
 }
diff --git a/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ErrorHandlerSupplier.java b/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ErrorHandlerSupplier.java
@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
 import graphql.kickstart.execution.error.GraphQLErrorHandler;
 import java.util.Objects;
diff --git a/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/GraphQLErrorFactory.java b/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/GraphQLErrorFactory.java
@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
 import graphql.GraphQLError;
 
diff --git a/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/GraphQLErrorFromExceptionHandler.java b/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/GraphQLErrorFromExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
 import static java.util.Collections.singletonList;
 
diff --git a/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/GraphQLErrorHandlerFactory.java b/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/GraphQLErrorHandlerFactory.java
@@ -1,6 +1,6 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
-import static com.oembedler.moon.graphql.boot.error.GraphQLErrorFactory.withReflection;
+import static graphql.kickstart.spring.error.GraphQLErrorFactory.withReflection;
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toList;
 
diff --git a/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/GraphQLErrorStartupListener.java b/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/GraphQLErrorStartupListener.java
@@ -1,10 +1,10 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
 import graphql.kickstart.execution.error.GraphQLErrorHandler;
-import javax.validation.constraints.NotNull;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.lang.NonNull;
 
 public class GraphQLErrorStartupListener implements ApplicationListener<ContextRefreshedEvent> {
 
@@ -17,7 +17,7 @@ public GraphQLErrorStartupListener(ErrorHandlerSupplier errorHandlerSupplier, bo
   }
 
   @Override
-  public void onApplicationEvent(@NotNull ContextRefreshedEvent event) {
+  public void onApplicationEvent(@NonNull ContextRefreshedEvent event) {
     if (!errorHandlerSupplier.isPresent()) {
       ConfigurableApplicationContext context = (ConfigurableApplicationContext) event.getApplicationContext();
       GraphQLErrorHandler errorHandler = new GraphQLErrorHandlerFactory().create(context, exceptionHandlersEnabled);
diff --git a/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ReflectiveGraphQLErrorFactory.java b/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ReflectiveGraphQLErrorFactory.java
@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
 import static java.util.Collections.singletonList;
 
diff --git a/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ReflectiveMethodValidator.java b/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ReflectiveMethodValidator.java
@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
 import graphql.GraphQLError;
 import java.lang.reflect.Method;
diff --git a/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ThrowableComparator.java b/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ThrowableComparator.java
@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
 import java.util.Comparator;
 
diff --git a/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ThrowableGraphQLError.java b/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/ThrowableGraphQLError.java
@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
 import graphql.kickstart.execution.error.GenericGraphQLError;
 import java.util.Objects;
diff --git a/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/Throwables.java b/graphql-kickstart-spring-support/src/main/java/graphql/kickstart/spring/error/Throwables.java
@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/graphql-kickstart-spring-support/src/test/java/graphql/kickstart/spring/error/GraphQLErrorHandlerFactoryTest.java b/graphql-kickstart-spring-support/src/test/java/graphql/kickstart/spring/error/GraphQLErrorHandlerFactoryTest.java
@@ -1,18 +1,16 @@
-package com.oembedler.moon.graphql.boot.error;
+package graphql.kickstart.spring.error;
 
 import static java.util.Collections.singletonList;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
 
 import graphql.GraphQLError;
 import graphql.kickstart.execution.error.GraphQLErrorHandler;
 import java.util.List;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -30,28 +28,29 @@ public class GraphQLErrorHandlerFactoryTest {
 
   @Before
   public void setup() {
-    when(applicationContext.getBeanFactory()).thenReturn(beanFactory);
-    when(beanFactory.getBeanDefinitionNames()).thenReturn(new String[]{"Test"});
-    when(applicationContext.containsBean("Test")).thenReturn(true);
-    doReturn(TestClass.class).when(applicationContext).getType("Test");
+    Mockito.when(applicationContext.getBeanFactory()).thenReturn(beanFactory);
+    Mockito.when(beanFactory.getBeanDefinitionNames()).thenReturn(new String[]{"Test"});
+    Mockito.when(applicationContext.containsBean("Test")).thenReturn(true);
+    Mockito.doReturn(TestClass.class).when(applicationContext).getType("Test");
 
     errorHandlerFactory = new GraphQLErrorHandlerFactory();
   }
 
   @Test
   public void createFindsCollectionHandler() {
     GraphQLErrorHandler handler = errorHandlerFactory.create(applicationContext, true);
-    assertTrue(handler instanceof GraphQLErrorFromExceptionHandler);
+    Assert.assertTrue(handler instanceof GraphQLErrorFromExceptionHandler);
     GraphQLErrorFromExceptionHandler errorHandler = (GraphQLErrorFromExceptionHandler) handler;
-    assertFalse("handler.factories should not be empty", errorHandler.getFactories().isEmpty());
+    Assert.assertFalse("handler.factories should not be empty", errorHandler.getFactories().isEmpty());
   }
 
-  public class TestClass {
+  public static class TestClass {
 
     @ExceptionHandler(IllegalArgumentException.class)
     List<GraphQLError> handle(IllegalArgumentException e) {
       return singletonList(new ThrowableGraphQLError(e, "Illegal argument"));
     }
+
   }
 
 }
diff --git a/graphql-spring-boot-autoconfigure/build.gradle b/graphql-spring-boot-autoconfigure/build.gradle
@@ -19,6 +19,7 @@
 
 dependencies {
     compile(project(":graphql-kickstart-spring-boot-starter-tools"))
+    compile(project(":graphql-kickstart-spring-support"))
     compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
     compile "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
     compile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebAutoConfiguration.java b/graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebAutoConfiguration.java
@@ -23,26 +23,21 @@
 
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oembedler.moon.graphql.boot.error.ErrorHandlerSupplier;
-import com.oembedler.moon.graphql.boot.error.GraphQLErrorStartupListener;
 import com.oembedler.moon.graphql.boot.metrics.MetricsInstrumentation;
-import graphql.GraphQL;
 import graphql.execution.AsyncExecutionStrategy;
 import graphql.execution.ExecutionStrategy;
 import graphql.execution.SubscriptionExecutionStrategy;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
-import graphql.kickstart.execution.GraphQLInvoker;
 import graphql.kickstart.execution.GraphQLObjectMapper;
 import graphql.kickstart.execution.GraphQLQueryInvoker;
 import graphql.kickstart.execution.config.DefaultExecutionStrategyProvider;
-import graphql.kickstart.execution.config.DefaultGraphQLSchemaProvider;
 import graphql.kickstart.execution.config.ExecutionStrategyProvider;
-import graphql.kickstart.execution.config.GraphQLBuilder;
-import graphql.kickstart.execution.config.GraphQLSchemaProvider;
 import graphql.kickstart.execution.config.ObjectMapperConfigurer;
 import graphql.kickstart.execution.config.ObjectMapperProvider;
 import graphql.kickstart.execution.error.GraphQLErrorHandler;
+import graphql.kickstart.spring.error.ErrorHandlerSupplier;
+import graphql.kickstart.spring.error.GraphQLErrorStartupListener;
 import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
 import graphql.schema.GraphQLSchema;
 import graphql.servlet.AbstractGraphQLHttpServlet;
diff --git a/graphql-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/graphql/boot/GraphQLErrorHandlerTest.java b/graphql-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/graphql/boot/GraphQLErrorHandlerTest.java
@@ -3,12 +3,12 @@
 import com.coxautodev.graphql.tools.GraphQLQueryResolver;
 import com.coxautodev.graphql.tools.SchemaParser;
 import com.graphql.spring.boot.test.TestUtils;
-import com.oembedler.moon.graphql.boot.error.ThrowableGraphQLError;
 import com.oembedler.moon.graphql.boot.test.AbstractAutoConfigurationTest;
 import graphql.GraphQL;
 import graphql.GraphQLError;
 import graphql.kickstart.execution.GraphQLObjectMapper;
 import graphql.kickstart.execution.error.GraphQLErrorHandler;
+import graphql.kickstart.spring.error.ThrowableGraphQLError;
 import graphql.schema.GraphQLSchema;
 import org.junit.Before;
 import org.junit.Test;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.oembedler.moon.graphql.boot.error;`
	`1`	`+package graphql.kickstart.spring.error;`
`2`	`2`
`3`	`3`	`import graphql.kickstart.execution.error.GraphQLErrorHandler;`
`4`	`4`	`import java.util.Objects;`