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

#180 - Overhaul of URI template expansion in Traverson.

Browse Source 
We're now consistently using Spring HATEOAS' UriTemplate instead of the Spring MVC one to be able to expand extended template parameters correctly.

Also the ObjectMapper used by Traverson to unmarshal JSON responses does not fail for unknown properties anymore.
This commit is contained in:
Oliver Gierke
2014-05-20 10:33:42 +02:00
parent bef8994a43
commit 9790d94872
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/springframework/hateoas/client/Traverson.java
View File

@@ -46,6 +46,7 @@ import org.springframework.plugin.core.OrderAwarePluginRegistry;
import org.springframework.util.Assert;
import org.springframework.web.client.RestTemplate;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jayway.jsonpath.JsonPath;
@@ -103,6 +104,7 @@ public class Traverson {
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new Jackson2HalModule());
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
@@ -197,7 +199,7 @@ public class Traverson {
public <T> T toObject(Class<T> type) {
Assert.notNull(type, "Target type must not be null!");
return template.exchange(traverseToFinalUrl(), GET, prepareRequest(headers), type, templateParameters).getBody();
return template.exchange(traverseToFinalUrl(), GET, prepareRequest(headers), type).getBody();
}
/**
@@ -210,7 +212,7 @@ public class Traverson {
public <T> T toObject(ParameterizedTypeReference<T> type) {
Assert.notNull(type, "Target type must not be null!");
return template.exchange(traverseToFinalUrl(), GET, prepareRequest(headers), type, templateParameters).getBody();
return template.exchange(traverseToFinalUrl(), GET, prepareRequest(headers), type).getBody();
}
/**
@@ -224,7 +226,7 @@ public class Traverson {
Assert.hasText(jsonPath, "JSON path must not be null or empty!");
String forObject = template.getForObject(traverseToFinalUrl(), String.class, templateParameters);
String forObject = template.getForObject(traverseToFinalUrl(), String.class);
return JsonPath.read(forObject, jsonPath);
}
@@ -237,11 +239,14 @@ public class Traverson {
public <T> ResponseEntity<T> toEntity(Class<T> type) {
Assert.notNull(type, "Target type must not be null!");
return template.getForEntity(traverseToFinalUrl(), type, templateParameters);
return template.getForEntity(traverseToFinalUrl(), type);
}
private String traverseToFinalUrl() {
return getAndFindLinkWithRel(baseUri.toString(), rels.iterator());
String uri = getAndFindLinkWithRel(baseUri.toString(), rels.iterator());
return new UriTemplate(uri).expand(templateParameters).toString();
}
private String getAndFindLinkWithRel(String uri, Iterator<String> rels) {