Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring in GraphQlSource.Builder

Browse Source 
Rename runtimeWiring to configureRuntimeWiring for consistency with
the configureGraphQl methods that's also Consumer based.
This commit is contained in:
Rossen Stoyanchev
2021-07-26 16:50:12 +01:00
parent 6cd0491077
commit 15e2e6c271
6 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlAutoConfiguration.java
View File

@@ -59,12 +59,12 @@ public class GraphQlAutoConfiguration {
ObjectProvider<GraphQlSourceBuilderCustomizer> sourceCustomizers,
ObjectProvider<RuntimeWiringBuilderCustomizer> wiringCustomizers) throws IOException {
List<Resource> 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();
}

2
spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java
View File

@@ -71,7 +71,7 @@ class DefaultGraphQlSourceBuilder implements GraphQlSource.Builder {
}
@Override
public GraphQlSource.Builder runtimeWiring(Consumer<RuntimeWiring.Builder> configurer) {
public GraphQlSource.Builder configureRuntimeWiring(Consumer<RuntimeWiring.Builder> configurer) {
Assert.notNull(configurer, "RuntimeWiring configurer is required");
this.runtimeWiringConfigurers = this.runtimeWiringConfigurers.andThen(configurer);
return this;

2
spring-graphql/src/main/java/org/springframework/graphql/execution/GraphQlSource.java
View File

@@ -87,7 +87,7 @@ public interface GraphQlSource {
* @see graphql.schema.idl.SchemaGenerator#makeExecutableSchema(TypeDefinitionRegistry,
* RuntimeWiring)
*/
Builder runtimeWiring(Consumer<RuntimeWiring.Builder> configurer);
Builder configureRuntimeWiring(Consumer<RuntimeWiring.Builder> configurer);
/**
* Add {@link DataFetcherExceptionResolver}'s to use for resolving exceptions from

3
spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java
View File

@@ -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)));
}
}

3
spring-graphql/src/test/java/org/springframework/graphql/data/QuerydslDataFetcherTests.java
View File

@@ -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(

3
spring-graphql/src/test/java/org/springframework/graphql/web/BookTestUtils.java
View File

@@ -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);