Use execution strategy provider for all servlets and expand to mutation/subscription strategies.

Author: apottere

src/main/java/graphql/servlet/DefaultExecutionStrategyProvider.java

@@ -0,0 +1,51 @@
+package graphql.servlet;
+
+import graphql.execution.ExecutionStrategy;
+import graphql.execution.SimpleExecutionStrategy;
+
+/**
+ * @author Andrew Potter
+ */
+public class DefaultExecutionStrategyProvider implements ExecutionStrategyProvider {
+
+ private final ExecutionStrategy queryExecutionStrategy;
+ private final ExecutionStrategy mutationExecutionStrategy;
+ private final ExecutionStrategy subscriptionExecutionStrategy;
+
+ public DefaultExecutionStrategyProvider() {
+ this(null);
+ }
+
+ public DefaultExecutionStrategyProvider(ExecutionStrategy executionStrategy) {
+ this(executionStrategy, null, null);
+ }
+
+ public DefaultExecutionStrategyProvider(ExecutionStrategy queryExecutionStrategy, ExecutionStrategy mutationExecutionStrategy, ExecutionStrategy subscriptionExecutionStrategy) {
+ this.queryExecutionStrategy = defaultIfNull(queryExecutionStrategy);
+ this.mutationExecutionStrategy = defaultIfNull(mutationExecutionStrategy, this.queryExecutionStrategy);
+ this.subscriptionExecutionStrategy = defaultIfNull(subscriptionExecutionStrategy, this.queryExecutionStrategy);
+ }
+
+ private ExecutionStrategy defaultIfNull(ExecutionStrategy executionStrategy) {
+ return defaultIfNull(executionStrategy, new SimpleExecutionStrategy());
+ }
+
+ private ExecutionStrategy defaultIfNull(ExecutionStrategy executionStrategy, ExecutionStrategy defaultStrategy) {
+ return executionStrategy != null ? executionStrategy : defaultStrategy;
+ }
+
+ @Override
+ public ExecutionStrategy getQueryExecutionStrategy() {
+ return queryExecutionStrategy;
+ }
+
+ @Override
+ public ExecutionStrategy getMutationExecutionStrategy() {
+ return mutationExecutionStrategy;
+ }
+
+ @Override
+ public ExecutionStrategy getSubscriptionExecutionStrategy() {
+ return subscriptionExecutionStrategy;
+ }
+}

src/main/java/graphql/servlet/EnhancedExecutionStrategyProvider.java

@@ -20,8 +20,19 @@
 
 @Component(property = "type=enhanced")
 public class EnhancedExecutionStrategyProvider implements ExecutionStrategyProvider {
+
+ @Override
+ public ExecutionStrategy getQueryExecutionStrategy() {
+ return new EnhancedExecutionStrategy();
+ }
+
+ @Override
+ public ExecutionStrategy getMutationExecutionStrategy() {
+ return new EnhancedExecutionStrategy();
+ }
+
  @Override
- public ExecutionStrategy getExecutionStrategy() {
+ public ExecutionStrategy getSubscriptionExecutionStrategy() {
  return new EnhancedExecutionStrategy();
  }
 }

src/main/java/graphql/servlet/ExecutionStrategyProvider.java

@@ -17,5 +17,7 @@
 import graphql.execution.ExecutionStrategy;
 
 public interface ExecutionStrategyProvider {
- ExecutionStrategy getExecutionStrategy();
+ ExecutionStrategy getQueryExecutionStrategy();
+ ExecutionStrategy getMutationExecutionStrategy();
+ ExecutionStrategy getSubscriptionExecutionStrategy();
 }

src/main/java/graphql/servlet/GraphQLSchemaProvider.java

@@ -25,18 +25,20 @@ static GraphQLSchema copyReadOnly(GraphQLSchema schema) {
  }
 
  /**
- * return a schema based on the request (auth, etc). Optional is empty when called from an mbean.
+ * @param request the http request
+ * @return a schema based on the request (auth, etc). Optional is empty when called from an mbean.
  */
  GraphQLSchema getSchema(HttpServletRequest request);
 
 
  /**
- * return a schema for handling mbean calls.
+ * @return a schema for handling mbean calls.
  */
  GraphQLSchema getSchema();
 
  /**
- * return a read-only schema based on the request (auth, etc). Should return the same schema as {@link #getSchema(HttpServletRequest)} for a given request.
+ * @param request the http request
+ * @return a read-only schema based on the request (auth, etc). Should return the same schema as {@link #getSchema(HttpServletRequest)} for a given request.
  */
  GraphQLSchema getReadOnlySchema(HttpServletRequest request);
 }

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

@@ -75,8 +75,7 @@ public abstract class GraphQLServlet extends HttpServlet implements Servlet, Gra
 
  protected abstract GraphQLSchemaProvider getSchemaProvider();
  protected abstract GraphQLContext createContext(Optional<HttpServletRequest> request, Optional<HttpServletResponse> response);
- protected abstract ExecutionStrategy getQueryExecutionStrategy();
- protected abstract ExecutionStrategy getMutationExecutionStrategy();
+ protected abstract ExecutionStrategyProvider getExecutionStrategyProvider();
  protected abstract Instrumentation getInstrumentation();
  protected abstract Map<String, Object> transformVariables(GraphQLSchema schema, String query, Map<String, Object> variables);
 
