From adc1969bc85d8c4fc900bfe86a6184e3c81c765e Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 24 May 2021 11:14:34 -0400 Subject: [PATCH] formatting --- .../gateway/filter/NettyRoutingFilter.java | 4 ++-- .../filter/NettyRoutingFilterTests.java | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/NettyRoutingFilter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/NettyRoutingFilter.java index 60ce0020..5c9b7248 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/NettyRoutingFilter.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/NettyRoutingFilter.java @@ -108,8 +108,8 @@ public class NettyRoutingFilter implements GlobalFilter, Ordered { URI requestUrl = exchange.getRequiredAttribute(GATEWAY_REQUEST_URL_ATTR); String scheme = requestUrl.getScheme(); - if (isAlreadyRouted(exchange) - || (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme))) { + if (isAlreadyRouted(exchange) || (!"http".equalsIgnoreCase(scheme) + && !"https".equalsIgnoreCase(scheme))) { return chain.filter(exchange); } setAlreadyRouted(exchange); diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterTests.java index 76dc1b7b..62a6b667 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterTests.java @@ -66,8 +66,11 @@ public class NettyRoutingFilterTests extends BaseWebClientTests { @Test // gh-2207 public void testCaseInsensitiveScheme() { - DisposableServer server = HttpServer.create().port(port).host("127.0.0.1").route( - routes -> routes.get("/issue", (request, response) -> response.sendString(Mono.just("issue2207")))) + DisposableServer server = HttpServer + .create().port(port).host( + "127.0.0.1") + .route(routes -> routes.get("/issue", (request, response) -> response + .sendString(Mono.just("issue2207")))) .bindNow(); try { @@ -75,7 +78,8 @@ public class NettyRoutingFilterTests extends BaseWebClientTests { .consumeWith(entityExchangeResult -> { Assert.assertNotNull(entityExchangeResult); Assert.assertNotNull(entityExchangeResult.getResponseBody()); - String content = new String(entityExchangeResult.getResponseBody()); + String content = new String( + entityExchangeResult.getResponseBody()); Assert.assertEquals("issue2207", content); }); } @@ -91,12 +95,9 @@ public class NettyRoutingFilterTests extends BaseWebClientTests { @Bean public RouteLocator routes(RouteLocatorBuilder builder) { - return builder.routes() - .route(p -> p.path("/mockexample") - .filters(f -> f.prefixPath("/httpbin")) - .uri("http://example.com")) - .route(p -> p.path("/issue").uri("HTTP://127.0.0.1:" + port)) - .build(); + return builder.routes().route(p -> p.path("/mockexample") + .filters(f -> f.prefixPath("/httpbin")).uri("http://example.com")) + .route(p -> p.path("/issue").uri("HTTP://127.0.0.1:" + port)).build(); } }