From d137f92f6696d748aed2d8eb384f8334d0cedf49 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 19 Apr 2022 16:58:06 +0200 Subject: [PATCH] Adapt to latest Spring for GraphQL changes This commit adapts to changes done in spring-projects/spring-graphql#312 --- .../autoconfigure/graphql/GraphQlAutoConfiguration.java | 5 +++-- .../graphql/GraphQlSourceBuilderCustomizer.java | 9 +++++---- .../data/GraphQlQuerydslSourceBuilderCustomizer.java | 4 ++-- .../graphql/GraphQlAutoConfigurationTests.java | 9 +++++---- .../graphql/GraphQlTypeExcludeFilterTests.java | 4 ++-- 5 files changed, 17 insertions(+), 14 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 efcadd2031d..4ab4c4444d7 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 @@ -80,8 +80,9 @@ public class GraphQlAutoConfiguration { String[] schemaLocations = properties.getSchema().getLocations(); Resource[] schemaResources = resolveSchemaResources(resourcePatternResolver, schemaLocations, properties.getSchema().getFileExtensions()); - GraphQlSource.Builder builder = GraphQlSource.builder().schemaResources(schemaResources) - .exceptionResolvers(toList(exceptionResolvers)).instrumentation(toList(instrumentations)); + GraphQlSource.SchemaResourceBuilder builder = GraphQlSource.schemaResourceBuilder() + .schemaResources(schemaResources).exceptionResolvers(toList(exceptionResolvers)) + .instrumentation(toList(instrumentations)); if (!properties.getSchema().getIntrospection().isEnabled()) { builder.configureRuntimeWiring(this::enableIntrospection); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlSourceBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlSourceBuilderCustomizer.java index 0310679b733..e8f1802dc2e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlSourceBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlSourceBuilderCustomizer.java @@ -20,8 +20,8 @@ import org.springframework.graphql.execution.GraphQlSource; /** * Callback interface that can be implemented by beans wishing to customize properties of - * {@link org.springframework.graphql.execution.GraphQlSource.Builder Builder} whilst - * retaining default auto-configuration. + * {@link org.springframework.graphql.execution.GraphQlSource.SchemaResourceBuilder + * Builder} whilst retaining default auto-configuration. * * @author Rossen Stoyanchev * @since 2.7.0 @@ -30,10 +30,11 @@ import org.springframework.graphql.execution.GraphQlSource; public interface GraphQlSourceBuilderCustomizer { /** - * Customize the {@link org.springframework.graphql.execution.GraphQlSource.Builder + * Customize the + * {@link org.springframework.graphql.execution.GraphQlSource.SchemaResourceBuilder * Builder} instance. * @param builder builder the builder to customize */ - void customize(GraphQlSource.Builder builder); + void customize(GraphQlSource.SchemaResourceBuilder builder); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQuerydslSourceBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQuerydslSourceBuilderCustomizer.java index 363456964b5..080d57a7e73 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQuerydslSourceBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQuerydslSourceBuilderCustomizer.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.graphql.GraphQlSourceBuilderCustomizer; -import org.springframework.graphql.execution.GraphQlSource.Builder; +import org.springframework.graphql.execution.GraphQlSource; import org.springframework.graphql.execution.RuntimeWiringConfigurer; /** @@ -59,7 +59,7 @@ class GraphQlQuerydslSourceBuilderCustomizer implements GraphQlSourceBuild } @Override - public void customize(Builder builder) { + public void customize(GraphQlSource.SchemaResourceBuilder builder) { if (!this.executors.isEmpty() || !this.reactiveExecutors.isEmpty()) { builder.configureRuntimeWiring(this.wiringConfigurerFactory.apply(this.executors, this.reactiveExecutors)); } 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 6442162192e..662d4429341 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 @@ -186,8 +186,9 @@ class GraphQlAutoConfigurationTests { static class CustomGraphQlBuilderConfiguration { @Bean - GraphQlSource.Builder customGraphQlSourceBuilder() { - return GraphQlSource.builder().schemaResources(new ClassPathResource("graphql/schema.graphqls"), + GraphQlSource.SchemaResourceBuilder customGraphQlSourceBuilder() { + return GraphQlSource.schemaResourceBuilder().schemaResources( + new ClassPathResource("graphql/schema.graphqls"), new ClassPathResource("graphql/types/book.graphqls")); } @@ -200,7 +201,7 @@ class GraphQlAutoConfigurationTests { GraphQlSource customGraphQlSource() { ByteArrayResource schemaResource = new ByteArrayResource( "type Query { greeting: String }".getBytes(StandardCharsets.UTF_8)); - return GraphQlSource.builder().schemaResources(schemaResource).build(); + return GraphQlSource.schemaResourceBuilder().schemaResources(schemaResource).build(); } } @@ -258,7 +259,7 @@ class GraphQlAutoConfigurationTests { public boolean applied = false; @Override - public void customize(GraphQlSource.Builder builder) { + public void customize(GraphQlSource.SchemaResourceBuilder builder) { this.applied = true; } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTypeExcludeFilterTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTypeExcludeFilterTests.java index e7d5d630c38..a284b9edb0b 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTypeExcludeFilterTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTypeExcludeFilterTests.java @@ -45,7 +45,7 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.classreading.SimpleMetadataReaderFactory; import org.springframework.graphql.execution.DataFetcherExceptionResolver; -import org.springframework.graphql.execution.GraphQlSource.Builder; +import org.springframework.graphql.execution.GraphQlSource; import org.springframework.graphql.execution.RuntimeWiringConfigurer; import org.springframework.graphql.server.WebGraphQlInterceptor; import org.springframework.graphql.server.WebGraphQlRequest; @@ -267,7 +267,7 @@ class GraphQlTypeExcludeFilterTests { static class ExampleGraphQlSourceBuilderCustomizer implements GraphQlSourceBuilderCustomizer { @Override - public void customize(Builder builder) { + public void customize(GraphQlSource.SchemaResourceBuilder builder) { }