Merge branch '5.3.x'

spring-core/src/main/java/org/springframework/core/annotation/RepeatableContainers.java

@@ -18,7 +18,9 @@ package org.springframework.core.annotation;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Repeatable;
+import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 import java.util.Map;
 
 import org.springframework.lang.Nullable;
@@ -131,6 +133,19 @@ public abstract class RepeatableContainers {
 		return NoRepeatableContainers.INSTANCE;
 	}
 
+	private static Object invokeAnnotationMethod(Annotation annotation, Method method) {
+		if (Proxy.isProxyClass(annotation.getClass())) {
+			try {
+				InvocationHandler handler = Proxy.getInvocationHandler(annotation);
+				return handler.invoke(annotation, method, null);
+			}
+			catch (Throwable ex) {
+				// ignore and fall back to reflection below
+			}
+		}
+		return ReflectionUtils.invokeMethod(method, annotation);
+	}
+
 
 	/**
 	 * Standard {@link RepeatableContainers} implementation that searches using
@@ -153,7 +168,7 @@ public abstract class RepeatableContainers {
 		Annotation[] findRepeatedAnnotations(Annotation annotation) {
 			Method method = getRepeatedAnnotationsMethod(annotation.annotationType());
 			if (method != null) {
-				return (Annotation[]) ReflectionUtils.invokeMethod(method, annotation);
+				return (Annotation[]) invokeAnnotationMethod(annotation, method);
 			}
 			return super.findRepeatedAnnotations(annotation);
 		}
@@ -240,7 +255,7 @@ public abstract class RepeatableContainers {
 		@Nullable
 		Annotation[] findRepeatedAnnotations(Annotation annotation) {
 			if (this.container.isAssignableFrom(annotation.annotationType())) {
-				return (Annotation[]) ReflectionUtils.invokeMethod(this.valueMethod, annotation);
+				return (Annotation[]) invokeAnnotationMethod(annotation, this.valueMethod);
 			}
 			return super.findRepeatedAnnotations(annotation);
 		}

spring-core/src/test/java/org/springframework/core/annotation/NestedRepeatableAnnotationsTests.java

@@ -181,7 +181,7 @@ class NestedRepeatableAnnotationsTests {
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 	@Repeatable(A.Container.class)
-	public @interface A {
+	@interface A {
 
 		int value() default 0;
 
@@ -197,7 +197,7 @@ class NestedRepeatableAnnotationsTests {
 	@Repeatable(B.Container.class)
 	@A
 	@A
-	public @interface B {
+	@interface B {
 
 		@AliasFor(annotation = A.class)
 		int value();