Add support for preparsed/cached queries and update to graphql 6.0 (fixes #39)

Author: apottere

build.gradle

@@ -55,7 +55,7 @@ dependencies {
     compile 'commons-fileupload:commons-fileupload:1.3.1'
 
     // GraphQL
-    compile 'com.graphql-java:graphql-java:4.2'
+    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'

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

@@ -13,6 +13,7 @@
 import graphql.GraphQL;
 import graphql.GraphQLError;
 import graphql.execution.instrumentation.Instrumentation;
+import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.introspection.IntrospectionQuery;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLSchema;
@@ -67,6 +68,7 @@ public abstract class GraphQLServlet extends HttpServlet implements Servlet, Gra
     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();
 
     private final LazyObjectMapperBuilder lazyObjectMapperBuilder;
     private final List<GraphQLServletListener> listeners;
@@ -286,6 +288,7 @@ private GraphQL newGraphQL(GraphQLSchema schema) {
             .mutationExecutionStrategy(executionStrategyProvider.getMutationExecutionStrategy())
             .subscriptionExecutionStrategy(executionStrategyProvider.getSubscriptionExecutionStrategy())
             .instrumentation(getInstrumentation())
+            .preparsedDocumentProvider(getPreparsedDocumentProvider())
             .build();
     }
 

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

@@ -1,6 +1,8 @@
 package graphql.servlet;
 
 import graphql.execution.instrumentation.Instrumentation;
+import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
+import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.GraphQLType;
@@ -33,6 +35,7 @@ public class OsgiGraphQLServlet extends GraphQLServlet {
     private ExecutionStrategyProvider executionStrategyProvider = new DefaultExecutionStrategyProvider();
     private InstrumentationProvider instrumentationProvider = new NoOpInstrumentationProvider();
     private GraphQLErrorHandler errorHandler = new DefaultGraphQLErrorHandler();
+    private PreparsedDocumentProvider preparsedDocumentProvider = NoOpPreparsedDocumentProvider.INSTANCE;
 
     private GraphQLSchemaProvider schemaProvider;
 
@@ -175,6 +178,14 @@ public void unsetErrorHandler(GraphQLErrorHandler errorHandler) {
         this.errorHandler = new DefaultGraphQLErrorHandler();
     }
 
+    @Reference(cardinality = ReferenceCardinality.OPTIONAL, policy= ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY)
+    public void setPreparsedDocumentProvider(PreparsedDocumentProvider preparsedDocumentProvider) {
+        this.preparsedDocumentProvider = preparsedDocumentProvider;
+    }
+    public void unsetPreparsedDocumentProvider(PreparsedDocumentProvider preparsedDocumentProvider) {
+        this.preparsedDocumentProvider = NoOpPreparsedDocumentProvider.INSTANCE;
+    }
+
     @Override
     protected GraphQLSchemaProvider getSchemaProvider() {
         return schemaProvider;
@@ -208,4 +219,9 @@ protected Map<String, Object> transformVariables(GraphQLSchema schema, String qu
     protected GraphQLErrorHandler getGraphQLErrorHandler() {
         return errorHandler;
     }
+
+    @Override
+    protected PreparsedDocumentProvider getPreparsedDocumentProvider() {
+        return preparsedDocumentProvider;
+    }
 }

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

@@ -3,6 +3,8 @@
 import graphql.execution.ExecutionStrategy;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.instrumentation.NoOpInstrumentation;
+import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
+import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLSchema;
 
 import javax.servlet.http.HttpServletRequest;
@@ -25,14 +27,14 @@ public SimpleGraphQLServlet(GraphQLSchema schema, ExecutionStrategy executionStr
     }
 
     public SimpleGraphQLServlet(GraphQLSchema schema, ExecutionStrategyProvider executionStrategyProvider) {
-        this(schema, executionStrategyProvider, null, null, null, null, null, null);
+        this(schema, executionStrategyProvider, null, null, null, null, null, null, null);
     }
 
-    public SimpleGraphQLServlet(final GraphQLSchema schema, ExecutionStrategyProvider executionStrategyProvider, ObjectMapperConfigurer objectMapperConfigurer, List<GraphQLServletListener> listeners, Instrumentation instrumentation, GraphQLErrorHandler errorHandler, GraphQLContextBuilder contextBuilder, GraphQLRootObjectBuilder rootObjectBuilder) {
-        this(new DefaultGraphQLSchemaProvider(schema), executionStrategyProvider, objectMapperConfigurer, listeners, instrumentation, errorHandler, contextBuilder, rootObjectBuilder);
+    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);
     }
 
-    public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrategyProvider executionStrategyProvider, ObjectMapperConfigurer objectMapperConfigurer, List<GraphQLServletListener> listeners, Instrumentation instrumentation, GraphQLErrorHandler errorHandler, GraphQLContextBuilder contextBuilder, GraphQLRootObjectBuilder rootObjectBuilder) {
+    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);
 
         this.schemaProvider = schemaProvider;
@@ -61,6 +63,12 @@ public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrat
         } else {
             this.rootObjectBuilder = rootObjectBuilder;
         }
+
+        if(preparsedDocumentProvider == null) {
+            this.preparsedDocumentProvider = NoOpPreparsedDocumentProvider.INSTANCE;
+        } else {
+            this.preparsedDocumentProvider = preparsedDocumentProvider;
+        }
     }
 
     private final GraphQLSchemaProvider schemaProvider;
@@ -69,6 +77,7 @@ public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrat
     private final GraphQLErrorHandler errorHandler;
     private final GraphQLContextBuilder contextBuilder;
     private final GraphQLRootObjectBuilder rootObjectBuilder;
+    private final PreparsedDocumentProvider preparsedDocumentProvider;
 
     @Override
     protected GraphQLSchemaProvider getSchemaProvider() {
@@ -104,4 +113,9 @@ protected Map<String, Object> transformVariables(GraphQLSchema schema, String qu
     protected GraphQLErrorHandler getGraphQLErrorHandler() {
         return errorHandler;
     }
+
+    @Override
+    protected PreparsedDocumentProvider getPreparsedDocumentProvider() {
+        return preparsedDocumentProvider;
+    }
 }