From 649bd3ee2dec74177c4973136e04e784d5be44ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sch=C3=A4fer=2C=20H=2EH=2E=20=28Hans=20Hosea=29?= Date: Mon, 13 Oct 2025 23:39:05 +0200 Subject: [PATCH] Do not clear queryParams UriComponentsBuilder#query MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See gh-35628 Signed-off-by: Schäfer, H.H. (Hans Hosea) --- .../web/util/UriComponentsBuilder.java | 3 --- .../web/util/UriComponentsBuilderTests.java | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java index ced5f4da3c0..21acd3d1f46 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java @@ -552,9 +552,6 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable { } resetSchemeSpecificPart(); } - else { - this.queryParams.clear(); - } return this; } diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java index b0df33c69d8..b2edb42017f 100644 --- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java @@ -477,6 +477,24 @@ class UriComponentsBuilderTests { 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) {