Merge pull request #3798 from raccoonback/encode-plus-sign-query-parameter-when-rewrite-in-mvc

Fix '+' character in query parameters is not encoded when rewrite query parameter in mvc

Author: ryanjbaxter

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

@@ -132,19 +132,36 @@ void rewriteEncodedRequestParameter() {
 			.hasToString("http://localhost/path?quux=corge%2B&baz=qux&foo%5B%5D=replacement%5B%5D");
 	}
 
+	@Test
+	void rewritePlusSignRequestParameter() {
+		MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/path")
+			.param("foo", "bar")
+			.param("baz", "qux")
+			.buildRequest(null);
+
+		ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList());
+
+		ServerRequest result = BeforeFilterFunctions.rewriteRequestParameter("foo", "replacement+").apply(request);
+
+		assertThat(result.param("foo")).isPresent().hasValue("replacement+");
+		assertThat(result.uri().toString()).hasToString("http://localhost/path?baz=qux&foo=replacement%2B");
+	}
+
 	@Test
 	void rewriteRequestParameterWithEncodedRemainParameters() {
 		MockHttpServletRequest servletRequest = MockMvcRequestBuilders.get("http://localhost/path")
 			.param("foo", "bar")
 			.param("baz[]", "qux[]")
+			.param("quux", "corge+")
 			.buildRequest(null);
 
 		ServerRequest request = ServerRequest.create(servletRequest, Collections.emptyList());
 
 		ServerRequest result = BeforeFilterFunctions.rewriteRequestParameter("foo", "replacement").apply(request);
 
 		assertThat(result.param("foo")).isPresent().hasValue("replacement");
-		assertThat(result.uri().toString()).hasToString("http://localhost/path?baz%5B%5D=qux%5B%5D&foo=replacement");
+		assertThat(result.uri().toString())
+			.hasToString("http://localhost/path?baz%5B%5D=qux%5B%5D&quux=corge%2B&foo=replacement");
 	}
 
 	@Test