Fix usage of NoUniqueBeanDefinitionException to be serializable

spring-projects · Dec 29, 2022 · d580f3f · d580f3f
1 parent 32e1a64
commit d580f3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...ng-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/...ng-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
@@ -21,6 +21,7 @@
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
 
@@ -215,7 +216,7 @@ public boolean isEager() {
 	 */
 	@Nullable
 	public Object resolveNotUnique(ResolvableType type, Map<String, Object> matchingBeans) throws BeansException {
-		throw new NoUniqueBeanDefinitionException(type, matchingBeans.keySet());
+		throw new NoUniqueBeanDefinitionException(type, new HashSet(matchingBeans.keySet()));
 	}
 
 	/**

diff --git a/...s/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/...s/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -30,6 +30,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -1284,7 +1285,7 @@ else if (candidateNames.length > 1) {
 				return new NamedBeanHolder<>(candidateName, (T) beanInstance);
 			}
 			if (!nonUniqueAsNull) {
-				throw new NoUniqueBeanDefinitionException(requiredType, candidates.keySet());
+				throw new NoUniqueBeanDefinitionException(requiredType, new HashSet(candidates.keySet()));
 			}
 		}