Polish "Reuse BatchLoaderRegistry in GraphQlService"

See gh-29929

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfiguration.java

@@ -64,8 +64,6 @@ public class GraphQlAutoConfiguration {
 
 	private static final Log logger = LogFactory.getLog(GraphQlAutoConfiguration.class);
 
-	private final BatchLoaderRegistry batchLoaderRegistry = new DefaultBatchLoaderRegistry();
-
 	@Bean
 	@ConditionalOnMissingBean
 	public GraphQlSource graphQlSource(ResourcePatternResolver resourcePatternResolver, GraphQlProperties properties,
@@ -118,7 +116,7 @@ private List<Resource> resolveSchemaResources(ResourcePatternResolver resolver,
 	@Bean
 	@ConditionalOnMissingBean
 	public BatchLoaderRegistry batchLoaderRegistry() {
-		return this.batchLoaderRegistry;
+		return new DefaultBatchLoaderRegistry();
 	}
 
 	@Bean

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java

@@ -38,6 +38,7 @@
 import org.springframework.graphql.data.method.annotation.support.AnnotatedControllerConfigurer;
 import org.springframework.graphql.execution.BatchLoaderRegistry;
 import org.springframework.graphql.execution.DataFetcherExceptionResolver;
+import org.springframework.graphql.execution.DataLoaderRegistrar;
 import org.springframework.graphql.execution.GraphQlSource;
 import org.springframework.graphql.execution.MissingSchemaException;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
@@ -170,11 +171,18 @@ void shouldDisableFieldIntrospection() {
 	}
 
 	@Test
-	void shouldConfigCustomBatchLoaderRegistry() {
-		this.contextRunner.withUserConfiguration(CustomBatchLoaderRegistryConfiguration.class).run((context) -> {
-			assertThat(context).getBeanNames(BatchLoaderRegistry.class).containsOnly("customBatchLoaderRegistry");
-			assertThat(context).hasSingleBean(BatchLoaderRegistry.class);
-		});
+	void shouldConfigureCustomBatchLoaderRegistry() {
+		this.contextRunner
+				.withBean("customBatchLoaderRegistry", BatchLoaderRegistry.class, () -> mock(BatchLoaderRegistry.class))
+				.run((context) -> {
+					assertThat(context).hasSingleBean(BatchLoaderRegistry.class);
+					assertThat(context.getBean("customBatchLoaderRegistry"))
+							.isSameAs(context.getBean(BatchLoaderRegistry.class));
+					assertThat(context.getBean(GraphQlService.class))
+							.extracting("dataLoaderRegistrars",
+									InstanceOfAssertFactories.list(DataLoaderRegistrar.class))
+							.containsOnly(context.getBean(BatchLoaderRegistry.class));
+				});
 	}
 
 	@Configuration(proxyBeanMethods = false)
@@ -261,14 +269,4 @@ public void customize(GraphQlSource.Builder builder) {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class CustomBatchLoaderRegistryConfiguration {
-
-		@Bean
-		BatchLoaderRegistry customBatchLoaderRegistry() {
-			return mock(BatchLoaderRegistry.class);
-		}
-
-	}
-
 }