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

Polish UriTemplateTests

Browse Source
This commit is contained in:
Rossen Stoyanchev
2016-01-29 15:39:02 -05:00
parent f5aa011722
commit bedf1a9bd0
2 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 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.
@@ -90,16 +90,16 @@ public class DefaultUriTemplateHandler implements UriTemplateHandler {
@Override
public URI expand(String uriTemplate, Map<String, ?> uriVariables) {
UriComponentsBuilder uriComponentsBuilder = initUriComponentsBuilder(uriTemplate);
UriComponents uriComponents = uriComponentsBuilder.build().expand(uriVariables).encode();
return insertBaseUrl(uriComponents);
UriComponentsBuilder builder = initUriComponentsBuilder(uriTemplate);
UriComponents url = builder.build().expand(uriVariables).encode();
return insertBaseUrl(url);
}
@Override
public URI expand(String uriTemplate, Object... uriVariableValues) {
UriComponentsBuilder uriComponentsBuilder = initUriComponentsBuilder(uriTemplate);
UriComponents uriComponents = uriComponentsBuilder.build().expand(uriVariableValues).encode();
return insertBaseUrl(uriComponents);
public URI expand(String uriTemplate, Object... uriVariables) {
UriComponentsBuilder builder = initUriComponentsBuilder(uriTemplate);
UriComponents url = builder.build().expand(uriVariables).encode();
return insertBaseUrl(url);
}
protected UriComponentsBuilder initUriComponentsBuilder(String uriTemplate) {