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

Allow @Bean method to override scanned class matching its return type

Browse Source 
Closes gh-31052
This commit is contained in:
Juergen Hoeller
2023-08-15 13:55:57 +02:00
parent d89e305c87
commit 57f675c537
2 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
View File

@@ -301,8 +301,12 @@ class ConfigurationClassBeanDefinitionReader {
}
// A bean definition resulting from a component scan can be silently overridden
// by an @Bean method, as of 4.2...
if (existingBeanDef instanceof ScannedGenericBeanDefinition) {
// by an @Bean method - and as of 6.1, even when general overriding is disabled
// as long as the bean class is the same.
if (existingBeanDef instanceof ScannedGenericBeanDefinition scannedBeanDef) {
if (beanMethod.getMetadata().getReturnTypeName().equals(scannedBeanDef.getBeanClassName())) {
this.registry.removeBeanDefinition(beanName);
}
return false;
}