Fix unit tests

Author: oliemansm

src/main/java/graphql/servlet/AbstractGraphQLInvocationInputParser.java

@@ -13,11 +13,11 @@ abstract class AbstractGraphQLInvocationInputParser implements GraphQLInvocation
   final ContextSetting contextSetting;
 
   boolean isSingleQuery(String query) {
-    return !isArrayStart(query);
+    return query != null && !query.trim().isEmpty() && !query.trim().startsWith("[");
   }
 
-  private boolean isArrayStart(String s) {
-    return s != null && s.trim().startsWith("[");
+  boolean isBatchedQuery(String query) {
+    return query != null && !query.trim().isEmpty() && query.trim().startsWith("[");
   }
 
 }

src/main/java/graphql/servlet/GraphQLErrorQueryResult.java

@@ -1,7 +1,5 @@
 package graphql.servlet;
 
-import graphql.ExecutionResult;
-import java.util.List;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -14,7 +12,7 @@ class GraphQLErrorQueryResult implements GraphQLQueryResult {
 
   @Override
   public boolean isBatched() {
-    return true;
+    return false;
   }
 
   @Override

src/main/java/graphql/servlet/GraphQLGetInvocationInputParser.java

@@ -32,7 +32,7 @@ public GraphQLInvocationInput getGraphQLInvocationInput(HttpServletRequest reque
 
     String query = request.getParameter("query");
     if (query == null) {
-      throw new GraphQLException("Query not found in request");
+      throw new GraphQLException("Query parameter not found in GET request");
     }
 
     if (isSingleQuery(query)) {
@@ -42,8 +42,8 @@ public GraphQLInvocationInput getGraphQLInvocationInput(HttpServletRequest reque
       return invocationInputFactory.createReadOnly(graphqlRequest, request, response);
     }
 
-    List<GraphQLRequest> requests = graphQLObjectMapper.readBatchedGraphQLRequest(query);
-    return invocationInputFactory.createReadOnly(contextSetting, requests, request, response);
+    List<GraphQLRequest> graphqlRequests = graphQLObjectMapper.readBatchedGraphQLRequest(query);
+    return invocationInputFactory.createReadOnly(contextSetting, graphqlRequests, request, response);
   }
 
   private boolean isIntrospectionQuery(HttpServletRequest request) {

src/main/java/graphql/servlet/GraphQLMultipartInvocationInputParser.java

@@ -59,18 +59,18 @@ public GraphQLInvocationInput getGraphQLInvocationInput(HttpServletRequest reque
         final Optional<Map<String, List<String>>> variablesMap =
             getPart(parts, "map").map(graphQLObjectMapper::deserializeMultipartMap);
 
-        if ("query".equals(key)) {
-          GraphQLRequest graphqlRequest = buildRequestFromQuery(inputStream, graphQLObjectMapper, parts);
+        String query = read(inputStream);
+        if ("query".equals(key) && isSingleQuery(query)) {
+          GraphQLRequest graphqlRequest = buildRequestFromQuery(query, graphQLObjectMapper, parts);
           variablesMap.ifPresent(m -> mapMultipartVariables(graphqlRequest, m, parts));
           return invocationInputFactory.create(graphqlRequest, request, response);
         } else {
-          String body = read(inputStream);
-          if (isSingleQuery(body)) {
-            GraphQLRequest graphqlRequest = graphQLObjectMapper.readGraphQLRequest(body);
+          if (isSingleQuery(query)) {
+            GraphQLRequest graphqlRequest = graphQLObjectMapper.readGraphQLRequest(query);
             variablesMap.ifPresent(m -> mapMultipartVariables(graphqlRequest, m, parts));
             return invocationInputFactory.create(graphqlRequest, request, response);
           } else {
-            List<GraphQLRequest> graphqlRequests = graphQLObjectMapper.readBatchedGraphQLRequest(body);
+            List<GraphQLRequest> graphqlRequests = graphQLObjectMapper.readBatchedGraphQLRequest(query);
             variablesMap.ifPresent(map -> graphqlRequests.forEach(r -> mapMultipartVariables(r, map, parts)));
             return invocationInputFactory.create(contextSetting, graphqlRequests, request, response);
           }
@@ -103,11 +103,9 @@ private void mapMultipartVariables(GraphQLRequest request,
     });
   }
 
-  private GraphQLRequest buildRequestFromQuery(InputStream inputStream,
+  private GraphQLRequest buildRequestFromQuery(String query,
       GraphQLObjectMapper graphQLObjectMapper,
       Map<String, List<Part>> parts) throws IOException {
-    String query = read(inputStream);
-
     Map<String, Object> variables = null;
     final Optional<Part> variablesItem = getPart(parts, "variables");
     if (variablesItem.isPresent()) {

src/main/java/graphql/servlet/GraphQLPostInvocationInputParser.java

@@ -3,6 +3,7 @@
 import static graphql.servlet.HttpRequestHandler.APPLICATION_GRAPHQL;
 import static java.util.stream.Collectors.joining;
 
+import graphql.GraphQLException;
 import graphql.servlet.context.ContextSetting;
 import graphql.servlet.core.GraphQLObjectMapper;
 import graphql.servlet.core.internal.GraphQLRequest;
@@ -34,8 +35,12 @@ public GraphQLInvocationInput getGraphQLInvocationInput(HttpServletRequest reque
       return invocationInputFactory.create(graphqlRequest, request, response);
     }
 
-    List<GraphQLRequest> requests = graphQLObjectMapper.readBatchedGraphQLRequest(body);
-    return invocationInputFactory.create(contextSetting, requests, request, response);
+    if (isBatchedQuery(body)) {
+      List<GraphQLRequest> requests = graphQLObjectMapper.readBatchedGraphQLRequest(body);
+      return invocationInputFactory.create(contextSetting, requests, request, response);
+    }
+
+    throw new GraphQLException("No valid query found in request");
   }
 
 }

src/main/java/graphql/servlet/HttpRequestHandlerImpl.java

@@ -2,13 +2,15 @@
 
 import static graphql.servlet.QueryResponseWriter.createWriter;
 
+import graphql.GraphQLException;
 import graphql.servlet.config.GraphQLConfiguration;
 import graphql.servlet.core.GraphQLQueryInvoker;
 import graphql.servlet.input.BatchInputPreProcessResult;
 import graphql.servlet.input.BatchInputPreProcessor;
 import graphql.servlet.input.GraphQLBatchedInvocationInput;
 import graphql.servlet.input.GraphQLInvocationInput;
 import graphql.servlet.input.GraphQLSingleInvocationInput;
+import java.util.Optional;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -34,7 +36,19 @@ public void handle(HttpServletRequest request, HttpServletResponse response) {
           configuration.getContextSetting()
       );
       GraphQLInvocationInput invocationInput = invocationInputParser.getGraphQLInvocationInput(request, response);
+      execute(invocationInput, request, response);
+    } catch (GraphQLException e) {
+      response.setStatus(STATUS_BAD_REQUEST);
+      log.info("Bad request: cannot create invocation input parser", e);
+    } catch (Throwable t) {
+      response.setStatus(500);
+      log.info("Bad request: cannot create invocation input parser", t);
+    }
+  }
 
+  private void execute(GraphQLInvocationInput invocationInput, HttpServletRequest request,
+      HttpServletResponse response) {
+    try {
       GraphQLQueryResult queryResult = invoke(invocationInput, request, response);
 
       QueryResponseWriter queryResponseWriter = createWriter(queryResult, configuration.getObjectMapper(),

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

@@ -392,6 +392,7 @@ class AbstractGraphQLHttpServletSpec extends Specification {
 
     def "query over HTTP POST without part or body returns bad request"() {
         when:
+        request.setMethod("POST")
         servlet.doPost(request, response)
 
         then:

src/test/groovy/graphql/servlet/DataLoaderDispatchingSpec.groovy

@@ -131,6 +131,7 @@ class DataLoaderDispatchingSpec extends Specification {
         request.addParameter('query', '[{ "query": "query { query(arg:\\"test\\") { echo(arg:\\"test\\") { echo(arg:\\"test\\") } }}" }, { "query": "query{query(arg:\\"test\\") { echo (arg:\\"test\\") { echo(arg:\\"test\\")} }}" },' +
                 ' { "query": "query{queryTwo(arg:\\"test\\") { echo (arg:\\"test\\")}}" }, { "query": "query{queryTwo(arg:\\"test\\") { echo (arg:\\"test\\")}}" }]')
         resetCounters()
+        request.setMethod("GET")
 
         when:
         servlet.doGet(request, response)
@@ -156,6 +157,7 @@ class DataLoaderDispatchingSpec extends Specification {
         request.addParameter('query', '[{ "query": "query { query(arg:\\"test\\") { echo(arg:\\"test\\") { echo(arg:\\"test\\") } }}" }, { "query": "query{query(arg:\\"test\\") { echo (arg:\\"test\\") { echo(arg:\\"test\\")} }}" },' +
                 ' { "query": "query{queryTwo(arg:\\"test\\") { echo (arg:\\"test\\")}}" }, { "query": "query{queryTwo(arg:\\"test\\") { echo (arg:\\"test\\")}}" }]')
         resetCounters()
+        request.setMethod("GET")
 
         when:
         servlet.doGet(request, response)