Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression with opaque URI determination

Browse Source 
Before RfcUriParser we expected opaque URI's to not have ":/"
after the scheme while the new parser expect opaque URI's to
not have a slash anywhere after the scheme. This commit
restores the previous behavior.

Closes gh-34588
This commit is contained in:
rstoyanchev
2025-03-21 09:05:31 +00:00
parent 5455c645f0
commit 15c20c3e65
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -155,6 +155,19 @@ class UriComponentsBuilderTests {
assertThat(result.toUri()).as("Invalid result URI").isEqualTo(uri);
}
@ParameterizedTest // see gh-34588
@EnumSource
void fromOpaqueUriWithUrnScheme(ParserType parserType) {
URI uri = UriComponentsBuilder
.fromUriString("urn:text:service-{region}:{prefix}/{id}", parserType).build()
.expand("US", "prefix1", "Id-2")
.toUri();
assertThat(uri.getScheme()).isEqualTo("urn");
assertThat(uri.isOpaque()).isTrue();
assertThat(uri.getSchemeSpecificPart()).isEqualTo("text:service-US:prefix1/Id-2");
}
@ParameterizedTest // see gh-9317
@EnumSource
void fromUriEncodedQuery(ParserType parserType) {