Improved builder usage

bbakerman · bbakerman · commit 7d318d79d454 · 2018-03-18T12:53:33.000+11:00
diff --git a/src/main/java/graphql/execution/Execution.java b/src/main/java/graphql/execution/Execution.java
@@ -20,6 +20,7 @@
 import graphql.language.VariableDefinition;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
+import org.reactivestreams.Publisher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -179,16 +180,14 @@ private CompletableFuture<ExecutionResult> executeOperation(ExecutionContext exe
      */
     private CompletableFuture<ExecutionResult> deferSupport(ExecutionContext executionContext, CompletableFuture<ExecutionResult> result) {
         return result.thenApply(er -> {
-            Map<Object, Object> extensions = er.getExtensions();
             DeferSupport deferSupport = executionContext.getDeferSupport();
             if (deferSupport.isDeferDetected()) {
-                if (extensions == null) {
-                    extensions = new LinkedHashMap<>();
-                }
                 // we start the rest of the query now to maximize throughput.  We have the initial important results
                 // and now we can start the rest of the calls as early as possible (even before some one subscribes)
-                extensions.put(DeferSupport.DEFERRED_RESULT_STREAM_NAME, deferSupport.startDeferredCalls());
-                return ExecutionResultImpl.newExecutionResult().from((ExecutionResultImpl) er).extensions(extensions).build();
+                Publisher<ExecutionResult> publisher = deferSupport.startDeferredCalls();
+                return ExecutionResultImpl.newExecutionResult().from((ExecutionResultImpl) er)
+                        .addExtension(DeferSupport.DEFERRED_RESULT_STREAM_NAME, publisher)
+                        .build();
             }
             return er;
         });
diff --git a/src/test/groovy/graphql/execution/defer/DeferSupportIntegrationTest.groovy b/src/test/groovy/graphql/execution/defer/DeferSupportIntegrationTest.groovy
@@ -175,12 +175,12 @@ class DeferSupportIntegrationTest extends Specification {
         Publisher<ExecutionResult> deferredResultStream = initialResult.extensions["deferredResultStream"] as Publisher<ExecutionResult>
         AtomicBoolean doneORCancelled = new AtomicBoolean()
         def subscriber = new Subscriber<ExecutionResult>() {
-            Subscription subscription;
+            Subscription subscription
 
             @Override
             void onSubscribe(Subscription s) {
                 println "\nonSubscribe@" + sentAt()
-                subscription = s;
+                subscription = s
                 subscription.request(1)
             }
 
