Deprecate async executor and enabled property

Author: oliemansm

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AbstractGraphQLHttpServlet.java

@@ -18,7 +18,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.servlet.AsyncContext;
 import javax.servlet.Servlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -135,59 +134,38 @@ public String executeQuery(String query) {
     }
   }
 
-  private void doRequestAsync(HttpServletRequest request, HttpServletResponse response,
-      HttpRequestHandler handler) {
-    if (configuration.isAsyncServletModeEnabled()) {
-      AsyncContext asyncContext = request.startAsync(request, response);
-      asyncContext.setTimeout(configuration.getAsyncTimeout());
-      HttpServletRequest asyncRequest = (HttpServletRequest) asyncContext.getRequest();
-      HttpServletResponse asyncResponse = (HttpServletResponse) asyncContext.getResponse();
-      configuration.getAsyncExecutor()
-          .execute(() -> doRequest(asyncRequest, asyncResponse, handler, asyncContext));
-    } else {
-      doRequest(request, response, handler, null);
-    }
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
+    doRequest(req, resp);
   }
 
-  private void doRequest(HttpServletRequest request, HttpServletResponse response,
-      HttpRequestHandler handler,
-      AsyncContext asyncContext) {
+  @Override
+  protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
+    doRequest(req, resp);
+  }
 
+  private void doRequest(HttpServletRequest request, HttpServletResponse response) {
+    init();
     List<GraphQLServletListener.RequestCallback> requestCallbacks = runListeners(
         l -> l.onRequest(request, response));
 
     try {
-      handler.handle(request, response);
+      requestHandler.handle(request, response);
       runCallbacks(requestCallbacks, c -> c.onSuccess(request, response));
-    } catch (Throwable t) {
+    } catch (Exception t) {
       log.error("Error executing GraphQL request!", t);
       runCallbacks(requestCallbacks, c -> c.onError(request, response, t));
     } finally {
       runCallbacks(requestCallbacks, c -> c.onFinally(request, response));
-      if (asyncContext != null) {
-        asyncContext.complete();
-      }
     }
   }
 
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
-    init();
-    doRequestAsync(req, resp, requestHandler);
-  }
-
-  @Override
-  protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
-    init();
-    doRequestAsync(req, resp, requestHandler);
-  }
-
   private <R> List<R> runListeners(Function<? super GraphQLServletListener, R> action) {
     return configuration.getListeners().stream()
         .map(listener -> {
           try {
             return action.apply(listener);
-          } catch (Throwable t) {
+          } catch (Exception t) {
             log.error("Error running listener: {}", listener, t);
             return null;
           }
@@ -200,7 +178,7 @@ private <T> void runCallbacks(List<T> callbacks, Consumer<T> action) {
     callbacks.forEach(callback -> {
       try {
         action.accept(callback);
-      } catch (Throwable t) {
+      } catch (Exception t) {
         log.error("Error running callback: {}", callback, t);
       }
     });

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLConfiguration.java

@@ -30,8 +30,19 @@ public class GraphQLConfiguration {
   private final GraphQLInvoker graphQLInvoker;
   private final GraphQLObjectMapper objectMapper;
   private final List<GraphQLServletListener> listeners;
+  /**
+   * For removal
+   * @since 10.1.0
+   */
+  @Deprecated
   private final boolean asyncServletModeEnabled;
+  /**
+   * For removal
+   * @since 10.1.0
+   */
+  @Deprecated
   private final Executor asyncExecutor;
+
   private final long subscriptionTimeout;
   @Getter
   private final long asyncTimeout;