From 7dadc1aad182b1c004100d50e65d7e769b3e6044 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 20 Apr 2021 21:45:55 +0000 Subject: [PATCH 1/6] Bumping versions --- pom.xml | 2 +- spring-cloud-gateway-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f06fdb20..287fc978 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ org.springframework.cloud spring-cloud-build - 2.3.4.BUILD-SNAPSHOT + 2.3.4.RELEASE diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index a7b1672b..683123eb 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.4.BUILD-SNAPSHOT + 2.3.4.RELEASE From 86142f2448ec75f0634df7f7e29ac532764941d9 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 21 Apr 2021 17:27:59 +0000 Subject: [PATCH 2/6] Update SNAPSHOT to 2.2.8.RELEASE --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-gateway-core/pom.xml | 2 +- spring-cloud-gateway-dependencies/pom.xml | 2 +- .../mvc-failure-analyzer/pom.xml | 2 +- spring-cloud-gateway-integration-tests/pom.xml | 2 +- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- spring-cloud-gateway-server/pom.xml | 2 +- spring-cloud-gateway-webflux/pom.xml | 2 +- spring-cloud-starter-gateway/pom.xml | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8cf050f3..e4d98c96 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index 287fc978..40488685 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE pom Spring Cloud Gateway @@ -52,9 +52,9 @@ UTF-8 UTF-8 1.8 - 2.2.8.BUILD-SNAPSHOT - 2.2.8.BUILD-SNAPSHOT - 1.0.4.RELEASE + 2.2.8.RELEASE + 2.2.8.RELEASE + 1.0.5.RELEASE 0.6 1.0.3.RELEASE diff --git a/spring-cloud-gateway-core/pom.xml b/spring-cloud-gateway-core/pom.xml index 3d1db569..d5b05d44 100644 --- a/spring-cloud-gateway-core/pom.xml +++ b/spring-cloud-gateway-core/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE .. spring-cloud-gateway-core diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index 683123eb..38373677 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -11,7 +11,7 @@ spring-cloud-gateway-dependencies - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml b/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml index d44fe799..80744a73 100644 --- a/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml +++ b/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway-integration-tests - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE .. diff --git a/spring-cloud-gateway-integration-tests/pom.xml b/spring-cloud-gateway-integration-tests/pom.xml index dfda11d9..c82e0c6f 100644 --- a/spring-cloud-gateway-integration-tests/pom.xml +++ b/spring-cloud-gateway-integration-tests/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE .. diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index b14c1d9c..b464aeb7 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index 8c0af80a..9fb61131 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE .. diff --git a/spring-cloud-gateway-server/pom.xml b/spring-cloud-gateway-server/pom.xml index 2e060af3..d84dbbbc 100644 --- a/spring-cloud-gateway-server/pom.xml +++ b/spring-cloud-gateway-server/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE .. spring-cloud-gateway-server diff --git a/spring-cloud-gateway-webflux/pom.xml b/spring-cloud-gateway-webflux/pom.xml index 9dd822bf..6be31b2e 100644 --- a/spring-cloud-gateway-webflux/pom.xml +++ b/spring-cloud-gateway-webflux/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE .. diff --git a/spring-cloud-starter-gateway/pom.xml b/spring-cloud-starter-gateway/pom.xml index 3c2d8595..a4c62ee8 100644 --- a/spring-cloud-starter-gateway/pom.xml +++ b/spring-cloud-starter-gateway/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.8.RELEASE .. spring-cloud-starter-gateway From 1a277db429eb7ebbf0155bdd969387183a3d34fd Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 21 Apr 2021 17:29:30 +0000 Subject: [PATCH 3/6] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-gateway-core/pom.xml | 2 +- spring-cloud-gateway-dependencies/pom.xml | 2 +- .../mvc-failure-analyzer/pom.xml | 2 +- spring-cloud-gateway-integration-tests/pom.xml | 2 +- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- spring-cloud-gateway-server/pom.xml | 2 +- spring-cloud-gateway-webflux/pom.xml | 2 +- spring-cloud-starter-gateway/pom.xml | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e4d98c96..8cf050f3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index 40488685..287fc978 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT pom Spring Cloud Gateway @@ -52,9 +52,9 @@ UTF-8 UTF-8 1.8 - 2.2.8.RELEASE - 2.2.8.RELEASE - 1.0.5.RELEASE + 2.2.8.BUILD-SNAPSHOT + 2.2.8.BUILD-SNAPSHOT + 1.0.4.RELEASE 0.6 1.0.3.RELEASE diff --git a/spring-cloud-gateway-core/pom.xml b/spring-cloud-gateway-core/pom.xml index d5b05d44..3d1db569 100644 --- a/spring-cloud-gateway-core/pom.xml +++ b/spring-cloud-gateway-core/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT .. spring-cloud-gateway-core diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index 38373677..683123eb 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -11,7 +11,7 @@ spring-cloud-gateway-dependencies - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml b/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml index 80744a73..d44fe799 100644 --- a/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml +++ b/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway-integration-tests - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-integration-tests/pom.xml b/spring-cloud-gateway-integration-tests/pom.xml index c82e0c6f..dfda11d9 100644 --- a/spring-cloud-gateway-integration-tests/pom.xml +++ b/spring-cloud-gateway-integration-tests/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index b464aeb7..b14c1d9c 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index 9fb61131..8c0af80a 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-server/pom.xml b/spring-cloud-gateway-server/pom.xml index d84dbbbc..2e060af3 100644 --- a/spring-cloud-gateway-server/pom.xml +++ b/spring-cloud-gateway-server/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT .. spring-cloud-gateway-server diff --git a/spring-cloud-gateway-webflux/pom.xml b/spring-cloud-gateway-webflux/pom.xml index 6be31b2e..9dd822bf 100644 --- a/spring-cloud-gateway-webflux/pom.xml +++ b/spring-cloud-gateway-webflux/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-gateway/pom.xml b/spring-cloud-starter-gateway/pom.xml index a4c62ee8..3c2d8595 100644 --- a/spring-cloud-starter-gateway/pom.xml +++ b/spring-cloud-starter-gateway/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.RELEASE + 2.2.8.BUILD-SNAPSHOT .. spring-cloud-starter-gateway From 0bf4dcfaa55c72c1df6b53922aca31933c0a2e34 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 21 Apr 2021 17:29:30 +0000 Subject: [PATCH 4/6] Bumping versions to 2.2.9.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-gateway-core/pom.xml | 2 +- spring-cloud-gateway-dependencies/pom.xml | 4 ++-- .../mvc-failure-analyzer/pom.xml | 2 +- spring-cloud-gateway-integration-tests/pom.xml | 2 +- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- spring-cloud-gateway-server/pom.xml | 2 +- spring-cloud-gateway-webflux/pom.xml | 2 +- spring-cloud-starter-gateway/pom.xml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8cf050f3..3c61afe2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index 287fc978..07f3a133 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT pom Spring Cloud Gateway @@ -52,9 +52,9 @@ UTF-8 UTF-8 1.8 - 2.2.8.BUILD-SNAPSHOT - 2.2.8.BUILD-SNAPSHOT - 1.0.4.RELEASE + 2.2.9.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT + 1.0.6.BUILD-SNAPSHOT 0.6 1.0.3.RELEASE diff --git a/spring-cloud-gateway-core/pom.xml b/spring-cloud-gateway-core/pom.xml index 3d1db569..77d8bace 100644 --- a/spring-cloud-gateway-core/pom.xml +++ b/spring-cloud-gateway-core/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT .. spring-cloud-gateway-core diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index 683123eb..0d5e5335 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -6,12 +6,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.4.RELEASE + 2.3.5.BUILD-SNAPSHOT spring-cloud-gateway-dependencies - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml b/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml index d44fe799..dfb24002 100644 --- a/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml +++ b/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway-integration-tests - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-integration-tests/pom.xml b/spring-cloud-gateway-integration-tests/pom.xml index dfda11d9..8c2dc122 100644 --- a/spring-cloud-gateway-integration-tests/pom.xml +++ b/spring-cloud-gateway-integration-tests/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index b14c1d9c..57aad214 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index 8c0af80a..cc34b315 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-server/pom.xml b/spring-cloud-gateway-server/pom.xml index 2e060af3..0a1acebd 100644 --- a/spring-cloud-gateway-server/pom.xml +++ b/spring-cloud-gateway-server/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT .. spring-cloud-gateway-server diff --git a/spring-cloud-gateway-webflux/pom.xml b/spring-cloud-gateway-webflux/pom.xml index 9dd822bf..79b9eaa4 100644 --- a/spring-cloud-gateway-webflux/pom.xml +++ b/spring-cloud-gateway-webflux/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-gateway/pom.xml b/spring-cloud-starter-gateway/pom.xml index 3c2d8595..8559da95 100644 --- a/spring-cloud-starter-gateway/pom.xml +++ b/spring-cloud-starter-gateway/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 2.2.9.BUILD-SNAPSHOT .. spring-cloud-starter-gateway From 0fd5cef6c81daca9dcc85d09832fa56b28923161 Mon Sep 17 00:00:00 2001 From: ctlove0523 <478309639@qq.com> Date: Sat, 17 Apr 2021 08:13:01 +0800 Subject: [PATCH 5/6] Matches http scheme regardless of case Fixes gh-2218 --- .../gateway/filter/NettyRoutingFilter.java | 2 +- .../filter/NettyRoutingFilterTests.java | 37 ++++++++++++++++++- 2 files changed, 37 insertions(+), 2 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 fcd9eda6..60ce0020 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 @@ -109,7 +109,7 @@ public class NettyRoutingFilter implements GlobalFilter, Ordered { String scheme = requestUrl.getScheme(); if (isAlreadyRouted(exchange) - || (!"http".equals(scheme) && !"https".equals(scheme))) { + || (!"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 149b7a18..76dc1b7b 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 @@ -17,9 +17,14 @@ package org.springframework.cloud.gateway.filter; import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import reactor.core.publisher.Mono; +import reactor.netty.DisposableServer; +import reactor.netty.http.server.HttpServer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; @@ -27,20 +32,29 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; +import org.springframework.cloud.gateway.test.BaseWebClientTests; import org.springframework.cloud.gateway.test.PermitAllSecurityConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; +import org.springframework.util.SocketUtils; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class NettyRoutingFilterTests { +public class NettyRoutingFilterTests extends BaseWebClientTests { + + private static int port; @Autowired private ApplicationContext context; + @BeforeClass + public static void beforeAll() { + port = SocketUtils.findAvailableTcpPort(); + } + @Test @Ignore public void mockServerWorks() { @@ -50,6 +64,26 @@ public class NettyRoutingFilterTests { .value(Matchers.lessThan(500)); } + @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")))) + .bindNow(); + + try { + testClient.get().uri("/issue").exchange().expectStatus().isOk().expectBody() + .consumeWith(entityExchangeResult -> { + Assert.assertNotNull(entityExchangeResult); + Assert.assertNotNull(entityExchangeResult.getResponseBody()); + String content = new String(entityExchangeResult.getResponseBody()); + Assert.assertEquals("issue2207", content); + }); + } + finally { + server.disposeNow(); + } + } + @SpringBootConfiguration @EnableAutoConfiguration @Import(PermitAllSecurityConfiguration.class) @@ -61,6 +95,7 @@ public class NettyRoutingFilterTests { .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(); } From adc1969bc85d8c4fc900bfe86a6184e3c81c765e Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 24 May 2021 11:14:34 -0400 Subject: [PATCH 6/6] 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(); } }