minor cleanups

andimarek · andimarek · commit 80fdb8111db1 · 2025-02-28T08:49:54.000+10:00
diff --git a/src/main/java/graphql/execution/incremental/IncrementalUtils.java b/src/main/java/graphql/execution/incremental/IncrementalUtils.java
@@ -7,6 +7,7 @@
 import graphql.execution.ValuesResolver;
 import graphql.language.Directive;
 import graphql.language.NodeUtil;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Locale;
@@ -20,7 +21,7 @@ public class IncrementalUtils {
     private IncrementalUtils() {
     }
 
-    public static <T> T createDeferredExecution(
+    public static @Nullable <T> T createDeferredExecution(
             Map<String, Object> variables,
             List<Directive> directives,
             Function<String, T> builderFunction
diff --git a/src/main/java/graphql/normalized/ExecutableNormalizedOperationFactory.java b/src/main/java/graphql/normalized/ExecutableNormalizedOperationFactory.java
@@ -536,10 +536,11 @@ private void buildEnfsRecursively(@Nullable ExecutableNormalizedField executable
                     // and is the type to which the field belongs (the container type of the field) and output type
                     // of the field needs to be determined based on the field name
                     GraphQLFieldDefinition fieldDefinition = Introspection.getFieldDef(graphQLSchema, fieldAndAstParent.astTypeCondition, fieldAndAstParent.field.getName());
-                    GraphQLUnmodifiedType selectionSetType = unwrapAll(fieldDefinition.getType());
+                    // it must a composite type, because the field has a selection set
+                    GraphQLCompositeType selectionSetType = (GraphQLCompositeType) unwrapAll(fieldDefinition.getType());
                     this.collectFromSelectionSet(fieldAndAstParent.field.getSelectionSet(),
                             collectedFields,
-                            (GraphQLCompositeType) selectionSetType,
+                            selectionSetType,
                             possibleObjects,
                             null
                     );
@@ -829,7 +830,7 @@ private void collectInlineFragment(List<CollectedField> result,
             collectFromSelectionSet(inlineFragment.getSelectionSet(), result, newAstTypeCondition, newPossibleObjects, newDeferredExecution);
         }
 
-        private NormalizedDeferredExecution buildDeferredExecution(
+        private @Nullable NormalizedDeferredExecution buildDeferredExecution(
                 List<Directive> directives,
                 Set<GraphQLObjectType> newPossibleObjects) {
             if (!options.deferSupport) {
