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

Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-11-23 15:45:13 +00:00
parent f25c32e8b9 058428a14c
commit 4f405ed97d
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; import org.springframework.context.annotation.Conditional;
/** /**
* {@link Conditional} that only matches when beans of the specified classes and/or with * {@link Conditional} that only matches when beans meeting all the specified requirements
* the specified names are already contained in the {@link BeanFactory}. * 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> * <p>
* When placed on a {@code @Bean} method, the bean class defaults to the return type of * When placed on a {@code @Bean} method, the bean class defaults to the return type of
* the factory method: * 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; import org.springframework.context.annotation.Conditional;
/** /**
* {@link Conditional} that only matches when no beans of the specified classes and/or * {@link Conditional} that only matches when no beans meeting the specified requirements
* with the specified names are already contained in the {@link BeanFactory}. * 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> * <p>
* When placed on a {@code @Bean} method, the bean class defaults to the return type of * When placed on a {@code @Bean} method, the bean class defaults to the return type of
* the factory method: * the factory method: