Merge branch 'master' into subscription-support

Author: apottere

.gitignore

@@ -6,3 +6,7 @@ build/
 .idea/
 target/
 /out/
+.classpath
+.project
+.settings
+bin

README.md

@@ -16,15 +16,15 @@ repositories {
 }
 
 dependencies {
-    compile 'com.graphql-java:graphql-java-servlet:4.5.0'
+    compile 'com.graphql-java:graphql-java-servlet:4.6.1'
 }
 ```
 
 ```xml
 <dependency>
     <groupId>com.graphql-java</groupId>
     <artifactId>graphql-java-servlet</artifactId>
-    <version>4.5.0</version>
+    <version>4.6.1</version>
 </dependency>
 ```
 

build.gradle

@@ -59,7 +59,6 @@ dependencies {
     // GraphQL
     compile 'com.graphql-java:graphql-java:6.0'
 
-    compileOnly 'com.graphql-java:graphql-java-annotations:0.13.1'
     testCompile 'com.graphql-java:graphql-java-annotations:0.13.1'
 
     // JSON

gradle.properties

@@ -1,2 +1,2 @@
-version = 4.6.1-SNAPSHOT
+version = 4.7.1
 group = com.graphql-java

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

@@ -44,6 +44,9 @@ protected List<GraphQLError> filterGraphQLErrors(List<GraphQLError> errors) {
     }
 
     protected boolean isClientError(GraphQLError error) {
-        return !(error instanceof ExceptionWhileDataFetching || error instanceof Throwable);
+        if (error instanceof ExceptionWhileDataFetching) {
+            return ((ExceptionWhileDataFetching) error).getException() instanceof GraphQLError;
+        }
+        return !(error instanceof Throwable);
     }
 }

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

@@ -46,10 +46,10 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -78,7 +78,7 @@ public abstract class GraphQLServlet extends HttpServlet implements Servlet, Gra
     protected abstract GraphQLRootObjectBuilder getRootObjectBuilder();
     protected abstract ExecutionStrategyProvider getExecutionStrategyProvider();
     protected abstract Instrumentation getInstrumentation();
-    protected abstract Map<String, Object> transformVariables(GraphQLSchema schema, String query, Map<String, Object> variables);
+
     protected abstract GraphQLErrorHandler getGraphQLErrorHandler();
     protected abstract PreparsedDocumentProvider getPreparsedDocumentProvider();
 
@@ -356,16 +356,14 @@ private void query(GraphQLRequest request, GraphQLRequestInfo info, ExecutionRes
             List<GraphQLServletListener.OperationCallback> operationCallbacks = runListeners(l -> l.onOperation(context, operationName, query, variables));
 
             try {
-                final ExecutionResult executionResult = newGraphQL(schema).execute(new ExecutionInput(query, operationName, context, rootObject, transformVariables(schema, query, variables)));
-                final List<GraphQLError> errors = executionResult.getErrors();
-                final Object data = executionResult.getData();
+                final ExecutionResult executionResult = newGraphQL(schema).execute(new ExecutionInput(query, operationName, context, rootObject, variables));
 
                 resultHandler.accept(executionResult);
 
-                if (getGraphQLErrorHandler().errorsPresent(errors)) {
-                    runCallbacks(operationCallbacks, c -> c.onError(context, operationName, query, variables, data, errors));
+                if (getGraphQLErrorHandler().errorsPresent(executionResult.getErrors())) {
+                    runCallbacks(operationCallbacks, c -> c.onError(context, operationName, query, variables, executionResult));
                 } else {
-                    runCallbacks(operationCallbacks, c -> c.onSuccess(context, operationName, query, variables, data));
+                    runCallbacks(operationCallbacks, c -> c.onSuccess(context, operationName, query, variables, executionResult));
                 }
 
             } finally {
@@ -380,13 +378,17 @@ private ExecutionResultHandler serializeResultAsJson(StringHandler responseHandl
 
     private Map<String, Object> createResultFromExecutionResult(ExecutionResult executionResult) {
 
-        final Map<String, Object> result = new HashMap<>();
+        final Map<String, Object> result = new LinkedHashMap<>();
         result.put("data", executionResult.getData());
 
         if (getGraphQLErrorHandler().errorsPresent(executionResult.getErrors())) {
             result.put("errors", getGraphQLErrorHandler().processErrors(executionResult.getErrors()));
         }
 
+        if(executionResult.getExtensions() != null){
+            result.put("extensions", executionResult.getExtensions());
+        }
+
         return result;
     }
 

src/main/java/graphql/servlet/GraphQLServletListener.java

@@ -1,5 +1,6 @@
 package graphql.servlet;
 
+import graphql.ExecutionResult;
 import graphql.GraphQLError;
 
 import javax.servlet.http.HttpServletRequest;
@@ -25,8 +26,8 @@ default void onFinally(HttpServletRequest request, HttpServletResponse response)
     }
 
     interface OperationCallback {
-        default void onSuccess(GraphQLContext context, String operationName, String query, Map<String, Object> variables, Object data) {}
-        default void onError(GraphQLContext context, String operationName, String query, Map<String, Object> variables, Object data, List<GraphQLError> errors) {}
+        default void onSuccess(GraphQLContext context, String operationName, String query, Map<String, Object> variables, ExecutionResult executionResult) {}
+        default void onError(GraphQLContext context, String operationName, String query, Map<String, Object> variables, ExecutionResult executionResult) {}
         default void onFinally(GraphQLContext context, String operationName, String query, Map<String, Object> variables) {}
     }
 }

src/main/java/graphql/servlet/GraphQLVariables.java

@@ -4,7 +4,6 @@
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLSchema;
 import graphql.schema.GraphQLType;
 import org.osgi.service.component.annotations.*;
 
@@ -13,7 +12,6 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -211,11 +209,6 @@ protected Instrumentation getInstrumentation() {
         return instrumentationProvider.getInstrumentation();
     }
 
-    @Override
-    protected Map<String, Object> transformVariables(GraphQLSchema schema, String query, Map<String, Object> variables) {
-        return new GraphQLVariables(schema, query, variables);
-    }
-
     @Override
     protected GraphQLErrorHandler getGraphQLErrorHandler() {
         return errorHandler;

src/main/java/graphql/servlet/OsgiGraphQLServlet.java

@@ -10,30 +10,49 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 
 /**
  * @author Andrew Potter
  */
 public class SimpleGraphQLServlet extends GraphQLServlet {
 
+    /**
+     * @deprecated use {@link #builder(GraphQLSchema)} instead.
+     */
+    @Deprecated
     public SimpleGraphQLServlet(GraphQLSchema schema) {
         this(schema, new DefaultExecutionStrategyProvider());
     }
 
+    /**
+     * @deprecated use {@link #builder(GraphQLSchema)} instead.
+     */
+    @Deprecated
     public SimpleGraphQLServlet(GraphQLSchema schema, ExecutionStrategy executionStrategy) {
         this(schema, new DefaultExecutionStrategyProvider(executionStrategy));
     }
 
+    /**
+     * @deprecated use {@link #builder(GraphQLSchema)} instead.
+     */
+    @Deprecated
     public SimpleGraphQLServlet(GraphQLSchema schema, ExecutionStrategyProvider executionStrategyProvider) {
         this(schema, executionStrategyProvider, null, null, null, null, null, null, null);
     }
 
+    /**
+     * @deprecated use {@link #builder(GraphQLSchema)} instead.
+     */
+    @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);
     }
 
+    /**
+     * @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, null);
 
@@ -71,6 +90,18 @@ public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrat
         }
     }
 
+    private SimpleGraphQLServlet(Builder builder) {
+        super(builder.objectMapperConfigurer, builder.listeners, null);
+
+        this.schemaProvider = builder.schemaProvider;
+        this.executionStrategyProvider = builder.executionStrategyProvider;
+        this.instrumentation = builder.instrumentation;
+        this.errorHandler = builder.errorHandler;
+        this.contextBuilder = builder.contextBuilder;
+        this.rootObjectBuilder = builder.rootObjectBuilder;
+        this.preparsedDocumentProvider = builder.preparsedDocumentProvider;
+    }
+
     private final GraphQLSchemaProvider schemaProvider;
     private final ExecutionStrategyProvider executionStrategyProvider;
     private final Instrumentation instrumentation;
@@ -79,6 +110,81 @@ public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrat
     private final GraphQLRootObjectBuilder rootObjectBuilder;
     private final PreparsedDocumentProvider preparsedDocumentProvider;
 
+    public static SimpleGraphQLServlet create(GraphQLSchema schema) {
+        return new Builder(schema).build();
+    }
+
+    public static SimpleGraphQLServlet create(GraphQLSchemaProvider schemaProvider) {
+        return new Builder(schemaProvider).build();
+    }
+
+    public static Builder builder(GraphQLSchema schema) {
+        return new Builder(schema);
+    }
+
+    public static Builder builder(GraphQLSchemaProvider schemaProvider) {
+        return new Builder(schemaProvider);
+    }
+
+    public static class Builder {
+        private final GraphQLSchemaProvider schemaProvider;
+        private ExecutionStrategyProvider executionStrategyProvider = new DefaultExecutionStrategyProvider();
+        private ObjectMapperConfigurer objectMapperConfigurer;
+        private List<GraphQLServletListener> listeners;
+        private Instrumentation instrumentation = NoOpInstrumentation.INSTANCE;
+        private GraphQLErrorHandler errorHandler = new DefaultGraphQLErrorHandler();
+        private GraphQLContextBuilder contextBuilder = new DefaultGraphQLContextBuilder();
+        private GraphQLRootObjectBuilder rootObjectBuilder = new DefaultGraphQLRootObjectBuilder();
+        private PreparsedDocumentProvider preparsedDocumentProvider = NoOpPreparsedDocumentProvider.INSTANCE;
+
+        public Builder(GraphQLSchema schema) {
+            this(new DefaultGraphQLSchemaProvider(schema));
+        }
+
+        public Builder(GraphQLSchemaProvider schemaProvider) {
+            this.schemaProvider = schemaProvider;
+        }
+
+        public Builder withExecutionStrategyProvider(ExecutionStrategyProvider provider) {
+            this.executionStrategyProvider = provider;
+            return this;
+        }
+
+        public Builder withObjectMapperConfigurer(ObjectMapperConfigurer configurer) {
+            this.objectMapperConfigurer = configurer;
+            return this;
+        }
+
+        public Builder withInstrumentation(Instrumentation instrumentation) {
+            this.instrumentation = instrumentation;
+            return this;
+        }
+
+        public Builder withGraphQLErrorHandler(GraphQLErrorHandler handler) {
+            this.errorHandler = handler;
+            return this;
+        }
+
+        public Builder withGraphQLContextBuilder(GraphQLContextBuilder context) {
+            this.contextBuilder = context;
+            return this;
+        }
+
+        public Builder withGraphQLRootObjectBuilder(GraphQLRootObjectBuilder rootObject) {
+            this.rootObjectBuilder = rootObject;
+            return this;
+        }
+
+        public Builder withPreparsedDocumentProvider(PreparsedDocumentProvider provider) {
+            this.preparsedDocumentProvider = provider;
+            return this;
+        }
+
+        public SimpleGraphQLServlet build() {
+            return new SimpleGraphQLServlet(this);
+        }
+    }
+
     @Override
     protected GraphQLSchemaProvider getSchemaProvider() {
         return schemaProvider;
@@ -104,11 +210,6 @@ protected Instrumentation getInstrumentation() {
         return instrumentation;
     }
 
-    @Override
-    protected Map<String, Object> transformVariables(GraphQLSchema schema, String query, Map<String, Object> variables) {
-        return variables;
-    }
-
     @Override
     protected GraphQLErrorHandler getGraphQLErrorHandler() {
         return errorHandler;