DATACMNS-642 - Avoid setter lookup in BeanWrapper for if field access is used.

We now delay the lookup of the setter method until we discover we really  need to use property access.

Author: odrotbohm

src/main/java/org/springframework/data/mapping/model/BeanWrapper.java

@@ -66,16 +66,18 @@ public void setProperty(PersistentProperty<?> property, Object value) {
 
 		Assert.notNull(property, "PersistentProperty must not be null!");
 
-		Method setter = property.getSetter();
-
 		try {
 
 			if (!property.usePropertyAccess()) {
 
 				ReflectionUtils.makeAccessible(property.getField());
 				ReflectionUtils.setField(property.getField(), bean, value);
+				return;
+			}
 
-			} else if (property.usePropertyAccess() && setter != null) {
+			Method setter = property.getSetter();
+
+			if (property.usePropertyAccess() && setter != null) {
 
 				ReflectionUtils.makeAccessible(setter);
 				ReflectionUtils.invokeMethod(setter, bean, value);
@@ -123,10 +125,10 @@ public <S> S getProperty(PersistentProperty<?> property, Class<? extends S> type
 
 				ReflectionUtils.makeAccessible(getter);
 				return (S) ReflectionUtils.invokeMethod(getter, bean);
-			} else {
-				return null;
 			}
 
+			return null;
+
 		} catch (IllegalStateException e) {
 			throw new MappingException(String.format("Could not read property %s of %s!", property.toString(),
 					bean.toString()), e);