From 09dd13c41a8d2fe79e8d0fedb644108a249d40c6 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Mon, 3 Jul 2017 14:29:55 +0200
Subject: [PATCH] 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.
---
 .../MappingAuditableBeanWrapperFactory.java        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java b/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java
index 78d69a0b9..cfbcd4577 100644
--- a/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java
+++ b/src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java
@@ -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;
 		}