From f9b6aed6b67d7351b3e60a057db8fa499554df49 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 13 Aug 2023 16:21:18 +0200
Subject: [PATCH] Polishing

... for consistency with StandardAnnotationMetadata.
---
 .../core/type/classreading/SimpleAnnotationMetadata.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 375ac630ff..ba4c84f1c2 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<MethodMetadata> declaredMethods;
 
-	private final MergedAnnotations annotations;
+	private final MergedAnnotations mergedAnnotations;
 
 	@Nullable
 	private Set<String> annotationTypes;
@@ -64,7 +64,7 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata {
 
 	SimpleAnnotationMetadata(String className, int access, @Nullable String enclosingClassName,
 			@Nullable String superClassName, boolean independentInnerClass, Set<String> interfaceNames,
-			Set<String> memberClassNames, Set<MethodMetadata> declaredMethods, MergedAnnotations annotations) {
+			Set<String> memberClassNames, Set<MethodMetadata> 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