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

Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean 

Closes gh-15177
This commit is contained in:
Andy Wilkinson 2018-11-23 15:44:58 +00:00
parent d104205880
commit 058428a14c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,8 +27,9 @@ import org.springframework.beans.factory.BeanFactory;
import org.springframework.context.annotation.Conditional;
/**
* {@link Conditional} that only matches when beans of the specified classes and/or with
* the specified names are already contained in the {@link BeanFactory}.
* {@link Conditional} that only matches when beans meeting all the specified requirements
* are already contained in the {@link BeanFactory}. All the requirements must be met for
* the condition to match, but they do not have to be met by the same bean.
* <p>
* When placed on a {@code @Bean} method, the bean class defaults to the return type of
* the factory method:

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

@ -27,8 +27,9 @@ import org.springframework.beans.factory.BeanFactory;
import org.springframework.context.annotation.Conditional;
/**
* {@link Conditional} that only matches when no beans of the specified classes and/or
* with the specified names are already contained in the {@link BeanFactory}.
* {@link Conditional} that only matches when no beans meeting the specified requirements
* are already contained in the {@link BeanFactory}. None of the requirements must be met
* for the condition to match and the requirements do not have to be met by the same bean.
* <p>
* When placed on a {@code @Bean} method, the bean class defaults to the return type of
* the factory method: