Remove local PropertySourcesUtils and re-use it from spring-context-e…

…xtras

dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrar.java

@@ -18,6 +18,7 @@
 
 import com.alibaba.dubbo.config.AbstractConfig;
 import com.alibaba.dubbo.config.spring.beans.factory.annotation.DubboConfigBindingBeanPostProcessor;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -40,8 +41,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 +86,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 +158,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 +179,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);

dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinder.java

@@ -17,12 +17,13 @@
 package com.alibaba.dubbo.config.spring.context.properties;
 
 import com.alibaba.dubbo.config.AbstractConfig;
+
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.validation.DataBinder;
 
 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 +37,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