Remove formatter-on/off comments

rstoyanchev · rstoyanchev · commit 69c2d08c717a · 2021-07-06T15:51:50.000+01:00
diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebFluxAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebFluxAutoConfiguration.java
@@ -95,7 +95,7 @@ public RouterFunction<ServerResponse> graphQlEndpoint(GraphQlHttpHandler handler
 		if (logger.isInfoEnabled()) {
 			logger.info("GraphQL endpoint HTTP POST " + graphQLPath);
 		}
-		// @formatter:off
+
 		RouterFunctions.Builder builder = RouterFunctions.route()
 				.GET(graphQLPath, request ->
 						ServerResponse.status(HttpStatus.METHOD_NOT_ALLOWED)
@@ -104,7 +104,6 @@ public RouterFunction<ServerResponse> graphQlEndpoint(GraphQlHttpHandler handler
 				.POST(graphQLPath,
 						accept(MediaType.APPLICATION_JSON).and(contentType(MediaType.APPLICATION_JSON)),
 						handler::handleRequest);
-		// @formatter:on
 
 		if (properties.getGraphiql().isEnabled()) {
 			Resource resource = resourceLoader.getResource("classpath:graphiql/index.html");
diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebMvcAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebMvcAutoConfiguration.java
@@ -105,7 +105,6 @@ public RouterFunction<ServerResponse> graphQlRouterFunction(GraphQlHttpHandler h
 			logger.info("GraphQL endpoint HTTP POST " + graphQLPath);
 		}
 
-		// @formatter:off
 		RouterFunctions.Builder builder = RouterFunctions.route()
 				.GET(graphQLPath, request ->
 						ServerResponse.status(HttpStatus.METHOD_NOT_ALLOWED)
@@ -114,7 +113,6 @@ public RouterFunction<ServerResponse> graphQlRouterFunction(GraphQlHttpHandler h
 				.POST(graphQLPath,
 						contentType(MediaType.APPLICATION_JSON).and(accept(MediaType.APPLICATION_JSON)),
 						handler::handleRequest);
-		// @formatter:on
 
 		if (properties.getGraphiql().isEnabled()) {
 			Resource resource = resourceLoader.getResource("classpath:graphiql/index.html");
@@ -139,12 +137,11 @@ public static class WebSocketConfiguration {
 		@ConditionalOnMissingBean
 		public GraphQlWebSocketHandler graphQlWebSocketHandler(WebGraphQlHandler webGraphQlHandler,
 				GraphQlProperties properties, HttpMessageConverters converters) {
-			// @formatter:off
+
 			HttpMessageConverter<?> converter = converters.getConverters().stream()
 					.filter((candidate) -> candidate.canRead(Map.class, MediaType.APPLICATION_JSON))
 					.findFirst()
 					.orElseThrow(() -> new IllegalStateException("No JSON converter"));
-			// @formatter:on
 
 			return new GraphQlWebSocketHandler(webGraphQlHandler, converter,
 					properties.getWebsocket().getConnectionInitTimeout());
diff --git a/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/GraphQlWebFluxAutoConfigurationTests.java b/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/GraphQlWebFluxAutoConfigurationTests.java
@@ -37,8 +37,6 @@
 
 import static org.hamcrest.Matchers.containsString;
 
-// @formatter:off
-
 class GraphQlWebFluxAutoConfigurationTests {
 
 	private static final String BASE_URL = "https://spring.example.org/graphql";
diff --git a/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/GraphQlWebMvcAutoConfigurationTests.java b/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/GraphQlWebMvcAutoConfigurationTests.java
@@ -42,8 +42,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-// @formatter:off
-
 class GraphQlWebMvcAutoConfigurationTests {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
diff --git a/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/actuate/metrics/GraphQlTagsTests.java b/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/actuate/metrics/GraphQlTagsTests.java
@@ -29,8 +29,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-// @formatter:off
-
 /**
  * Tests for {@link GraphQlTags}
  *
diff --git a/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/test/tester/GraphQlTesterAutoConfigurationTests.java b/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/test/tester/GraphQlTesterAutoConfigurationTests.java
@@ -82,11 +82,9 @@ static class WebTestClientConfiguration {
 
 		@Bean
 		WebTestClient webTestClient() {
-			// @formatter:off
 			RouterFunction<ServerResponse> routes =
 					RouterFunctions.route().POST("/graphql", (request) -> ServerResponse.ok().build()).build();
 			return WebTestClient.bindToRouterFunction(routes).build();
-			// @formatter:on
 		}
 
 		@Bean
diff --git a/samples/webflux-security/src/test/java/io/spring/sample/graphql/SampleApplicationTests.java b/samples/webflux-security/src/test/java/io/spring/sample/graphql/SampleApplicationTests.java
@@ -27,8 +27,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-// @formatter:off
-
 @SpringBootTest()
 @AutoConfigureWebTestClient
 @AutoConfigureGraphQlTester
diff --git a/samples/webflux-websocket/src/main/java/io/spring/sample/graphql/SampleWiring.java b/samples/webflux-websocket/src/main/java/io/spring/sample/graphql/SampleWiring.java
@@ -32,12 +32,10 @@ public SampleWiring(@Autowired DataRepository dataRepository) {
 
 	@Override
 	public void customize(RuntimeWiring.Builder wiringBuilder) {
-		// @formatter:off
 		wiringBuilder.type("Query", builder -> builder.dataFetcher("greeting", this.repository::getBasic));
 		wiringBuilder.type("Query", builder -> builder.dataFetcher("greetingMono", this.repository::getGreeting));
 		wiringBuilder.type("Query", builder -> builder.dataFetcher("greetingsFlux", this.repository::getGreetings));
 		wiringBuilder.type("Subscription", builder -> builder.dataFetcher("greetings", this.repository::getGreetingsStream));
-		// @formatter:on
 	}
 
 }
diff --git a/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/QueryTests.java b/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/QueryTests.java
@@ -25,8 +25,6 @@
 import org.springframework.graphql.test.tester.WebGraphQlTester;
 import org.springframework.graphql.web.WebGraphQlHandler;
 
-// @formatter:off
-
 /**
  * GraphQL query tests directly via {@link GraphQL}.
  */
diff --git a/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/SubscriptionTests.java b/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/SubscriptionTests.java
@@ -27,8 +27,6 @@
 import org.springframework.graphql.test.tester.WebGraphQlTester;
 import org.springframework.graphql.web.WebGraphQlHandler;
 
-// @formatter:off
-
 /**
  * GraphQL subscription tests directly via {@link GraphQL}.
  */
diff --git a/samples/webmvc-http-security/src/test/java/io/spring/sample/graphql/SampleApplicationTests.java b/samples/webmvc-http-security/src/test/java/io/spring/sample/graphql/SampleApplicationTests.java
@@ -11,8 +11,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-// @formatter:off
-
 @SpringBootTest
 @AutoConfigureMockMvc
 @AutoConfigureGraphQlTester
diff --git a/samples/webmvc-http/src/main/java/io/spring/sample/graphql/project/ProjectStatus.java b/samples/webmvc-http/src/main/java/io/spring/sample/graphql/project/ProjectStatus.java
@@ -10,12 +10,10 @@ public enum ProjectStatus {
 
 	@JsonCreator
 	public static ProjectStatus fromName(String name) {
-		// @formatter:off
 		return Arrays.stream(ProjectStatus.values())
 				.filter(type -> type.name().equals(name))
 				.findFirst()
 				.orElse(ProjectStatus.ACTIVE);
-		// @formatter:on
 	}
 
 }
diff --git a/samples/webmvc-http/src/main/java/io/spring/sample/graphql/project/ReleaseStatus.java b/samples/webmvc-http/src/main/java/io/spring/sample/graphql/project/ReleaseStatus.java
@@ -10,12 +10,10 @@ public enum ReleaseStatus {
 
 	@JsonCreator
 	public static ReleaseStatus fromName(String name) {
-		// @formatter:off
 		return Arrays.stream(ReleaseStatus.values())
 				.filter(type -> type.name().equals(name))
 				.findFirst()
 				.orElse(ReleaseStatus.GENERAL_AVAILABILITY);
-		// @formatter:on
 	}
 
 }
diff --git a/samples/webmvc-http/src/main/java/io/spring/sample/graphql/project/SpringProjectsClient.java b/samples/webmvc-http/src/main/java/io/spring/sample/graphql/project/SpringProjectsClient.java
@@ -17,13 +17,9 @@
 @Component
 public class SpringProjectsClient {
 
-	// @formatter:off
-
 	private static final TypeReferences.CollectionModelType<Release> releaseCollection =
 			new TypeReferences.CollectionModelType<Release>() {};
 
-	// @formatter:on
-
 	private final Traverson traverson;
 
 	public SpringProjectsClient(RestTemplateBuilder builder) {
@@ -34,11 +30,9 @@ public SpringProjectsClient(RestTemplateBuilder builder) {
 	}
 
 	public Project fetchProject(String projectSlug) {
-		// @formatter:off
 		return this.traverson.follow("projects")
 				.follow(Hop.rel("project").withParameter("id", projectSlug))
 				.toObject(Project.class);
-		// @formatter:on
 	}
 
 	public List<Release> fetchProjectReleases(String projectSlug) {
diff --git a/samples/webmvc-http/src/main/java/io/spring/sample/graphql/repository/ArtifactRepositoriesInitializer.java b/samples/webmvc-http/src/main/java/io/spring/sample/graphql/repository/ArtifactRepositoriesInitializer.java
@@ -18,12 +18,10 @@ public ArtifactRepositoriesInitializer(ArtifactRepositories repositories) {
 
 	@Override
 	public void run(ApplicationArguments args) throws Exception {
-		// @formatter:off
 		List<ArtifactRepository> repositoryList = Arrays.asList(
 				new ArtifactRepository("spring-releases", "Spring Releases", "https://repo.spring.io/libs-releases"),
 				new ArtifactRepository("spring-milestones", "Spring Milestones", "https://repo.spring.io/libs-milestones"),
 				new ArtifactRepository("spring-snapshots", "Spring Snapshots", "https://repo.spring.io/libs-snapshots"));
-		// @formatter:on
 		repositories.saveAll(repositoryList);
 	}
 
diff --git a/samples/webmvc-http/src/test/java/io/spring/sample/graphql/project/MockMvcGraphQlTests.java b/samples/webmvc-http/src/test/java/io/spring/sample/graphql/project/MockMvcGraphQlTests.java
@@ -26,8 +26,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-// @formatter:off
-
 /**
  * GraphQL requests via {@link GraphQlTester} connecting to {@link MockMvc}.
  */
diff --git a/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQlTesterTests.java b/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQlTesterTests.java
@@ -44,8 +44,6 @@
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
-// @formatter:off
-
 /**
  * Tests for {@link GraphQlTester}.
  *
diff --git a/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/WebGraphQlTesterTests.java b/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/WebGraphQlTesterTests.java
@@ -52,8 +52,6 @@
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
-// @formatter:off
-
 /**
  * Tests for {@link WebGraphQlTester} parameterized to:
  * <ul>
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandler.java
@@ -63,8 +63,6 @@ public DataFetcherExceptionHandlerResult onException(DataFetcherExceptionHandler
 		return invokeChain(exception, parameters.getDataFetchingEnvironment());
 	}
 
-	// @formatter:off
-
 	DataFetcherExceptionHandlerResult invokeChain(Throwable ex, DataFetchingEnvironment env) {
 		// For now we have to block:
 		// https://github.com/graphql-java/graphql-java/issues/2356
@@ -97,6 +95,4 @@ private DataFetcherExceptionHandlerResult applyDefaultHandling(Throwable ex, Dat
 		return DataFetcherExceptionHandlerResult.newResult(error).build();
 	}
 
-	// @formatter:on
-
 }
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/DefaultWebGraphQlHandlerBuilder.java b/spring-graphql/src/main/java/org/springframework/graphql/web/DefaultWebGraphQlHandlerBuilder.java
@@ -86,12 +86,10 @@ public WebGraphQlHandler build() {
 		WebGraphQlHandler targetHandler = (webInput) ->
 				this.service.execute(webInput).map((result) -> new WebOutput(webInput, result));
 
-		// @formatter:off
 		WebGraphQlHandler interceptionChain = interceptorsToUse.stream()
 				.reduce(WebInterceptor::andThen)
 				.map((interceptor) -> (WebGraphQlHandler) (input) -> interceptor.intercept(input, targetHandler))
 				.orElse(targetHandler);
-		// @formatter:on
 
 		return (CollectionUtils.isEmpty(this.accessors) ? interceptionChain
 				: new ThreadLocalExtractingHandler(interceptionChain, ThreadLocalAccessor.composite(this.accessors)));
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlHttpHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlHttpHandler.java
@@ -39,10 +39,8 @@ public class GraphQlHttpHandler {
 
 	private static final Log logger = LogFactory.getLog(GraphQlHttpHandler.class);
 
-	// @formatter:off
 	private static final ParameterizedTypeReference<Map<String, Object>> MAP_PARAMETERIZED_TYPE_REF =
 			new ParameterizedTypeReference<Map<String, Object>>() {};
-	// @formatter:on
 
 	private final WebGraphQlHandler graphQlHandler;
 
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandler.java
@@ -69,15 +69,12 @@ public class GraphQlWebSocketHandler implements WebSocketHandler {
 
 	private static final Log logger = LogFactory.getLog(GraphQlWebSocketHandler.class);
 
-	// @formatter:off
-
 	private static final List<String> SUB_PROTOCOL_LIST =
 			Arrays.asList("graphql-transport-ws", "subscriptions-transport-ws");
 
 	static final ResolvableType MAP_RESOLVABLE_TYPE =
 			ResolvableType.forType(new ParameterizedTypeReference<Map<String, Object>>() {});
 
-	// @formatter:off
 
 	private final WebGraphQlHandler graphQlHandler;
 
@@ -104,8 +101,6 @@ public GraphQlWebSocketHandler(WebGraphQlHandler graphQlHandler, ServerCodecConf
 		this.initTimeoutDuration = connectionInitTimeout;
 	}
 
-	// @formatter:off
-
 	private static Decoder<?> initDecoder(ServerCodecConfigurer configurer) {
 		return configurer.getReaders().stream()
 				.filter((reader) -> reader.canRead(MAP_RESOLVABLE_TYPE, MediaType.APPLICATION_JSON))
@@ -122,8 +117,6 @@ private static Encoder<?> initEncoder(ServerCodecConfigurer configurer) {
 				.orElseThrow(() -> new IllegalArgumentException("No JSON Encoder"));
 	}
 
-	// @formatter:on
-
 	@Override
 	public List<String> getSubProtocols() {
 		return SUB_PROTOCOL_LIST;
@@ -144,17 +137,13 @@ public Mono<Void> handle(WebSocketSession session) {
 		AtomicBoolean connectionInitProcessed = new AtomicBoolean();
 		Map<String, Subscription> subscriptions = new ConcurrentHashMap<>();
 
-		// @formatter:off
-
 		Mono.delay(this.initTimeoutDuration)
 				.then(Mono.defer(() ->
 						connectionInitProcessed.compareAndSet(false, true) ?
 								session.close(GraphQlStatus.INIT_TIMEOUT_STATUS) :
 								Mono.empty()))
 				.subscribe();
 
-		// @formatter:on
-
 		return session.send(session.receive().flatMap((message) -> {
 			Map<String, Object> map = decode(message);
 			String id = (String) map.get("id");
@@ -209,8 +198,6 @@ private static Map<String, Object> getPayload(Map<String, Object> message) {
 		return payload;
 	}
 
-	// @formatter:off
-
 	@SuppressWarnings("unchecked")
 	private Flux<WebSocketMessage> handleWebOutput(WebSocketSession session, String id,
 			Map<String, Subscription> subscriptions, WebOutput output) {
@@ -258,8 +245,6 @@ private Flux<WebSocketMessage> handleWebOutput(WebSocketSession session, String
 				});
 	}
 
-	// @formatter:on
-
 	@SuppressWarnings("unchecked")
 	private <T> WebSocketMessage encode(WebSocketSession session, @Nullable String id, MessageType messageType,
 			@Nullable Object payload) {
@@ -281,17 +266,13 @@ private <T> WebSocketMessage encode(WebSocketSession session, @Nullable String i
 
 	private enum MessageType {
 
-		// @formatter:off
-
 		CONNECTION_INIT("connection_init"),
 		CONNECTION_ACK("connection_ack"),
 		SUBSCRIBE("subscribe"),
 		NEXT("next"),
 		ERROR("error"),
 		COMPLETE("complete");
 
-		// @formatter:on
-
 		private static final Map<String, MessageType> messageTypes = new HashMap<>(6);
 
 		static {
@@ -319,8 +300,6 @@ public static MessageType resolve(@Nullable String type) {
 
 	private static class GraphQlStatus {
 
-		// @formatter:off
-
 		static final CloseStatus INVALID_MESSAGE_STATUS = new CloseStatus(4400, "Invalid message");
 
 		static final CloseStatus UNAUTHORIZED_STATUS = new CloseStatus(4401, "Unauthorized");
@@ -329,8 +308,6 @@ private static class GraphQlStatus {
 
 		static final CloseStatus TOO_MANY_INIT_REQUESTS_STATUS = new CloseStatus(4429, "Too many initialisation requests");
 
-		// @formatter:on
-
 		static <V> Flux<V> close(WebSocketSession session, CloseStatus status) {
 			return session.close(status).thenMany(Mono.empty());
 		}
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlHttpHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlHttpHandler.java
@@ -46,10 +46,8 @@ public class GraphQlHttpHandler {
 
 	private static final Log logger = LogFactory.getLog(GraphQlHttpHandler.class);
 
-	// @formatter:off
 	private static final ParameterizedTypeReference<Map<String, Object>> MAP_PARAMETERIZED_TYPE_REF =
 			new ParameterizedTypeReference<Map<String, Object>>() {};
-	// @formatter:on
 
 	private final WebGraphQlHandler graphQlHandler;
 
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandler.java
diff --git a/spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java b/spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java
diff --git a/spring-graphql/src/test/java/org/springframework/graphql/execution/ContextDataFetcherDecoratorTests.java b/spring-graphql/src/test/java/org/springframework/graphql/execution/ContextDataFetcherDecoratorTests.java
diff --git a/spring-graphql/src/test/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandlerTests.java
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
diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/WebGraphQlHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/web/WebGraphQlHandlerTests.java
diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/WebInterceptorTests.java b/spring-graphql/src/test/java/org/springframework/graphql/web/WebInterceptorTests.java
diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandlerTests.java
diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandlerTests.java

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@`
`29`	`29`
`30`	`30`	`import static org.assertj.core.api.Assertions.assertThat;`
`31`	`31`
`32`		`-// @formatter:off`
`33`		`-`
`34`	`32`	`/**`
`35`	`33`	`* Tests for {@link GraphQlTags}`
`36`	`34`	`*`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,10 @@ public SampleWiring(@Autowired DataRepository dataRepository) {`
`32`	`32`
`33`	`33`	`@Override`
`34`	`34`	`public void customize(RuntimeWiring.Builder wiringBuilder) {`
`35`		`- // @formatter:off`
`36`	`35`	`wiringBuilder.type("Query", builder -> builder.dataFetcher("greeting", this.repository::getBasic));`
`37`	`36`	`wiringBuilder.type("Query", builder -> builder.dataFetcher("greetingMono", this.repository::getGreeting));`
`38`	`37`	`wiringBuilder.type("Query", builder -> builder.dataFetcher("greetingsFlux", this.repository::getGreetings));`
`39`	`38`	`wiringBuilder.type("Subscription", builder -> builder.dataFetcher("greetings", this.repository::getGreetingsStream));`
`40`		`- // @formatter:on`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`}`