Merge branch '1.2.x'

Author: bclozel

buildSrc/build.gradle

@@ -18,16 +18,16 @@ ext {
 }
 
 dependencies {
-	checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
+	checkstyle("com.puppycrawl.tools:checkstyle:${checkstyle.toolVersion}")
+	checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")
+
 	implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
 	implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}")
 	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
 }
 
 checkstyle {
-	def archive = configurations.checkstyle.filter { it.name.startsWith("spring-javaformat-checkstyle")}
-	config = resources.text.fromArchiveEntry(archive, "io/spring/javaformat/checkstyle/checkstyle.xml")
-	toolVersion = 8.11
+	toolVersion = "10.12.4"
 }
 
 gradlePlugin {

buildSrc/gradle.properties

@@ -1 +1 @@
-javaFormatVersion=0.0.28
+javaFormatVersion=0.0.41

buildSrc/src/main/java/org/springframework/graphql/build/ConventionsPlugin.java

@@ -23,6 +23,7 @@
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
 
 import org.springframework.graphql.build.conventions.DeploymentConventions;
+import org.springframework.graphql.build.conventions.FormattingConventions;
 import org.springframework.graphql.build.conventions.JavaConventions;
 import org.springframework.graphql.build.conventions.KotlinConventions;
 
@@ -42,6 +43,7 @@ public class ConventionsPlugin implements Plugin<Project> {
 
 	@Override
 	public void apply(Project project) {
+		new FormattingConventions().apply(project);
 		new JavaConventions().apply(project);
 		new KotlinConventions().apply(project);
 		new DeploymentConventions().apply(project);

buildSrc/src/main/java/org/springframework/graphql/build/conventions/FormattingConventions.java

@@ -16,7 +16,6 @@
 
 package org.springframework.graphql.build.conventions;
 
-import io.spring.javaformat.gradle.FormatTask;
 import io.spring.javaformat.gradle.SpringJavaFormatPlugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.DependencySet;
@@ -26,8 +25,7 @@
 
 /**
  * Conventions that are applied in the presence of the {@link JavaBasePlugin}. When the
- * plugin is applied, the {@link SpringJavaFormatPlugin Spring Java Format} and
- * {@link CheckstylePlugin Checkstyle}.
+ * plugin is applied, {@link CheckstylePlugin Checkstyle} is applied and configured.
  *
  * @author Brian Clozel
  */
@@ -38,14 +36,14 @@ public void apply(Project project) {
 	}
 
 	private void applySpringJavaFormat(Project project) {
-		project.getPlugins().apply(SpringJavaFormatPlugin.class);
-		project.getTasks().withType(FormatTask.class, (formatTask) -> formatTask.setEncoding("UTF-8"));
 		project.getPlugins().apply(CheckstylePlugin.class);
 		CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
-		checkstyle.setToolVersion("8.43");
+		checkstyle.setToolVersion("10.12.4");
 		checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 		String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 		DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();
+		checkstyleDependencies
+				.add(project.getDependencies().create("com.puppycrawl.tools:checkstyle:" + checkstyle.getToolVersion()));
 		checkstyleDependencies
 				.add(project.getDependencies().create("io.spring.javaformat:spring-javaformat-checkstyle:" + version));
 	}

spring-graphql-docs/src/main/java/org/springframework/graphql/docs/graalvm/server/GraphQlConfiguration.java

@@ -31,8 +31,8 @@ public class GraphQlConfiguration {
 	@Bean
 	RuntimeWiringConfigurer customWiringConfigurer(BookRepository bookRepository) { // <1>
 		DataFetcher<Book> dataFetcher = QuerydslDataFetcher.builder(bookRepository).single();
-		return wiringBuilder -> wiringBuilder
-				.type("Query", builder -> builder.dataFetcher("book", dataFetcher)); // <2>
+		return (wiringBuilder) -> wiringBuilder
+				.type("Query", (builder) -> builder.dataFetcher("book", dataFetcher)); // <2>
 	}
 
 }

spring-graphql-docs/src/main/java/org/springframework/graphql/docs/graphiql/configuration/GraphiQlConfiguration.java

@@ -28,13 +28,13 @@
 @Configuration
 public class GraphiQlConfiguration {
 
-    @Bean
-    @Order(0)
-    public RouterFunction<ServerResponse> graphiQlRouterFunction() {
-        RouterFunctions.Builder builder = RouterFunctions.route();
-        ClassPathResource graphiQlPage = new ClassPathResource("graphiql/index.html"); // <1>
-        GraphiQlHandler graphiQLHandler = new GraphiQlHandler("/graphql", "", graphiQlPage); // <2>
-        builder = builder.GET("/graphiql", graphiQLHandler::handleRequest); // <3>
-        return builder.build(); // <4>
-    }
+	@Bean
+	@Order(0)
+	public RouterFunction<ServerResponse> graphiQlRouterFunction() {
+		RouterFunctions.Builder builder = RouterFunctions.route();
+		ClassPathResource graphiQlPage = new ClassPathResource("graphiql/index.html"); // <1>
+		GraphiQlHandler graphiQLHandler = new GraphiQlHandler("/graphql", "", graphiQlPage); // <2>
+		builder = builder.GET("/graphiql", graphiQLHandler::handleRequest); // <3>
+		return builder.build(); // <4>
+	}
 }

spring-graphql-docs/src/main/java/org/springframework/graphql/docs/server/interception/web/RequestErrorInterceptor.java

@@ -30,20 +30,20 @@ class RequestErrorInterceptor implements WebGraphQlInterceptor {
 
 	@Override
 	public Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, Chain chain) {
-		return chain.next(request).map(response -> {
+		return chain.next(request).map((response) -> {
 			if (response.isValid()) {
 				return response; // <1>
 			}
 
 			List<GraphQLError> errors = response.getErrors().stream() // <2>
-					.map(error -> {
+					.map((error) -> {
 						GraphqlErrorBuilder<?> builder = GraphqlErrorBuilder.newError();
 						// ...
 						return builder.build();
 					})
 					.toList();
 
-			return response.transform(builder -> builder.errors(errors).build()); // <3>
+			return response.transform((builder) -> builder.errors(errors).build()); // <3>
 		});
 	}
-}
+}

spring-graphql-docs/src/main/java/org/springframework/graphql/docs/server/interception/web/ResponseHeaderInterceptor.java

@@ -33,7 +33,7 @@ class ResponseHeaderInterceptor implements WebGraphQlInterceptor {
 
 	@Override
 	public Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, Chain chain) { // <2>
-		return chain.next(request).doOnNext(response -> {
+		return chain.next(request).doOnNext((response) -> {
 			String value = response.getExecutionInput().getGraphQLContext().get("cookieName");
 			ResponseCookie cookie = ResponseCookie.from("cookieName", value).build();
 			response.getResponseHeaders().add(HttpHeaders.SET_COOKIE, cookie.toString());

spring-graphql-docs/src/main/java/org/springframework/graphql/docs/server/transports/rsocket/GraphQlRSocketController.java

@@ -43,4 +43,4 @@ public Mono<Map<String, Object>> handle(Map<String, Object> payload) {
 	public Flux<Map<String, Object>> handleSubscription(Map<String, Object> payload) {
 		return this.handler.handleSubscription(payload);
 	}
-}
+}

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractDirectGraphQlTransport.java

@@ -41,7 +41,6 @@
  * to a server-side GraphQL handler or service.
  *
  * @author Rossen Stoyanchev
- * @since 1.0.0
  */
 abstract class AbstractDirectGraphQlTransport implements GraphQlTransport {
 
@@ -56,15 +55,15 @@ public Mono<GraphQlResponse> execute(GraphQlRequest request) {
 	@SuppressWarnings({"ConstantConditions", "unchecked"})
 	@Override
 	public Flux<GraphQlResponse> executeSubscription(GraphQlRequest request) {
-		return executeInternal(toExecutionRequest(request)).flatMapMany(response -> {
+		return executeInternal(toExecutionRequest(request)).flatMapMany((response) -> {
 			try {
 				Object data = response.getData();
 				AssertionErrors.assertTrue("Not a Publisher: " + data, data instanceof Publisher);
 
 				List<ResponseError> errors = response.getErrors();
 				AssertionErrors.assertTrue("Subscription errors: " + errors, CollectionUtils.isEmpty(errors));
 
-				return Flux.from((Publisher<ExecutionResult>) data).map(executionResult ->
+				return Flux.from((Publisher<ExecutionResult>) data).map((executionResult) ->
 						new DefaultExecutionGraphQlResponse(response.getExecutionInput(), executionResult));
 			}
 			catch (AssertionError ex) {

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractGraphQlTesterBuilder.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.graphql.test.tester;
 
 import java.time.Duration;
@@ -35,7 +36,6 @@
 import org.springframework.graphql.client.AbstractGraphQlClientBuilder;
 import org.springframework.graphql.client.GraphQlClient;
 import org.springframework.graphql.client.GraphQlTransport;
-import org.springframework.graphql.support.CachingDocumentSource;
 import org.springframework.graphql.support.DocumentSource;
 import org.springframework.graphql.support.ResourceDocumentSource;
 import org.springframework.lang.Nullable;
@@ -51,6 +51,7 @@
  * agnostic {@code GraphQlTester}. A transport specific extension can then wrap
  * this default tester by extending {@link AbstractDelegatingGraphQlTester}.
  *
+ * @param <B> the type of builder
  * @author Rossen Stoyanchev
  * @since 1.0.0
  * @see AbstractDelegatingGraphQlTester
@@ -86,7 +87,7 @@ private static DocumentSource initDocumentSource() {
 
 	@Override
 	public B errorFilter(Predicate<ResponseError> predicate) {
-		this.errorFilter = (this.errorFilter != null ? errorFilter.and(predicate) : predicate);
+		this.errorFilter = (this.errorFilter != null) ? this.errorFilter.and(predicate) : predicate;
 		return self();
 	}
 
@@ -115,6 +116,7 @@ private <T extends B> T self() {
 	/**
 	 * Allow transport-specific subclass builders to register a JSON Path
 	 * {@link MappingProvider} that matches the JSON encoding/decoding they use.
+	 * @param configurer a function applied to the JSON Path configuration
 	 */
 	protected void configureJsonPathConfig(Function<Configuration, Configuration> configurer) {
 		this.jsonPathConfig = configurer.apply(this.jsonPathConfig);
@@ -123,6 +125,7 @@ protected void configureJsonPathConfig(Function<Configuration, Configuration> co
 	/**
 	 * Build the default transport-agnostic client that subclasses can then wrap
 	 * with {@link AbstractDelegatingGraphQlTester}.
+	 * @param transport the graphql transport to use
 	 */
 	protected GraphQlTester buildGraphQlTester(GraphQlTransport transport) {
 
@@ -139,12 +142,12 @@ protected GraphQlTester buildGraphQlTester(GraphQlTransport transport) {
 	 * initialize new builder instances with, based on "this" builder.
 	 */
 	protected Consumer<AbstractGraphQlTesterBuilder<?>> getBuilderInitializer() {
-		return builder -> {
+		return (builder) -> {
 			if (this.errorFilter != null) {
 				builder.errorFilter(this.errorFilter);
 			}
 			builder.documentSource(this.documentSource);
-			builder.configureJsonPathConfig(config -> this.jsonPathConfig);
+			builder.configureJsonPathConfig((config) -> this.jsonPathConfig);
 			builder.responseTimeout(this.responseTimeout);
 		};
 	}
@@ -153,6 +156,7 @@ protected Consumer<AbstractGraphQlTesterBuilder<?>> getBuilderInitializer() {
 	 * For cases where the Tester needs the {@link GraphQlTransport}, we can't use
 	 * transports directly since they are package private, but we can adapt the corresponding
 	 * {@link GraphQlClient} and adapt it to {@code GraphQlTransport}.
+	 * @param client the graphql client to use for extracting the transport
 	 */
 	protected static GraphQlTransport asTransport(GraphQlClient client) {
 		return new GraphQlTransport() {
@@ -180,7 +184,7 @@ public Flux<GraphQlResponse> executeSubscription(GraphQlRequest request) {
 	}
 
 
-	private static class Jackson2Configurer {
+	private static final class Jackson2Configurer {
 
 		private static final Class<?> defaultJsonProviderType;
 

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultExecutionGraphQlServiceTesterBuilder.java

@@ -37,7 +37,6 @@
  * wraps an {@code ExecutionGraphQlService}.
  *
  * @author Rossen Stoyanchev
- * @since 1.0.0
  */
 final class DefaultExecutionGraphQlServiceTesterBuilder
 		extends AbstractGraphQlTesterBuilder<DefaultExecutionGraphQlServiceTesterBuilder>
@@ -95,7 +94,7 @@ public ExecutionGraphQlServiceTester build() {
 
 	private void registerJsonPathMappingProvider() {
 		if (this.encoder != null && this.decoder != null) {
-			configureJsonPathConfig(config -> {
+			configureJsonPathConfig((config) -> {
 				EncoderDecoderMappingProvider provider = new EncoderDecoderMappingProvider(
 						Collections.singletonList(this.encoder), Collections.singletonList(this.decoder));
 				return config.mappingProvider(provider);
@@ -111,7 +110,7 @@ private GraphQlServiceGraphQlTransport createTransport() {
 	/**
 	 * Default {@link ExecutionGraphQlServiceTester} implementation.
 	 */
-	private static class DefaultExecutionGraphQlServiceTester
+	private static final class DefaultExecutionGraphQlServiceTester
 			extends AbstractDelegatingGraphQlTester implements ExecutionGraphQlServiceTester {
 
 		private final GraphQlServiceGraphQlTransport transport;