35628: UriComponentsBuilder: Do not clear queryparams in method query which is intended for adding values

Author: Schäfer, H.H. (Hans Hosea)

spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java

@@ -607,9 +607,6 @@ public UriComponentsBuilder query(@Nullable String query) {
 			}
 			resetSchemeSpecificPart();
 		}
-		else {
-			this.queryParams.clear();
-		}
 		return this;
 	}
 

spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java

@@ -477,6 +477,24 @@ void replacePath(ParserType parserType) {
 		assertThat(result.toUriString()).isEqualTo("https://www.ietf.org");
 	}
 
+	@ParameterizedTest
+	@EnumSource
+	void query(final ParserType parserType) {
+		final UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?foo=bar", parserType)
+			.query("baz=qux")
+			.build();
+		assertThat(uriComponents.getQueryParams()).isEqualTo(Map.of("foo", List.of("bar"), "baz", List.of("qux")));
+	}
+
+	@ParameterizedTest
+	@EnumSource
+	void queryWithNullDoesRetainQueryParameters(final ParserType parserType) {
+		final UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?foo=bar", parserType)
+			.query(null)
+			.build();
+		assertThat(uriComponents.getQueryParams()).isEqualTo(Map.of("foo", List.of("bar")));
+	}
+
 	@ParameterizedTest
 	@EnumSource
 	void replaceQuery(ParserType parserType) {