Apply checkstyle changes to spring-graphql-test

See gh-943

Author: bclozel

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;

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

@@ -153,7 +153,7 @@ public DefaultRequest extension(String name, @Nullable Object value) {
 		@SuppressWarnings("ConstantConditions")
 		@Override
 		public Response execute() {
-			return transport.execute(request()).map(response -> mapResponse(response, request())).block(responseTimeout);
+			return DefaultGraphQlTester.this.transport.execute(request()).map((response) -> mapResponse(response, request())).block(DefaultGraphQlTester.this.responseTimeout);
 		}
 
 		@Override
@@ -163,15 +163,15 @@ public void executeAndVerify() {
 
 		@Override
 		public Subscription executeSubscription() {
-			return () -> transport.executeSubscription(request()).map(result -> mapResponse(result, request()));
+			return () -> DefaultGraphQlTester.this.transport.executeSubscription(request()).map((result) -> mapResponse(result, request()));
 		}
 
 		private GraphQlRequest request() {
 			return new DefaultGraphQlRequest(this.document, this.operationName, this.variables, this.extensions);
 		}
 
 		private DefaultResponse mapResponse(GraphQlResponse response, GraphQlRequest request) {
-			return new DefaultResponse(response, errorFilter, assertDecorator(request), jsonPathConfig);
+			return new DefaultResponse(response, DefaultGraphQlTester.this.errorFilter, assertDecorator(request), DefaultGraphQlTester.this.jsonPathConfig);
 		}
 
 		private Consumer<Runnable> assertDecorator(GraphQlRequest request) {
@@ -191,7 +191,7 @@ private Consumer<Runnable> assertDecorator(GraphQlRequest request) {
 	/**
 	 * Container for GraphQL response data and errors along with convenience methods.
 	 */
-	private final static class ResponseDelegate {
+	private static final class ResponseDelegate {
 
 		private final DocumentContext jsonDoc;
 
@@ -258,7 +258,7 @@ void expectErrors(Predicate<ResponseError> predicate) {
 		}
 
 		void consumeErrors(Consumer<List<ResponseError>> consumer) {
-			filterErrors(error -> true);
+			filterErrors((error) -> true);
 			consumer.accept(this.errors);
 		}
 
@@ -392,7 +392,7 @@ public Path valueIsNull() {
 			this.delegate.doAssert(() -> {
 				Object value = this.pathHelper.evaluateJsonPath(this.delegate.jsonContent());
 				AssertionErrors.assertNull(
-						"Expected null value at JSON path \"" + path + "\" but found " + value, value);
+						"Expected null value at JSON path \"" + this.path + "\" but found " + value, value);
 			});
 			return this;
 		}
@@ -464,7 +464,7 @@ static Path forNestedPath(@Nullable String basePath, String path, ResponseDelega
 		}
 
 		private static String joinPaths(@Nullable String basePath, String path) {
-			return (basePath != null ? basePath + "." + path : path);
+			return (basePath != null) ? basePath + "." + path : path;
 		}
 
 
@@ -476,65 +476,65 @@ private class DefaultEntity<D, S extends Entity<D, S>> implements Entity<D, S> {
 			private final D entity;
 
 			protected DefaultEntity(TypeRefAdapter<D> typeAdapter) {
-				this.entity = delegate.read(jsonPath, typeAdapter);
+				this.entity = DefaultPath.this.delegate.read(DefaultPath.this.jsonPath, typeAdapter);
 			}
 
 			protected D getEntity() {
 				return this.entity;
 			}
 
 			protected void doAssert(Runnable task) {
-				delegate.doAssert(task);
+				DefaultPath.this.delegate.doAssert(task);
 			}
 
 			protected String getPath() {
-				return path;
+				return DefaultPath.this.path;
 			}
 
 			@Override
 			public Path path(String path) {
-				return forPath(basePath, path, delegate);
+				return forPath(DefaultPath.this.basePath, path, DefaultPath.this.delegate);
 			}
 
 			@Override
 			public Path path(String path, Consumer<Path> pathConsumer) {
-				return forNestedPath(basePath, path, delegate, pathConsumer);
+				return forNestedPath(DefaultPath.this.basePath, path, DefaultPath.this.delegate, pathConsumer);
 			}
 
 			@Override
 			public <T extends S> T isEqualTo(Object expected) {
-				delegate.doAssert(() -> AssertionErrors.assertEquals(path, expected, this.entity));
+				DefaultPath.this.delegate.doAssert(() -> AssertionErrors.assertEquals(DefaultPath.this.path, expected, this.entity));
 				return self();
 			}
 
 			@Override
 			public <T extends S> T isNotEqualTo(Object other) {
-				delegate.doAssert(() -> AssertionErrors.assertNotEquals(path, other, this.entity));
+				DefaultPath.this.delegate.doAssert(() -> AssertionErrors.assertNotEquals(DefaultPath.this.path, other, this.entity));
 				return self();
 			}
 
 			@Override
 			public <T extends S> T isSameAs(Object expected) {
-				delegate.doAssert(() -> AssertionErrors.assertTrue(path, expected == this.entity));
+				DefaultPath.this.delegate.doAssert(() -> AssertionErrors.assertTrue(DefaultPath.this.path, expected == this.entity));
 				return self();
 			}
 
 			@Override
 			public <T extends S> T isNotSameAs(Object other) {
-				delegate.doAssert(() -> AssertionErrors.assertTrue(path, other != this.entity));
+				DefaultPath.this.delegate.doAssert(() -> AssertionErrors.assertTrue(DefaultPath.this.path, other != this.entity));
 				return self();
 			}
 
 			@Override
 			public <T extends S> T matches(Predicate<D> predicate) {
-				delegate
-						.doAssert(() -> AssertionErrors.assertTrue(path, predicate.test(this.entity)));
+				DefaultPath.this.delegate
+						.doAssert(() -> AssertionErrors.assertTrue(DefaultPath.this.path, predicate.test(this.entity)));
 				return self();
 			}
 
 			@Override
 			public <T extends S> T satisfies(Consumer<D> consumer) {
-				delegate.doAssert(() -> consumer.accept(this.entity));
+				DefaultPath.this.delegate.doAssert(() -> consumer.accept(this.entity));
 				return self();
 			}
 
@@ -557,7 +557,7 @@ private <T extends S> T self() {
 		private final class DefaultEntityList<E>
 				extends DefaultEntity<List<E>, EntityList<E>> implements EntityList<E> {
 
-			public DefaultEntityList(TypeRefAdapter<List<E>> typeAdapter) {
+			DefaultEntityList(TypeRefAdapter<List<E>> typeAdapter) {
 				super(typeAdapter);
 			}
 

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

@@ -33,7 +33,6 @@
  * {@link WebTestClient.Builder}.
  *
  * @author Rossen Stoyanchev
- * @since 1.0.0
  */
 final class DefaultHttpGraphQlTesterBuilder
 		extends AbstractGraphQlTesterBuilder<DefaultHttpGraphQlTesterBuilder>
@@ -93,8 +92,8 @@ public HttpGraphQlTester build() {
 	}
 
 	private void registerJsonPathMappingProvider() {
-		this.webTestClientBuilder.codecs(codecConfigurer ->
-				configureJsonPathConfig(config -> {
+		this.webTestClientBuilder.codecs((codecConfigurer) ->
+				configureJsonPathConfig((config) -> {
 					EncoderDecoderMappingProvider provider = new EncoderDecoderMappingProvider(codecConfigurer);
 					return config.mappingProvider(provider);
 				}));
@@ -105,7 +104,7 @@ private void registerJsonPathMappingProvider() {
 	 * Default {@link HttpGraphQlTester} that builds and uses a {@link WebTestClient}
 	 * for request execution.
 	 */
-	private static class DefaultHttpGraphQlTester extends AbstractDelegatingGraphQlTester implements HttpGraphQlTester {
+	private static final class DefaultHttpGraphQlTester extends AbstractDelegatingGraphQlTester implements HttpGraphQlTester {
 
 		private final WebTestClient webTestClient;
 

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

@@ -113,9 +113,9 @@ public RSocketGraphQlTester build() {
 	}
 
 	private void registerJsonPathMappingProvider() {
-		this.rsocketGraphQlClientBuilder.rsocketRequester(builder ->
-				builder.rsocketStrategies(strategiesBuilder ->
-						configureJsonPathConfig(config -> {
+		this.rsocketGraphQlClientBuilder.rsocketRequester((builder) ->
+				builder.rsocketStrategies((strategiesBuilder) ->
+						configureJsonPathConfig((config) -> {
 							RSocketStrategies strategies = strategiesBuilder.build();
 							List<Encoder<?>> encoders = strategies.encoders();
 							List<Decoder<?>> decoders = strategies.decoders();

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

@@ -27,7 +27,6 @@
  * Default {@link GraphQlTester.Builder} with a given, externally prepared transport.
  *
  * @author Rossen Stoyanchev
- * @since 1.0.0
  */
 final class DefaultTransportGraphQlTesterBuilder
 		extends AbstractGraphQlTesterBuilder<DefaultTransportGraphQlTesterBuilder> {
@@ -50,7 +49,7 @@ public GraphQlTester build() {
 	/**
 	 * {@link GraphQlTester} with a given transport.
 	 */
-	private static class DefaultTransportGraphQlTester extends AbstractDelegatingGraphQlTester {
+	private static final class DefaultTransportGraphQlTester extends AbstractDelegatingGraphQlTester {
 
 		private final GraphQlTransport transport;
 

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java renamed to spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTesterBuilder.java

@@ -34,7 +34,6 @@
  * {@link WebGraphQlHandler} for request execution.
  *
  * @author Rossen Stoyanchev
- * @since 1.0.0
  */
 final class DefaultWebGraphQlTesterBuilder
 		extends AbstractGraphQlTesterBuilder<DefaultWebGraphQlTesterBuilder>
@@ -104,7 +103,7 @@ public WebGraphQlTester build() {
 	}
 
 	private void registerJsonPathMappingProvider() {
-		configureJsonPathConfig(jsonPathConfig -> {
+		configureJsonPathConfig((jsonPathConfig) -> {
 			EncoderDecoderMappingProvider provider = new EncoderDecoderMappingProvider(this.codecConfigurer);
 			return jsonPathConfig.mappingProvider(provider);
 		});
@@ -114,7 +113,7 @@ private void registerJsonPathMappingProvider() {
 	/**
 	 * Default {@link WebGraphQlTester} implementation.
 	 */
-	private static class DefaultWebGraphQlTester extends AbstractDelegatingGraphQlTester implements WebGraphQlTester {
+	private static final class DefaultWebGraphQlTester extends AbstractDelegatingGraphQlTester implements WebGraphQlTester {
 
 		private final WebGraphQlHandlerGraphQlTransport transport;
 

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebSocketGraphQlTester.java renamed to spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebSocketGraphQlTesterBuilder.java

@@ -34,7 +34,6 @@
  * {@link WebSocketGraphQlClient.Builder}.
  *
  * @author Rossen Stoyanchev
- * @since 1.0.0
  */
 final class DefaultWebSocketGraphQlTesterBuilder
 		extends AbstractGraphQlTesterBuilder<DefaultWebSocketGraphQlTesterBuilder>
@@ -108,8 +107,8 @@ public WebSocketGraphQlTester build() {
 	}
 
 	private void registerJsonPathMappingProvider() {
-		this.graphQlClientBuilder.codecConfigurer(codecConfigurer -> {
-			configureJsonPathConfig(jsonPathConfig -> {
+		this.graphQlClientBuilder.codecConfigurer((codecConfigurer) -> {
+			configureJsonPathConfig((jsonPathConfig) -> {
 				EncoderDecoderMappingProvider provider = new EncoderDecoderMappingProvider(codecConfigurer);
 				return jsonPathConfig.mappingProvider(provider);
 			});
@@ -120,7 +119,7 @@ private void registerJsonPathMappingProvider() {
 	/**
 	 * Default {@link WebSocketGraphQlTester} implementation.
 	 */
-	private static class DefaultWebSocketGraphQlTester extends AbstractDelegatingGraphQlTester implements WebSocketGraphQlTester {
+	private static final class DefaultWebSocketGraphQlTester extends AbstractDelegatingGraphQlTester implements WebSocketGraphQlTester {
 
 		private final WebSocketGraphQlClient client;