root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Support queries in opaque URLs 

Closes gh-32920
This commit is contained in:
Arjen Poutsma 2024-06-07 10:55:53 +02:00
parent 7fc4937199
commit 35e8f1c423
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,8 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable {
builder.port(urlRecord.port().toString());
}
if (urlRecord.path().isOpaque()) {
builder.schemeSpecificPart(urlRecord.path().toString());
String ssp = urlRecord.path() + urlRecord.search();
builder.schemeSpecificPart(ssp);
}
else {
builder.path(urlRecord.path().toString());

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

@ -196,6 +196,16 @@ class UriComponentsBuilderTests {
assertThat(result.getQuery()).isNull();
assertThat(result.getFragment()).isEqualTo("baz");
result = UriComponentsBuilder.fromUriString("mailto:user@example.com?subject=foo").build();
assertThat(result.getScheme()).isEqualTo("mailto");
assertThat(result.getUserInfo()).isNull();
assertThat(result.getHost()).isNull();
assertThat(result.getPort()).isEqualTo(-1);
assertThat(result.getSchemeSpecificPart()).isEqualTo("user@example.com?subject=foo");
assertThat(result.getPath()).isNull();
assertThat(result.getQuery()).isNull();
assertThat(result.getFragment()).isNull();
result = UriComponentsBuilder.fromUriString("docs/guide/collections/designfaq.html#28").build();
assertThat(result.getScheme()).isNull();
assertThat(result.getUserInfo()).isNull();

23
spring-web/src/test/java/org/springframework/web/util/UrlParserTests.java
View File

@ -61,8 +61,31 @@ class UrlParserTests {
else {
assertThat(result.port()).as("Port is not null").isNull();
}
assertThat(result.hasOpaquePath()).as("Result has opaque path").isFalse();
assertThat(result.path().toString()).as("Invalid path").isEqualTo(path);
assertThat(result.query()).as("Invalid query").isEqualTo(query);
assertThat(result.fragment()).as("Invalid fragment").isEqualTo(fragment);
}
@Test
void parseOpaque() {
testParseOpaque("mailto:user@example.com?subject=foo", "user@example.com", "subject=foo");
}
void testParseOpaque(String input, String path, @Nullable String query) {
UrlParser.UrlRecord result = UrlParser.parse("mailto:user@example.com?subject=foo", EMPTY_URL_RECORD, null, null);
assertThat(result.scheme()).as("Invalid scheme").isEqualTo("mailto");
assertThat(result.hasOpaquePath()).as("Result has no opaque path").isTrue();
assertThat(result.path().toString()).as("Invalid path").isEqualTo(path);
if (query != null) {
assertThat(result.query()).as("Query is null").isNotNull();
assertThat(result.query()).as("Invalid query").isEqualTo(query);
}
else {
assertThat(result.query()).as("Query is not null").isNull();
}
}
}