From b382bb6cf09a4e9617d93dbfc50b5366c8b3869f Mon Sep 17 00:00:00 2001 From: spring-builds Date: Sat, 22 Mar 2025 13:26:55 +0000 Subject: [PATCH] Bumping versions --- .../server/mvc/filter/BeforeFilterFunctions.java | 6 +++++- .../mvc/filter/BeforeFilterFunctionsTests.java | 15 ++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctions.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctions.java index c96fffdd..dba4e260 100644 --- a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctions.java +++ b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctions.java @@ -332,7 +332,11 @@ public abstract class BeforeFilterFunctions { String path = request.uri().getPath(); String newPath = pattern.matcher(path).replaceAll(normalizedReplacement); - URI rewrittenUri = UriComponentsBuilder.fromUri(request.uri()).replacePath(newPath).encode().build().toUri(); + URI rewrittenUri = UriComponentsBuilder.fromUri(request.uri()) + .replacePath(newPath) + .encode() + .build() + .toUri(); ServerRequest modified = ServerRequest.from(request).uri(rewrittenUri).build(); diff --git a/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java b/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java index 309b81bf..ae6a7ee2 100644 --- a/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java +++ b/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java @@ -184,8 +184,7 @@ class BeforeFilterFunctionsTests { @Test void rewritePath() { - MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/get") - .buildRequest(null); + MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/get").buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); @@ -197,7 +196,7 @@ class BeforeFilterFunctionsTests { @Test void rewritePathWithSpace() { MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/get/path/with spaces") - .buildRequest(null); + .buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); @@ -209,7 +208,7 @@ class BeforeFilterFunctionsTests { @Test void rewritePathWithEnDash() { MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/get/path/with–en–dashes") - .buildRequest(null); + .buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); @@ -220,14 +219,16 @@ class BeforeFilterFunctionsTests { @Test void rewritePathWithEnDashAndSpace() { - MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/get/path/with–en–dashes and spaces") - .buildRequest(null); + MockHttpServletRequest servletRequest = MockMvcRequestBuilders + .get("http://localhost/get/path/with–en–dashes and spaces") + .buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); ServerRequest modified = BeforeFilterFunctions.rewritePath("get", "modified").apply(request); - assertThat(modified.uri().getRawPath()).isEqualTo("/modified/path/with%E2%80%93en%E2%80%93dashes%20and%20spaces"); + assertThat(modified.uri().getRawPath()) + .isEqualTo("/modified/path/with%E2%80%93en%E2%80%93dashes%20and%20spaces"); } }