Merge pull request #224 from graphql-java-kickstart/bugfix/219-server-endpoint-error

Bugfix/219 server endpoint error

Author: oliemansm

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

@@ -22,7 +22,7 @@
 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.GraphQLErrorHandlerFactory;
+import com.oembedler.moon.graphql.boot.error.GraphQLErrorStartupListener;
 import com.oembedler.moon.graphql.boot.metrics.MetricsInstrumentation;
 import graphql.execution.AsyncExecutionStrategy;
 import graphql.execution.ExecutionStrategy;
@@ -48,7 +48,6 @@
 import graphql.servlet.ObjectMapperConfigurer;
 import graphql.servlet.ObjectMapperProvider;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -60,16 +59,14 @@
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.config.annotation.CorsRegistryWorkaround;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.MultipartConfigElement;
 import java.util.List;
 import java.util.Map;
@@ -89,7 +86,7 @@
 @ConditionalOnProperty(value = "graphql.servlet.enabled", havingValue = "true", matchIfMissing = true)
 @AutoConfigureAfter({GraphQLJavaToolsAutoConfiguration.class, JacksonAutoConfiguration.class})
 @EnableConfigurationProperties({GraphQLServletProperties.class})
-public class GraphQLWebAutoConfiguration implements ApplicationContextAware {
+public class GraphQLWebAutoConfiguration {
 
     public static final String QUERY_EXECUTION_STRATEGY = "queryExecutionStrategy";
     public static final String MUTATION_EXECUTION_STRATEGY = "mutationExecutionStrategy";
@@ -130,14 +127,16 @@ public class GraphQLWebAutoConfiguration implements ApplicationContextAware {
     @Autowired(required = false)
     private BatchExecutionHandler batchExecutionHandler;
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        if (errorHandler == null) {
-            ConfigurableApplicationContext context = (ConfigurableApplicationContext) applicationContext;
-            errorHandler = new GraphQLErrorHandlerFactory().create(context, graphQLServletProperties.isExceptionHandlersEnabled());
-            context.getBeanFactory().registerSingleton(errorHandler.getClass().getCanonicalName(), errorHandler);
+    @PostConstruct
+    void postConstruct() {
+        if (errorHandler != null) {
+            errorHandlerSupplier.setErrorHandler(errorHandler);
         }
-        errorHandlerSupplier.setErrorHandler(errorHandler);
+    }
+
+    @Bean
+    public GraphQLErrorStartupListener graphQLErrorStartupListener() {
+        return new GraphQLErrorStartupListener(errorHandlerSupplier, graphQLServletProperties.isExceptionHandlersEnabled());
     }
 
     @Bean
@@ -263,12 +262,12 @@ public ObjectMapperProvider objectMapperProvider(ObjectMapper objectMapper) {
     @ConditionalOnMissingBean
     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())
-            .build();
+                .with(queryInvoker)
+                .with(graphQLObjectMapper)
+                .with(listeners)
+                .with(graphQLServletProperties.isAsyncModeEnabled())
+                .with(graphQLServletProperties.getSubscriptionTimeout())
+                .build();
     }
 
     @Bean

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

@@ -18,6 +18,10 @@ public GraphQLErrorHandler get() {
         return errorHandler;
     }
 
+    public boolean isPresent() {
+        return errorHandler != null;
+    }
+
     public void setErrorHandler(GraphQLErrorHandler errorHandler) {
         this.errorHandler = Objects.requireNonNull(errorHandler);
     }

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

@@ -0,0 +1,30 @@
+package com.oembedler.moon.graphql.boot.error;
+
+import graphql.servlet.GraphQLErrorHandler;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.event.ContextRefreshedEvent;
+
+import javax.validation.constraints.NotNull;
+
+public class GraphQLErrorStartupListener implements ApplicationListener<ContextRefreshedEvent> {
+
+    private final ErrorHandlerSupplier errorHandlerSupplier;
+    private final boolean exceptionHandlersEnabled;
+
+    public GraphQLErrorStartupListener(ErrorHandlerSupplier errorHandlerSupplier, boolean exceptionHandlersEnabled) {
+        this.errorHandlerSupplier = errorHandlerSupplier;
+        this.exceptionHandlersEnabled = exceptionHandlersEnabled;
+    }
+
+    @Override
+    public void onApplicationEvent(@NotNull ContextRefreshedEvent event) {
+        if (!errorHandlerSupplier.isPresent()) {
+            ConfigurableApplicationContext context = (ConfigurableApplicationContext) event.getApplicationContext();
+            GraphQLErrorHandler errorHandler = new GraphQLErrorHandlerFactory().create(context, exceptionHandlersEnabled);
+            context.getBeanFactory().registerSingleton(errorHandler.getClass().getCanonicalName(), errorHandler);
+            errorHandlerSupplier.setErrorHandler(errorHandler);
+        }
+    }
+
+}

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

@@ -80,7 +80,7 @@ public void clearHeaders() {
      * @deprecated Use {@link #postForResource(String)} instead
      *
      * @param graphqlResource path to the classpath resource containing the GraphQL query
-     * @return <tt>GraphQLResponse</tt> containing the result of query execution
+     * @return GraphQLResponse containing the result of query execution
      * @throws IOException if the resource cannot be loaded from the classpath
      */
     public GraphQLResponse perform(String graphqlResource) throws IOException {
@@ -97,7 +97,7 @@ public GraphQLResponse perform(String graphqlResource, ObjectNode variables) thr
      * Loads a GraphQL query from the given classpath resource and sends it to the GraphQL server.
      *
      * @param graphqlResource path to the classpath resource containing the GraphQL query
-     * @return <tt>GraphQLResponse</tt> containing the result of query execution
+     * @return GraphQLResponse containing the result of query execution
      * @throws IOException if the resource cannot be loaded from the classpath
      */
     public GraphQLResponse postForResource(String graphqlResource) throws IOException {