Poblish apache#2297

mercyblitz · Aug 14, 2018 · c0928d8 · c0928d8
1 parent 593ce64
commit c0928d8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 169 deletions.
diff --git a/.../java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrar.java b/.../java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrar.java
@@ -40,8 +40,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import static com.alibaba.dubbo.config.spring.util.PropertySourcesUtils.getSubProperties;
-import static com.alibaba.dubbo.config.spring.util.PropertySourcesUtils.normalizePrefix;
+import static com.alibaba.spring.util.PropertySourcesUtils.getSubProperties;
+import static com.alibaba.spring.util.PropertySourcesUtils.normalizePrefix;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.registerWithGeneratedName;
 
@@ -85,7 +85,7 @@ private void registerDubboConfigBeans(String prefix,
                                           boolean multiple,
                                           BeanDefinitionRegistry registry) {
 
-        Map<String, String> properties = getSubProperties(environment.getPropertySources(), prefix);
+        Map<String, Object> properties = getSubProperties(environment.getPropertySources(), prefix);
 
         if (CollectionUtils.isEmpty(properties)) {
             if (log.isDebugEnabled()) {
@@ -157,7 +157,7 @@ public void setEnvironment(Environment environment) {
 
     }
 
-    private Set<String> resolveMultipleBeanNames(Map<String, String> properties) {
+    private Set<String> resolveMultipleBeanNames(Map<String, Object> properties) {
 
         Set<String> beanNames = new LinkedHashSet<String>();
 
@@ -178,10 +178,10 @@ private Set<String> resolveMultipleBeanNames(Map<String, String> properties) {
 
     }
 
-    private String resolveSingleBeanName(Map<String, String> properties, Class<? extends AbstractConfig> configClass,
+    private String resolveSingleBeanName(Map<String, Object> properties, Class<? extends AbstractConfig> configClass,
                                          BeanDefinitionRegistry registry) {
 
-        String beanName = properties.get("id");
+        String beanName = (String) properties.get("id");
 
         if (!StringUtils.hasText(beanName)) {
             BeanDefinitionBuilder builder = rootBeanDefinition(configClass);

diff --git a/...ain/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinder.java b/...ain/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinder.java
@@ -22,7 +22,7 @@
 
 import java.util.Map;
 
-import static com.alibaba.dubbo.config.spring.util.PropertySourcesUtils.getSubProperties;
+import static com.alibaba.spring.util.PropertySourcesUtils.getSubProperties;
 
 /**
  * Default {@link DubboConfigBinder} implementation based on Spring {@link DataBinder}
@@ -36,7 +36,7 @@ public <C extends AbstractConfig> void bind(String prefix, C dubboConfig) {
         dataBinder.setIgnoreInvalidFields(isIgnoreInvalidFields());
         dataBinder.setIgnoreUnknownFields(isIgnoreUnknownFields());
         // Get properties under specified prefix from PropertySources
-        Map<String, String> properties = getSubProperties(getPropertySources(), prefix);
+        Map<String, Object> properties = getSubProperties(getPropertySources(), prefix);
         // Convert Map to MutablePropertyValues
         MutablePropertyValues propertyValues = new MutablePropertyValues(properties);
         // Bind

diff --git a/...onfig-spring/src/main/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtils.java b/...onfig-spring/src/main/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtils.java
diff --git a/...g-spring/src/test/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtilsTest.java b/...g-spring/src/test/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtilsTest.java