Fix Testcases' bugs (#5353)

* Polish #5306 : [Migration] Upgrade the @SInCE tags in Javadoc migration cloud native to master * Polish #5306 : [Migration] Upgrade the @SInCE tags in Javadoc migration cloud native to master * Polish #5309 : [ISSURE] The beans of Dubbo's Config can't be found on the ReferenceBean's initialization * Polish #5312 : Resolve the demos' issues of zookeeper and nacos * Polish #5313 : [Migration] migrate the code in common module from cloud-native branch to master * Polish #5316 : [Refactor] Replace @EnableDubboConfigBinding Using spring-context-support * Polish #5317 : [Refactor] Refactor ReferenceAnnotationBeanPostProcessor using Alibaba spring-context-suuport API * Polish #5321 : Remove BeanFactoryUtils * Polish #5321 : Remove AnnotatedBeanDefinitionRegistryUtils * Polish #5321 : Remove AnnotationUtils * Polish #5321 : Remove ClassUtils * Polish #5321 : Remove BeanRegistrar * Polish #5321 : Remove ObjectUtils * Polish #5321 : Remove PropertySourcesUtils * Polish #5325 : [Migration] To migrate dubbo-metadata-api from cloud-native branch * Polish #5326 : [Migration] To migrate dubbo-metadata-processor from cloud-native branch * Polish #5329 : [Feature] To add the default metadata into ServiceInstance * Polish #5339 : [Refactor] Refactor the DynamicConfiguration interface * Polish bugfix * Fixes test cases * Merge remote-tracking branch 'upstream/master' into cloud-native-2.7.5 # Conflicts: # dubbo-configcenter/dubbo-configcenter-zookeeper/src/test/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationTest.java # dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/DynamicConfigurationServiceNameMappingTest.java * Merge remote-tracking branch 'upstream/master' into cloud-native-2.7.5 # Conflicts: # dubbo-configcenter/dubbo-configcenter-zookeeper/src/test/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationTest.java # dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/DynamicConfigurationServiceNameMappingTest.java * Fix test-cases
apache · Nov 19, 2019 · 77a4784 · 77a4784
1 parent 4506648
commit 77a4784
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/.../org/apache/dubbo/config/spring/context/annotation/DubboConfigConfigurationRegistrar.java b/.../org/apache/dubbo/config/spring/context/annotation/DubboConfigConfigurationRegistrar.java
@@ -18,6 +18,7 @@
 
 import org.apache.dubbo.config.AbstractConfig;
 import org.apache.dubbo.config.spring.beans.factory.annotation.DubboConfigAliasPostProcessor;
+import org.apache.dubbo.config.spring.context.config.NamePropertyDefaultValueDubboConfigBeanCustomizer;
 
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
@@ -27,6 +28,7 @@
 
 import static com.alibaba.spring.util.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
 import static com.alibaba.spring.util.BeanRegistrar.registerInfrastructureBean;
+import static org.apache.dubbo.config.spring.context.config.NamePropertyDefaultValueDubboConfigBeanCustomizer.BEAN_NAME;
 
 /**
  * Dubbo {@link AbstractConfig Config} {@link ImportBeanDefinitionRegistrar register}, which order can be configured
@@ -55,6 +57,14 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
 
         // Register DubboConfigAliasPostProcessor
         registerDubboConfigAliasPostProcessor(registry);
+
+        // Register NamePropertyDefaultValueDubboConfigBeanCustomizer
+        registerDubboConfigBeanCustomizers(registry);
+
+    }
+
+    private void registerDubboConfigBeanCustomizers(BeanDefinitionRegistry registry) {
+        registerInfrastructureBean(registry, BEAN_NAME, NamePropertyDefaultValueDubboConfigBeanCustomizer.class);
     }
 
     /**

diff --git a/...rc/main/java/org/apache/dubbo/config/spring/context/config/DubboConfigBeanCustomizer.java b/...rc/main/java/org/apache/dubbo/config/spring/context/config/DubboConfigBeanCustomizer.java
@@ -20,6 +20,7 @@
 import org.apache.dubbo.config.spring.beans.factory.annotation.DubboConfigBindingBeanPostProcessor;
 import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
 
+import com.alibaba.spring.context.config.ConfigurationBeanCustomizer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.Ordered;
 
@@ -35,7 +36,7 @@
  * @see DubboConfigBindingBeanPostProcessor
  * @since 2.6.6
  */
-public interface DubboConfigBeanCustomizer extends Ordered {
+public interface DubboConfigBeanCustomizer extends ConfigurationBeanCustomizer, Ordered {
 
     /**
      * Customize {@link AbstractConfig Dubbo Config Bean}
@@ -44,4 +45,11 @@ public interface DubboConfigBeanCustomizer extends Ordered {
      * @param dubboConfigBean the instance of {@link AbstractConfig Dubbo Config Bean}
      */
     void customize(String beanName, AbstractConfig dubboConfigBean);
+
+    @Override
+    default void customize(String beanName, Object configurationBean) {
+        if (configurationBean instanceof AbstractConfig) {
+            customize(beanName, (AbstractConfig) configurationBean);
+        }
+    }
 }
diff --git a/...che/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java b/...che/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
@@ -67,9 +67,19 @@ public void test() {
 
         DefaultConversionService conversionService = new DefaultConversionService();
 
-        conversionService.addConverter((Converter<String[], String>) source -> arrayToCommaDelimitedString(source));
-
-        conversionService.addConverter((Converter<String[], Map<String, String>>) source -> CollectionUtils.toStringMap(source));
+        conversionService.addConverter(new Converter<String[], String>() {
+            @Override
+            public String convert(String[] source) {
+                return arrayToCommaDelimitedString(source);
+            }
+        });
+
+        conversionService.addConverter(new Converter<String[], Map<String, String>>() {
+            @Override
+            public Map<String, String> convert(String[] source) {
+                return CollectionUtils.toStringMap(source);
+            }
+        });
 
 
         dataBinder.setConversionService(conversionService);