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

Tweaked how the version is exposed. It isn't by default so I added a check for @RestResource on the version attribute. If a path is set, the version is exported under that name.

Browse Source
This commit is contained in:
Jon Brisbin
2012-10-15 07:42:02 -04:00
committed by Jon Brisbin
parent d526e073ba
commit 851ae50301
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/jpa/JpaEntityMetadata.java
View File

@@ -61,10 +61,15 @@ public class JpaEntityMetadata implements EntityMetadata<JpaAttributeMetadata> {
if(repositories.hasRepositoryFor(attrType)) {
linkedAttributes.put(name, new JpaAttributeMetadata(entityType, attr));
} else {
if(!(attr instanceof SingularAttribute && ((SingularAttribute)attr).isId())
&& !(attr instanceof SingularAttribute && ((SingularAttribute)attr).isVersion())) {
embeddedAttributes.put(name, new JpaAttributeMetadata(entityType, attr));
if((attr instanceof SingularAttribute && ((SingularAttribute)attr).isId())) {
// Don't export the id attribute
continue;
} else if(((attr instanceof SingularAttribute) && ((SingularAttribute)attr).isVersion())
&& (null == fieldResourceAnno || !StringUtils.hasText(fieldResourceAnno.path()))) {
// Don't export the version attribute
continue;
}
embeddedAttributes.put(name, new JpaAttributeMetadata(entityType, attr));
}
}
}

2
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Person.java
View File

@@ -14,6 +14,7 @@ import javax.persistence.PrePersist;
import javax.persistence.Version;
import org.codehaus.jackson.annotate.JsonManagedReference;
import org.springframework.data.rest.repository.annotation.RestResource;
/**
* @author Jon Brisbin <jbrisbin@vmware.com>
@@ -23,6 +24,7 @@ public class Person {
@Id @GeneratedValue private Long id;
private String name;
@RestResource(path = "version")
@Version
private Long version;
@JsonManagedReference