From 912eb53d7ab56fd5ae50c1866bd66fbfa5c45d78 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Tue, 17 Jul 2018 16:34:01 -0700 Subject: [PATCH] Clarify configuration class behavior based on bean conditions --- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 52cef1b1db..14a9b28176 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -6409,8 +6409,9 @@ on auto-configuration classes (since these are guaranteed to load after any user beans 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.