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

DATAREST-277 - Adapted to changed generics in BeanWrapper.

Browse Source
This commit is contained in:
Oliver Gierke
2014-03-21 11:39:31 +01:00
parent 063cebe6c1
commit 05fa30abc1
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/DomainObjectMerger.java
View File

@@ -70,8 +70,8 @@ public class DomainObjectMerger {
return;
}
final BeanWrapper<?, Object> fromWrapper = BeanWrapper.create(from, conversionService);
final BeanWrapper<?, Object> targetWrapper = BeanWrapper.create(target, conversionService);
final BeanWrapper<Object> fromWrapper = BeanWrapper.create(from, conversionService);
final BeanWrapper<Object> targetWrapper = BeanWrapper.create(target, conversionService);
final PersistentEntity<?, ?> entity = repositories.getPersistentEntity(target.getClass());
entity.doWithProperties(new SimplePropertyHandler() {

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

@@ -82,7 +82,7 @@ public class PersistentEntityResourceAssembler implements ResourceAssembler<Obje
instanceType));
}
BeanWrapper<?, Object> wrapper = BeanWrapper.create(instance, null);
BeanWrapper<Object> wrapper = BeanWrapper.create(instance, null);
Object id = wrapper.getProperty(entity.getIdProperty());
Link resourceLink = entityLinks.linkToSingleResource(entity.getType(), id);

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

@@ -229,7 +229,7 @@ class RepositoryEntityController extends AbstractRepositoryRestController implem
if (domainObject == null) {
BeanWrapper<?, Object> incomingWrapper = BeanWrapper.create(payload.getContent(), conversionService);
BeanWrapper<Object> incomingWrapper = BeanWrapper.create(payload.getContent(), conversionService);
incomingWrapper.setProperty(payload.getPersistentEntity().getIdProperty(), id);
return createAndReturn(incomingWrapper.getBean(), invoker, assembler);

14
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceController.java
View File

@@ -207,7 +207,7 @@ class RepositoryPropertyReferenceController extends AbstractRepositoryRestContro
if (prop.property.isCollectionLike()) {
for (Object obj : (Iterable<?>) prop.propertyValue) {
BeanWrapper<?, Object> propValWrapper = BeanWrapper.create(obj, null);
BeanWrapper<Object> propValWrapper = BeanWrapper.create(obj, null);
String sId = propValWrapper.getProperty(prop.entity.getIdProperty()).toString();
if (propertyId.equals(sId)) {
@@ -220,7 +220,7 @@ class RepositoryPropertyReferenceController extends AbstractRepositoryRestContro
} else if (prop.property.isMap()) {
for (Map.Entry<Object, Object> entry : ((Map<Object, Object>) prop.propertyValue).entrySet()) {
BeanWrapper<?, Object> propValWrapper = BeanWrapper.create(entry.getValue(), null);
BeanWrapper<Object> propValWrapper = BeanWrapper.create(entry.getValue(), null);
String sId = propValWrapper.getProperty(prop.entity.getIdProperty()).toString();
if (propertyId.equals(sId)) {
@@ -397,7 +397,7 @@ class RepositoryPropertyReferenceController extends AbstractRepositoryRestContro
Iterator<Object> itr = coll.iterator();
while (itr.hasNext()) {
Object obj = itr.next();
BeanWrapper<?, Object> propValWrapper = BeanWrapper.create(obj, null);
BeanWrapper<Object> propValWrapper = BeanWrapper.create(obj, null);
String s = propValWrapper.getProperty(prop.entity.getIdProperty()).toString();
if (propertyId.equals(s)) {
itr.remove();
@@ -408,7 +408,7 @@ class RepositoryPropertyReferenceController extends AbstractRepositoryRestContro
Iterator<Object> itr = m.keySet().iterator();
while (itr.hasNext()) {
Object key = itr.next();
BeanWrapper<?, Object> propValWrapper = BeanWrapper.create(m.get(key), null);
BeanWrapper<Object> propValWrapper = BeanWrapper.create(m.get(key), null);
String s = propValWrapper.getProperty(prop.entity.getIdProperty()).toString();
if (propertyId.equals(s)) {
itr.remove();
@@ -457,7 +457,7 @@ class RepositoryPropertyReferenceController extends AbstractRepositoryRestContro
throw new ResourceNotFoundException();
}
BeanWrapper<?, Object> wrapper = BeanWrapper.create(domainObj, null);
BeanWrapper<Object> wrapper = BeanWrapper.create(domainObj, null);
Object propVal = wrapper.getProperty(prop);
return handler.apply(new ReferencedProperty(prop, propVal, wrapper));
@@ -469,9 +469,9 @@ class RepositoryPropertyReferenceController extends AbstractRepositoryRestContro
final PersistentProperty<?> property;
final Class<?> propertyType;
final Object propertyValue;
final BeanWrapper<?, ?> wrapper;
final BeanWrapper<?> wrapper;
private ReferencedProperty(PersistentProperty<?> property, Object propertyValue, BeanWrapper<?, ?> wrapper) {
private ReferencedProperty(PersistentProperty<?> property, Object propertyValue, BeanWrapper<?> wrapper) {
this.property = property;
this.propertyValue = propertyValue;