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

Log multiple primary bean detection in DefaultListableBeanFactory 

Prior to this commit, a NoUniqueBeanDefinitionException was thrown when
multiple primary beans were detected within a given set of beans, but
nothing was logged. For use cases where the exception is handled by
infrastructure code, it may not be obvious to the developer what the
problem is.

To address that, a TRACE message is now logged whenever multiple
competing primary beans are detected in DefaultListableBeanFactory.

Closes gh-35550
This commit is contained in:
Sam Brannen 2025-10-03 13:57:01 +02:00
parent 3041071269
commit 1cdd56bf02
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
View File

@ -2098,8 +2098,9 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
boolean candidateLocal = containsBeanDefinition(candidateBeanName); boolean candidateLocal = containsBeanDefinition(candidateBeanName);
boolean primaryLocal = containsBeanDefinition(primaryBeanName); boolean primaryLocal = containsBeanDefinition(primaryBeanName);
if (candidateLocal == primaryLocal) { if (candidateLocal == primaryLocal) {
throw new NoUniqueBeanDefinitionException(requiredType, candidates.size(), String message = "more than one 'primary' bean found among candidates: " + candidates.keySet();
"more than one 'primary' bean found among candidates: " + candidates.keySet()); logger.trace(message);
throw new NoUniqueBeanDefinitionException(requiredType, candidates.size(), message);
} }
else if (candidateLocal) { else if (candidateLocal) {
primaryBeanName = candidateBeanName; primaryBeanName = candidateBeanName;

4
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@ -1798,7 +1798,7 @@ class DefaultListableBeanFactoryTests {
assertThatExceptionOfType(NoUniqueBeanDefinitionException.class) assertThatExceptionOfType(NoUniqueBeanDefinitionException.class)
.isThrownBy(() -> lbf.getBean(TestBean.class)) .isThrownBy(() -> lbf.getBean(TestBean.class))
.withMessageContaining("more than one 'primary'"); .withMessageEndingWith("more than one 'primary' bean found among candidates: [bd1, bd2]");
} }
@Test @Test
@ -2122,7 +2122,7 @@ class DefaultListableBeanFactoryTests {
assertThatExceptionOfType(NoUniqueBeanDefinitionException.class) assertThatExceptionOfType(NoUniqueBeanDefinitionException.class)
.isThrownBy(() -> lbf.getBean(ConstructorDependency.class, 42)) .isThrownBy(() -> lbf.getBean(ConstructorDependency.class, 42))
.withMessageContaining("more than one 'primary'"); .withMessageEndingWith("more than one 'primary' bean found among candidates: [bd1, bd2]");
} }
@Test @Test