Add any registered listeners to servlet

Author: oliemansm

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

@@ -4,8 +4,6 @@
 import graphql.execution.ExecutionStrategy;
 import graphql.execution.SubscriptionExecutionStrategy;
 
-import java.util.function.Supplier;
-
 /**
  * @author Andrew Potter
  */
@@ -24,17 +22,13 @@ public DefaultExecutionStrategyProvider(ExecutionStrategy executionStrategy) {
     }
 
     public DefaultExecutionStrategyProvider(ExecutionStrategy queryExecutionStrategy, ExecutionStrategy mutationExecutionStrategy, ExecutionStrategy subscriptionExecutionStrategy) {
-        this.queryExecutionStrategy = defaultIfNull(queryExecutionStrategy);
-        this.mutationExecutionStrategy = defaultIfNull(mutationExecutionStrategy, () -> this.queryExecutionStrategy);
-        this.subscriptionExecutionStrategy = defaultIfNull(subscriptionExecutionStrategy, SubscriptionExecutionStrategy::new);
-    }
-
-    private ExecutionStrategy defaultIfNull(ExecutionStrategy executionStrategy) {
-        return defaultIfNull(executionStrategy, AsyncExecutionStrategy::new);
+        this.queryExecutionStrategy = defaultIfNull(queryExecutionStrategy, new AsyncExecutionStrategy());
+        this.mutationExecutionStrategy = defaultIfNull(mutationExecutionStrategy, this.queryExecutionStrategy);
+        this.subscriptionExecutionStrategy = defaultIfNull(subscriptionExecutionStrategy, new SubscriptionExecutionStrategy());
     }
 
-    private ExecutionStrategy defaultIfNull(ExecutionStrategy executionStrategy, Supplier<ExecutionStrategy> defaultStrategy) {
-        return executionStrategy != null ? executionStrategy : defaultStrategy.get();
+    private ExecutionStrategy defaultIfNull(ExecutionStrategy executionStrategy, ExecutionStrategy defaultStrategy) {
+        return executionStrategy != null ? executionStrategy : defaultStrategy;
     }
 
     @Override
@@ -51,4 +45,5 @@ public ExecutionStrategy getMutationExecutionStrategy() {
     public ExecutionStrategy getSubscriptionExecutionStrategy() {
         return subscriptionExecutionStrategy;
     }
+
 }

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

@@ -8,7 +8,10 @@
 public interface GraphQLSchemaProvider {
 
     static GraphQLSchema copyReadOnly(GraphQLSchema schema) {
-        return GraphQLSchema.newSchema().query(schema.getQueryType()).build(schema.getAdditionalTypes());
+        return GraphQLSchema.newSchema()
+                .query(schema.getQueryType())
+                .subscription(schema.getSubscriptionType())
+                .build(schema.getAdditionalTypes());
     }
 
     /**
@@ -33,4 +36,5 @@ static GraphQLSchema copyReadOnly(GraphQLSchema schema) {
      * @return a read-only schema based on the request (auth, etc).  Should return the same schema (query-only version) as {@link #getSchema(HttpServletRequest)} for a given request.
      */
     GraphQLSchema getReadOnlySchema(HttpServletRequest request);
+
 }

src/main/java/graphql/servlet/SimpleGraphQLHttpServlet.java

@@ -2,6 +2,8 @@
 
 import graphql.schema.GraphQLSchema;
 
+import java.util.List;
+
 /**
  * @author Andrew Potter
  */
@@ -11,8 +13,8 @@ public class SimpleGraphQLHttpServlet extends AbstractGraphQLHttpServlet {
     private final GraphQLQueryInvoker queryInvoker;
     private final GraphQLObjectMapper graphQLObjectMapper;
 
-    private SimpleGraphQLHttpServlet(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQLObjectMapper, boolean asyncServletMode) {
-        super(null, asyncServletMode);
+    private SimpleGraphQLHttpServlet(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQLObjectMapper, List<GraphQLServletListener> listeners, boolean asyncServletMode) {
+        super(listeners, asyncServletMode);
         this.invocationInputFactory = invocationInputFactory;
         this.queryInvoker = queryInvoker;
         this.graphQLObjectMapper = graphQLObjectMapper;
@@ -49,6 +51,7 @@ public static class Builder {
         private final GraphQLInvocationInputFactory invocationInputFactory;
         private GraphQLQueryInvoker queryInvoker = GraphQLQueryInvoker.newBuilder().build();
         private GraphQLObjectMapper graphQLObjectMapper = GraphQLObjectMapper.newBuilder().build();
+        private List<GraphQLServletListener> listeners;
         private boolean asyncServletMode;
 
         Builder(GraphQLInvocationInputFactory invocationInputFactory) {
@@ -70,8 +73,13 @@ public Builder withAsyncServletMode(boolean asyncServletMode) {
             return this;
         }
 
+        public Builder withListeners(List<GraphQLServletListener> listeners) {
+            this.listeners = listeners;
+            return this;
+        }
+
         public SimpleGraphQLHttpServlet build() {
-            return new SimpleGraphQLHttpServlet(invocationInputFactory, queryInvoker, graphQLObjectMapper, asyncServletMode);
+            return new SimpleGraphQLHttpServlet(invocationInputFactory, queryInvoker, graphQLObjectMapper, listeners, asyncServletMode);
         }
     }
 }