root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid repeated superclass introspection in findAnnotation(Method,...) 

Issue: SPR-16730

(cherry picked from commit d78e27f)
This commit is contained in:
Juergen Hoeller 2018-04-17 16:44:28 +02:00
parent 4cd43dc793
commit 26652a6b83
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
View File

@ -555,13 +555,18 @@ public abstract class AnnotationUtils {
if (clazz == null || Object.class == clazz) { if (clazz == null || Object.class == clazz) {
break; break;
} }
try { Set<Method> annotatedMethods = getAnnotatedMethodsInBaseType(clazz);
Method equivalentMethod = clazz.getDeclaredMethod(method.getName(), method.getParameterTypes()); if (!annotatedMethods.isEmpty()) {
Method resolvedEquivalentMethod = BridgeMethodResolver.findBridgedMethod(equivalentMethod); for (Method annotatedMethod : annotatedMethods) {
result = findAnnotation((AnnotatedElement) resolvedEquivalentMethod, annotationType); if (annotatedMethod.getName().equals(method.getName()) &&
Arrays.equals(annotatedMethod.getParameterTypes(), method.getParameterTypes())) {
Method resolvedSuperMethod = BridgeMethodResolver.findBridgedMethod(annotatedMethod);
result = findAnnotation((AnnotatedElement) resolvedSuperMethod, annotationType);
if (result != null) {
break;
}
}
} }
catch (NoSuchMethodException ex) {
// No equivalent method found
} }
if (result == null) { if (result == null) {
result = searchOnInterfaces(method, annotationType, clazz.getInterfaces()); result = searchOnInterfaces(method, annotationType, clazz.getInterfaces());