non nullable handling

andimarek · andimarek · commit 221b4161ba97 · 2025-07-01T10:30:26.000+10:00
diff --git a/src/main/java/graphql/EngineRunningState.java b/src/main/java/graphql/EngineRunningState.java
@@ -182,6 +182,9 @@ public void updateExecutionId(ExecutionId executionId) {
     }
 
     private void changeOfState(EngineRunningObserver.RunningState runningState) {
+        Assert.assertNotNull(engineRunningObserver);
+        Assert.assertNotNull(executionId);
+        Assert.assertNotNull(graphQLContext);
         engineRunningObserver.runningStateChanged(executionId, graphQLContext, runningState);
     }
 
diff --git a/src/main/java/graphql/ProfilerResult.java b/src/main/java/graphql/ProfilerResult.java
@@ -20,6 +20,7 @@ public class ProfilerResult {
 
     public static final String PROFILER_CONTEXT_KEY = "__GJ_PROFILER";
 
+    @Nullable
     private volatile ExecutionId executionId;
     private long startTime;
     private long endTime;
@@ -34,7 +35,9 @@ public class ProfilerResult {
     private final Map<String, DataFetcherType> dataFetcherTypeMap = new ConcurrentHashMap<>();
 
     private final Map<String, DataFetcherResultType> dataFetcherResultType = new ConcurrentHashMap<>();
+    @Nullable
     private volatile String operationName;
+    @Nullable
     private volatile String operationType;
     private volatile boolean dataLoaderChainingEnabled;
     private final Set<Integer> oldStrategyDispatchingAll = ConcurrentHashMap.newKeySet();
@@ -152,10 +155,12 @@ void addDispatchEvent(String dataLoaderName, @Nullable Integer level, int count)
     // public getters
 
     public String getOperationName() {
+        Assert.assertNotNull(operationName);
         return operationName;
     }
 
     public String getOperationType() {
+        Assert.assertNotNull(operationType);
         return operationType;
     }
 
diff --git a/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java b/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java
@@ -516,6 +516,7 @@ private void dispatchAll(DataLoaderRegistry dataLoaderRegistry, int level) {
         for (DataLoader<?, ?> dataLoader : dataLoaderRegistry.getDataLoaders()) {
             dataLoader.dispatch().whenComplete((objects, throwable) -> {
                 if (objects != null && objects.size() > 0) {
+                    Assert.assertNotNull(dataLoader.getName());
                     profiler.batchLoadedOldStrategy(dataLoader.getName(), level, objects.size());
                 }
             });
diff --git a/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java b/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java
@@ -471,7 +471,7 @@ public static class DFEInternalState {
         final Profiler profiler;
         final AlternativeCallContext alternativeCallContext;
 
-        public DFEInternalState(DataLoaderDispatchStrategy dataLoaderDispatchStrategy, AlternativeCallContext deferredCallContext, Profiler profiler) {
+        public DFEInternalState(DataLoaderDispatchStrategy dataLoaderDispatchStrategy, AlternativeCallContext alternativeCallContext, Profiler profiler) {
             this.dataLoaderDispatchStrategy = dataLoaderDispatchStrategy;
             this.alternativeCallContext = alternativeCallContext;
             this.profiler = profiler;

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,9 @@ public void updateExecutionId(ExecutionId executionId) {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`private void changeOfState(EngineRunningObserver.RunningState runningState) {`
	`185`	`+ Assert.assertNotNull(engineRunningObserver);`
	`186`	`+ Assert.assertNotNull(executionId);`
	`187`	`+ Assert.assertNotNull(graphQLContext);`
`185`	`188`	`engineRunningObserver.runningStateChanged(executionId, graphQLContext, runningState);`
`186`	`189`	`}`
`187`	`190`
Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,7 @@ private void dispatchAll(DataLoaderRegistry dataLoaderRegistry, int level) {`
`516`	`516`	`for (DataLoader<?, ?> dataLoader : dataLoaderRegistry.getDataLoaders()) {`
`517`	`517`	`dataLoader.dispatch().whenComplete((objects, throwable) -> {`
`518`	`518`	`if (objects != null && objects.size() > 0) {`
	`519`	`+ Assert.assertNotNull(dataLoader.getName());`
`519`	`520`	`profiler.batchLoadedOldStrategy(dataLoader.getName(), level, objects.size());`
`520`	`521`	`}`
`521`	`522`	`});`