nullable types

andimarek · andimarek · commit 08278776299d · 2025-06-12T17:03:54.000+10:00
diff --git a/src/main/java/graphql/Assert.java b/src/main/java/graphql/Assert.java
@@ -1,7 +1,5 @@
 package graphql;
 
-import org.jspecify.annotations.NullMarked;
-
 import java.util.Collection;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
@@ -10,7 +8,6 @@
 
 @SuppressWarnings("TypeParameterUnusedInFormals")
 @Internal
-@NullMarked
 public class Assert {
 
     public static <T> T assertNotNullWithNPE(T object, Supplier<String> msg) {
diff --git a/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java b/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java
@@ -296,7 +296,8 @@ public void deferredOnFieldValue(String resultKey, FieldValueInfo fieldValueInfo
         CallStack callStack = getCallStack(parameters);
         boolean ready = callStack.lock.callLocked(() -> {
             callStack.deferredFragmentRootFieldsFetched.add(fieldValueInfo);
-            return callStack.deferredFragmentRootFieldsFetched.size() == parameters.getDeferredCallContext().getFields();
+            DeferredCallContext deferredCallContext = Assert.assertNotNull(parameters.getDeferredCallContext());
+            return callStack.deferredFragmentRootFieldsFetched.size() == deferredCallContext.getFields();
         });
         if (ready) {
             int curLevel = parameters.getPath().getLevel();
@@ -358,7 +359,7 @@ private void onFieldValuesInfoDispatchIfNeeded(List<FieldValueInfo> fieldValueIn
     //
 // thread safety: called with callStack.lock
 //
-    private Integer handleSubSelectionFetched(List<FieldValueInfo> fieldValueInfos, int subSelectionLevel, CallStack
+    private @Nullable Integer handleSubSelectionFetched(List<FieldValueInfo> fieldValueInfos, int subSelectionLevel, CallStack
             callStack) {
         callStack.increaseHappenedOnFieldValueCalls(subSelectionLevel);
         int expectedOnObjectCalls = getObjectCountForList(fieldValueInfos);
@@ -426,7 +427,7 @@ private boolean dispatchIfNeeded(int level, CallStack callStack) {
     //
 // thread safety: called with callStack.lock
 //
-    private Integer getHighestReadyLevel(int startFrom, CallStack callStack) {
+    private @Nullable Integer getHighestReadyLevel(int startFrom, CallStack callStack) {
         int curLevel = callStack.highestReadyLevel;
         while (true) {
             if (!checkLevelImpl(curLevel + 1, callStack)) {
@@ -499,7 +500,7 @@ void dispatch(int level, CallStack callStack) {
     }
 
 
-    public void dispatchDLCFImpl(Set<String> resultPathsToDispatch, Integer level, CallStack callStack) {
+    private void dispatchDLCFImpl(Set<String> resultPathsToDispatch, @Nullable Integer level, CallStack callStack) {
 
         // filter out all DataLoaderCFS that are matching the fields we want to dispatch
         List<ResultPathWithDataLoader> relevantResultPathWithDataLoader = new ArrayList<>();
@@ -570,7 +571,7 @@ public void run() {
                 callStack.batchWindowOfDelayedDataLoaderToDispatch.clear();
                 callStack.batchWindowOpen = false;
             });
-            dispatchDLCFImpl(resultPathToDispatch.get(), null, callStack);
+            dispatchDLCFImpl(Assert.assertNotNull(resultPathToDispatch.get()), null, callStack);
         }
     }
 
