Fixing tests after merge

Author: ryanjbaxter

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

@@ -350,7 +350,7 @@ public static Function<ServerRequest, ServerRequest> rewriteRequestParameter(Str
 				queryParams.add(name, replacement);
 			}
 
-			MultiValueMap<String, String> encodedQueryParams = UriUtils.encodeQueryParams(queryParams);
+			MultiValueMap<String, String> encodedQueryParams = MvcUtils.encodeQueryParams(queryParams);
 			URI rewrittenUri = UriComponentsBuilder.fromUri(request.uri())
 				.replaceQueryParams(unmodifiableMultiValueMap(encodedQueryParams))
 				.build(true)

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

@@ -117,9 +117,9 @@ void rewriteOnlyFirstRequestParameter() {
 	@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 @@ void rewriteEncodedRequestParameter() {
 
 		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