From 11221f5ccb7c87316fec1d2960f9468446976f7c Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 18 Mar 2016 19:30:53 +0100 Subject: [PATCH] Fix Javadoc errors in AnnotatedElementUtils --- .../annotation/AnnotatedElementUtils.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) 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 bded44b06a..9f6516a12f 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -207,11 +207,11 @@ public class AnnotatedElementUtils { /** * Determine if the supplied {@link AnnotatedElement} is annotated with * a composed annotation that is meta-annotated with an - * annotation of the specified {@code annotationName}. + * annotation of the specified {@code annotationType}. *

This method follows get semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. * @param element the annotated element - * @param annotationType the annotation type on which to find meta-annotations + * @param annotationType the meta-annotation type to find * @return {@code true} if a matching meta-annotation is present * @since 4.2.3 * @see #getMetaAnnotationTypes @@ -255,7 +255,7 @@ public class AnnotatedElementUtils { } /** - * Determine if an annotation of the specified {@code annotationName} + * Determine if an annotation of the specified {@code annotationType} * is present on the supplied {@link AnnotatedElement} or * within the annotation hierarchy above the specified element. *

If this method returns {@code true}, then {@link #getMergedAnnotationAttributes} @@ -263,7 +263,7 @@ public class AnnotatedElementUtils { *

This method follows get semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. * @param element the annotated element - * @param annotationType the annotation type on which to find meta-annotations + * @param annotationType the annotation type to find * @return {@code true} if a matching annotation is present * @since 4.2.3 */ @@ -461,7 +461,7 @@ public class AnnotatedElementUtils { } /** - * Find the first annotation of the specified {@code annotationName} within + * Find the first annotation of the specified {@code annotationType} within * 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. @@ -472,8 +472,8 @@ public class AnnotatedElementUtils { *

In contrast to {@link #getAllAnnotationAttributes}, the search * algorithm used by this method will stop searching the annotation * hierarchy once the first annotation of the specified - * {@code annotationName} has been found. As a consequence, additional - * annotations of the specified {@code annotationName} will be ignored. + * {@code annotationType} has been found. As a consequence, additional + * annotations of the specified {@code annotationType} will be ignored. *

This method follows find semantics as described in the * {@linkplain AnnotatedElementUtils class-level javadoc}. * @param element the annotated element @@ -613,10 +613,11 @@ public class AnnotatedElementUtils { } /** - * Search for annotations of the specified {@code annotationName} on - * the specified {@code element}, following get semantics. + * Search for annotations of the specified {@code annotationName} or + * {@code annotationType} on the specified {@code element}, following + * get semantics. * @param element the annotated element - * @param annotationType the annotation type on which to find meta-annotations + * @param annotationType the annotation type to find * @param annotationName the fully qualified class name of the annotation * type to find (as an alternative to {@code annotationType}) * @param processor the processor to delegate to @@ -642,7 +643,7 @@ public class AnnotatedElementUtils { *

The {@code metaDepth} parameter is explained in the * {@link Processor#process process()} method of the {@link Processor} API. * @param element the annotated element - * @param annotationType the annotation type on which to find meta-annotations + * @param annotationType the annotation type to find * @param annotationName the fully qualified class name of the annotation * type to find (as an alternative to {@code annotationType}) * @param processor the processor to delegate to @@ -702,7 +703,7 @@ public class AnnotatedElementUtils { * @param annotatedElement the element that is annotated with the supplied * annotations, used for contextual logging; may be {@code null} if unknown * @param annotations the annotations to search in - * @param annotationType the annotation type on which to find meta-annotations + * @param annotationType the annotation type to find * @param annotationName the fully qualified class name of the annotation * type to find (as an alternative to {@code annotationType}) * @param processor the processor to delegate to @@ -744,10 +745,11 @@ public class AnnotatedElementUtils { } /** - * Search for annotations of the specified {@code annotationName} on - * the specified {@code element}, following find semantics. + * Search for annotations of the specified {@code annotationName} or + * {@code annotationType} on the specified {@code element}, following + * find semantics. * @param element the annotated element - * @param annotationType the annotation type on which to find meta-annotations + * @param annotationType the annotation type to find * @param annotationName the fully qualified class name of the annotation * type to find (as an alternative to {@code annotationType}) * @param processor the processor to delegate to @@ -774,7 +776,7 @@ public class AnnotatedElementUtils { *

The {@code metaDepth} parameter is explained in the * {@link Processor#process process()} method of the {@link Processor} API. * @param element the annotated element - * @param annotationType the annotation type on which to find meta-annotations + * @param annotationType the annotation type to find * @param annotationName the fully qualified class name of the annotation * type to find (as an alternative to {@code annotationType}) * @param processor the processor to delegate to @@ -1004,7 +1006,7 @@ public class AnnotatedElementUtils { * annotation attributes from lower levels in the annotation hierarchy * during the {@link #postProcess} phase. * @since 4.2 - * @see AnnotationUtils#retrieveAnnotationAttributes(AnnotatedElement, Annotation, boolean, boolean) + * @see AnnotationUtils#retrieveAnnotationAttributes * @see AnnotationUtils#postProcessAnnotationAttributes */ private static class MergedAnnotationAttributesProcessor implements Processor {