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

Harmonize NoUniqueBeanDefinitionException message

Browse Source 
This commit makes sure that the programmatic exception that is thrown
by the cache abstraction uses the same message structure as a default
message produced by NoUniqueBeanDefinitionException.

Closes gh-33305
This commit is contained in:
Stéphane Nicoll
2024-08-02 16:24:43 +02:00
parent 29dce74fcd
commit 0a2611b22f
4 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-beans/src/main/java/org/springframework/beans/factory/NoUniqueBeanDefinitionException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ import org.springframework.util.StringUtils;
* multiple matching candidates have been found when only one matching bean was expected.
*
* @author Juergen Hoeller
* @author Stephane Nicoll
* @since 3.2.1
* @see BeanFactory#getBean(Class)
*/
@@ -41,6 +42,19 @@ public class NoUniqueBeanDefinitionException extends NoSuchBeanDefinitionExcepti
private final Collection<String> beanNamesFound;
/**
* Create a new {@code NoUniqueBeanDefinitionException}.
* @param type required type of the non-unique bean
* @param beanNamesFound the names of all matching beans (as a Collection)
* @param message detailed message describing the problem
* @since 6.2
*/
public NoUniqueBeanDefinitionException(Class<?> type, Collection<String> beanNamesFound, String message) {
super(type, message);
this.numberOfBeansFound = beanNamesFound.size();
this.beanNamesFound = new ArrayList<>(beanNamesFound);
}
/**
* Create a new {@code NoUniqueBeanDefinitionException}.
* @param type required type of the non-unique bean
@@ -59,10 +73,8 @@ public class NoUniqueBeanDefinitionException extends NoSuchBeanDefinitionExcepti
* @param beanNamesFound the names of all matching beans (as a Collection)
*/
public NoUniqueBeanDefinitionException(Class<?> type, Collection<String> beanNamesFound) {
super(type, "expected single matching bean but found " + beanNamesFound.size() + ": " +
this(type, beanNamesFound, "expected single matching bean but found " + beanNamesFound.size() + ": " +
StringUtils.collectionToCommaDelimitedString(beanNamesFound));
this.numberOfBeansFound = beanNamesFound.size();
this.beanNamesFound = new ArrayList<>(beanNamesFound);
}
/**