Polish /#3193 : Change the default behavior of @EnableDubboConfig.mul…

…tiple()
apache · Mar 15, 2019 · 90466a5 · 90466a5
1 parent a8112d2
commit 90466a5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.../org/apache/dubbo/config/spring/context/annotation/DubboConfigConfigurationRegistrar.java b/.../org/apache/dubbo/config/spring/context/annotation/DubboConfigConfigurationRegistrar.java
@@ -44,10 +44,11 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
 
         boolean multiple = attributes.getBoolean("multiple");
 
-        if (multiple) {
+        // Single Config Bindings
+        registerBeans(registry, DubboConfigConfiguration.Single.class);
+
+        if (multiple) { // Since 2.6.6 https://github.com/apache/incubator-dubbo/issues/3193
             registerBeans(registry, DubboConfigConfiguration.Multiple.class);
-        } else {
-            registerBeans(registry, DubboConfigConfiguration.Single.class);
         }
     }
 

diff --git a/...g-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/EnableDubbo.java b/...g-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/EnableDubbo.java
@@ -76,6 +76,6 @@
      * @see EnableDubboConfig#multiple()
      */
     @AliasFor(annotation = EnableDubboConfig.class, attribute = "multiple")
-    boolean multipleConfig() default false;
+    boolean multipleConfig() default true;
 
 }
diff --git a/...ng/src/main/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfig.java b/...ng/src/main/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfig.java
@@ -59,7 +59,7 @@
  *
  * @see EnableDubboConfigBinding
  * @see DubboConfigConfiguration
- * @see DubboConfigConfigurationSelector
+ * @see DubboConfigConfigurationRegistrar
  * @since 2.5.8
  */
 @Target({ElementType.TYPE})
@@ -75,6 +75,6 @@
      * @return the default value is <code>false</code>
      * @revised 2.5.9
      */
-    boolean multiple() default false;
+    boolean multiple() default true;
 
 }
diff --git a/...rc/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java b/...rc/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
@@ -26,7 +26,6 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.PropertySource;
 
@@ -95,13 +94,13 @@ public void testMultiple() {
 
     }
 
-    @EnableDubboConfig(multiple = true)
+    @EnableDubboConfig
     @PropertySource("META-INF/config.properties")
     private static class TestMultipleConfig {
 
     }
 
-    @EnableDubboConfig
+    @EnableDubboConfig(multiple = false)
     @PropertySource("META-INF/config.properties")
     private static class TestConfig {