Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2025-03-24 13:58:51 +01:00
parent 065692237c
commit d5bfd7ff8b
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/main/java/org/springframework/core/annotation/AliasFor.java
View File

@@ -166,10 +166,10 @@ import java.lang.annotation.Target;
* }</pre> * }</pre>
* *
* <h3>Spring Annotations Supporting Attribute Aliases</h3> * <h3>Spring Annotations Supporting Attribute Aliases</h3>
* <p>As of Spring Framework 4.2, several annotations within core Spring * <p>Many annotations within the Spring Framework and across the Spring
* have been updated to use {@code @AliasFor} to configure their internal * ecosystem rely on {@code @AliasFor} to configure attribute aliases. Consult
* attribute aliases. Consult the Javadoc for individual annotations as well * the Javadoc for individual annotations as well as reference documentation for
* as the reference manual for details. * details.
* *
* @author Sam Brannen * @author Sam Brannen
* @since 4.2 * @since 4.2

52
spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
View File

@@ -237,8 +237,8 @@ public abstract class AnnotatedElementUtils {
* the annotation hierarchy <em>above</em> the supplied {@code element} and * the annotation hierarchy <em>above</em> the supplied {@code element} and
* merge that annotation's attributes with <em>matching</em> attributes from * merge that annotation's attributes with <em>matching</em> attributes from
* annotations in lower levels of the annotation hierarchy. * annotations in lower levels of the annotation hierarchy.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* within a single annotation and within the annotation hierarchy. * a single annotation and within the annotation hierarchy.
* <p>This method delegates to {@link #getMergedAnnotationAttributes(AnnotatedElement, String)}. * <p>This method delegates to {@link #getMergedAnnotationAttributes(AnnotatedElement, String)}.
* @param element the annotated element * @param element the annotated element
* @param annotationType the annotation type to find * @param annotationType the annotation type to find
@@ -262,8 +262,8 @@ public abstract class AnnotatedElementUtils {
* the annotation hierarchy <em>above</em> the supplied {@code element} and * the annotation hierarchy <em>above</em> the supplied {@code element} and
* merge that annotation's attributes with <em>matching</em> attributes from * merge that annotation's attributes with <em>matching</em> attributes from
* annotations in lower levels of the annotation hierarchy. * annotations in lower levels of the annotation hierarchy.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* within a single annotation and within the annotation hierarchy. * a single annotation and within the annotation hierarchy.
* <p>This method delegates to {@link #getMergedAnnotationAttributes(AnnotatedElement, String, boolean, boolean)}, * <p>This method delegates to {@link #getMergedAnnotationAttributes(AnnotatedElement, String, boolean, boolean)},
* supplying {@code false} for {@code classValuesAsString} and {@code nestedAnnotationsAsMap}. * supplying {@code false} for {@code classValuesAsString} and {@code nestedAnnotationsAsMap}.
* @param element the annotated element * @param element the annotated element
@@ -321,8 +321,8 @@ public abstract class AnnotatedElementUtils {
* merge that annotation's attributes with <em>matching</em> attributes from * merge that annotation's attributes with <em>matching</em> attributes from
* annotations in lower levels of the annotation hierarchy, and synthesize * annotations in lower levels of the annotation hierarchy, and synthesize
* the result back into an annotation of the specified {@code annotationType}. * the result back into an annotation of the specified {@code annotationType}.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* within a single annotation and within the annotation hierarchy. * a single annotation and within the annotation hierarchy.
* @param element the annotated element * @param element the annotated element
* @param annotationType the annotation type to find * @param annotationType the annotation type to find
* @return the merged, synthesized {@code Annotation}, or {@code null} if not found * @return the merged, synthesized {@code Annotation}, or {@code null} if not found
@@ -348,8 +348,8 @@ public abstract class AnnotatedElementUtils {
* <em>matching</em> attributes from annotations in lower levels of the annotation * <em>matching</em> attributes from annotations in lower levels of the annotation
* hierarchy and synthesize the results back into an annotation of the specified * hierarchy and synthesize the results back into an annotation of the specified
* {@code annotationType}. * {@code annotationType}.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both within a * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* single annotation and within annotation hierarchies. * a single annotation and within the annotation hierarchy.
* <p>This method follows <em>get semantics</em> as described in the * <p>This method follows <em>get semantics</em> as described in the
* {@linkplain AnnotatedElementUtils class-level javadoc}. * {@linkplain AnnotatedElementUtils class-level javadoc}.
* @param element the annotated element (never {@code null}) * @param element the annotated element (never {@code null})
@@ -375,8 +375,8 @@ public abstract class AnnotatedElementUtils {
* <em>matching</em> attributes from annotations in lower levels of the * <em>matching</em> attributes from annotations in lower levels of the
* annotation hierarchy and synthesize the results back into an annotation * annotation hierarchy and synthesize the results back into an annotation
* of the corresponding {@code annotationType}. * of the corresponding {@code annotationType}.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both within a * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* single annotation and within annotation hierarchies. * a single annotation and within the annotation hierarchy.
* <p>This method follows <em>get semantics</em> as described in the * <p>This method follows <em>get semantics</em> as described in the
* {@linkplain AnnotatedElementUtils class-level javadoc}. * {@linkplain AnnotatedElementUtils class-level javadoc}.
* @param element the annotated element (never {@code null}) * @param element the annotated element (never {@code null})
@@ -402,9 +402,9 @@ public abstract class AnnotatedElementUtils {
* hierarchy and synthesize the results back into an annotation of the specified * hierarchy and synthesize the results back into an annotation of the specified
* {@code annotationType}. * {@code annotationType}.
* <p>The container type that holds the repeatable annotations will be looked up * <p>The container type that holds the repeatable annotations will be looked up
* via {@link java.lang.annotation.Repeatable}. * via {@link java.lang.annotation.Repeatable @Repeatable}.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both within a * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* single annotation and within annotation hierarchies. * a single annotation and within the annotation hierarchy.
* <p>This method follows <em>get semantics</em> as described in the * <p>This method follows <em>get semantics</em> as described in the
* {@linkplain AnnotatedElementUtils class-level javadoc}. * {@linkplain AnnotatedElementUtils class-level javadoc}.
* @param element the annotated element (never {@code null}) * @param element the annotated element (never {@code null})
@@ -431,8 +431,8 @@ public abstract class AnnotatedElementUtils {
* <em>matching</em> attributes from annotations in lower levels of the annotation * <em>matching</em> attributes from annotations in lower levels of the annotation
* hierarchy and synthesize the results back into an annotation of the specified * hierarchy and synthesize the results back into an annotation of the specified
* {@code annotationType}. * {@code annotationType}.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both within a * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* single annotation and within annotation hierarchies. * a single annotation and within the annotation hierarchy.
* <p>This method follows <em>get semantics</em> as described in the * <p>This method follows <em>get semantics</em> as described in the
* {@linkplain AnnotatedElementUtils class-level javadoc}. * {@linkplain AnnotatedElementUtils class-level javadoc}.
* <p><strong>WARNING</strong>: if the supplied {@code containerType} is not * <p><strong>WARNING</strong>: if the supplied {@code containerType} is not
@@ -621,8 +621,8 @@ public abstract class AnnotatedElementUtils {
* merge that annotation's attributes with <em>matching</em> attributes from * merge that annotation's attributes with <em>matching</em> attributes from
* annotations in lower levels of the annotation hierarchy, and synthesize * annotations in lower levels of the annotation hierarchy, and synthesize
* the result back into an annotation of the specified {@code annotationType}. * the result back into an annotation of the specified {@code annotationType}.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* within a single annotation and within the annotation hierarchy. * a single annotation and within the annotation hierarchy.
* <p>This method follows <em>find semantics</em> as described in the * <p>This method follows <em>find semantics</em> as described in the
* {@linkplain AnnotatedElementUtils class-level javadoc}. * {@linkplain AnnotatedElementUtils class-level javadoc}.
* @param element the annotated element * @param element the annotated element
@@ -652,8 +652,8 @@ public abstract class AnnotatedElementUtils {
* <em>matching</em> attributes from annotations in lower levels of the annotation * <em>matching</em> attributes from annotations in lower levels of the annotation
* hierarchy and synthesize the results back into an annotation of the specified * hierarchy and synthesize the results back into an annotation of the specified
* {@code annotationType}. * {@code annotationType}.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both within a * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* single annotation and within annotation hierarchies. * a single annotation and within the annotation hierarchy.
* <p>This method follows <em>find semantics</em> as described in the * <p>This method follows <em>find semantics</em> as described in the
* {@linkplain AnnotatedElementUtils class-level javadoc}. * {@linkplain AnnotatedElementUtils class-level javadoc}.
* @param element the annotated element (never {@code null}) * @param element the annotated element (never {@code null})
@@ -677,8 +677,8 @@ public abstract class AnnotatedElementUtils {
* <em>matching</em> attributes from annotations in lower levels of the * <em>matching</em> attributes from annotations in lower levels of the
* annotation hierarchy and synthesize the results back into an annotation * annotation hierarchy and synthesize the results back into an annotation
* of the corresponding {@code annotationType}. * of the corresponding {@code annotationType}.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both within a * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* single annotation and within annotation hierarchies. * a single annotation and within the annotation hierarchy.
* <p>This method follows <em>find semantics</em> as described in the * <p>This method follows <em>find semantics</em> as described in the
* {@linkplain AnnotatedElementUtils class-level javadoc}. * {@linkplain AnnotatedElementUtils class-level javadoc}.
* @param element the annotated element (never {@code null}) * @param element the annotated element (never {@code null})
@@ -703,9 +703,9 @@ public abstract class AnnotatedElementUtils {
* hierarchy and synthesize the results back into an annotation of the specified * hierarchy and synthesize the results back into an annotation of the specified
* {@code annotationType}. * {@code annotationType}.
* <p>The container type that holds the repeatable annotations will be looked up * <p>The container type that holds the repeatable annotations will be looked up
* via {@link java.lang.annotation.Repeatable}. * via {@link java.lang.annotation.Repeatable @Repeatable}.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both within a * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* single annotation and within annotation hierarchies. * a single annotation and within the annotation hierarchy.
* <p>This method follows <em>find semantics</em> as described in the * <p>This method follows <em>find semantics</em> as described in the
* {@linkplain AnnotatedElementUtils class-level javadoc}. * {@linkplain AnnotatedElementUtils class-level javadoc}.
* @param element the annotated element (never {@code null}) * @param element the annotated element (never {@code null})
@@ -732,8 +732,8 @@ public abstract class AnnotatedElementUtils {
* <em>matching</em> attributes from annotations in lower levels of the annotation * <em>matching</em> attributes from annotations in lower levels of the annotation
* hierarchy and synthesize the results back into an annotation of the specified * hierarchy and synthesize the results back into an annotation of the specified
* {@code annotationType}. * {@code annotationType}.
* <p>{@link AliasFor @AliasFor} semantics are fully supported, both within a * <p>{@link AliasFor @AliasFor} semantics are fully supported, both within
* single annotation and within annotation hierarchies. * a single annotation and within the annotation hierarchy.
* <p>This method follows <em>find semantics</em> as described in the * <p>This method follows <em>find semantics</em> as described in the
* {@linkplain AnnotatedElementUtils class-level javadoc}. * {@linkplain AnnotatedElementUtils class-level javadoc}.
* <p><strong>WARNING</strong>: if the supplied {@code containerType} is not * <p><strong>WARNING</strong>: if the supplied {@code containerType} is not

2
spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java
View File

@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
* "merged" from different source values, typically: * "merged" from different source values, typically:
* *
* <ul> * <ul>
* <li>Explicit and Implicit {@link AliasFor @AliasFor} declarations on one or * <li>Explicit and implicit {@link AliasFor @AliasFor} declarations on one or
* more attributes within the annotation</li> * more attributes within the annotation</li>
* <li>Explicit {@code @AliasFor} declarations for a meta-annotation</li> * <li>Explicit {@code @AliasFor} declarations for a meta-annotation</li>
* <li>Convention based attribute aliases for a meta-annotation</li> * <li>Convention based attribute aliases for a meta-annotation</li>