Avoid getMostSpecificMethod resolution for non-annotated methods

This is aligned with AutowiredAnnotationBeanPostProcessor now. Closes gh-31967
spring-projects · Jan 7, 2024 · 9912a52 · 9912a52
1 parent 419e34e
commit 9912a52
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/...c/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/...c/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -456,8 +456,8 @@ else if (javaxResourceType != null && field.isAnnotationPresent(javaxResourceTyp
 				if (!BridgeMethodResolver.isVisibilityBridgeMethodPair(method, bridgedMethod)) {
 					return;
 				}
-				if (method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
-					if (ejbAnnotationType != null && bridgedMethod.isAnnotationPresent(ejbAnnotationType)) {
+				if (ejbAnnotationType != null && bridgedMethod.isAnnotationPresent(ejbAnnotationType)) {
+					if (method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
 						if (Modifier.isStatic(method.getModifiers())) {
 							throw new IllegalStateException("@EJB annotation is not supported on static methods");
 						}
@@ -467,7 +467,9 @@ else if (javaxResourceType != null && field.isAnnotationPresent(javaxResourceTyp
 						PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, clazz);
 						currElements.add(new EjbRefElement(method, bridgedMethod, pd));
 					}
-					else if (jakartaResourceType != null && bridgedMethod.isAnnotationPresent(jakartaResourceType)) {
+				}
+				else if (jakartaResourceType != null && bridgedMethod.isAnnotationPresent(jakartaResourceType)) {
+					if (method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
 						if (Modifier.isStatic(method.getModifiers())) {
 							throw new IllegalStateException("@Resource annotation is not supported on static methods");
 						}
@@ -480,7 +482,9 @@ else if (jakartaResourceType != null && bridgedMethod.isAnnotationPresent(jakart
 							currElements.add(new ResourceElement(method, bridgedMethod, pd));
 						}
 					}
-					else if (javaxResourceType != null && bridgedMethod.isAnnotationPresent(javaxResourceType)) {
+				}
+				else if (javaxResourceType != null && bridgedMethod.isAnnotationPresent(javaxResourceType)) {
+					if (method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
 						if (Modifier.isStatic(method.getModifiers())) {
 							throw new IllegalStateException("@Resource annotation is not supported on static methods");
 						}