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

Synthesize annotation arrays within AnnotationUtils 

Issue: SPR-11393
This commit is contained in:
Sam Brannen 2015-06-23 18:30:47 +02:00
parent 75fe61843a
commit 2451594cdd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,7 +219,7 @@ public abstract class AnnotationUtils {
*/ */
public static Annotation[] getAnnotations(AnnotatedElement annotatedElement) { public static Annotation[] getAnnotations(AnnotatedElement annotatedElement) {
try { try {
return annotatedElement.getAnnotations(); return synthesizeAnnotationArray(annotatedElement.getAnnotations(), annotatedElement);
} }
catch (Exception ex) { catch (Exception ex) {
handleIntrospectionFailure(annotatedElement, ex); handleIntrospectionFailure(annotatedElement, ex);
@ -241,7 +241,7 @@ public abstract class AnnotationUtils {
*/ */
public static Annotation[] getAnnotations(Method method) { public static Annotation[] getAnnotations(Method method) {
try { try {
return BridgeMethodResolver.findBridgedMethod(method).getAnnotations(); return synthesizeAnnotationArray(BridgeMethodResolver.findBridgedMethod(method).getAnnotations(), method);
} }
catch (Exception ex) { catch (Exception ex) {
handleIntrospectionFailure(method, ex); handleIntrospectionFailure(method, ex);
@ -1811,6 +1811,9 @@ public abstract class AnnotationUtils {
this.declaredMode = declaredMode; this.declaredMode = declaredMode;
} }
/**
* @since 4.2
*/
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
static Class<? extends Annotation> resolveContainerAnnotationType(Class<? extends Annotation> annotationType) { static Class<? extends Annotation> resolveContainerAnnotationType(Class<? extends Annotation> annotationType) {
try { try {