SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
spring-builds
2025-03-22 13:26:55 +00:00
parent b68c391e45
commit b382bb6cf0
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctions.java
View File

@@ -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();

15
spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/BeforeFilterFunctionsTests.java
View File

@@ -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");
}
}