From b0211911b51cc4bc0a13c3f5f49d15d3fe5e1bcf Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Tue, 7 Apr 2015 08:39:59 +0200
Subject: [PATCH] DATACMNS-677 - AnnotationBasedPersistentProperty now caches
 absence of annotations on accessor-only properties.

AnnotationBasedPersistentProperty now also caches the absence of properties that are expressed through accessors only. Previously the absence of a field caused us to skip the registration of the absence in the cache.
---
 .../AnnotationBasedPersistentProperty.java    |  7 +++---
 ...ationBasedPersistentPropertyUnitTests.java | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java b/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java
index 36c1f6649..8820f1cda 100644
--- a/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java
+++ b/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java
@@ -201,8 +201,9 @@ public abstract class AnnotationBasedPersistentProperty<P extends PersistentProp
 	}
 
 	/**
-	 * Returns the annotation found for the current {@link AnnotationBasedPersistentProperty}. Will prefer field
-	 * annotations over ones found at getters or setters.
+	 * Returns the annotation found for the current {@link AnnotationBasedPersistentProperty}. Will prefer getters or
+	 * setters annotations over ones found at the backing field as the former can be used to reconfigure the metadata in
+	 * subclasses.
 	 * 
 	 * @param annotationType must not be {@literal null}.
 	 * @return
@@ -229,7 +230,7 @@ public abstract class AnnotationBasedPersistentProperty<P extends PersistentProp
 			}
 		}
 
-		return field == null ? null : cacheAndReturn(annotationType, AnnotationUtils.getAnnotation(field, annotationType));
+		return cacheAndReturn(annotationType, field == null ? null : AnnotationUtils.getAnnotation(field, annotationType));
 	}
 
 	/* 
diff --git a/src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java
index fb8988f94..8e7e14d1d 100644
--- a/src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java
@@ -203,6 +203,23 @@ public class AnnotationBasedPersistentPropertyUnitTests<P extends AnnotationBase
 		getProperty(TypeWithCustomAnnotationsOnBothFieldAndAccessor.class, "field");
 	}
 
+	/**
+	 * @see DATACMNS-677
+	 */
+	@Test
+	@SuppressWarnings("unchecked")
+	public void cachesNonPresenceOfAnnotationOnField() {
+
+		SamplePersistentProperty property = getProperty(Sample.class, "getterWithoutField");
+
+		assertThat(property.findAnnotation(MyAnnotation.class), is(nullValue()));
+
+		Map<Class<?>, ?> field = (Map<Class<?>, ?>) ReflectionTestUtils.getField(property, "annotationCache");
+
+		assertThat(field.containsKey(MyAnnotation.class), is(true));
+		assertThat(field.get(MyAnnotation.class), is(nullValue()));
+	}
+
 	@SuppressWarnings("unchecked")
 	private Map<Class<? extends Annotation>, Annotation> getAnnotationCache(SamplePersistentProperty property) {
 		return (Map<Class<? extends Annotation>, Annotation>) ReflectionTestUtils.getField(property, "annotationCache");
@@ -250,6 +267,13 @@ public class AnnotationBasedPersistentPropertyUnitTests<P extends AnnotationBase
 		public void setDoubleMapping(String doubleMapping) {
 			this.doubleMapping = doubleMapping;
 		}
+
+		@AccessType(Type.PROPERTY)
+		public Object getGetterWithoutField() {
+			return null;
+		}
+
+		public void setGetterWithoutField(Object object) {}
 	}
 
 	static class InvalidSample {