Fixed deferred support to have proper Instrumentation - fixed bugs

bbakerman · bbakerman · commit b831e2148d00 · 2025-08-12T15:31:42.000+10:00
diff --git a/src/main/java/graphql/execution/incremental/DeferredExecutionSupport.java b/src/main/java/graphql/execution/incremental/DeferredExecutionSupport.java
@@ -18,7 +18,7 @@
 import graphql.execution.instrumentation.parameters.InstrumentationFieldParameters;
 import graphql.incremental.IncrementalPayload;
 import graphql.util.FpKit;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -162,8 +162,6 @@ private Supplier<CompletableFuture<DeferredFragmentCall.FieldWithExecutionResult
                     }
             );
 
-
-
             // todo: handle cached computations
             return dfCache.computeIfAbsent(
                     currentField.getResultKey(),
@@ -174,7 +172,7 @@ private Supplier<CompletableFuture<DeferredFragmentCall.FieldWithExecutionResult
             );
         }
 
-        @NotNull
+        @NonNull
         private Supplier<CompletableFuture<DeferredFragmentCall.FieldWithExecutionResult>> resolveDeferredFieldValue(MergedField currentField, ExecutionContext executionContext, ExecutionStrategyParameters executionStrategyParameters) {
             return () -> {
 
diff --git a/src/test/groovy/graphql/execution/instrumentation/InstrumentationTest.groovy b/src/test/groovy/graphql/execution/instrumentation/InstrumentationTest.groovy
@@ -506,9 +506,7 @@ class InstrumentationTest extends Specification {
         def query = """
         {
             hero {
-                ... @defer(label: "id") {
-                    id
-                }
+                id
                 ... @defer(label: "name") {
                     name
                 }
@@ -551,6 +549,13 @@ class InstrumentationTest extends Specification {
                                           "end:fetch-hero",
                                           "start:complete-hero",
                                           "start:execute-object",
+                                          "start:field-id",
+                                          "start:fetch-id",
+                                          "end:fetch-id",
+                                          "start:complete-id",
+                                          "end:complete-id",
+                                          "end:field-id",
+
                                           "end:execute-object",
                                           "end:complete-hero",
                                           "end:field-hero",
@@ -559,14 +564,6 @@ class InstrumentationTest extends Specification {
                                           "end:execution",
                                           //
                                           // the deferred field resolving now happens after the operation has come back
-                                          "start:deferred-field-id",
-                                          "start:field-id",
-                                          "start:fetch-id",
-                                          "end:fetch-id",
-                                          "start:complete-id",
-                                          "end:complete-id",
-                                          "end:field-id",
-                                          "end:deferred-field-id",
                                           "start:deferred-field-name",
                                           "start:field-name",
                                           "start:fetch-name",
