From d7b0a3e4d4f27a8b24fe0bc0352c77e50dd56b96 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 12 Nov 2013 13:15:52 +0100 Subject: [PATCH] DATACMNS-392, DATACMNS-386 - Polished code after upgrade to Spring 3.2.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Spring 3.2.5 made AnnotationConfigUtils.processCommonDefinitionAnnotations(…) public so that we can call it directly instead of invoking it via reflection. --- .../config/RepositoryComponentProvider.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java b/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java index 0986ca9c3..81500c57e 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java @@ -16,7 +16,6 @@ package org.springframework.data.repository.config; import java.io.IOException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -35,7 +34,6 @@ import org.springframework.data.repository.Repository; import org.springframework.data.repository.RepositoryDefinition; import org.springframework.data.repository.util.ClassUtils; import org.springframework.util.Assert; -import org.springframework.util.ReflectionUtils; /** * Custom {@link ClassPathScanningCandidateComponentProvider} scanning for interfaces extending the given base @@ -119,15 +117,8 @@ class RepositoryComponentProvider extends ClassPathScanningCandidateComponentPro Set candidates = super.findCandidateComponents(basePackage); for (BeanDefinition candidate : candidates) { - if (candidate instanceof AnnotatedBeanDefinition) { - - // TODO: Remove after upgrade to Spring 3.2.5 - SPR-11032, DATACMNS-386 - // Use AnnotationConfigUtils directly - Method method = ReflectionUtils.findMethod(AnnotationConfigUtils.class, "processCommonDefinitionAnnotations", - AnnotatedBeanDefinition.class); - ReflectionUtils.makeAccessible(method); - ReflectionUtils.invokeMethod(method, null, candidate); + AnnotationConfigUtils.processCommonDefinitionAnnotations((AnnotatedBeanDefinition) candidate); } }