Polish "Make sure NoUniqueBeanDefinitionException to be serializable"

See gh-29753
spring-projects · Aug 27, 2023 · 1396daa · 1396daa
1 parent 1b409d5
commit 1396daa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...eans/src/main/java/org/springframework/beans/factory/NoUniqueBeanDefinitionException.java b/...eans/src/main/java/org/springframework/beans/factory/NoUniqueBeanDefinitionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -16,6 +16,7 @@
 
 package org.springframework.beans.factory;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -61,7 +62,7 @@ public NoUniqueBeanDefinitionException(Class<?> type, Collection<String> beanNam
 		super(type, "expected single matching bean but found " + beanNamesFound.size() + ": " +
 				StringUtils.collectionToCommaDelimitedString(beanNamesFound));
 		this.numberOfBeansFound = beanNamesFound.size();
-		this.beanNamesFound = beanNamesFound;
+		this.beanNamesFound = new ArrayList<>(beanNamesFound);
 	}
 
 	/**
@@ -83,7 +84,7 @@ public NoUniqueBeanDefinitionException(ResolvableType type, Collection<String> b
 		super(type, "expected single matching bean but found " + beanNamesFound.size() + ": " +
 				StringUtils.collectionToCommaDelimitedString(beanNamesFound));
 		this.numberOfBeansFound = beanNamesFound.size();
-		this.beanNamesFound = beanNamesFound;
+		this.beanNamesFound = new ArrayList<>(beanNamesFound);
 	}
 
 	/**

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,7 +21,6 @@
 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;
 
@@ -216,7 +215,7 @@ public boolean isEager() {
 	 */
 	@Nullable
 	public Object resolveNotUnique(ResolvableType type, Map<String, Object> matchingBeans) throws BeansException {
-		throw new NoUniqueBeanDefinitionException(type, new HashSet<>( matchingBeans.keySet() ));
+		throw new NoUniqueBeanDefinitionException(type, 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,7 +30,6 @@
 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;
@@ -1297,7 +1296,7 @@ else if (candidateNames.length > 1) {
 				return new NamedBeanHolder<>(candidateName, (T) beanInstance);
 			}
 			if (!nonUniqueAsNull) {
-				throw new NoUniqueBeanDefinitionException(requiredType, new HashSet<>(candidates.keySet()));
+				throw new NoUniqueBeanDefinitionException(requiredType, candidates.keySet());
 			}
 		}