Adapt to latest Spring for GraphQL changes

This commit adapts to changes done in spring-projects/spring-graphql#312

Author: bclozel

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

@@ -80,8 +80,9 @@ public GraphQlSource graphQlSource(ResourcePatternResolver resourcePatternResolv
 		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);
 		}

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

@@ -20,8 +20,8 @@
 
 /**
  * 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 @@
 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);
 
 }

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

@@ -23,7 +23,7 @@
 
 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<E, R> 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));
 		}

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

@@ -186,8 +186,9 @@ void shouldConfigureCustomBatchLoaderRegistry() {
 	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 @@ static class CustomGraphQlSourceConfiguration {
 		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 @@ public static class CustomGraphQlSourceBuilderCustomizer implements GraphQlSourc
 			public boolean applied = false;
 
 			@Override
-			public void customize(GraphQlSource.Builder builder) {
+			public void customize(GraphQlSource.SchemaResourceBuilder builder) {
 				this.applied = true;
 			}
 

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.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 @@ public InstrumentationContext<Object> beginFieldFetch(InstrumentationFieldFetchP
 	static class ExampleGraphQlSourceBuilderCustomizer implements GraphQlSourceBuilderCustomizer {
 
 		@Override
-		public void customize(Builder builder) {
+		public void customize(GraphQlSource.SchemaResourceBuilder builder) {
 
 		}