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

Updating source to reflect latest changes in Spring HATEOAS snapshots.

Browse Source
This commit is contained in:
Jon Brisbin
2012-09-12 10:49:17 -05:00
committed by Jon Brisbin
parent efc38c642d
commit 749218445a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/RepositoryAwareJacksonModule.java
View File

@@ -155,7 +155,7 @@ public class RepositoryAwareJacksonModule extends SimpleModule implements Initia
}
}
if(entityConversionSvc.canConvert(sourceType, Resource.class)) {
Set<Link> links = resource.getLinks();
List<Link> links = resource.getLinks();
resource = entityConversionSvc.convert(value, Resource.class);
resource.add(links);
}

4
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/CustomResource.java
View File

@@ -1,7 +1,7 @@
package org.springframework.data.rest.test.webmvc;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonProperty;
@@ -23,7 +23,7 @@ public class CustomResource extends Resource<Map<String, Object>> {
}
@JsonProperty("_links")
@Override public Set<Link> getLinks() {
@Override public List<Link> getLinks() {
return super.getLinks();
}