Skip to content

Commit 09dd13c

Browse files
committed
DATACMNS-1101 - Adapt API changes in PropertyAccessor from MappingAuditableBeanWrapperFactory.
We now avoid wrapping the value into an Optional as PropertyAccessor now takes Object as parameter right away.
1 parent f78793c commit 09dd13c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ public Optional<AuditableBeanWrapper> getBeanWrapperFor(Object source) {
8181
MappingAuditingMetadata metadata = metadataCache.computeIfAbsent(type,
8282
key -> new MappingAuditingMetadata(entity));
8383

84-
return Optional.<AuditableBeanWrapper> ofNullable(metadata.isAuditable()
85-
? new MappingMetadataAuditableBeanWrapper(entity.getPropertyAccessor(it), metadata) : null);
84+
return Optional.<AuditableBeanWrapper> ofNullable(
85+
metadata.isAuditable() ? new MappingMetadataAuditableBeanWrapper(entity.getPropertyAccessor(it), metadata)
86+
: null);
8687

8788
}).orElseGet(() -> super.getBeanWrapperFor(source));
8889
});
@@ -190,8 +191,7 @@ public Object setLastModifiedBy(Object value) {
190191
*/
191192
@Override
192193
public Optional<TemporalAccessor> getLastModifiedDate() {
193-
return getAsTemporalAccessor(metadata.lastModifiedDateProperty.map(accessor::getProperty),
194-
LocalDateTime.class);
194+
return getAsTemporalAccessor(metadata.lastModifiedDateProperty.map(accessor::getProperty), LocalDateTime.class);
195195
}
196196

197197
/*
@@ -205,16 +205,16 @@ public TemporalAccessor setLastModifiedDate(TemporalAccessor value) {
205205

206206
private <T, P extends PersistentProperty<?>> T setProperty(Optional<P> property, T value) {
207207

208-
property.ifPresent(it -> this.accessor.setProperty(it, Optional.of(value)));
208+
property.ifPresent(it -> this.accessor.setProperty(it, value));
209209

210210
return value;
211211
}
212212

213213
private <P extends PersistentProperty<?>> TemporalAccessor setDateProperty(Optional<P> property,
214214
TemporalAccessor value) {
215215

216-
property.ifPresent(
217-
it -> this.accessor.setProperty(it, getDateValueToSet(value, it.getType(), accessor.getBean())));
216+
property
217+
.ifPresent(it -> this.accessor.setProperty(it, getDateValueToSet(value, it.getType(), accessor.getBean())));
218218

219219
return value;
220220
}

0 commit comments

Comments
 (0)