Change defer callback method name

felipe-gdr-atlassian · felipe-gdr-atlassian · commit ea8a89f93899 · 2024-06-21T09:11:36.000+10:00
diff --git a/src/main/java/graphql/execution/DataLoaderDispatchStrategy.java b/src/main/java/graphql/execution/DataLoaderDispatchStrategy.java
@@ -4,7 +4,6 @@
 import graphql.schema.DataFetcher;
 
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 
 @Internal
 public interface DataLoaderDispatchStrategy {
@@ -50,7 +49,7 @@ default DataFetcher<?> modifyDataFetcher(DataFetcher<?> dataFetcher) {
         return dataFetcher;
     }
 
-    default void deferredField(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters executionStrategyParameters) {
+    default void executeDeferredOnFieldValueInfo(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters executionStrategyParameters) {
 
     }
 }
diff --git a/src/main/java/graphql/execution/incremental/DeferredExecutionSupport.java b/src/main/java/graphql/execution/incremental/DeferredExecutionSupport.java
@@ -162,7 +162,7 @@ private Supplier<CompletableFuture<DeferredFragmentCall.FieldWithExecutionResult
 
                                 CompletableFuture<ExecutionResult> executionResultCF = fieldValueResult
                                         .thenCompose(fvi -> {
-                                                    executionContext.getDataLoaderDispatcherStrategy().deferredField(fvi, executionStrategyParameters);
+                                                    executionContext.getDataLoaderDispatcherStrategy().executeDeferredOnFieldValueInfo(fvi, executionStrategyParameters);
 
                                                     return fvi
                                                             .getFieldValueFuture()
diff --git a/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java b/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java
@@ -98,7 +98,7 @@ public PerLevelDataLoaderDispatchStrategy(ExecutionContext executionContext) {
     }
 
     @Override
-    public void deferredField(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters executionStrategyParameters) {
+    public void executeDeferredOnFieldValueInfo(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters executionStrategyParameters) {
         throw new UnsupportedOperationException("Data Loaders cannot be used to resolve deferred fields");
     }
 
diff --git a/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategyWithDefer.java b/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategyWithDefer.java
@@ -117,7 +117,7 @@ public PerLevelDataLoaderDispatchStrategyWithDefer(ExecutionContext executionCon
     }
 
     @Override
-    public void deferredField(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters parameters) {
+    public void executeDeferredOnFieldValueInfo(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters parameters) {
         int curLevel = parameters.getExecutionStepInfo().getPath().getLevel() + 1;
 
         onFieldValuesInfoDispatchIfNeeded(Collections.singletonList(fieldValueInfo), curLevel, true);
@@ -165,6 +165,25 @@ public void executeObjectOnFieldValuesException(Throwable t, ExecutionStrategyPa
         );
     }
 
+    @Override
+    public void fieldFetched(ExecutionContext executionContext,
+                             ExecutionStrategyParameters parameters,
+                             DataFetcher<?> dataFetcher,
+                             Object fetchedValue) {
+        int level = parameters.getPath().getLevel();
+        boolean isDeferred = parameters.getField().isDeferred();
+        boolean dispatchNeeded = callStack.lock.callLocked(() -> {
+            if (!isDeferred) {
+                callStack.increaseFetchCount(level);
+            }
+            return dispatchIfNeeded(level);
+        });
+        if (dispatchNeeded) {
+            dispatch();
+        }
+
+    }
+
 
     private void increaseCallCounts(int curLevel, ExecutionStrategyParameters parameters) {
         int fieldCount = parameters.getFields().size();
@@ -220,26 +239,6 @@ private int getCountForList(List<FieldValueInfo> fieldValueInfos) {
     }
 
 
-    @Override
-    public void fieldFetched(ExecutionContext executionContext,
-                             ExecutionStrategyParameters parameters,
-                             DataFetcher<?> dataFetcher,
-                             Object fetchedValue) {
-        int level = parameters.getPath().getLevel();
-        boolean isDeferred = parameters.getField().isDeferred();
-        boolean dispatchNeeded = callStack.lock.callLocked(() -> {
-            if (!isDeferred) {
-                callStack.increaseFetchCount(level);
-            }
-            return dispatchIfNeeded(level);
-        });
-        if (dispatchNeeded) {
-            dispatch();
-        }
-
-    }
-
-
     //
     // thread safety : called with callStack.lock
     //

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`import graphql.schema.DataFetcher;`
`5`	`5`
`6`	`6`	`import java.util.List;`
`7`		`-import java.util.concurrent.CompletableFuture;`
`8`	`7`
`9`	`8`	`@Internal`
`10`	`9`	`public interface DataLoaderDispatchStrategy {`
`@@ -50,7 +49,7 @@ default DataFetcher<?> modifyDataFetcher(DataFetcher<?> dataFetcher) {`
`50`	`49`	`return dataFetcher;`
`51`	`50`	`}`
`52`	`51`
`53`		`- default void deferredField(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters executionStrategyParameters) {`
	`52`	`+ default void executeDeferredOnFieldValueInfo(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters executionStrategyParameters) {`
`54`	`53`
`55`	`54`	`}`
`56`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public PerLevelDataLoaderDispatchStrategy(ExecutionContext executionContext) {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- public void deferredField(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters executionStrategyParameters) {`
	`101`	`+ public void executeDeferredOnFieldValueInfo(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters executionStrategyParameters) {`
`102`	`102`	`throw new UnsupportedOperationException("Data Loaders cannot be used to resolve deferred fields");`
`103`	`103`	`}`
`104`	`104`