admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refine null handling in UriComponentsBuilder#query

Browse Source 
Closes gh-35629
This commit is contained in:
rstoyanchev
2025-10-15 12:30:29 +01:00
parent 649bd3ee2d
commit 3607f98240
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
+9 -11
View File
@@ -479,20 +479,18 @@ class UriComponentsBuilderTests {
@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")));
void query(ParserType parserType) {
String url = "https://example.com/foo?foo=bar";
UriComponents uric = UriComponentsBuilder.fromUriString(url, parserType).query("baz=qux").build();
assertThat(uric.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")));
@EnumSource // gh-35628
void queryWithNull(ParserType parserType) {
String url = "https://example.com/foo?foo=bar";
UriComponents uric = UriComponentsBuilder.fromUriString(url, parserType).query(null).build();
assertThat(uric.getQueryParams()).isEqualTo(Map.of("foo", List.of("bar")));
}
@ParameterizedTest