Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x'

Browse Source 
Closes gh-42506
This commit is contained in:
Andy Wilkinson
2024-10-03 10:23:09 +01:00
parent f5934f86f0 7b4cd03066
commit 8d0cfdfe5e
2 changed files with 6 additions and 4 deletions
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

@@ -35,8 +35,9 @@ import org.springframework.context.annotation.Conditional;
* 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:
* When placed on a {@link Bean @Bean} method and none of {@link #value}, {@link #type},
* {@link #name}, or {@link #annotation} has been specified, the bean type to match
* defaults to the return type of the {@code @Bean} method:
*
* <pre class="code">
* &#064;Configuration

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

@@ -35,8 +35,9 @@ import org.springframework.context.annotation.Conditional;
* 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:
* When placed on a {@link Bean @Bean} method and none of {@link #value}, {@link #type},
* {@link #name}, or {@link #annotation} has been specified, the bean type to match
* defaults to the return type of the {@code @Bean} method:
*
* <pre class="code">
* &#064;Configuration