From 4fd0e29cc8719bda72e0e67c2392fd48e7b4009d Mon Sep 17 00:00:00 2001
From: Brian Clozel <brian.clozel@broadcom.com>
Date: Fri, 16 Feb 2024 15:27:23 +0100
Subject: [PATCH] iRemove TypeDefinitionConfigurer auto-configuration

Closes gh-39604
---
 .../graphql/GraphQlAutoConfiguration.java     |  5 +--
 .../GraphQlAutoConfigurationTests.java        | 31 -------------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfiguration.java
index 85d5c5e9ddb..2756ead51c0 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfiguration.java
@@ -66,7 +66,6 @@ import org.springframework.graphql.execution.DefaultExecutionGraphQlService;
 import org.springframework.graphql.execution.GraphQlSource;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
 import org.springframework.graphql.execution.SubscriptionExceptionResolver;
-import org.springframework.graphql.execution.TypeDefinitionConfigurer;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for creating a Spring GraphQL base
@@ -96,8 +95,7 @@ public class GraphQlAutoConfiguration {
 			ObjectProvider<DataFetcherExceptionResolver> exceptionResolvers,
 			ObjectProvider<SubscriptionExceptionResolver> subscriptionExceptionResolvers,
 			ObjectProvider<Instrumentation> instrumentations, ObjectProvider<RuntimeWiringConfigurer> wiringConfigurers,
-			ObjectProvider<GraphQlSourceBuilderCustomizer> sourceCustomizers,
-			ObjectProvider<TypeDefinitionConfigurer> typeDefinitionConfigurers) {
+			ObjectProvider<GraphQlSourceBuilderCustomizer> sourceCustomizers) {
 		String[] schemaLocations = properties.getSchema().getLocations();
 		Resource[] schemaResources = resolveSchemaResources(resourcePatternResolver, schemaLocations,
 				properties.getSchema().getFileExtensions());
@@ -112,7 +110,6 @@ public class GraphQlAutoConfiguration {
 		if (!properties.getSchema().getIntrospection().isEnabled()) {
 			builder.configureRuntimeWiring(this::enableIntrospection);
 		}
-		typeDefinitionConfigurers.forEach(builder::configureTypeDefinitions);
 		builder.configureTypeDefinitions(new ConnectionTypeDefinitionConfigurer());
 		wiringConfigurers.orderedStream().forEach(builder::configureRuntimeWiring);
 		sourceCustomizers.orderedStream().forEach((customizer) -> customizer.customize(builder));
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java
index 8b121538210..dd0f97c7a4a 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java
@@ -26,7 +26,6 @@ import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLOutputType;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.idl.RuntimeWiring;
-import graphql.schema.idl.TypeDefinitionRegistry;
 import graphql.schema.visibility.DefaultGraphqlFieldVisibility;
 import graphql.schema.visibility.NoIntrospectionGraphqlFieldVisibility;
 import org.assertj.core.api.InstanceOfAssertFactories;
@@ -53,7 +52,6 @@ import org.springframework.graphql.execution.DataFetcherExceptionResolver;
 import org.springframework.graphql.execution.DataLoaderRegistrar;
 import org.springframework.graphql.execution.GraphQlSource;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
-import org.springframework.graphql.execution.TypeDefinitionConfigurer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -224,14 +222,6 @@ class GraphQlAutoConfigurationTests {
 		});
 	}
 
-	@Test
-	void shouldUseCustomTypeDefinitionConfigurerWhenDefined() {
-		this.contextRunner.withUserConfiguration(CustomTypeDefinitionConfigurer.class).run((context) -> {
-			TestTypeDefinitionConfigurer configurer = context.getBean(TestTypeDefinitionConfigurer.class);
-			assertThat(configurer.applied).isTrue();
-		});
-	}
-
 	@Test
 	void whenApplicationTaskExecutorIsDefinedThenAnnotatedControllerConfigurerShouldUseIt() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(TaskExecutionAutoConfiguration.class))
@@ -347,25 +337,4 @@ class GraphQlAutoConfigurationTests {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class CustomTypeDefinitionConfigurer {
-
-		@Bean
-		TestTypeDefinitionConfigurer testTypeDefinitionConfigurer() {
-			return new TestTypeDefinitionConfigurer();
-		}
-
-	}
-
-	static class TestTypeDefinitionConfigurer implements TypeDefinitionConfigurer {
-
-		boolean applied = false;
-
-		@Override
-		public void configure(TypeDefinitionRegistry registry) {
-			this.applied = true;
-		}
-
-	}
-
 }