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 index 2f126ac6..6b25323c 100644 --- 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 class GraphQlWebFluxAutoConfiguration { 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 class GraphQlWebFluxAutoConfiguration { .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 index 51553c37..6442fa7f 100644 --- 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 class GraphQlWebMvcAutoConfiguration { 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 class GraphQlWebMvcAutoConfiguration { .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 class GraphQlWebMvcAutoConfiguration { @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 index ea2914d4..05b65525 100644 --- 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 org.springframework.test.web.reactive.server.WebTestClient; 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 index 14734e18..102b6c31 100644 --- 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. 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 index 2f371c39..92086337 100644 --- 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 org.springframework.graphql.test.tester.TestExecutionResult; 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 index 2a39d143..77fe27bd 100644 --- 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 @@ class GraphQlTesterAutoConfigurationTests { @Bean WebTestClient webTestClient() { - // @formatter:off RouterFunction 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 index 67c61c1c..5ee200b9 100644 --- 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 org.springframework.graphql.test.tester.WebGraphQlTester; 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 index f06066c7..d2fefd67 100644 --- 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 class SampleWiring implements RuntimeWiringBuilderCustomizer { @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 index 8e0b83d8..c702c547 100644 --- 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.GraphQlTester; 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 index d610d3db..38ad6ebc 100644 --- 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.GraphQlTester; 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 index 42141303..2201decd 100644 --- 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 org.springframework.graphql.test.tester.WebGraphQlTester; 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 index 9d57f707..75f8b151 100644 --- 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 index f4264324..9caa64ab 100644 --- 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 index 58695610..0c236172 100644 --- 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 @@ import org.springframework.web.client.RestTemplate; @Component public class SpringProjectsClient { - // @formatter:off - private static final TypeReferences.CollectionModelType releaseCollection = new TypeReferences.CollectionModelType() {}; - // @formatter:on - private final Traverson traverson; public SpringProjectsClient(RestTemplateBuilder builder) { @@ -34,11 +30,9 @@ public class SpringProjectsClient { } 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 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 index 01cace4e..9fdd925b 100644 --- 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 class ArtifactRepositoriesInitializer implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { - // @formatter:off List 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 index 40152676..04f70bac 100644 --- 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 org.springframework.test.web.servlet.MockMvc; 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 index 913033c1..7df947bb 100644 --- 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.assertj.core.api.Assertions.assertThatThrownBy; 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 index 982a92ed..b20b236c 100644 --- 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.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -// @formatter:off - /** * Tests for {@link WebGraphQlTester} parameterized to: *
    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 index c154aacd..ac05f2f7 100644 --- 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 @@ class ExceptionResolversExceptionHandler implements 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 @@ class ExceptionResolversExceptionHandler implements DataFetcherExceptionHandler 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 index e53a14d4..b6f323e8 100644 --- 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 @@ class DefaultWebGraphQlHandlerBuilder implements WebGraphQlHandler.Builder { 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 index 9d28b553..095fd591 100644 --- 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_PARAMETERIZED_TYPE_REF = new ParameterizedTypeReference>() {}; - // @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 index 9cc81513..432ae6ae 100644 --- 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 SUB_PROTOCOL_LIST = Arrays.asList("graphql-transport-ws", "subscriptions-transport-ws"); static final ResolvableType MAP_RESOLVABLE_TYPE = ResolvableType.forType(new ParameterizedTypeReference>() {}); - // @formatter:off private final WebGraphQlHandler graphQlHandler; @@ -104,8 +101,6 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { 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 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { .orElseThrow(() -> new IllegalArgumentException("No JSON Encoder")); } - // @formatter:on - @Override public List getSubProtocols() { return SUB_PROTOCOL_LIST; @@ -144,8 +137,6 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { AtomicBoolean connectionInitProcessed = new AtomicBoolean(); Map subscriptions = new ConcurrentHashMap<>(); - // @formatter:off - Mono.delay(this.initTimeoutDuration) .then(Mono.defer(() -> connectionInitProcessed.compareAndSet(false, true) ? @@ -153,8 +144,6 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { Mono.empty())) .subscribe(); - // @formatter:on - return session.send(session.receive().flatMap((message) -> { Map map = decode(message); String id = (String) map.get("id"); @@ -209,8 +198,6 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { return payload; } - // @formatter:off - @SuppressWarnings("unchecked") private Flux handleWebOutput(WebSocketSession session, String id, Map subscriptions, WebOutput output) { @@ -258,8 +245,6 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { }); } - // @formatter:on - @SuppressWarnings("unchecked") private WebSocketMessage encode(WebSocketSession session, @Nullable String id, MessageType messageType, @Nullable Object payload) { @@ -281,8 +266,6 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { private enum MessageType { - // @formatter:off - CONNECTION_INIT("connection_init"), CONNECTION_ACK("connection_ack"), SUBSCRIBE("subscribe"), @@ -290,8 +273,6 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { ERROR("error"), COMPLETE("complete"); - // @formatter:on - private static final Map messageTypes = new HashMap<>(6); static { @@ -319,8 +300,6 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { 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 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { static final CloseStatus TOO_MANY_INIT_REQUESTS_STATUS = new CloseStatus(4429, "Too many initialisation requests"); - // @formatter:on - static Flux 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 index 3f4cc9ea..75b3fc2a 100644 --- 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_PARAMETERIZED_TYPE_REF = new ParameterizedTypeReference>() {}; - // @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 index 0283c8a5..648767b4 100644 --- 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 @@ -72,12 +72,9 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub private static final Log logger = LogFactory.getLog(GraphQlWebSocketHandler.class); - // @formatter:off - private static final List SUB_PROTOCOL_LIST = Arrays.asList("graphql-transport-ws", "subscriptions-transport-ws"); - // @formatter:on private final WebGraphQlHandler graphQlHandler; @@ -123,8 +120,6 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub SessionState sessionState = new SessionState(session.getId()); this.sessionInfoMap.put(session.getId(), sessionState); - // @formatter:off - Mono.delay(this.initTimeoutDuration) .then(Mono.fromRunnable(() -> { if (sessionState.isConnectionInitNotProcessed()) { @@ -133,8 +128,6 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub })) .subscribe(); - // @formatter:on - } @Override @@ -165,12 +158,10 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub if (logger.isDebugEnabled()) { logger.debug("Executing: " + input); } - // @formatter:off this.graphQlHandler.handle(input) .flatMapMany((output) -> handleWebOutput(session, input.getId(), output)) .publishOn(sessionState.getScheduler()) // Serial blocking send via single thread .subscribe(new SendMessageSubscriber(id, session, sessionState)); - // @formatter:on return; case COMPLETE: if (id != null) { @@ -212,8 +203,6 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub return info; } - // @formatter:off - @SuppressWarnings("unchecked") private Flux handleWebOutput(WebSocketSession session, String id, WebOutput output) { if (logger.isDebugEnabled()) { @@ -258,8 +247,6 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub }); } - // @formatter:on - @SuppressWarnings("unchecked") private TextMessage encode(@Nullable String id, MessageType messageType, @Nullable Object payload) { Map payloadMap = new HashMap<>(3); @@ -303,8 +290,6 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub private enum MessageType { - // @formatter:off - CONNECTION_INIT("connection_init"), CONNECTION_ACK("connection_ack"), SUBSCRIBE("subscribe"), @@ -312,8 +297,6 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub ERROR("error"), COMPLETE("complete"); - // @formatter:on - private static final Map messageTypes = new HashMap<>(6); static { @@ -341,8 +324,6 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub private static class GraphQlStatus { - // @formatter:off - private static final CloseStatus INVALID_MESSAGE_STATUS = new CloseStatus(4400, "Invalid message"); private static final CloseStatus UNAUTHORIZED_STATUS = new CloseStatus(4401, "Unauthorized"); @@ -351,8 +332,6 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub private static final CloseStatus TOO_MANY_INIT_REQUESTS_STATUS = new CloseStatus(4429, "Too many initialisation requests"); - // @formatter:on - static void closeSession(WebSocketSession session, CloseStatus status) { try { session.close(status); diff --git a/spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java b/spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java index da7054e0..df3cdc54 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/GraphQlTestUtils.java @@ -27,8 +27,6 @@ import org.springframework.core.io.ByteArrayResource; import org.springframework.graphql.execution.DataFetcherExceptionResolver; import org.springframework.graphql.execution.GraphQlSource; -// @formatter:off - /** * Utility methods for GraphQL tests. */ 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 index b3cd633f..1a3c9913 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/execution/ContextDataFetcherDecoratorTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/execution/ContextDataFetcherDecoratorTests.java @@ -35,8 +35,6 @@ import org.springframework.graphql.TestThreadLocalAccessor; import static org.assertj.core.api.Assertions.assertThat; -// @formatter:off - /** * Tests for {@link ContextDataFetcherDecorator}. */ 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 index 5b4f9c7e..343d872a 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandlerTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandlerTests.java @@ -38,8 +38,6 @@ import org.springframework.graphql.TestThreadLocalAccessor; import static org.assertj.core.api.Assertions.assertThat; -// @formatter:off - /** * Tests for {@link ExceptionResolversExceptionHandler}. */ 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 index db974624..470b79fa 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/BookTestUtils.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/web/BookTestUtils.java @@ -28,8 +28,6 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.graphql.execution.ExecutionGraphQlService; import org.springframework.graphql.execution.GraphQlSource; -// @formatter:off - public abstract class BookTestUtils { public static final String SUBSCRIPTION_ID = "1"; 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 index cda2694b..7918a166 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/WebGraphQlHandlerTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/web/WebGraphQlHandlerTests.java @@ -42,8 +42,6 @@ import org.springframework.http.HttpHeaders; import static org.assertj.core.api.Assertions.assertThat; -// @formatter:off - /** * Tests for {@link WebGraphQlHandler}, common to both HTTP and WebSocket. */ 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 index 586de375..a1cff666 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/WebInterceptorTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/web/WebInterceptorTests.java @@ -32,8 +32,6 @@ import org.springframework.http.HttpHeaders; import static org.assertj.core.api.Assertions.assertThat; -// @formatter:off - /** * Unit tests for a {@link WebInterceptor} chain. */ 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 index a1157f04..4c377d69 100644 --- 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 @@ -44,8 +44,6 @@ import org.springframework.web.reactive.socket.WebSocketMessage; import static org.assertj.core.api.Assertions.as; import static org.assertj.core.api.Assertions.assertThat; -// @formatter:off - /** * Unit tests for {@link GraphQlWebSocketHandler}. */ 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 index 07f75d3e..1ad0c24c 100644 --- 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 @@ -44,8 +44,6 @@ import org.springframework.web.socket.WebSocketMessage; import static org.assertj.core.api.Assertions.as; import static org.assertj.core.api.Assertions.assertThat; -// @formatter:off - /** * Unit tests for {@link GraphQlWebSocketHandler}. */