From ff7c66c0d242595341536a8354037682ab223ca6 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 31 Mar 2015 08:18:54 +0200 Subject: [PATCH] Fix annotation() javadoc --- .../boot/autoconfigure/condition/ConditionalOnBean.java | 5 +++-- .../autoconfigure/condition/ConditionalOnMissingBean.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java index 82493ad9b5..9f3f765ec8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java @@ -55,8 +55,9 @@ public @interface ConditionalOnBean { /** * The annotation type decorating a bean that should be checked. The condition matches - * when each class specified is missing from beans in the {@link ApplicationContext}. - * @return the class types of beans to check + * when any of the annotations specified is defined on a bean in the + * {@link ApplicationContext}. + * @return the class-level annotation types to check */ Class[] annotation() default {}; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java index 55e84e4499..70345b18de 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java @@ -55,9 +55,9 @@ public @interface ConditionalOnMissingBean { /** * The annotation type decorating a bean that should be checked. The condition matches - * when each class specified is missing from all beans in the + * when each annotation specified is missing from all beans in the * {@link ApplicationContext}. - * @return the class types of beans to check + * @return the class-level annotation types to check */ Class[] annotation() default {};