Skip to content

Commit 4fd0e29

Browse files
committed
iRemove TypeDefinitionConfigurer auto-configuration
Closes gh-39604
1 parent 77922af commit 4fd0e29

File tree

2 files changed

+1
-35
lines changed

2 files changed

+1
-35
lines changed

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
import org.springframework.graphql.execution.GraphQlSource;
6767
import org.springframework.graphql.execution.RuntimeWiringConfigurer;
6868
import org.springframework.graphql.execution.SubscriptionExceptionResolver;
69-
import org.springframework.graphql.execution.TypeDefinitionConfigurer;
7069

7170
/**
7271
* {@link EnableAutoConfiguration Auto-configuration} for creating a Spring GraphQL base
@@ -96,8 +95,7 @@ public GraphQlSource graphQlSource(ResourcePatternResolver resourcePatternResolv
9695
ObjectProvider<DataFetcherExceptionResolver> exceptionResolvers,
9796
ObjectProvider<SubscriptionExceptionResolver> subscriptionExceptionResolvers,
9897
ObjectProvider<Instrumentation> instrumentations, ObjectProvider<RuntimeWiringConfigurer> wiringConfigurers,
99-
ObjectProvider<GraphQlSourceBuilderCustomizer> sourceCustomizers,
100-
ObjectProvider<TypeDefinitionConfigurer> typeDefinitionConfigurers) {
98+
ObjectProvider<GraphQlSourceBuilderCustomizer> sourceCustomizers) {
10199
String[] schemaLocations = properties.getSchema().getLocations();
102100
Resource[] schemaResources = resolveSchemaResources(resourcePatternResolver, schemaLocations,
103101
properties.getSchema().getFileExtensions());
@@ -112,7 +110,6 @@ public GraphQlSource graphQlSource(ResourcePatternResolver resourcePatternResolv
112110
if (!properties.getSchema().getIntrospection().isEnabled()) {
113111
builder.configureRuntimeWiring(this::enableIntrospection);
114112
}
115-
typeDefinitionConfigurers.forEach(builder::configureTypeDefinitions);
116113
builder.configureTypeDefinitions(new ConnectionTypeDefinitionConfigurer());
117114
wiringConfigurers.orderedStream().forEach(builder::configureRuntimeWiring);
118115
sourceCustomizers.orderedStream().forEach((customizer) -> customizer.customize(builder));

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

-31
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import graphql.schema.GraphQLOutputType;
2727
import graphql.schema.GraphQLSchema;
2828
import graphql.schema.idl.RuntimeWiring;
29-
import graphql.schema.idl.TypeDefinitionRegistry;
3029
import graphql.schema.visibility.DefaultGraphqlFieldVisibility;
3130
import graphql.schema.visibility.NoIntrospectionGraphqlFieldVisibility;
3231
import org.assertj.core.api.InstanceOfAssertFactories;
@@ -53,7 +52,6 @@
5352
import org.springframework.graphql.execution.DataLoaderRegistrar;
5453
import org.springframework.graphql.execution.GraphQlSource;
5554
import org.springframework.graphql.execution.RuntimeWiringConfigurer;
56-
import org.springframework.graphql.execution.TypeDefinitionConfigurer;
5755

5856
import static org.assertj.core.api.Assertions.assertThat;
5957
import static org.mockito.Mockito.mock;
@@ -224,14 +222,6 @@ void shouldContributeConnectionTypeDefinitionConfigurer() {
224222
});
225223
}
226224

227-
@Test
228-
void shouldUseCustomTypeDefinitionConfigurerWhenDefined() {
229-
this.contextRunner.withUserConfiguration(CustomTypeDefinitionConfigurer.class).run((context) -> {
230-
TestTypeDefinitionConfigurer configurer = context.getBean(TestTypeDefinitionConfigurer.class);
231-
assertThat(configurer.applied).isTrue();
232-
});
233-
}
234-
235225
@Test
236226
void whenApplicationTaskExecutorIsDefinedThenAnnotatedControllerConfigurerShouldUseIt() {
237227
this.contextRunner.withConfiguration(AutoConfigurations.of(TaskExecutionAutoConfiguration.class))
@@ -347,25 +337,4 @@ Executor customExecutor() {
347337

348338
}
349339

350-
@Configuration(proxyBeanMethods = false)
351-
static class CustomTypeDefinitionConfigurer {
352-
353-
@Bean
354-
TestTypeDefinitionConfigurer testTypeDefinitionConfigurer() {
355-
return new TestTypeDefinitionConfigurer();
356-
}
357-
358-
}
359-
360-
static class TestTypeDefinitionConfigurer implements TypeDefinitionConfigurer {
361-
362-
boolean applied = false;
363-
364-
@Override
365-
public void configure(TypeDefinitionRegistry registry) {
366-
this.applied = true;
367-
}
368-
369-
}
370-
371340
}

0 commit comments

Comments
 (0)