fix number type is lost in yaml config file (apache#1401)

* apache#1399 fi * update test
rolandhe · Feb 27, 2018 · ecc739c · ecc739c
1 parent bf556c0
commit ecc739c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
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
@@ -52,9 +52,7 @@ public static Map<String, String> getSubProperties(PropertySources propertySourc
                     if (name.startsWith(normalizedPrefix)) {
                         String subName = name.substring(normalizedPrefix.length());
                         Object value = source.getProperty(name);
-                        if (value instanceof String) {
-                            subProperties.put(subName, String.valueOf(value));
-                        }
+                        subProperties.put(subName, String.valueOf(value));
                     }
                 }
             }

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
@@ -44,19 +44,21 @@ public void testGetSubProperties() {
 
         propertySources.addFirst(propertySource);
 
-        Map<String, String> result = PropertySourcesUtils.getSubProperties(propertySources, "user");
+        String KEY_PREFIX = "user";
+        String KEY_NAME = "name";
+        String KEY_AGE = "age";
+        Map<String, String> result = PropertySourcesUtils.getSubProperties(propertySources, KEY_PREFIX);
 
         Assert.assertEquals(Collections.emptyMap(), result);
 
-        source.put("user.name", "Mercy");
-        source.put("user.age", "31");
+        source.put(KEY_PREFIX + "." + KEY_NAME, "Mercy");
+        source.put(KEY_PREFIX + "." + KEY_AGE, 31);
 
         Map<String, Object> expected = new HashMap<String, Object>();
-        expected.put("name", "Mercy");
-        expected.put("age", "31");
-
-        result = PropertySourcesUtils.getSubProperties(propertySources, "user");
+        expected.put(KEY_NAME, "Mercy");
+        expected.put(KEY_AGE, "31");
 
+        result = PropertySourcesUtils.getSubProperties(propertySources, KEY_PREFIX);
         Assert.assertEquals(expected, result);
 
         result = PropertySourcesUtils.getSubProperties(propertySources, "");