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

Polish DefaultUrlTemplateHandler

Browse Source
This commit is contained in:
Rossen Stoyanchev
2016-04-27 08:55:52 -04:00
parent a50ea80e4e
commit 335d968f85
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java
View File

@@ -92,14 +92,14 @@ public class DefaultUriTemplateHandler extends AbstractUriTemplateHandler {
@Override
public URI expandInternal(String uriTemplate, Map<String, ?> uriVariables) {
protected URI expandInternal(String uriTemplate, Map<String, ?> uriVariables) {
UriComponentsBuilder uriComponentsBuilder = initUriComponentsBuilder(uriTemplate);
UriComponents uriComponents = expandAndEncode(uriComponentsBuilder, uriVariables);
return createUri(uriComponents);
}
@Override
public URI expandInternal(String uriTemplate, Object... uriVariables) {
protected URI expandInternal(String uriTemplate, Object... uriVariables) {
UriComponentsBuilder uriComponentsBuilder = initUriComponentsBuilder(uriTemplate);
UriComponents uriComponents = expandAndEncode(uriComponentsBuilder, uriVariables);
return createUri(uriComponents);
@@ -161,6 +161,7 @@ public class DefaultUriTemplateHandler extends AbstractUriTemplateHandler {
private URI createUri(UriComponents uriComponents) {
try {
// Avoid further encoding (in the case of strictEncoding=true)
return new URI(uriComponents.toUriString());
}
catch (URISyntaxException ex) {