Merge branch 'master' into query_invoker_refactor

Author: jmccaull

README.md

@@ -101,6 +101,7 @@ The servlet supports the following request formats:
     * operationName (optional)
     * variables (optional)
 * POST multipart parts named "query", "operationName" (optional), and "variables" (optional)
+* POST with Content Type "application/graphql" will treat the HTTP POST body contents as the GraphQL query string
 
 ## Servlet Listeners
 

build.gradle

@@ -14,8 +14,8 @@ plugins {
 }
 
 apply plugin: 'java'
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 // Tests
 apply plugin: 'groovy'
@@ -202,7 +202,11 @@ artifactory {
 
 idea {
     project {
-        languageLevel = '1.8'
+        languageLevel = '11'
         vcs = 'Git'
     }
 }
+
+wrapper {
+    gradleVersion = '4.10.3'
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Wed Apr 25 17:03:16 EDT 2018
+#Thu Jun 20 12:32:36 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -24,7 +24,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.*;
+import javax.servlet.AsyncContext;
+import javax.servlet.AsyncEvent;
+import javax.servlet.AsyncListener;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -66,7 +70,7 @@ public abstract class AbstractGraphQLHttpServlet extends HttpServlet implements
     private static final String[] MULTIPART_KEYS = new String[]{"operations", "graphql", "query"};
 
     private GraphQLConfiguration configuration;
-    
+
     /**
      * @deprecated override {@link #getConfiguration()} instead
      */
@@ -285,11 +289,19 @@ private void mapMultipartVariables(GraphQLRequest request,
     }
 
     public void addListener(GraphQLServletListener servletListener) {
-        configuration.add(servletListener);
+        if (configuration != null) {
+            configuration.add(servletListener);
+        } else {
+            listeners.add(servletListener);
+        }
     }
 
     public void removeListener(GraphQLServletListener servletListener) {
-        configuration.remove(servletListener);
+        if (configuration != null) {
+            configuration.remove(servletListener);
+        } else {
+            listeners.remove(servletListener);
+        }
     }
 
     @Override
@@ -343,11 +355,13 @@ private void doRequest(HttpServletRequest request, HttpServletResponse response,
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        init();
         doRequestAsync(req, resp, getHandler);
     }
 
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        init();
         doRequestAsync(req, resp, postHandler);
     }
 
@@ -498,23 +512,28 @@ default void accept(HttpServletRequest request, HttpServletResponse response) {
 
     private static class SubscriptionAsyncListener implements AsyncListener {
         private final AtomicReference<Subscription> subscriptionRef;
+
         public SubscriptionAsyncListener(AtomicReference<Subscription> subscriptionRef) {
             this.subscriptionRef = subscriptionRef;
         }
 
-        @Override public void onComplete(AsyncEvent event) {
+        @Override
+        public void onComplete(AsyncEvent event) {
             subscriptionRef.get().cancel();
         }
 
-        @Override public void onTimeout(AsyncEvent event) {
+        @Override
+        public void onTimeout(AsyncEvent event) {
             subscriptionRef.get().cancel();
         }
 
-        @Override public void onError(AsyncEvent event) {
+        @Override
+        public void onError(AsyncEvent event) {
             subscriptionRef.get().cancel();
         }
 
-        @Override public void onStartAsync(AsyncEvent event) {
+        @Override
+        public void onStartAsync(AsyncEvent event) {
         }
     }
 

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

@@ -53,7 +53,7 @@ protected boolean isClientError(GraphQLError error) {
         if (error instanceof ExceptionWhileDataFetching) {
             return ((ExceptionWhileDataFetching) error).getException() instanceof GraphQLError;
         }
-        return !(error instanceof Throwable);
+        return true;
     }
 
     private GraphQLError replaceNonNullableFieldWasNullError(GraphQLError error) {

src/main/java/graphql/servlet/core/DefaultGraphQLErrorHandler.java

@@ -23,13 +23,15 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
+import static java.util.stream.Collectors.toList;
+
 /**
  * @author Andrew Potter
  */
 public class GraphQLObjectMapper {
     private static final TypeReference<Map<String, List<String>>>
-        MULTIPART_MAP_TYPE_REFERENCE = new TypeReference<Map<String, List<String>>>() {
-        };
+            MULTIPART_MAP_TYPE_REFERENCE = new TypeReference<Map<String, List<String>>>() {
+    };
     private final ObjectMapperProvider objectMapperProvider;
     private final Supplier<GraphQLErrorHandler> graphQLErrorHandlerSupplier;
 
@@ -44,7 +46,7 @@ protected GraphQLObjectMapper(ObjectMapperProvider objectMapperProvider, Supplie
     public ObjectMapper getJacksonMapper() {
         ObjectMapper result = mapper;
         if (result == null) { // First check (no locking)
-            synchronized(this) {
+            synchronized (this) {
                 result = mapper;
                 if (result == null) { // Second check (with locking)
                     mapper = result = objectMapperProvider.provide();
@@ -110,7 +112,7 @@ public ExecutionResult sanitizeErrors(ExecutionResult executionResult) {
         List<GraphQLError> errors = executionResult.getErrors();
 
         GraphQLErrorHandler errorHandler = graphQLErrorHandlerSupplier.get();
-        if(errorHandler.errorsPresent(errors)) {
+        if (errorHandler.errorsPresent(errors)) {
             errors = errorHandler.processErrors(errors);
         } else {
             errors = null;
@@ -131,14 +133,14 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu
         final Map<String, Object> result = new LinkedHashMap<>();
 
         if (areErrorsPresent(executionResult)) {
-            result.put("errors", executionResult.getErrors());
+            result.put("errors", executionResult.getErrors().stream().map(GraphQLError::toSpecification).collect(toList()));
         }
 
-        if(executionResult.getExtensions() != null && !executionResult.getExtensions().isEmpty()){
+        if (executionResult.getExtensions() != null && !executionResult.getExtensions().isEmpty()) {
             result.put("extensions", executionResult.getExtensions());
         }
 
-        if(includeData) {
+        if (includeData) {
             result.put("data", executionResult.getData());
         }
 
@@ -153,7 +155,7 @@ public Map<String, Object> deserializeVariables(String variables) {
         }
     }
 
-    public Map<String,List<String>> deserializeMultipartMap(Part part) {
+    public Map<String, List<String>> deserializeMultipartMap(Part part) {
         try {
             return getJacksonMapper().readValue(part.getInputStream(), MULTIPART_MAP_TYPE_REFERENCE);
         } catch (IOException e) {

src/main/java/graphql/servlet/core/GraphQLObjectMapper.java

@@ -1,5 +1,7 @@
 package graphql.servlet.core.internal;
 
+import graphql.servlet.GraphQLSingleInvocationInput;
+
 import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
 import java.util.UUID;
@@ -19,18 +21,23 @@ public FallbackSubscriptionProtocolHandler(SubscriptionHandlerInput subscription
 
     @Override
     public void onMessage(HandshakeRequest request, Session session, WsSessionSubscriptions subscriptions, String text) throws Exception {
+        GraphQLSingleInvocationInput graphQLSingleInvocationInput = createInvocationInput(session, text);
         subscribe(
             session,
-            input.getQueryInvoker().query(
-                input.getInvocationInputFactory().create(
-                    input.getGraphQLObjectMapper().readGraphQLRequest(text)
-                )
-            ),
+            input.getQueryInvoker().query(graphQLSingleInvocationInput),
             subscriptions,
             UUID.randomUUID().toString()
         );
     }
 
+    private GraphQLSingleInvocationInput createInvocationInput(Session session, String text) throws IOException {
+        GraphQLRequest graphQLRequest = input.getGraphQLObjectMapper().readGraphQLRequest(text);
+        HandshakeRequest handshakeRequest = (HandshakeRequest) session.getUserProperties()
+                .get(HandshakeRequest.class.getName());
+
+        return input.getInvocationInputFactory().create(graphQLRequest, session, handshakeRequest);
+    }
+
     @Override
     protected void sendDataMessage(Session session, String id, Object payload) {
         sender.send(session, payload);