Fix comment and test

andimarek · Jan 10, 2024 · Dec 5, 2023 · Dec 5, 2023 · Dec 12, 2023 · Dec 12, 2023
commit c85cbed61ad1a99f01e499df03a7b7c667f2cacd
diff --git a/src/main/java/graphql/normalized/ExecutableNormalizedOperationToAstCompiler.java b/src/main/java/graphql/normalized/ExecutableNormalizedOperationToAstCompiler.java
@@ -152,7 +152,7 @@ private static List<Selection<?>> subselectionsForNormalizedField(GraphQLSchema
                                                                       VariableAccumulator variableAccumulator) {
         ImmutableList.Builder<Selection<?>> selections = ImmutableList.builder();
 
-        // All conditional fields go here instead of directly to selections, so they can be grouped together
+        // All conditional and deferred fields go here instead of directly to selections, so they can be grouped together
         // in the same inline fragment in the output
         //
         Map<ExecutionFragmentDetails, List<Field>> fieldsByFragmentDetails = new LinkedHashMap<>();

diff --git a/...test/groovy/graphql/normalized/ExecutableNormalizedOperationToAstCompilerDeferTest.groovy b/...test/groovy/graphql/normalized/ExecutableNormalizedOperationToAstCompilerDeferTest.groovy
@@ -24,20 +24,6 @@ class ExecutableNormalizedOperationToAstCompilerDeferTest extends Specification
         }
     }
 
-    VariablePredicate jsonVariables = new VariablePredicate() {
-        @Override
-        boolean shouldMakeVariable(ExecutableNormalizedField executableNormalizedField, String argName, NormalizedInputValue normalizedInputValue) {
-            "JSON" == normalizedInputValue.unwrappedTypeName && normalizedInputValue.value != null
-        }
-    }
-
-    VariablePredicate allVariables = new VariablePredicate() {
-        @Override
-        boolean shouldMakeVariable(ExecutableNormalizedField executableNormalizedField, String argName, NormalizedInputValue normalizedInputValue) {
-            return true
-        }
-    }
-
     String sdl = """
             directive @defer(if: Boolean, label: String) on FRAGMENT_SPREAD | INLINE_FRAGMENT
 
@@ -252,10 +238,12 @@ class ExecutableNormalizedOperationToAstCompilerDeferTest extends Specification
         then:
         printed == '''{
   animal {
-    name
     ... on Dog @defer {
       breed
     }
+    ... on Dog {
+      name
+    }
     ... on Dog @defer(label: "owner-defer") {
       owner {
         firstname
@@ -316,7 +304,12 @@ class ExecutableNormalizedOperationToAstCompilerDeferTest extends Specification
         then:
         printed == '''{
   animal {
-    name
+    ... on Cat @defer {
+      breed
+    }
+    ... on Dog @defer {
+      breed
+    }
   }
 }
 '''