Polish apache#4690 : AnnotatedBeanDefinitionRegistryUtils#registerBea…

…ns can't remove the duplicated bean definitions
mercyblitz · Aug 21, 2019 · 46999e1 · 46999e1
1 parent e819462
commit 46999e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...c/main/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtils.java b/...c/main/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
@@ -27,9 +27,9 @@
 
 import java.lang.annotation.Annotation;
 import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.LinkedHashSet;
 import java.util.Objects;
+import java.util.Set;
 
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
@@ -95,7 +95,7 @@ public static void registerBeans(BeanDefinitionRegistry registry, Class<?>... an
             return;
         }
 
-        List<Class<?>> classesToRegister = new LinkedList<>(asList(annotatedClasses));
+        Set<Class<?>> classesToRegister = new LinkedHashSet<>(asList(annotatedClasses));
 
         // Remove all annotated-classes that have been registered
         Iterator<Class<?>> iterator = classesToRegister.iterator();
@@ -115,5 +115,7 @@ public static void registerBeans(BeanDefinitionRegistry registry, Class<?>... an
 
         reader.register(classesToRegister.toArray(new Class[0]));
 
+        // clear
+        classesToRegister.clear();
     }
 }
diff --git a/...st/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtilsTest.java b/...st/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtilsTest.java
@@ -18,6 +18,7 @@
 
 import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.stereotype.Service;
@@ -36,6 +37,11 @@ public class AnnotatedBeanDefinitionRegistryUtilsTest {
 
     private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 
+    @BeforeEach
+    public void init() {
+        context.setAllowBeanDefinitionOverriding(false);
+    }
+
     @AfterEach
     public void destroy() {
         context.close();