diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java index 375ac630fff..ba4c84f1c27 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java @@ -56,7 +56,7 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata { private final Set declaredMethods; - private final MergedAnnotations annotations; + private final MergedAnnotations mergedAnnotations; @Nullable private Set annotationTypes; @@ -64,7 +64,7 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata { SimpleAnnotationMetadata(String className, int access, @Nullable String enclosingClassName, @Nullable String superClassName, boolean independentInnerClass, Set interfaceNames, - Set memberClassNames, Set declaredMethods, MergedAnnotations annotations) { + Set memberClassNames, Set declaredMethods, MergedAnnotations mergedAnnotations) { this.className = className; this.access = access; @@ -74,7 +74,7 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata { this.interfaceNames = interfaceNames; this.memberClassNames = memberClassNames; this.declaredMethods = declaredMethods; - this.annotations = annotations; + this.mergedAnnotations = mergedAnnotations; } @Override @@ -131,7 +131,7 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata { @Override public MergedAnnotations getAnnotations() { - return this.annotations; + return this.mergedAnnotations; } @Override