From b560c7b85d8d1c35b0e099670ad8679744f4df1e Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Wed, 8 Apr 2026 12:35:24 +0200 Subject: [PATCH] Improve Javadoc for MergedAnnotations --- .../core/annotation/MergedAnnotations.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java index c33e0fd9514..b775ce34228 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java @@ -310,8 +310,8 @@ public interface MergedAnnotations extends Iterable * {@link #from(AnnotatedElement, SearchStrategy)} with an appropriate * {@link SearchStrategy}. * @param element the source element - * @return a {@code MergedAnnotations} instance containing the element's - * annotations + * @return a {@code MergedAnnotations} instance containing the merged + * annotations for the supplied element * @see #search(SearchStrategy) */ static MergedAnnotations from(AnnotatedElement element) { @@ -325,7 +325,7 @@ public interface MergedAnnotations extends Iterable * @param element the source element * @param searchStrategy the search strategy to use * @return a {@code MergedAnnotations} instance containing the merged - * element annotations + * annotations for the supplied element * @see #search(SearchStrategy) */ static MergedAnnotations from(AnnotatedElement element, SearchStrategy searchStrategy) { @@ -338,10 +338,10 @@ public interface MergedAnnotations extends Iterable * depending on the {@link SearchStrategy}, related inherited elements. * @param element the source element * @param searchStrategy the search strategy to use - * @param repeatableContainers the repeatable containers that may be used by - * the element annotations or the meta-annotations + * @param repeatableContainers the strategy to use for finding repeatable + * annotations and their container annotations * @return a {@code MergedAnnotations} instance containing the merged - * element annotations + * annotations for the supplied element * @see #search(SearchStrategy) */ static MergedAnnotations from(AnnotatedElement element, SearchStrategy searchStrategy, @@ -356,8 +356,8 @@ public interface MergedAnnotations extends Iterable * depending on the {@link SearchStrategy}, related inherited elements. * @param element the source element * @param searchStrategy the search strategy to use - * @param repeatableContainers the repeatable containers that may be used by - * the element annotations or the meta-annotations + * @param repeatableContainers the strategy to use for finding repeatable + * annotations and their container annotations * @param annotationFilter an annotation filter used to restrict the * annotations considered * @return a {@code MergedAnnotations} instance containing the merged @@ -416,8 +416,8 @@ public interface MergedAnnotations extends Iterable * for information and logging. It does not need to actually * contain the specified annotations, and it will not be searched. * @param annotations the annotations to include - * @param repeatableContainers the repeatable containers that may be used by - * meta-annotations + * @param repeatableContainers the strategy to use for finding repeatable + * annotations and their container annotations * @return a {@code MergedAnnotations} instance containing the annotations */ static MergedAnnotations from(Object source, Annotation[] annotations, RepeatableContainers repeatableContainers) { @@ -431,8 +431,8 @@ public interface MergedAnnotations extends Iterable * for information and logging. It does not need to actually * contain the specified annotations, and it will not be searched. * @param annotations the annotations to include - * @param repeatableContainers the repeatable containers that may be used by - * meta-annotations + * @param repeatableContainers the strategy to use for finding repeatable + * annotations and their container annotations * @param annotationFilter an annotation filter used to restrict the * annotations considered * @return a {@code MergedAnnotations} instance containing the annotations @@ -586,8 +586,8 @@ public interface MergedAnnotations extends Iterable /** * Configure the {@link RepeatableContainers} to use. *

Defaults to {@link RepeatableContainers#standardRepeatables()}. - * @param repeatableContainers the repeatable containers that may be used - * by annotations or meta-annotations + * @param repeatableContainers the strategy to use for finding repeatable + * annotations and their container annotations * @return this {@code Search} instance for chained method invocations * @see #withAnnotationFilter(AnnotationFilter) * @see #from(AnnotatedElement)