GQLGW-5297-assert-on-result-and-remove-redundant-call

llin2 · llin2 · commit 50169f0b9ff1 · 2025-11-18T11:52:02.000+11:00
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -333,7 +333,6 @@ DeferredExecutionSupport createDeferredExecutionSupport(ExecutionContext executi
                 && deferredExecutionSupport.deferredFieldsCount() > 0
                 && executionContext.getGraphQLContext().getBoolean(IncrementalExecutionContextKeys.ENABLE_EAGER_DEFER_START, false)) {
 
-            executionContext.getIncrementalCallState().startDeferredCalls();
             executionContext.getIncrementalCallState().startDrainingNow();
         }
 
diff --git a/src/main/java/graphql/execution/incremental/IncrementalCallState.java b/src/main/java/graphql/execution/incremental/IncrementalCallState.java
@@ -105,7 +105,7 @@ public Publisher<DelayedIncrementalPartialResult> startDeferredCalls() {
     }
 
     public void startDrainingNow() {
-        publisher.get();
+        startDeferredCalls();
         drainIncrementalCalls();
     }
 
diff --git a/src/test/groovy/graphql/execution/incremental/DeferExecutionSupportIntegrationTest.groovy b/src/test/groovy/graphql/execution/incremental/DeferExecutionSupportIntegrationTest.groovy
@@ -1787,11 +1787,20 @@ class DeferExecutionSupportIntegrationTest extends Specification {
         ]
 
         when:
-        def sub = new CapturingSubscriber<DelayedIncrementalPartialResult>()
-        initialResult.incrementalItemPublisher.subscribe(sub)
+        def incrementalResults = getIncrementalResults(initialResult)
 
         then:
-        Awaitility.await().untilTrue(sub.isDone())
+        incrementalResults == [
+                [
+                        hasNext    : false,
+                        incremental: [
+                                [
+                                        path: [],
+                                        data: [post: [summary: "A summary"]]
+                                ]
+                        ]
+                ]
+        ]
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,6 @@ DeferredExecutionSupport createDeferredExecutionSupport(ExecutionContext executi`
`333`	`333`	`&& deferredExecutionSupport.deferredFieldsCount() > 0`
`334`	`334`	`&& executionContext.getGraphQLContext().getBoolean(IncrementalExecutionContextKeys.ENABLE_EAGER_DEFER_START, false)) {`
`335`	`335`
`336`		`- executionContext.getIncrementalCallState().startDeferredCalls();`
`337`	`336`	`executionContext.getIncrementalCallState().startDrainingNow();`
`338`	`337`	`}`
`339`	`338`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public Publisher<DelayedIncrementalPartialResult> startDeferredCalls() {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`public void startDrainingNow() {`
`108`		`- publisher.get();`
	`108`	`+ startDeferredCalls();`
`109`	`109`	`drainIncrementalCalls();`
`110`	`110`	`}`
`111`	`111`