From ecc88f7a41e2b2490e5b72f1524c058d9430f101 Mon Sep 17 00:00:00 2001
From: Brian Clozel <brian.clozel@broadcom.com>
Date: Tue, 8 Apr 2025 10:46:48 +0200
Subject: [PATCH] Ensure that DataLoader are retrieved from
 DataFetchingEnvironment

Closes gh-1177
---
 .../annotation/support/AnnotatedControllerConfigurer.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedControllerConfigurer.java b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedControllerConfigurer.java
index 9bed5816..ed2ec224 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedControllerConfigurer.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedControllerConfigurer.java
@@ -606,7 +606,7 @@ public class AnnotatedControllerConfigurer
 
 		@Override
 		public Object get(DataFetchingEnvironment env) {
-			DataLoader<?, ?> dataLoader = env.getDataLoaderRegistry().getDataLoader(this.dataLoaderKey);
+			DataLoader<?, ?> dataLoader = env.getDataLoader(this.dataLoaderKey);
 			Assert.state(dataLoader != null, "No DataLoader for key '" + this.dataLoaderKey + "'");
 			return ((env.getLocalContext() != null) ?
 					dataLoader.load(env.getSource(), env.getLocalContext()) :