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

DATACMNS-1101 - Adapt API changes in PropertyAccessor from MappingAuditableBeanWrapperFactory.

Browse Source 
We now avoid wrapping the value into an Optional as PropertyAccessor now takes Object as parameter right away.
This commit is contained in:
Oliver Gierke
2017-07-03 14:29:55 +02:00
parent f78793ceeb
commit 09dd13c41a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java
View File

@@ -81,8 +81,9 @@ public class MappingAuditableBeanWrapperFactory extends DefaultAuditableBeanWrap
MappingAuditingMetadata metadata = metadataCache.computeIfAbsent(type,
key -> new MappingAuditingMetadata(entity));
return Optional.<AuditableBeanWrapper> ofNullable(metadata.isAuditable()
? new MappingMetadataAuditableBeanWrapper(entity.getPropertyAccessor(it), metadata) : null);
return Optional.<AuditableBeanWrapper> ofNullable(
metadata.isAuditable() ? new MappingMetadataAuditableBeanWrapper(entity.getPropertyAccessor(it), metadata)
: null);
}).orElseGet(() -> super.getBeanWrapperFor(source));
});
@@ -190,8 +191,7 @@ public class MappingAuditableBeanWrapperFactory extends DefaultAuditableBeanWrap
*/
@Override
public Optional<TemporalAccessor> getLastModifiedDate() {
return getAsTemporalAccessor(metadata.lastModifiedDateProperty.map(accessor::getProperty),
LocalDateTime.class);
return getAsTemporalAccessor(metadata.lastModifiedDateProperty.map(accessor::getProperty), LocalDateTime.class);
}
/*
@@ -205,7 +205,7 @@ public class MappingAuditableBeanWrapperFactory extends DefaultAuditableBeanWrap
private <T, P extends PersistentProperty<?>> T setProperty(Optional<P> property, T value) {
property.ifPresent(it -> this.accessor.setProperty(it, Optional.of(value)));
property.ifPresent(it -> this.accessor.setProperty(it, value));
return value;
}
@@ -213,8 +213,8 @@ public class MappingAuditableBeanWrapperFactory extends DefaultAuditableBeanWrap
private <P extends PersistentProperty<?>> TemporalAccessor setDateProperty(Optional<P> property,
TemporalAccessor value) {
property.ifPresent(
it -> this.accessor.setProperty(it, getDateValueToSet(value, it.getType(), accessor.getBean())));
property
.ifPresent(it -> this.accessor.setProperty(it, getDateValueToSet(value, it.getType(), accessor.getBean())));
return value;
}