As of Spring Framework 4.2, several annotations within core Spring - * have been updated to use {@code @AliasFor} to configure their internal - * attribute aliases. Consult the Javadoc for individual annotations as well - * as the reference manual for details. + *
Many annotations within the Spring Framework and across the Spring + * ecosystem rely on {@code @AliasFor} to configure attribute aliases. Consult + * the Javadoc for individual annotations as well as reference documentation for + * details. * * @author Sam Brannen * @since 4.2 diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java index f48bb77a93b..f8b7f20aa28 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java @@ -237,8 +237,8 @@ public abstract class AnnotatedElementUtils { * the annotation hierarchy above the supplied {@code element} and * merge that annotation's attributes with matching attributes from * annotations in lower levels of the annotation hierarchy. - *
{@link AliasFor @AliasFor} semantics are fully supported, both - * within a single annotation and within the annotation hierarchy. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method delegates to {@link #getMergedAnnotationAttributes(AnnotatedElement, String)}. * @param element the annotated element * @param annotationType the annotation type to find @@ -262,8 +262,8 @@ public abstract class AnnotatedElementUtils { * the annotation hierarchy above the supplied {@code element} and * merge that annotation's attributes with matching attributes from * annotations in lower levels of the annotation hierarchy. - *
{@link AliasFor @AliasFor} semantics are fully supported, both - * within a single annotation and within the annotation hierarchy. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method delegates to {@link #getMergedAnnotationAttributes(AnnotatedElement, String, boolean, boolean)}, * supplying {@code false} for {@code classValuesAsString} and {@code nestedAnnotationsAsMap}. * @param element the annotated element @@ -321,8 +321,8 @@ public abstract class AnnotatedElementUtils { * merge that annotation's attributes with matching attributes from * annotations in lower levels of the annotation hierarchy, and synthesize * the result back into an annotation of the specified {@code annotationType}. - *
{@link AliasFor @AliasFor} semantics are fully supported, both - * within a single annotation and within the annotation hierarchy. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. * @param element the annotated element * @param annotationType the annotation type to find * @return the merged, synthesized {@code Annotation}, or {@code null} if not found @@ -348,8 +348,8 @@ public abstract class AnnotatedElementUtils { * matching attributes from annotations in lower levels of the annotation * hierarchy and synthesize the results back into an annotation of the specified * {@code annotationType}. - *
{@link AliasFor @AliasFor} semantics are fully supported, both within a - * single annotation and within annotation hierarchies. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method follows get semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. * @param element the annotated element (never {@code null}) @@ -375,8 +375,8 @@ public abstract class AnnotatedElementUtils { * matching attributes from annotations in lower levels of the * annotation hierarchy and synthesize the results back into an annotation * of the corresponding {@code annotationType}. - *
{@link AliasFor @AliasFor} semantics are fully supported, both within a - * single annotation and within annotation hierarchies. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method follows get semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. * @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 * {@code annotationType}. *
The container type that holds the repeatable annotations will be looked up - * via {@link java.lang.annotation.Repeatable}. - *
{@link AliasFor @AliasFor} semantics are fully supported, both within a - * single annotation and within annotation hierarchies. + * via {@link java.lang.annotation.Repeatable @Repeatable}. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method follows get semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. * @param element the annotated element (never {@code null}) @@ -431,8 +431,8 @@ public abstract class AnnotatedElementUtils { * matching attributes from annotations in lower levels of the annotation * hierarchy and synthesize the results back into an annotation of the specified * {@code annotationType}. - *
{@link AliasFor @AliasFor} semantics are fully supported, both within a - * single annotation and within annotation hierarchies. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method follows get semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. *
WARNING: if the supplied {@code containerType} is not @@ -621,8 +621,8 @@ public abstract class AnnotatedElementUtils { * merge that annotation's attributes with matching attributes from * annotations in lower levels of the annotation hierarchy, and synthesize * the result back into an annotation of the specified {@code annotationType}. - *
{@link AliasFor @AliasFor} semantics are fully supported, both - * within a single annotation and within the annotation hierarchy. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method follows find semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. * @param element the annotated element @@ -652,8 +652,8 @@ public abstract class AnnotatedElementUtils { * matching attributes from annotations in lower levels of the annotation * hierarchy and synthesize the results back into an annotation of the specified * {@code annotationType}. - *
{@link AliasFor @AliasFor} semantics are fully supported, both within a - * single annotation and within annotation hierarchies. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method follows find semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. * @param element the annotated element (never {@code null}) @@ -677,8 +677,8 @@ public abstract class AnnotatedElementUtils { * matching attributes from annotations in lower levels of the * annotation hierarchy and synthesize the results back into an annotation * of the corresponding {@code annotationType}. - *
{@link AliasFor @AliasFor} semantics are fully supported, both within a - * single annotation and within annotation hierarchies. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method follows find semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. * @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 * {@code annotationType}. *
The container type that holds the repeatable annotations will be looked up - * via {@link java.lang.annotation.Repeatable}. - *
{@link AliasFor @AliasFor} semantics are fully supported, both within a - * single annotation and within annotation hierarchies. + * via {@link java.lang.annotation.Repeatable @Repeatable}. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method follows find semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. * @param element the annotated element (never {@code null}) @@ -732,8 +732,8 @@ public abstract class AnnotatedElementUtils { * matching attributes from annotations in lower levels of the annotation * hierarchy and synthesize the results back into an annotation of the specified * {@code annotationType}. - *
{@link AliasFor @AliasFor} semantics are fully supported, both within a - * single annotation and within annotation hierarchies. + *
{@link AliasFor @AliasFor} semantics are fully supported, both within + * a single annotation and within the annotation hierarchy. *
This method follows find semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. *
WARNING: if the supplied {@code containerType} is not 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 22db779552f..3bbbb403683 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 @@ -36,7 +36,7 @@ import org.springframework.util.Assert; * "merged" from different source values, typically: * *