From 15e2e6c27195fc87d98fbac5ada65ab10bea0bd4 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 26 Jul 2021 16:50:12 +0100 Subject: [PATCH] Minor refactoring in GraphQlSource.Builder Rename runtimeWiring to configureRuntimeWiring for consistency with the configureGraphQl methods that's also Consumer based. --- .../graphql/boot/GraphQlAutoConfiguration.java | 6 +++--- .../graphql/execution/DefaultGraphQlSourceBuilder.java | 2 +- .../springframework/graphql/execution/GraphQlSource.java | 2 +- .../java/org/springframework/graphql/GraphQlTestUtils.java | 3 +-- .../graphql/data/QuerydslDataFetcherTests.java | 3 +-- .../java/org/springframework/graphql/web/BookTestUtils.java | 3 +-- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlAutoConfiguration.java index dac49ab5..b53ac495 100644 --- a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlAutoConfiguration.java +++ b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlAutoConfiguration.java @@ -59,12 +59,12 @@ public class GraphQlAutoConfiguration { ObjectProvider sourceCustomizers, ObjectProvider wiringCustomizers) throws IOException { - List schemaResources = resolveSchemaResources(resourcePatternResolver, properties.getSchema().getLocations()); - GraphQlSource.Builder builder = GraphQlSource.builder().schemaResources(schemaResources.toArray(new Resource[0])) + GraphQlSource.Builder builder = GraphQlSource.builder() + .schemaResources(schemaResources.toArray(new Resource[0])) .exceptionResolvers(exceptionResolversProvider.orderedStream().collect(Collectors.toList())) .instrumentation(instrumentationsProvider.orderedStream().collect(Collectors.toList())); - wiringCustomizers.orderedStream().forEach((customizer) -> builder.runtimeWiring(customizer::customize)); + wiringCustomizers.orderedStream().forEach((customizer) -> builder.configureRuntimeWiring(customizer::customize)); sourceCustomizers.orderedStream().forEach((customizer) -> customizer.customize(builder)); return builder.build(); } diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java index 4e44720e..b07abf2e 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java @@ -71,7 +71,7 @@ class DefaultGraphQlSourceBuilder implements GraphQlSource.Builder { } @Override - public GraphQlSource.Builder runtimeWiring(Consumer configurer) { + public GraphQlSource.Builder configureRuntimeWiring(Consumer configurer) { Assert.notNull(configurer, "RuntimeWiring configurer is required"); this.runtimeWiringConfigurers = this.runtimeWiringConfigurers.andThen(configurer); return this; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/GraphQlSource.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/GraphQlSource.java index b217123c..dd2262db 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/execution/GraphQlSource.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/GraphQlSource.java @@ -87,7 +87,7 @@ public interface GraphQlSource { * @see graphql.schema.idl.SchemaGenerator#makeExecutableSchema(TypeDefinitionRegistry, * RuntimeWiring) */ - Builder runtimeWiring(Consumer configurer); + Builder configureRuntimeWiring(Consumer configurer); /** * Add {@link DataFetcherExceptionResolver}'s to use for resolving exceptions from diff --git a/spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java b/spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java index 6a1f5f51..0fce2d33 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java @@ -21,7 +21,6 @@ import java.util.Arrays; import graphql.GraphQL; import graphql.schema.DataFetcher; -import graphql.schema.idl.RuntimeWiring; import org.springframework.core.io.ByteArrayResource; import org.springframework.graphql.execution.DataFetcherExceptionResolver; @@ -52,7 +51,7 @@ public abstract class GraphQlTestUtils { return GraphQlSource.builder() .schemaResources(new ByteArrayResource(schemaContent.getBytes(StandardCharsets.UTF_8))) - .runtimeWiring(wiring -> wiring.type(typeName, (builder) -> builder.dataFetcher(fieldName, fetcher))); + .configureRuntimeWiring(wiring -> wiring.type(typeName, (builder) -> builder.dataFetcher(fieldName, fetcher))); } } diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/QuerydslDataFetcherTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/QuerydslDataFetcherTests.java index 3a03d0e5..9aa91534 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/QuerydslDataFetcherTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/QuerydslDataFetcherTests.java @@ -25,7 +25,6 @@ import java.util.function.Consumer; import com.querydsl.core.types.Predicate; import graphql.schema.GraphQLTypeVisitor; -import graphql.schema.idl.RuntimeWiring; import graphql.schema.idl.TypeRuntimeWiring; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -282,7 +281,7 @@ class QuerydslDataFetcherTests { if (configurer != null) { TypeRuntimeWiring.Builder typeBuilder = TypeRuntimeWiring.newTypeWiring("Query"); configurer.accept(typeBuilder); - graphQlSourceBuilder.runtimeWiring(wiring -> wiring.type(typeBuilder)); + graphQlSourceBuilder.configureRuntimeWiring(wiring -> wiring.type(typeBuilder)); } GraphQLTypeVisitor visitor = QuerydslDataFetcher.registrationTypeVisitor( diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/BookTestUtils.java b/spring-graphql/src/test/java/org/springframework/graphql/web/BookTestUtils.java index c1040f9a..53327750 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/BookTestUtils.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/web/BookTestUtils.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import graphql.schema.idl.RuntimeWiring; import graphql.schema.idl.TypeRuntimeWiring; import reactor.core.publisher.Flux; @@ -72,7 +71,7 @@ public abstract class BookTestUtils { private static GraphQlSource graphQlSource() { return GraphQlSource.builder() .schemaResources(new ClassPathResource("books/schema.graphqls")) - .runtimeWiring(builder -> builder.type(TypeRuntimeWiring.newTypeWiring("Query") + .configureRuntimeWiring(builder -> builder.type(TypeRuntimeWiring.newTypeWiring("Query") .dataFetcher("bookById", (env) -> { Long id = Long.parseLong(env.getArgument("id")); return booksMap.get(id);