From 05fa30abc15c1b749b2f95c325c8325f98c720a8 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 21 Mar 2014 11:39:31 +0100 Subject: [PATCH] DATAREST-277 - Adapted to changed generics in BeanWrapper. --- .../data/rest/core/support/DomainObjectMerger.java | 4 ++-- .../webmvc/PersistentEntityResourceAssembler.java | 2 +- .../rest/webmvc/RepositoryEntityController.java | 2 +- .../RepositoryPropertyReferenceController.java | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/DomainObjectMerger.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/DomainObjectMerger.java index 9d635316e..ac31b6591 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/DomainObjectMerger.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/DomainObjectMerger.java @@ -70,8 +70,8 @@ public class DomainObjectMerger { return; } - final BeanWrapper fromWrapper = BeanWrapper.create(from, conversionService); - final BeanWrapper targetWrapper = BeanWrapper.create(target, conversionService); + final BeanWrapper fromWrapper = BeanWrapper.create(from, conversionService); + final BeanWrapper targetWrapper = BeanWrapper.create(target, conversionService); final PersistentEntity entity = repositories.getPersistentEntity(target.getClass()); entity.doWithProperties(new SimplePropertyHandler() { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceAssembler.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceAssembler.java index c97804de4..4dba53413 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceAssembler.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceAssembler.java @@ -82,7 +82,7 @@ public class PersistentEntityResourceAssembler implements ResourceAssembler wrapper = BeanWrapper.create(instance, null); + BeanWrapper wrapper = BeanWrapper.create(instance, null); Object id = wrapper.getProperty(entity.getIdProperty()); Link resourceLink = entityLinks.linkToSingleResource(entity.getType(), id); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java index 7f0ae63c9..3d5d3eb42 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java @@ -229,7 +229,7 @@ class RepositoryEntityController extends AbstractRepositoryRestController implem if (domainObject == null) { - BeanWrapper incomingWrapper = BeanWrapper.create(payload.getContent(), conversionService); + BeanWrapper incomingWrapper = BeanWrapper.create(payload.getContent(), conversionService); incomingWrapper.setProperty(payload.getPersistentEntity().getIdProperty(), id); return createAndReturn(incomingWrapper.getBean(), invoker, assembler); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceController.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceController.java index 2d2201134..381b0bdaf 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceController.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryPropertyReferenceController.java @@ -207,7 +207,7 @@ class RepositoryPropertyReferenceController extends AbstractRepositoryRestContro if (prop.property.isCollectionLike()) { for (Object obj : (Iterable) prop.propertyValue) { - BeanWrapper propValWrapper = BeanWrapper.create(obj, null); + BeanWrapper 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 entry : ((Map) prop.propertyValue).entrySet()) { - BeanWrapper propValWrapper = BeanWrapper.create(entry.getValue(), null); + BeanWrapper 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 itr = coll.iterator(); while (itr.hasNext()) { Object obj = itr.next(); - BeanWrapper propValWrapper = BeanWrapper.create(obj, null); + BeanWrapper 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 itr = m.keySet().iterator(); while (itr.hasNext()) { Object key = itr.next(); - BeanWrapper propValWrapper = BeanWrapper.create(m.get(key), null); + BeanWrapper 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 wrapper = BeanWrapper.create(domainObj, null); + BeanWrapper 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;