Merge pull request #4164 from graphql-java/use-dispatch-all

andimarek · web-flow · commit aed1e8071dff · 2025-11-10T11:51:07.000+10:00
diff --git a/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java b/src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java
@@ -473,14 +473,7 @@ void dispatch(int level, CallStack callStack) {
     }
 
     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());
-                }
-            });
-        }
+        dataLoaderRegistry.dispatchAll();
     }
 
     private void dispatchDLCFImpl(Integer level, CallStack callStack, boolean normalOrDelayed, boolean chained) {

Original file line number	Diff line number	Diff line change
`@@ -473,14 +473,7 @@ void dispatch(int level, CallStack callStack) {`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`private void dispatchAll(DataLoaderRegistry dataLoaderRegistry, int level) {`
`476`		`- for (DataLoader<?, ?> dataLoader : dataLoaderRegistry.getDataLoaders()) {`
`477`		`- dataLoader.dispatch().whenComplete((objects, throwable) -> {`
`478`		`- if (objects != null && objects.size() > 0) {`
`479`		`- Assert.assertNotNull(dataLoader.getName());`
`480`		`- profiler.batchLoadedOldStrategy(dataLoader.getName(), level, objects.size());`
`481`		`- }`
`482`		`- });`
`483`		`- }`
	`476`	`+ dataLoaderRegistry.dispatchAll();`
`484`	`477`	`}`
`485`	`478`
`486`	`479`	`private void dispatchDLCFImpl(Integer level, CallStack callStack, boolean normalOrDelayed, boolean chained) {`