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

DATACMNS-271 - AnnotationBasedPersistentProperty now caches annotation lookups.

Browse Source
This commit is contained in:
Oliver Gierke
2013-01-28 14:28:12 +01:00
parent 8e3b0cb1e6
commit 33a31a25e0
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java
View File

@@ -15,11 +15,15 @@
*/
package org.springframework.data.mapping.model;
import static org.springframework.core.annotation.AnnotationUtils.*;
import java.beans.PropertyDescriptor;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -42,6 +46,7 @@ public abstract class AnnotationBasedPersistentProperty<P extends PersistentProp
AbstractPersistentProperty<P> {
private final Value value;
private final Map<Class<? extends Annotation>, Annotation> annotationCache = new HashMap<Class<? extends Annotation>, Annotation>();
/**
* Creates a new {@link AnnotationBasedPersistentProperty}.
@@ -112,10 +117,15 @@ public abstract class AnnotationBasedPersistentProperty<P extends PersistentProp
* @param annotationType must not be {@literal null}.
* @return
*/
protected <A extends Annotation> A findAnnotation(Class<? extends A> annotationType) {
@SuppressWarnings("unchecked")
public <A extends Annotation> A findAnnotation(Class<? extends A> annotationType) {
Assert.notNull(annotationType, "Annotation type must not be null!");
if (annotationCache != null && annotationCache.containsKey(annotationType)) {
return (A) annotationCache.get(annotationType);
}
for (Method method : Arrays.asList(getGetter(), getSetter())) {
if (method == null) {
@@ -125,11 +135,26 @@ public abstract class AnnotationBasedPersistentProperty<P extends PersistentProp
A annotation = AnnotationUtils.findAnnotation(method, annotationType);
if (annotation != null) {
return annotation;
return cacheAndReturn(annotationType, annotation);
}
}
return AnnotationUtils.getAnnotation(field, annotationType);
return cacheAndReturn(annotationType, getAnnotation(field, annotationType));
}
/**
* Puts the given annotation into the local cache and returns it.
*
* @param annotation
* @return
*/
private <A extends Annotation> A cacheAndReturn(Class<? extends A> type, A annotation) {
if (annotationCache != null) {
annotationCache.put(type, annotation);
}
return annotation;
}
/**