From a9c80d7409145bec968fdf6e9c24b6013b3ee56b Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 14 May 2025 13:26:21 +0000 Subject: [PATCH] Bumping versions --- .../mvc/filter/BeforeFilterFunctions.java | 3 +-- .../mvc/filter/BeforeFilterFunctionsTests.java | 18 ++++++------------ 2 files changed, 7 insertions(+), 14 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 6c7e6725..3c86e394 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 @@ -195,8 +195,7 @@ public abstract class BeforeFilterFunctions { String newPath = uri.getRawPath() + request.uri().getRawPath(); - URI prefixedUri = UriComponentsBuilder.fromUri(request.uri()) - .replacePath(newPath).build(true).toUri(); + URI prefixedUri = UriComponentsBuilder.fromUri(request.uri()).replacePath(newPath).build(true).toUri(); return ServerRequest.from(request).uri(prefixedUri).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 42743b9b..a8777c56 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 @@ -245,28 +245,22 @@ class BeforeFilterFunctionsTests { @Test void prefixPath() { - 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()); + ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); - ServerRequest modified = BeforeFilterFunctions.prefixPath("/prefix") - .apply(request); + ServerRequest modified = BeforeFilterFunctions.prefixPath("/prefix").apply(request); assertThat(modified.uri().getRawPath()).isEqualTo("/prefix/get"); } @Test void prefixEncodedPath() { - 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()); + ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); - ServerRequest modified = BeforeFilterFunctions.prefixPath("/pre fix") - .apply(request); + ServerRequest modified = BeforeFilterFunctions.prefixPath("/pre fix").apply(request); assertThat(modified.uri().getRawPath()).isEqualTo("/pre%20fix/get/%C3%A9"); }