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

DATAREST-130 - Support nulling out properties when doing HTTP PUTs.

Browse Source
This commit is contained in:
Willie Wheeler
2014-01-14 09:59:37 +01:00
committed by Oliver Gierke
parent b3a03ea832
commit eafdc4771e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,11 +63,16 @@ public class DomainObjectMerger {
* @see org.springframework.data.mapping.SimplePropertyHandler#doWithPersistentProperty(org.springframework.data.mapping.PersistentProperty)
*/
@Override
public void doWithPersistentProperty(PersistentProperty<?> property) {
Object fromVal = fromWrapper.getProperty(property);
if (null != fromVal && !fromVal.equals(targetWrapper.getProperty(property))) {
targetWrapper.setProperty(property, fromVal);
public void doWithPersistentProperty(PersistentProperty persistentProperty) {
Object fromVal = fromWrapper.getProperty(persistentProperty);
// Support PUTting null property values per DATAREST-130.
boolean mergeProperty =
!entity.isIdProperty(persistentProperty)
&& (fromVal == null || !fromVal.equals(targetWrapper.getProperty(persistentProperty)));
if (mergeProperty) {
targetWrapper.setProperty(persistentProperty, fromVal);
}
}
});