From 03eb741d68849067facd45dbc312ae80fe9b2832 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 22 May 2025 15:30:30 -0400 Subject: [PATCH] Fixing tests after merge --- .../gateway/server/mvc/filter/BeforeFilterFunctions.java | 2 +- .../server/mvc/filter/BeforeFilterFunctionsTests.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 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 578d7c7c..ce2b2404 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 @@ -350,7 +350,7 @@ public abstract class BeforeFilterFunctions { queryParams.add(name, replacement); } - MultiValueMap encodedQueryParams = UriUtils.encodeQueryParams(queryParams); + MultiValueMap encodedQueryParams = MvcUtils.encodeQueryParams(queryParams); URI rewrittenUri = UriComponentsBuilder.fromUri(request.uri()) .replaceQueryParams(unmodifiableMultiValueMap(encodedQueryParams)) .build(true) 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 f6648063..db5a4b7a 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 @@ -117,9 +117,9 @@ class BeforeFilterFunctionsTests { @Test void rewriteEncodedRequestParameter() { MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/path") - .param("foo", "bar") - .param("baz[]", "qux[]") - .param("quux", "corge+") + .param("foo[]", "bar") + .param("baz", "qux") + .param("quux", "corge+") .buildRequest(null); ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList()); @@ -128,7 +128,8 @@ class BeforeFilterFunctionsTests { assertThat(result.param("foo[]")).isPresent().hasValue("replacement[]"); assertThat(result.param("quux")).isPresent().hasValue("corge+"); - assertThat(result.uri().toString()).hasToString("http://localhost/path?baz=qux&foo%5B%5D=replacement%5B%5D&quux=corge%2B"); + assertThat(result.uri().toString()) + .hasToString("http://localhost/path?quux=corge%2B&baz=qux&foo%5B%5D=replacement%5B%5D"); } @Test