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

#1127 - Avoid double encoding in UriTemplate.

Browse Source 
We now directly use UriComponentsBuilder in UriTemplate.expand(…) to avoid potential double encoding in the base URI.
This commit is contained in:
Oliver Drotbohm
2019-11-28 11:14:57 +01:00
parent 5f016d6c9e
commit d3ece765bc
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,8 +244,7 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
return URI.create(baseUri);
}
org.springframework.web.util.UriTemplate baseTemplate = new org.springframework.web.util.UriTemplate(baseUri);
UriComponentsBuilder builder = UriComponentsBuilder.fromUri(baseTemplate.expand(parameters));
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUri);
Iterator<Object> iterator = Arrays.asList(parameters).iterator();
for (TemplateVariable variable : getOptionalVariables()) {
@@ -254,7 +253,7 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
appendToBuilder(builder, variable, value);
}
return builder.build().toUri();
return builder.buildAndExpand(parameters).toUri();
}
/**
@@ -265,20 +264,19 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
*/
public URI expand(Map<String, ?> parameters) {
Assert.notNull(parameters, "Parameters must not be null!");
if (TemplateVariables.NONE.equals(variables)) {
return URI.create(baseUri);
}
Assert.notNull(parameters, "Parameters must not be null!");
org.springframework.web.util.UriTemplate baseTemplate = new org.springframework.web.util.UriTemplate(baseUri);
UriComponentsBuilder builder = UriComponentsBuilder.fromUri(baseTemplate.expand(parameters));
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUri);
for (TemplateVariable variable : getOptionalVariables()) {
appendToBuilder(builder, variable, parameters.get(variable.getName()));
}
return builder.build().toUri();
return builder.buildAndExpand(parameters).toUri();
}
/*