Cache method annotations in MethodParameter

jhoeller · jhoeller · commit 6dfa54b8ea60 · 2026-02-11T16:41:55.000+01:00
Closes gh-36307
diff --git a/spring-core/src/main/java/org/springframework/core/MethodParameter.java b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
@@ -87,6 +87,8 @@ public class MethodParameter {
 
 	private volatile @Nullable Type genericParameterType;
 
+	private volatile Annotation @Nullable [] methodAnnotations;
+
 	private volatile Annotation @Nullable [] parameterAnnotations;
 
 	private volatile @Nullable ParameterNameDiscoverer parameterNameDiscoverer =
@@ -584,17 +586,28 @@ public Type getNestedGenericParameterType() {
 	 * Return the annotations associated with the target method/constructor itself.
 	 */
 	public Annotation[] getMethodAnnotations() {
-		return adaptAnnotationArray(getAnnotatedElement().getAnnotations());
+		Annotation[] methodAnns = this.methodAnnotations;
+		if (methodAnns == null) {
+			methodAnns = adaptAnnotationArray(getAnnotatedElement().getAnnotations());
+			this.methodAnnotations = methodAnns;
+		}
+		return methodAnns;
 	}
 
 	/**
 	 * Return the method/constructor annotation of the given type, if available.
 	 * @param annotationType the annotation type to look for
 	 * @return the annotation object, or {@code null} if not found
 	 */
+	@SuppressWarnings("unchecked")
 	public <A extends Annotation> @Nullable A getMethodAnnotation(Class<A> annotationType) {
-		A annotation = getAnnotatedElement().getAnnotation(annotationType);
-		return (annotation != null ? adaptAnnotation(annotation) : null);
+		Annotation[] anns = getMethodAnnotations();
+		for (Annotation ann : anns) {
+			if (annotationType.isInstance(ann)) {
+				return (A) ann;
+			}
+		}
+		return null;
 	}
 
 	/**
@@ -604,7 +617,7 @@ public Annotation[] getMethodAnnotations() {
 	 * @see #getMethodAnnotation(Class)
 	 */
 	public <A extends Annotation> boolean hasMethodAnnotation(Class<A> annotationType) {
-		return getAnnotatedElement().isAnnotationPresent(annotationType);
+		return (getMethodAnnotation(annotationType) != null);
 	}
 
 	/**
