merging

andimarek · andimarek · commit c9a3ff36dd80 · 2025-05-16T11:52:18.000+10:00
diff --git a/src/main/java/graphql/schema/DataLoaderWithContext.java b/src/main/java/graphql/schema/DataLoaderWithContext.java
@@ -15,13 +15,11 @@
 public class DataLoaderWithContext<K, V> extends DelegatingDataLoader<K, V> {
     final DataFetchingEnvironment dfe;
     final String dataLoaderName;
-    final DataLoader<K, V> delegate;
 
     public DataLoaderWithContext(DataFetchingEnvironment dfe, String dataLoaderName, DataLoader<K, V> delegate) {
         super(delegate);
         this.dataLoaderName = dataLoaderName;
         this.dfe = dfe;
-        this.delegate = delegate;
     }
 
     @Override
diff --git a/src/test/groovy/graphql/schema/DataFetchingEnvironmentImplTest.groovy b/src/test/groovy/graphql/schema/DataFetchingEnvironmentImplTest.groovy
@@ -73,7 +73,8 @@ class DataFetchingEnvironmentImplTest extends Specification {
         dfe.getVariables() == variables
         dfe.getOperationDefinition() == operationDefinition
         dfe.getExecutionId() == executionId
-        dfe.getDataLoader("dataLoader").delegate == dataLoader
+        dfe.getDataLoaderRegistry() == executionContext.getDataLoaderRegistry()
+        dfe.getDataLoader("dataLoader").delegate == executionContext.getDataLoaderRegistry().getDataLoader("dataLoader")
     }
 
     def "create environment from existing one will copy everything to new instance"() {
@@ -118,7 +119,7 @@ class DataFetchingEnvironmentImplTest extends Specification {
         dfe.getDocument() == dfeCopy.getDocument()
         dfe.getOperationDefinition() == dfeCopy.getOperationDefinition()
         dfe.getVariables() == dfeCopy.getVariables()
-        dfe.getDataLoader("dataLoader").delegate == dataLoader
+        dfe.getDataLoader("dataLoader").delegate == dfeCopy.getDataLoader("dataLoader").delegate
         dfe.getLocale() == dfeCopy.getLocale()
         dfe.getLocalContext() == dfeCopy.getLocalContext()
     }
