Polishing.

Extract duplicate calls to findAnnotation(…) into static helper methods.

See #2500

Author: mp911de

src/main/java/org/springframework/data/convert/CustomConversions.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.convert;
 
+import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,7 +44,6 @@
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.convert.ConverterBuilder.ConverterAware;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.data.repository.RepositoryDefinition;
 import org.springframework.data.util.Streamable;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -760,8 +760,8 @@ public Streamable<ConverterRegistration> getRegistrationsFor(Object converter) {
 			Assert.notNull(converter, "Converter must not be null!");
 
 			Class<?> type = converter.getClass();
-			boolean isWriting = AnnotationUtils.findAnnotation(type, WritingConverter.class) != null;
-			boolean isReading = AnnotationUtils.findAnnotation(type, ReadingConverter.class) != null;
+			boolean isWriting = isAnnotatedWith(type, WritingConverter.class);
+			boolean isReading = isAnnotatedWith(type, ReadingConverter.class);
 
 			if (converter instanceof ConverterAware) {
 
@@ -789,6 +789,10 @@ public Streamable<ConverterRegistration> getRegistrationsFor(Object converter) {
 			}
 		}
 
+		private static boolean isAnnotatedWith(Class<?> type, Class<? extends Annotation> annotationType) {
+			return AnnotationUtils.findAnnotation(type, annotationType) != null;
+		}
+
 		private Streamable<ConverterRegistration> getRegistrationFor(Object converter, Class<?> type, boolean isReading,
 				boolean isWriting) {
 

src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java

@@ -42,7 +42,6 @@
 
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.log.LogMessage;
-import org.springframework.data.annotation.PersistenceConstructor;
 import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;
 import org.springframework.data.repository.config.RepositoryFragmentConfiguration;
 import org.springframework.data.repository.core.support.RepositoryComposition.RepositoryFragments;
@@ -264,7 +263,7 @@ public Set<Class<? extends Annotation>> getStereotypes() {
 
 		return Arrays.stream(repositoryType.getAnnotations())//
 				.map(Annotation::annotationType)//
-				.filter(it -> AnnotationUtils.findAnnotation(it, Stereotype.class) != null)//
+				.filter(it -> isAnnotatedWith(it, Stereotype.class))//
 				.collect(Collectors.toSet());
 	}
 
@@ -281,7 +280,7 @@ public Class<?> getBeanClass() {
 	 * @see javax.enterprise.inject.spi.Bean#isAlternative()
 	 */
 	public boolean isAlternative() {
-		return AnnotationUtils.findAnnotation(repositoryType, Alternative.class) != null;
+		return isAnnotatedWith(repositoryType, Alternative.class);
 	}
 
 	/*
@@ -524,6 +523,10 @@ public String toString() {
 				qualifiers.toString());
 	}
 
+	private static boolean isAnnotatedWith(Class<?> type, Class<? extends Annotation> annotationType) {
+		return AnnotationUtils.findAnnotation(type, annotationType) != null;
+	}
+
 	enum DefaultCdiRepositoryConfiguration implements CdiRepositoryConfiguration {
 		INSTANCE;
 	}

src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java

@@ -99,8 +99,8 @@ private boolean isRepository(Class<?> type) {
 
 		boolean isInterface = type.isInterface();
 		boolean extendsRepository = Repository.class.isAssignableFrom(type);
-		boolean isAnnotated = AnnotationUtils.findAnnotation(type, RepositoryDefinition.class) != null;
-		boolean excludedByAnnotation = AnnotationUtils.findAnnotation(type, NoRepositoryBean.class) != null;
+		boolean isAnnotated = isAnnotatedWith(type, RepositoryDefinition.class);
+		boolean excludedByAnnotation = isAnnotatedDirectlyWith(type, NoRepositoryBean.class);
 
 		return isInterface && (extendsRepository || isAnnotated) && !excludedByAnnotation;
 	}
@@ -114,7 +114,7 @@ private Set<Annotation> getQualifiers(final Class<?> type) {
 		Annotation[] annotations = type.getAnnotations();
 		for (Annotation annotation : annotations) {
 			Class<? extends Annotation> annotationType = annotation.annotationType();
-			if (AnnotationUtils.findAnnotation(annotationType, Qualifier.class) != null) {
+			if (isAnnotatedWith(annotationType, Qualifier.class)) {
 				qualifiers.add(annotation);
 			}
 		}
@@ -165,7 +165,7 @@ protected void registerBean(CdiRepositoryBean<?> bean) {
 
 		Class<?> repositoryInterface = bean.getBeanClass();
 
-		if (AnnotationUtils.findAnnotation(repositoryInterface, Eager.class) != null) {
+		if (isAnnotatedWith(repositoryInterface, Eager.class)) {
 			this.eagerRepositories.add(bean);
 		}
 	}
@@ -185,6 +185,14 @@ protected CdiRepositoryContext getRepositoryContext() {
 		return context;
 	}
 
+	private static boolean isAnnotatedWith(Class<?> type, Class<? extends Annotation> annotationType) {
+		return AnnotationUtils.findAnnotation(type, annotationType) != null;
+	}
+
+	private static boolean isAnnotatedDirectlyWith(Class<?> type, Class<? extends Annotation> annotationType) {
+		return AnnotationUtils.isAnnotationDeclaredLocally(annotationType, type);
+	}
+
 	@SuppressWarnings("all")
 	static class DefaultAnnotationLiteral extends AnnotationLiteral<Default> implements Default {
 

src/main/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadata.java

@@ -47,7 +47,7 @@ public AnnotationRepositoryMetadata(Class<?> repositoryInterface) {
 		super(repositoryInterface);
 
 		Assert.isTrue(AnnotationUtils.findAnnotation(repositoryInterface, RepositoryDefinition.class) != null,
-				String.format(NO_ANNOTATION_FOUND, repositoryInterface.getName()));
+				() -> String.format(NO_ANNOTATION_FOUND, repositoryInterface.getName()));
 
 		this.idType = resolveIdType(repositoryInterface);
 		this.domainType = resolveDomainType(repositoryInterface);
@@ -73,7 +73,7 @@ public Class<?> getDomainType() {
 
 	private Class<?> resolveIdType(Class<?> repositoryInterface) {
 
-		RepositoryDefinition annotation = repositoryInterface.getAnnotation(RepositoryDefinition.class);
+		RepositoryDefinition annotation = AnnotationUtils.findAnnotation(repositoryInterface, RepositoryDefinition.class);
 
 		if (annotation == null || annotation.idClass() == null) {
 			throw new IllegalArgumentException(String.format("Could not resolve id type of %s!", repositoryInterface));
@@ -84,7 +84,7 @@ private Class<?> resolveIdType(Class<?> repositoryInterface) {
 
 	private Class<?> resolveDomainType(Class<?> repositoryInterface) {
 
-		RepositoryDefinition annotation = repositoryInterface.getAnnotation(RepositoryDefinition.class);
+		RepositoryDefinition annotation = AnnotationUtils.findAnnotation(repositoryInterface, RepositoryDefinition.class);
 
 		if (annotation == null || annotation.domainClass() == null) {
 			throw new IllegalArgumentException(String.format("Could not resolve domain type of %s!", repositoryInterface));