Merge pull request #142 from jmccaull/master

Abstract servlet does not maintain http request data for application/graphql

Author: oliemansm

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

@@ -148,7 +148,7 @@ public void init(ServletConfig servletConfig) {
             try {
                 if (APPLICATION_GRAPHQL.equals(request.getContentType())) {
                     String query = CharStreams.toString(request.getReader());
-                    query(queryInvoker, graphQLObjectMapper, invocationInputFactory.create(new GraphQLRequest(query, null, null)), response);
+                    query(queryInvoker, graphQLObjectMapper, invocationInputFactory.create(new GraphQLRequest(query, null, null), request, response), response);
                 } else if (request.getContentType() != null && request.getContentType().startsWith("multipart/form-data") && !request.getParts().isEmpty()) {
                     final Map<String, List<Part>> fileItems = request.getParts()
                             .stream()

src/test/groovy/graphql/servlet/AbstractGraphQLHttpServletSpec.groovy

@@ -300,6 +300,21 @@ class AbstractGraphQLHttpServletSpec extends Specification {
         getResponseContent().data.echo == "test"
     }
 
+    def "query over HTTP POST body with graphql contentType maintains request object"() {
+        setup:
+        request.addHeader("Content-Type", "application/graphql")
+        request.addHeader("requestHeaderTest", "test")
+        request.setContent('query { echo(arg:"test") }'.getBytes("UTF-8"))
+
+        when:
+        servlet.doPost(request, response)
+
+        then:
+        response.getStatus() == STATUS_OK
+        response.getContentType() == CONTENT_TYPE_JSON_UTF8
+        getResponseContent().extensions.requestHeaderTest == "true"
+    }
+
     def "query over HTTP POST body with variables returns data"() {
         setup:
         request.setContent(mapper.writeValueAsBytes([

src/test/groovy/graphql/servlet/TestInstrumentation.java

@@ -0,0 +1,21 @@
+package graphql.servlet;
+
+import graphql.ExecutionResult;
+import graphql.ExecutionResultImpl;
+import graphql.execution.instrumentation.SimpleInstrumentation;
+import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters;
+
+import java.util.concurrent.CompletableFuture;
+
+public class TestInstrumentation extends SimpleInstrumentation {
+    @Override
+    public CompletableFuture<ExecutionResult> instrumentExecutionResult(ExecutionResult executionResult, InstrumentationExecutionParameters parameters) {
+        ExecutionResultImpl.Builder builder = ExecutionResultImpl.newExecutionResult().from((ExecutionResultImpl) executionResult);
+        GraphQLContext context = parameters.getContext();
+        if (context.getHttpServletRequest().map(req -> req.getHeader("requestHeaderTest")).isPresent()) {
+            builder.addExtension("requestHeaderTest", "true");
+        }
+        return CompletableFuture.completedFuture(builder.build());
+    }
+
+}

src/test/groovy/graphql/servlet/TestUtils.groovy

@@ -2,17 +2,25 @@ package graphql.servlet
 
 import com.google.common.io.ByteStreams
 import graphql.Scalars
+import graphql.execution.instrumentation.Instrumentation
 import graphql.schema.*
 
 class TestUtils {
 
     static def createServlet(DataFetcher queryDataFetcher = { env -> env.arguments.arg },
                              DataFetcher mutationDataFetcher = { env -> env.arguments.arg }) {
-        GraphQLHttpServlet servlet = GraphQLHttpServlet.with(createGraphQlSchema(queryDataFetcher, mutationDataFetcher))
+        GraphQLHttpServlet servlet = GraphQLHttpServlet.with(GraphQLConfiguration
+                .with(createGraphQlSchema(queryDataFetcher, mutationDataFetcher))
+                .with(createInstrumentedQueryInvoker()).build())
         servlet.init(null)
         return servlet
     }
 
+    static def createInstrumentedQueryInvoker() {
+        Instrumentation instrumentation = new TestInstrumentation()
+        GraphQLQueryInvoker.newBuilder().with([instrumentation]).build()
+    }
+
     static def createGraphQlSchema(DataFetcher queryDataFetcher = { env -> env.arguments.arg },
                                    DataFetcher mutationDataFetcher = { env -> env.arguments.arg }) {
         GraphQLObjectType query = GraphQLObjectType.newObject()