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

Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Madhura Bhave 2018-07-17 16:43:02 -07:00
parent a57d0f0853 912eb53d7a
commit c36804908c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -7503,8 +7503,9 @@ on auto-configuration classes (since these are guaranteed to load after any user
bean definitions have been added).
NOTE: `@ConditionalOnBean` and `@ConditionalOnMissingBean` do not prevent `@Configuration`
classes from being created. Using these conditions at the class level is equivalent to
marking each contained `@Bean` method with the annotation.
classes from being created. The only difference between using these conditions at the class level
and marking each contained `@Bean` method with the annotation is that the former prevents
registration of the `@Configuration` class as a bean if the condition does not match.