admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2026-04-08 12:35:54 +02:00
parent f602967dbc b560c7b85d
commit 9da22ecb46
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java
+14 -14
View File
@@ -310,8 +310,8 @@ public interface MergedAnnotations extends Iterable<MergedAnnotation<Annotation>
* {@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<MergedAnnotation<Annotation>
* @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<MergedAnnotation<Annotation>
* 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<MergedAnnotation<Annotation>
* 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<MergedAnnotation<Annotation>
* for information and logging. It does not need to <em>actually</em>
* 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<MergedAnnotation<Annotation>
* for information and logging. It does not need to <em>actually</em>
* 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<MergedAnnotation<Annotation>
/**
* Configure the {@link RepeatableContainers} to use.
* <p>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)