Changed name of extension map entry

bbakerman · bbakerman · commit d93f8715af61 · 2018-03-22T08:17:46.000+11:00
diff --git a/docs/defer.rst b/docs/defer.rst
@@ -82,7 +82,7 @@ the ``extensions`` map
         sendResult(httpServletResponse, initialResult);
 
         Map<Object, Object> extensions = initialResult.getExtensions();
-        Publisher<ExecutionResult> deferredResults = (Publisher<ExecutionResult>) extensions.get("deferredResultStream");
+        Publisher<ExecutionResult> deferredResults = (Publisher<ExecutionResult>) extensions.get(GraphQL.DEFERRED_RESULTS);
 
         //
         // you subscribe to the deferred results like any other reactive stream
diff --git a/src/main/java/graphql/GraphQL.java b/src/main/java/graphql/GraphQL.java
@@ -77,6 +77,12 @@
 @PublicApi
 public class GraphQL {
 
+    /**
+     * When @defer directives are used, this is the extension key name used to contain the {@link org.reactivestreams.Publisher}
+     * of deferred results
+     */
+    public static final String DEFERRED_RESULTS = "deferredResults";
+
     private static final Logger log = LoggerFactory.getLogger(GraphQL.class);
 
     private static final ExecutionIdProvider DEFAULT_EXECUTION_ID_PROVIDER = (query, operationName, context) -> ExecutionId.generate();
diff --git a/src/main/java/graphql/execution/Execution.java b/src/main/java/graphql/execution/Execution.java
@@ -4,6 +4,7 @@
 import graphql.ExecutionInput;
 import graphql.ExecutionResult;
 import graphql.ExecutionResultImpl;
+import graphql.GraphQL;
 import graphql.GraphQLError;
 import graphql.Internal;
 import graphql.execution.defer.DeferSupport;
@@ -25,7 +26,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -186,7 +186,7 @@ private CompletableFuture<ExecutionResult> deferSupport(ExecutionContext executi
                 // and now we can start the rest of the calls as early as possible (even before some one subscribes)
                 Publisher<ExecutionResult> publisher = deferSupport.startDeferredCalls();
                 return ExecutionResultImpl.newExecutionResult().from((ExecutionResultImpl) er)
-                        .addExtension(DeferSupport.DEFERRED_RESULT_STREAM_NAME, publisher)
+                        .addExtension(GraphQL.DEFERRED_RESULTS, publisher)
                         .build();
             }
             return er;
diff --git a/src/main/java/graphql/execution/defer/DeferSupport.java b/src/main/java/graphql/execution/defer/DeferSupport.java
@@ -20,8 +20,6 @@
 @Internal
 public class DeferSupport {
 
-    public static final String DEFERRED_RESULT_STREAM_NAME = "deferredResultStream";
-
     private final AtomicBoolean deferDetected = new AtomicBoolean(false);
     private final Deque<DeferredCall> deferredCalls = new ConcurrentLinkedDeque<>();
     private final SingleSubscriberPublisher<ExecutionResult> publisher = new SingleSubscriberPublisher<>();
diff --git a/src/test/groovy/graphql/execution/defer/DeferSupportIntegrationTest.groovy b/src/test/groovy/graphql/execution/defer/DeferSupportIntegrationTest.groovy
@@ -172,7 +172,7 @@ class DeferSupportIntegrationTest extends Specification {
         when:
         List<ExecutionResult> resultList = []
 
-        Publisher<ExecutionResult> deferredResultStream = initialResult.extensions["deferredResultStream"] as Publisher<ExecutionResult>
+        Publisher<ExecutionResult> deferredResultStream = initialResult.extensions[GraphQL.DEFERRED_RESULTS] as Publisher<ExecutionResult>
         AtomicBoolean doneORCancelled = new AtomicBoolean()
         def subscriber = new Subscriber<ExecutionResult>() {
             Subscription subscription
diff --git a/src/test/groovy/readme/DeferredExamples.java b/src/test/groovy/readme/DeferredExamples.java
@@ -40,7 +40,7 @@ void basicExample(HttpServletResponse httpServletResponse, String deferredQuery)
         sendResult(httpServletResponse, initialResult);
 
         Map<Object, Object> extensions = initialResult.getExtensions();
-        Publisher<ExecutionResult> deferredResults = (Publisher<ExecutionResult>) extensions.get("deferredResultStream");
+        Publisher<ExecutionResult> deferredResults = (Publisher<ExecutionResult>) extensions.get(GraphQL.DEFERRED_RESULTS);
 
         //
         // you subscribe to the deferred results like any other reactive stream
