From 27bc60e0774ce23862e47dcfdee21e7e88053990 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 30 Mar 2026 16:59:24 +0200 Subject: [PATCH 1/2] Polishing --- .../core/annotation/MergedAnnotation.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotation.java b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotation.java index 7d218cbdcf3..26dce1bc4ed 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotation.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotation.java @@ -442,7 +442,7 @@ public interface MergedAnnotation { /** * Create a new view of the annotation that exposes non-merged attribute values. *

Methods from this view will return attribute values with only alias mirroring - * rules applied. Aliases to {@link #getMetaSource() meta-source} attributes will + * rules applied. Aliases to {@linkplain #getMetaSource() meta-source} attributes will * not be applied. * @return a non-merged view of the annotation */ @@ -451,25 +451,27 @@ public interface MergedAnnotation { /** * Create a new mutable {@link AnnotationAttributes} instance from this * merged annotation. - *

The {@link Adapt adaptations} may be used to change the way that values - * are added. + *

The {@linkplain Adapt adaptations} may be used to change the way that + * values are added. * @param adaptations the adaptations that should be applied to the annotation values * @return an immutable map containing the attributes and values */ AnnotationAttributes asAnnotationAttributes(Adapt... adaptations); /** - * Get an immutable {@link Map} that contains all the annotation attributes. - *

The {@link Adapt adaptations} may be used to change the way that values are added. + * Create an immutable {@link Map} that contains all the annotation attributes. + *

The {@linkplain Adapt adaptations} may be used to change the way that + * values are added. * @param adaptations the adaptations that should be applied to the annotation values * @return an immutable map containing the attributes and values */ Map asMap(Adapt... adaptations); /** - * Create a new {@link Map} instance of the given type that contains all the annotation + * Create a new {@link Map} of the given type that contains all the annotation * attributes. - *

The {@link Adapt adaptations} may be used to change the way that values are added. + *

The {@linkplain Adapt adaptations} may be used to change the way that + * values are added. * @param factory a map factory * @param adaptations the adaptations that should be applied to the annotation values * @return a map containing the attributes and values From b7a1157e66185c0c39ad165cb5b8b2299efc3c03 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 30 Mar 2026 16:59:57 +0200 Subject: [PATCH 2/2] Correct Javadoc for MergedAnnotation.asAnnotationAttributes() Closes gh-36567 --- .../org/springframework/core/annotation/MergedAnnotation.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotation.java b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotation.java index 26dce1bc4ed..e316d7d4e76 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotation.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotation.java @@ -454,7 +454,8 @@ public interface MergedAnnotation { *

The {@linkplain Adapt adaptations} may be used to change the way that * values are added. * @param adaptations the adaptations that should be applied to the annotation values - * @return an immutable map containing the attributes and values + * @return a mutable {@code AnnotationAttributes} instance containing the attributes + * and values */ AnnotationAttributes asAnnotationAttributes(Adapt... adaptations);