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-03-30 17:01:56 +02:00
parent a64b001f6a b7a1157e66
commit e7fdbb8339
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotation.java
+11 -8
View File
@@ -442,7 +442,7 @@ public interface MergedAnnotation<A extends Annotation> {
/**
* Create a new view of the annotation that exposes non-merged attribute values.
* <p>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,28 @@ public interface MergedAnnotation<A extends Annotation> {
/**
* Create a new mutable {@link AnnotationAttributes} instance from this
* merged annotation.
* <p>The {@link Adapt adaptations} may be used to change the way that values
* are added.
* <p>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);
/**
* Get an immutable {@link Map} that contains all the annotation attributes.
* <p>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.
* <p>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<String, Object> 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.
* <p>The {@link Adapt adaptations} may be used to change the way that values are added.
* <p>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