Merge pull request #74 from shariqislam786/master

Added AsyncServlet 3.0 Support

Author: oliemansm

src/main/java/graphql/servlet/GraphQLServlet.java

@@ -20,6 +20,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.security.auth.Subject;
+import javax.servlet.AsyncContext;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -67,14 +68,17 @@ public abstract class GraphQLServlet extends HttpServlet implements Servlet, Gra
 
     private final HttpRequestHandler getHandler;
     private final HttpRequestHandler postHandler;
+    
+    private final boolean asyncServletMode;
 
     public GraphQLServlet() {
-        this(null, null);
+        this(null, null, false);
     }
 
-    public GraphQLServlet(ObjectMapperConfigurer objectMapperConfigurer, List<GraphQLServletListener> listeners) {
+    public GraphQLServlet(ObjectMapperConfigurer objectMapperConfigurer, List<GraphQLServletListener> listeners, boolean asyncServletMode) {
         this.lazyObjectMapperBuilder = new LazyObjectMapperBuilder(objectMapperConfigurer != null ? objectMapperConfigurer : new DefaultObjectMapperConfigurer());
         this.listeners = listeners != null ? new ArrayList<>(listeners) : new ArrayList<>();
+        this.asyncServletMode = asyncServletMode;
 
         this.getHandler = (request, response) -> {
             final GraphQLContext context = createContext(Optional.of(request), Optional.of(response));
@@ -249,7 +253,7 @@ public String executeQuery(String query) {
         }
     }
 
-    private void doRequest(HttpServletRequest request, HttpServletResponse response, HttpRequestHandler handler) {
+    private void doRequest(HttpServletRequest request, HttpServletResponse response, HttpRequestHandler handler,AsyncContext asyncContext) {
 
         List<GraphQLServletListener.RequestCallback> requestCallbacks = runListeners(l -> l.onRequest(request, response));
 
@@ -262,17 +266,33 @@ private void doRequest(HttpServletRequest request, HttpServletResponse response,
             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) throws ServletException, IOException {
-        doRequest(req, resp, getHandler);
-    }
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		if (asyncServletMode) {
+			AsyncContext asyncContext = req.startAsync();
+			HttpServletRequest request = (HttpServletRequest) asyncContext.getRequest();
+			HttpServletResponse response = (HttpServletResponse) asyncContext.getResponse();
+			new Thread(() -> doRequest(request, response, getHandler, asyncContext)).start();
+		} else {
+			doRequest(req, resp, getHandler, null);
+		}
+	}
 
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        doRequest(req, resp, postHandler);
+    	if (asyncServletMode) {
+			  AsyncContext asyncContext = req.startAsync();
+			  HttpServletRequest request = (HttpServletRequest) asyncContext.getRequest();
+			  HttpServletResponse response = (HttpServletResponse) asyncContext.getResponse();
+			  new Thread(() -> doRequest(request, response, postHandler, asyncContext)).start();
+		  } else {
+			  doRequest(req, resp, postHandler, null);
+		  }
     }
 
     private Optional<Part> getFileItem(Map<String, List<Part>> fileItems, String name) {

src/main/java/graphql/servlet/SimpleGraphQLServlet.java

@@ -1,21 +1,23 @@
 package graphql.servlet;
 
+import java.util.List;
+import java.util.Optional;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import graphql.execution.ExecutionStrategy;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.instrumentation.SimpleInstrumentation;
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLSchema;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Optional;
-
 /**
  * @author Andrew Potter
  */
 public class SimpleGraphQLServlet extends GraphQLServlet {
+	
 
     /**
      * @deprecated use {@link #builder(GraphQLSchema)} instead.
@@ -46,15 +48,16 @@ public SimpleGraphQLServlet(GraphQLSchema schema, ExecutionStrategyProvider exec
      */
     @Deprecated
     public SimpleGraphQLServlet(final GraphQLSchema schema, ExecutionStrategyProvider executionStrategyProvider, ObjectMapperConfigurer objectMapperConfigurer, List<GraphQLServletListener> listeners, Instrumentation instrumentation, GraphQLErrorHandler errorHandler, GraphQLContextBuilder contextBuilder, GraphQLRootObjectBuilder rootObjectBuilder, PreparsedDocumentProvider preparsedDocumentProvider) {
-        this(new DefaultGraphQLSchemaProvider(schema), executionStrategyProvider, objectMapperConfigurer, listeners, instrumentation, errorHandler, contextBuilder, rootObjectBuilder, preparsedDocumentProvider);
+        this(new DefaultGraphQLSchemaProvider(schema), executionStrategyProvider, objectMapperConfigurer, listeners, instrumentation, errorHandler, contextBuilder, rootObjectBuilder, preparsedDocumentProvider,false);
     }
 
+    
     /**
      * @deprecated use {@link #builder(GraphQLSchemaProvider)} instead.
      */
     @Deprecated
-    public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrategyProvider executionStrategyProvider, ObjectMapperConfigurer objectMapperConfigurer, List<GraphQLServletListener> listeners, Instrumentation instrumentation, GraphQLErrorHandler errorHandler, GraphQLContextBuilder contextBuilder, GraphQLRootObjectBuilder rootObjectBuilder, PreparsedDocumentProvider preparsedDocumentProvider) {
-        super(objectMapperConfigurer, listeners);
+    public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrategyProvider executionStrategyProvider, ObjectMapperConfigurer objectMapperConfigurer, List<GraphQLServletListener> listeners, Instrumentation instrumentation, GraphQLErrorHandler errorHandler, GraphQLContextBuilder contextBuilder, GraphQLRootObjectBuilder rootObjectBuilder, PreparsedDocumentProvider preparsedDocumentProvider, boolean asyncServletMode) {
+        super(objectMapperConfigurer, listeners, asyncServletMode);
 
         this.schemaProvider = schemaProvider;
         this.executionStrategyProvider = executionStrategyProvider;
@@ -91,7 +94,7 @@ public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrat
     }
 
     protected SimpleGraphQLServlet(Builder builder) {
-        super(builder.objectMapperConfigurer, builder.listeners);
+        super(builder.objectMapperConfigurer, builder.listeners, builder.asyncServletMode);
 
         this.schemaProvider = builder.schemaProvider;
         this.executionStrategyProvider = builder.executionStrategyProvider;
@@ -136,6 +139,7 @@ public static class Builder {
         private GraphQLContextBuilder contextBuilder = new DefaultGraphQLContextBuilder();
         private GraphQLRootObjectBuilder rootObjectBuilder = new DefaultGraphQLRootObjectBuilder();
         private PreparsedDocumentProvider preparsedDocumentProvider = NoOpPreparsedDocumentProvider.INSTANCE;
+        private boolean asyncServletMode;
 
         public Builder(GraphQLSchema schema) {
             this(new DefaultGraphQLSchemaProvider(schema));
@@ -184,6 +188,11 @@ public Builder withListeners(List<GraphQLServletListener> listeners) {
             this.listeners = listeners;
             return this;
         }
+        
+        public Builder withAsyncServletMode(boolean value) {
+        	this.asyncServletMode=value;
+        	return this;
+        }
 
         public SimpleGraphQLServlet build() {
             return new SimpleGraphQLServlet(this);