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

Support fragments in UriComponentsBuilder.fromHttpUrl()

Browse Source 
Prior to this commit, UriComponentsBuilder.fromHttpUrl() threw an
IllegalArgumentException if the provided URL contained a fragment.

This commit aligns the implementation of fromHttpUrl() with that of
fromUriString(), by parsing a fragment and storing it in the builder.

Closes gh-25300
This commit is contained in:
Sam Brannen
2020-06-26 18:30:09 +02:00
parent dd11dbf3b1
commit 9876ca003b
2 changed files with 84 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,6 +248,84 @@ class UriComponentsBuilderTests {
UriComponentsBuilder.fromHttpUrl("http://[1abc:2abc:3abc::5ABC:6abc:8080/resource"));
}
@Test
void fromHttpUrlWithoutFragment() {
String httpUrl = "http://localhost:8080/test/print";
UriComponents uriComponents = UriComponentsBuilder.fromHttpUrl(httpUrl).build();
assertThat(uriComponents.getScheme()).isEqualTo("http");
assertThat(uriComponents.getUserInfo()).isNull();
assertThat(uriComponents.getHost()).isEqualTo("localhost");
assertThat(uriComponents.getPort()).isEqualTo(8080);
assertThat(uriComponents.getPath()).isEqualTo("/test/print");
assertThat(uriComponents.getPathSegments()).isEqualTo(Arrays.asList("test", "print"));
assertThat(uriComponents.getQuery()).isNull();
assertThat(uriComponents.getFragment()).isNull();
assertThat(uriComponents.toUri().toString()).isEqualTo(httpUrl);
httpUrl = "http://user:test@localhost:8080/test/print?foo=bar";
uriComponents = UriComponentsBuilder.fromHttpUrl(httpUrl).build();
assertThat(uriComponents.getScheme()).isEqualTo("http");
assertThat(uriComponents.getUserInfo()).isEqualTo("user:test");
assertThat(uriComponents.getHost()).isEqualTo("localhost");
assertThat(uriComponents.getPort()).isEqualTo(8080);
assertThat(uriComponents.getPath()).isEqualTo("/test/print");
assertThat(uriComponents.getPathSegments()).isEqualTo(Arrays.asList("test", "print"));
assertThat(uriComponents.getQuery()).isEqualTo("foo=bar");
assertThat(uriComponents.getFragment()).isNull();
assertThat(uriComponents.toUri().toString()).isEqualTo(httpUrl);
httpUrl = "http://localhost:8080/test/print?foo=bar";
uriComponents = UriComponentsBuilder.fromHttpUrl(httpUrl).build();
assertThat(uriComponents.getScheme()).isEqualTo("http");
assertThat(uriComponents.getUserInfo()).isNull();
assertThat(uriComponents.getHost()).isEqualTo("localhost");
assertThat(uriComponents.getPort()).isEqualTo(8080);
assertThat(uriComponents.getPath()).isEqualTo("/test/print");
assertThat(uriComponents.getPathSegments()).isEqualTo(Arrays.asList("test", "print"));
assertThat(uriComponents.getQuery()).isEqualTo("foo=bar");
assertThat(uriComponents.getFragment()).isNull();
assertThat(uriComponents.toUri().toString()).isEqualTo(httpUrl);
}
@Test // gh-25300
void fromHttpUrlWithFragment() {
String httpUrl = "https://example.com#baz";
UriComponents uriComponents = UriComponentsBuilder.fromHttpUrl(httpUrl).build();
assertThat(uriComponents.getScheme()).isEqualTo("https");
assertThat(uriComponents.getUserInfo()).isNull();
assertThat(uriComponents.getHost()).isEqualTo("example.com");
assertThat(uriComponents.getPort()).isEqualTo(-1);
assertThat(uriComponents.getPath()).isNullOrEmpty();
assertThat(uriComponents.getPathSegments()).isEmpty();
assertThat(uriComponents.getQuery()).isNull();
assertThat(uriComponents.getFragment()).isEqualTo("baz");
assertThat(uriComponents.toUri().toString()).isEqualTo(httpUrl);
httpUrl = "http://localhost:8080/test/print#baz";
uriComponents = UriComponentsBuilder.fromHttpUrl(httpUrl).build();
assertThat(uriComponents.getScheme()).isEqualTo("http");
assertThat(uriComponents.getUserInfo()).isNull();
assertThat(uriComponents.getHost()).isEqualTo("localhost");
assertThat(uriComponents.getPort()).isEqualTo(8080);
assertThat(uriComponents.getPath()).isEqualTo("/test/print");
assertThat(uriComponents.getPathSegments()).isEqualTo(Arrays.asList("test", "print"));
assertThat(uriComponents.getQuery()).isNull();
assertThat(uriComponents.getFragment()).isEqualTo("baz");
assertThat(uriComponents.toUri().toString()).isEqualTo(httpUrl);
httpUrl = "http://localhost:8080/test/print?foo=bar#baz";
uriComponents = UriComponentsBuilder.fromHttpUrl(httpUrl).build();
assertThat(uriComponents.getScheme()).isEqualTo("http");
assertThat(uriComponents.getUserInfo()).isNull();
assertThat(uriComponents.getHost()).isEqualTo("localhost");
assertThat(uriComponents.getPort()).isEqualTo(8080);
assertThat(uriComponents.getPath()).isEqualTo("/test/print");
assertThat(uriComponents.getPathSegments()).isEqualTo(Arrays.asList("test", "print"));
assertThat(uriComponents.getQuery()).isEqualTo("foo=bar");
assertThat(uriComponents.getFragment()).isEqualTo("baz");
assertThat(uriComponents.toUri().toString()).isEqualTo(httpUrl);
}
@Test
void fromHttpRequest() {
MockHttpServletRequest request = new MockHttpServletRequest();