Test cleanup - no need for its own field

Author: JacobMountain

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

@@ -2,7 +2,6 @@
 
 import com.google.common.io.ByteStreams;
 import com.google.common.io.CharStreams;
-import graphql.DeferredExecutionResult;
 import graphql.ExecutionResult;
 import graphql.GraphQL;
 import graphql.execution.reactive.SingleSubscriberPublisher;
@@ -379,15 +378,16 @@ private void query(GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQL
             AtomicReference<Subscription> subscriptionRef = new AtomicReference<>();
             asyncContext.addListener(new SubscriptionAsyncListener(subscriptionRef));
             ExecutionResultSubscriber subscriber = new ExecutionResultSubscriber(subscriptionRef, asyncContext, graphQLObjectMapper);
-            Publisher<ExecutionResult> publisher;
+            List<Publisher<ExecutionResult>> publishers = new ArrayList<>();
             if (result.getData() instanceof Publisher) {
-                publisher = result.getData();
+                publishers.add(result.getData());
             } else {
-                publisher = new SingleSubscriberPublisher<>();
-                ((SingleSubscriberPublisher<ExecutionResult>) publisher).offer(result);
-                publisher = new MultiPublisher<>(publisher, (Publisher<ExecutionResult>) result.getExtensions().get(GraphQL.DEFERRED_RESULTS));
+                publishers.add(new StaticDataPublisher<>(result));
+                final Publisher<ExecutionResult> deferredResultsPublisher = (Publisher<ExecutionResult>) result.getExtensions().get(GraphQL.DEFERRED_RESULTS);
+                publishers.add(deferredResultsPublisher);
             }
-            publisher.subscribe(subscriber);
+            publishers.forEach(it -> it.subscribe(subscriber));
+
             if (isInAsyncThread) {
                 // We need to delay the completion of async context until after the subscription has terminated, otherwise the AsyncContext is prematurely closed.
                 try {
@@ -581,20 +581,11 @@ public void await() throws InterruptedException {
         }
     }
 
-    private static class MultiPublisher<T> implements Publisher<T> {
-
-        private List<Publisher<T>> publishers;
-
-        @SafeVarargs
-        MultiPublisher(Publisher<T>... publishers) {
-            this.publishers = Arrays.asList(publishers);
+    private static class StaticDataPublisher<T> extends SingleSubscriberPublisher<T> implements Publisher<T> {
+        StaticDataPublisher(T data) {
+            super();
+            super.offer(data);
         }
-
-        @Override
-        public void subscribe(Subscriber<? super T> s) {
-            publishers.forEach(publisher -> publisher.subscribe(s));
-        }
-
     }
 
 }

src/test/groovy/graphql/servlet/AbstractGraphQLHttpServletSpec.groovy

@@ -286,23 +286,23 @@ class AbstractGraphQLHttpServletSpec extends Specification {
 
     def "deferred query over HTTP GET"() {
         setup:
-        request.addParameter('query', 'query { deferred(arg:"test") @defer }')
+        request.addParameter('query', 'query { echo(arg:"test") @defer }')
 
         when:
         servlet.doGet(request, response)
 
         then:
         response.getStatus() == STATUS_OK
         response.getContentType() == CONTENT_TYPE_SERVER_SENT_EVENTS
-        getSubscriptionResponseContent()[0].data.deferred == null
+        getSubscriptionResponseContent()[0].data.echo == null
 
         when:
         subscriptionLatch.await(1, TimeUnit.SECONDS)
 
         then:
         def content = getSubscriptionResponseContent()
         content[1].data == "test"
-        content[1].path == ["deferred"]
+        content[1].path == ["echo"]
     }
 
     def "Batch Execution Handler allows limiting batches and sending error messages."() {
@@ -1056,7 +1056,7 @@ class AbstractGraphQLHttpServletSpec extends Specification {
         setup:
         servlet = TestUtils.createDefaultServlet()
         request.setContent(mapper.writeValueAsBytes([
-                query: 'query { deferred(arg:"test") @defer }'
+                query: 'query { echo(arg:"test") @defer }'
         ]))
         request.setAsyncSupported(true)
 
@@ -1066,15 +1066,15 @@ class AbstractGraphQLHttpServletSpec extends Specification {
         then:
         response.getStatus() == STATUS_OK
         response.getContentType() == CONTENT_TYPE_SERVER_SENT_EVENTS
-        getSubscriptionResponseContent()[0].data.deferred == null
+        getSubscriptionResponseContent()[0].data.echo == null
 
         when:
         subscriptionLatch.await(1, TimeUnit.SECONDS)
 
         then:
         def content = getSubscriptionResponseContent()
         content[1].data == "test"
-        content[1].path == ["deferred"]
+        content[1].path == ["echo"]
     }
 
     def "errors before graphql schema execution return internal server error"() {

src/test/groovy/graphql/servlet/TestUtils.groovy

@@ -120,20 +120,6 @@ class TestUtils {
             field.type(new GraphQLNonNull(Scalars.GraphQLString))
             field.dataFetcher({ env -> null })
         }
-        .field { GraphQLFieldDefinition.Builder field ->
-            field.name("deferred")
-            field.type(Scalars.GraphQLString)
-            field.argument { argument ->
-                argument.name("arg")
-                argument.type(Scalars.GraphQLString)
-            }
-            field.dataFetcher({ env ->
-                return CompletableFuture.supplyAsync( {
-                    Thread.sleep(100)
-                    env.arguments.arg
-                })
-            })
-        }
         .build()
 
         GraphQLObjectType mutation = GraphQLObjectType.newObject()