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

Consistent encoding in DefaultUriBuilderFactory

Browse Source 
Unlike 5,1, TEMPLATE_AND_VALUES is not the default encoding mode.
Nevertheless when that mode is used, it should work consistently.

Issue: SPR-17465
This commit is contained in:
Rossen Stoyanchev
2018-11-09 14:13:51 -05:00
parent f73a5222f1
commit 24051619a5
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java
View File

@@ -228,16 +228,14 @@ public class DefaultUriBuilderFactory implements UriBuilderFactory {
}
private UriComponentsBuilder initUriComponentsBuilder(String uriTemplate) {
if (StringUtils.isEmpty(uriTemplate)) {
return baseUri != null ? baseUri.cloneBuilder() : UriComponentsBuilder.newInstance();
}
UriComponentsBuilder result;
if (baseUri != null) {
UriComponentsBuilder uricBuilder = UriComponentsBuilder.fromUriString(uriTemplate);
UriComponents uric = uricBuilder.build();
result = uric.getHost() == null ? baseUri.cloneBuilder().uriComponents(uric) : uricBuilder;
if (StringUtils.isEmpty(uriTemplate)) {
result = baseUri != null ? baseUri.cloneBuilder() : UriComponentsBuilder.newInstance();
}
else if (baseUri != null) {
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(uriTemplate);
UriComponents uri = builder.build();
result = uri.getHost() == null ? baseUri.cloneBuilder().uriComponents(uri) : builder;
}
else {
result = UriComponentsBuilder.fromUriString(uriTemplate);

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

@@ -35,7 +35,7 @@ public class DefaultUriBuilderFactoryTests {
@Test
public void defaultSettings() {
DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory();
URI uri = factory.uriString("/foo").pathSegment("{id}").build("a/b");
URI uri = factory.uriString("/foo/{id}").build("a/b");
assertEquals("/foo/a%2Fb", uri.toString());
}
@@ -126,6 +126,14 @@ public class DefaultUriBuilderFactoryTests {
assertEquals(expected, uriBuilder.build(singletonMap("id", id)).toString());
}
@Test
public void encodingTemplateAndValuesSpr17465() {
DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory();
factory.setEncodingMode(EncodingMode.TEMPLATE_AND_VALUES);
URI uri = factory.builder().path("/foo/{id}").build("a/b");
assertEquals("/foo/a%2Fb", uri.toString());
}
@Test
public void encodingValuesOnlySpr14147() {
DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory();