Polishing MergedAnnotation code

philwebb · jhoeller · commit e11990e63d6d · 2019-05-07T23:12:42.000+02:00
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsProcessor.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsProcessor.java
@@ -26,6 +26,7 @@
  * @param <C> the context type
  * @param <R> the result type
  * @author Phillip Webb
+ * @since 5.2
  * @see AnnotationsScanner
  * @see TypeMappedAnnotations
  */
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotationSelectors.java b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotationSelectors.java
@@ -49,7 +49,7 @@ public static <A extends Annotation> MergedAnnotationSelector<A> nearest() {
 	}
 
 	/**
-	 * Select the first directly declared annotation when possible. If not direct
+	 * Select the first directly declared annotation when possible. If no direct
 	 * annotations are declared then the earliest annotation is selected.
 	 * @return a selector that picks the first directly declared annotation whenever possible
 	 */

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static <A extends Annotation> MergedAnnotationSelector<A> nearest() {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`		`- * Select the first directly declared annotation when possible. If not direct`
	`52`	`+ * Select the first directly declared annotation when possible. If no direct`
`53`	`53`	`* annotations are declared then the earliest annotation is selected.`
`54`	`54`	`* @return a selector that picks the first directly declared annotation whenever possible`
`55`	`55`	`*/`