Do not use annotation detection shortcuts on Class

Issue: SPR-13440

Author: jhoeller

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

@@ -332,9 +332,13 @@ public static <A extends Annotation> A getMergedAnnotation(AnnotatedElement elem
 		Assert.notNull(annotationType, "annotationType must not be null");
 
 		// Shortcut: directly present on the element, with no merging needed?
-		A annotation = element.getAnnotation(annotationType);
-		if (annotation != null) {
-			return AnnotationUtils.synthesizeAnnotation(annotation, element);
+		if (!(element instanceof Class)) {
+			// Do not use this shortcut against a Class: Inherited annotations
+			// would get preferred over locally declared composed annotations.
+			A annotation = element.getAnnotation(annotationType);
+			if (annotation != null) {
+				return AnnotationUtils.synthesizeAnnotation(annotation, element);
+			}
 		}
 
 		// Exhaustive retrieval of merged annotation attributes...
@@ -478,9 +482,13 @@ public static <A extends Annotation> A findMergedAnnotation(AnnotatedElement ele
 		Assert.notNull(annotationType, "annotationType must not be null");
 
 		// Shortcut: directly present on the element, with no merging needed?
-		A annotation = element.getDeclaredAnnotation(annotationType);
-		if (annotation != null) {
-			return AnnotationUtils.synthesizeAnnotation(annotation, element);
+		if (!(element instanceof Class)) {
+			// Do not use this shortcut against a Class: Inherited annotations
+			// would get preferred over locally declared composed annotations.
+			A annotation = element.getAnnotation(annotationType);
+			if (annotation != null) {
+				return AnnotationUtils.synthesizeAnnotation(annotation, element);
+			}
 		}
 
 		// Exhaustive retrieval of merged annotation attributes...