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

#137 - Fixed variable expansion in UriTemplate.

Browse Source 
We now eagerly return from UriTemplate.expand(…) if the template doesn't actually contain any variables.
This commit is contained in:
Oliver Gierke
2014-01-22 14:59:01 +01:00
parent 3c62de720f
commit 64fd8543b6
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/springframework/hateoas/UriTemplate.java
View File

@@ -72,7 +72,7 @@ public class UriTemplate implements Iterable<TemplateVariable> {
}
}
this.variables = new TemplateVariables(variables);
this.variables = variables.isEmpty() ? TemplateVariables.NONE : new TemplateVariables(variables);
this.baseUri = template.substring(0, baseUriEndIndex);
}
@@ -140,7 +140,11 @@ public class UriTemplate implements Iterable<TemplateVariable> {
*/
public URI expand(Object... parameters) {
UriComponentsBuilder builder = UriComponentsBuilder.fromPath(baseUri);
if (TemplateVariables.NONE.equals(variables)) {
return URI.create(baseUri);
}
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUri);
Iterator<Object> iterator = Arrays.asList(parameters).iterator();
for (TemplateVariable variable : variables) {
@@ -160,8 +164,12 @@ public class UriTemplate implements Iterable<TemplateVariable> {
*/
public URI expand(Map<String, Object> parameters) {
if (TemplateVariables.NONE.equals(variables)) {
return URI.create(baseUri);
}
Assert.notNull(parameters, "Parameters must not be null!");
UriComponentsBuilder builder = UriComponentsBuilder.fromPath(baseUri);
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUri);
for (TemplateVariable variable : variables) {
appendToBuilder(builder, variable, parameters.get(variable.getName()));