@@ -253,9 +252,11 @@ private Optional<FileItem> getFileItem(Map<String, List<FileItem>> fileItems, St
  }
 
  private GraphQL newGraphQL(GraphQLSchema schema) {
+ ExecutionStrategyProvider executionStrategyProvider = getExecutionStrategyProvider();
  return GraphQL.newGraphQL(schema)
- .queryExecutionStrategy(getQueryExecutionStrategy())
- .mutationExecutionStrategy(getMutationExecutionStrategy())
+ .queryExecutionStrategy(executionStrategyProvider.getQueryExecutionStrategy())
+ .mutationExecutionStrategy(executionStrategyProvider.getMutationExecutionStrategy())
+ .subscriptionExecutionStrategy(executionStrategyProvider.getSubscriptionExecutionStrategy())
  .instrumentation(getInstrumentation())
  .build();
  }

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

@@ -138,7 +138,7 @@ public void unsetExecutionStrategyProvider(ExecutionStrategyProvider provider) {
  public void setInstrumentationProvider(InstrumentationProvider provider) {
  instrumentationProvider = provider;
  }
- public void unsetInstrumentationProvider(ExecutionStrategyProvider provider) {
+ public void unsetInstrumentationProvider(InstrumentationProvider provider) {
  instrumentationProvider = new NoOpInstrumentationProvider();
  }
 
@@ -152,13 +152,8 @@ protected GraphQLContext createContext(Optional<HttpServletRequest> req, Optiona
  }
 
  @Override
- protected ExecutionStrategy getQueryExecutionStrategy() {
- return executionStrategyProvider.getExecutionStrategy();
- }
-
- @Override
- protected ExecutionStrategy getMutationExecutionStrategy() {
- return getQueryExecutionStrategy();
+ protected ExecutionStrategyProvider getExecutionStrategyProvider() {
+ return executionStrategyProvider;
  }
 
  @Override

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

@@ -32,27 +32,26 @@
 public class SimpleGraphQLServlet extends GraphQLServlet {
 
  public SimpleGraphQLServlet(GraphQLSchema schema) {
- this(schema, new SimpleExecutionStrategy());
+ this(schema, new DefaultExecutionStrategyProvider());
  }
 
- public SimpleGraphQLServlet(GraphQLSchema schema, ExecutionStrategy queryExecutionStrategy) {
- this(schema, queryExecutionStrategy, queryExecutionStrategy);
+ public SimpleGraphQLServlet(GraphQLSchema schema, ExecutionStrategy executionStrategy) {
+ this(schema, new DefaultExecutionStrategyProvider(executionStrategy));
  }
 
- public SimpleGraphQLServlet(GraphQLSchema schema, ExecutionStrategy queryExecutionStrategy, ExecutionStrategy mutationExecutionStrategy) {
- this(schema, queryExecutionStrategy, mutationExecutionStrategy, null, null);
+ public SimpleGraphQLServlet(GraphQLSchema schema, ExecutionStrategyProvider executionStrategyProvider) {
+ this(schema, executionStrategyProvider, null, null);
  }
 
- public SimpleGraphQLServlet(final GraphQLSchema schema, ExecutionStrategy queryExecutionStrategy, ExecutionStrategy mutationExecutionStrategy, List<GraphQLServletListener> listeners, Instrumentation instrumentation) {
- this(new DefaultGraphQLSchemaProvider(schema), queryExecutionStrategy, mutationExecutionStrategy, listeners, instrumentation);
+ public SimpleGraphQLServlet(final GraphQLSchema schema, ExecutionStrategyProvider executionStrategyProvider, List<GraphQLServletListener> listeners, Instrumentation instrumentation) {
+ this(new DefaultGraphQLSchemaProvider(schema), executionStrategyProvider, listeners, instrumentation);
  }
 
- public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrategy queryExecutionStrategy, ExecutionStrategy mutationExecutionStrategy, List<GraphQLServletListener> listeners, Instrumentation instrumentation) {
+ public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrategyProvider executionStrategyProvider, List<GraphQLServletListener> listeners, Instrumentation instrumentation) {
  super(listeners, null);
 
  this.schemaProvider = schemaProvider;
- this.queryExecutionStrategy = queryExecutionStrategy;
- this.mutationExecutionStrategy = mutationExecutionStrategy;
+ this.executionStrategyProvider = executionStrategyProvider;
 
  if (instrumentation == null) {
  this.instrumentation = NoOpInstrumentation.INSTANCE;
@@ -62,8 +61,7 @@ public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrat
  }
 
  private final GraphQLSchemaProvider schemaProvider;
- private final ExecutionStrategy queryExecutionStrategy;
- private final ExecutionStrategy mutationExecutionStrategy;
+ private final ExecutionStrategyProvider executionStrategyProvider;
  private final Instrumentation instrumentation;
 
  @Override
@@ -77,13 +75,8 @@ protected GraphQLContext createContext(Optional<HttpServletRequest> request, Opt
  }
 
  @Override
- protected ExecutionStrategy getQueryExecutionStrategy() {
- return queryExecutionStrategy;
- }
-
- @Override
- protected ExecutionStrategy getMutationExecutionStrategy() {
- return mutationExecutionStrategy;
+ protected ExecutionStrategyProvider getExecutionStrategyProvider() {
+ return executionStrategyProvider;
  }
 
  @Override