Small adjustments after pairing with Andi

Author: felipe-gdr-atlassian

src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategyWithDeferAlwaysDispatch.java

@@ -31,11 +31,11 @@ public class PerLevelDataLoaderDispatchStrategyWithDeferAlwaysDispatch implement
     private final ExecutionContext executionContext;
 
     /**
-     * This flag is used to determine if we are in a deferred context or not.
+     * This flag is used to determine if we have started the deferred execution.
      * The value of this flag is set to true as soon as we identified that a deferred field is being executed, and then
      * the flag stays on that state for the remainder of the execution.
      */
-    private final AtomicBoolean enteredDeferredContext = new AtomicBoolean(false);
+    private final AtomicBoolean startedDeferredExecution = new AtomicBoolean(false);
 
 
     private static class CallStack {
@@ -115,12 +115,12 @@ public PerLevelDataLoaderDispatchStrategyWithDeferAlwaysDispatch(ExecutionContex
 
     @Override
     public void executeDeferredOnFieldValueInfo(FieldValueInfo fieldValueInfo, ExecutionStrategyParameters executionStrategyParameters) {
-        this.enteredDeferredContext.set(true);
+        this.startedDeferredExecution.set(true);
     }
 
     @Override
     public void executionStrategy(ExecutionContext executionContext, ExecutionStrategyParameters parameters) {
-        if (this.enteredDeferredContext.get()) {
+        if (this.startedDeferredExecution.get()) {
             return;
         }
         int curLevel = parameters.getExecutionStepInfo().getPath().getLevel() + 1;
@@ -129,7 +129,7 @@ public void executionStrategy(ExecutionContext executionContext, ExecutionStrate
 
     @Override
     public void executeObject(ExecutionContext executionContext, ExecutionStrategyParameters parameters) {
-        if (this.enteredDeferredContext.get()) {
+        if (this.startedDeferredExecution.get()) {
             return;
         }
         int curLevel = parameters.getExecutionStepInfo().getPath().getLevel() + 1;
@@ -138,7 +138,7 @@ public void executeObject(ExecutionContext executionContext, ExecutionStrategyPa
 
     @Override
     public void executionStrategyOnFieldValuesInfo(List<FieldValueInfo> fieldValueInfoList, ExecutionStrategyParameters parameters) {
-        if (this.enteredDeferredContext.get()) {
+        if (this.startedDeferredExecution.get()) {
             this.dispatch();
         }
         int curLevel = parameters.getPath().getLevel() + 1;
@@ -155,7 +155,7 @@ public void executionStrategyOnFieldValuesException(Throwable t, ExecutionStrate
 
     @Override
     public void executeObjectOnFieldValuesInfo(List<FieldValueInfo> fieldValueInfoList, ExecutionStrategyParameters parameters) {
-        if (this.enteredDeferredContext.get()) {
+        if (this.startedDeferredExecution.get()) {
             this.dispatch();
         }
         int curLevel = parameters.getPath().getLevel() + 1;
@@ -179,8 +179,8 @@ public void fieldFetched(ExecutionContext executionContext,
 
         final boolean dispatchNeeded;
 
-        if (parameters.getField().isDeferred() || this.enteredDeferredContext.get()) {
-            this.enteredDeferredContext.compareAndSet(false, true);
+        if (parameters.getField().isDeferred() || this.startedDeferredExecution.get()) {
+            this.startedDeferredExecution.set(true);
             dispatchNeeded = true;
         } else {
             int level = parameters.getPath().getLevel();

src/test/groovy/graphql/execution/instrumentation/dataloader/DataLoaderPerformanceData.groovy

@@ -249,7 +249,14 @@ class DataLoaderPerformanceData {
                 .collect { it.toSpecification() }
     }
 
-
+    /**
+     * Combines the initial result with the incremental results into a single result that has the same shape as a
+     * "normal" execution result.
+     *
+     * @param initialResult the data from the initial execution
+     * @param incrementalResults the data from the incremental executions
+     * @return a single result that combines the initial and incremental results
+     */
     static Map<String, Object> combineExecutionResults(Map<String, Object> initialResult, List<Map<String, Object>> incrementalResults) {
         Map<String, Object> combinedResult = deepClone(initialResult, Map.class)
 
@@ -275,6 +282,7 @@ class DataLoaderPerformanceData {
                     }
                 }
 
+        // Remove the "hasNext" to make the result look like a normal execution result
         combinedResult.remove("hasNext")
 
         combinedResult

src/test/groovy/graphql/execution/instrumentation/dataloader/DeferWithDataLoaderTest.groovy

@@ -190,9 +190,6 @@ class DeferWithDataLoaderTest extends Specification {
 
         ExecutionResult result = graphQL.execute(executionInput)
 
-        println "dept for shops dl: " + batchCompareDataFetchers.departmentsForShopsBatchLoaderCounter.get()
-        println "prod for depts dl: " + batchCompareDataFetchers.productsForDepartmentsBatchLoaderCounter.get()
-
         then:
         result.toSpecification() == expectedInitialData