root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix annotation() javadoc

This commit is contained in:
Stephane Nicoll 2015-03-31 08:18:54 +02:00
parent 5d9efe40d0
commit ff7c66c0d2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java
View File

@ -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<? extends Annotation>[] annotation() default {};

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
View File

@ -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<? extends Annotation>[] annotation() default {};