支持配置JSON，并自动转成相应类型(2)-补全单元测试并修改异常返回值

Author: zxhdaniel

disconf-client/src/main/java/com/baidu/disconf/client/support/utils/ClassUtils.java

@@ -116,7 +116,7 @@ public static Object getValeByType(Class<?> type, Object value)
         }
 
         // trim
-        String dataValue = (String) value;
+        String dataValue = String.valueOf(value);
         dataValue = dataValue.trim();
 
         // process
@@ -126,15 +126,15 @@ public static Object getValeByType(Class<?> type, Object value)
         if (typeName.equals("int") || typeName.equals("java.lang.integer")) {
 
             if (value.equals("")) {
-                value = "0";
+            		return 0;
             }
 
             return Integer.valueOf(dataValue);
 
         } else if (typeName.equals("long") || typeName.equals("java.lang.long")) {
 
             if (value.equals("")) {
-                value = "0";
+            		return 0L;
             }
 
             return Long.valueOf(dataValue);
@@ -143,7 +143,7 @@ public static Object getValeByType(Class<?> type, Object value)
                 || typeName.equals("java.lang.boolean")) {
 
             if (value.equals("")) {
-                value = "false";
+            		return false;
             }
 
             return Boolean.valueOf(dataValue);
@@ -152,7 +152,7 @@ public static Object getValeByType(Class<?> type, Object value)
                 || typeName.equals("java.lang.double")) {
 
             if (value.equals("")) {
-                value = "0.0";
+            		return 0.0D;
             }
 
             return Double.valueOf(dataValue);
@@ -170,7 +170,8 @@ public static Object getValeByType(Class<?> type, Object value)
 			} catch (Exception ex) {
 				ex.printStackTrace();
 			}
-			return value;
+			// JSON解析异常的情况下，返回null，防止待会转换继续抛异常
+			return null;
         }
     }
 

disconf-client/src/test/java/com/baidu/disconf/client/support/utils/ClassUtilsTest.java

@@ -13,14 +13,20 @@ public class ClassUtilsTest {
 	@Test
 	public void testGetValeByType() throws Exception {
 		assertTrue(ClassUtils.getValeByType(Integer.class, "10086").equals(new Integer(10086)));
+		assertTrue(ClassUtils.getValeByType(Integer.class, "").equals(new Integer(0)));
+		assertTrue(ClassUtils.getValeByType(Integer.class, 0).equals(new Integer(0)));
 		assertTrue(ClassUtils.getValeByType(Long.class, "1688").equals(new Long(1688)));
+		assertTrue(ClassUtils.getValeByType(Long.class, "").equals(new Long(0)));
 		assertTrue(ClassUtils.getValeByType(Boolean.class, "true").equals(new Boolean(true)));
+		assertTrue(ClassUtils.getValeByType(Boolean.class, "").equals(new Boolean(false)));
 		assertTrue(ClassUtils.getValeByType(Double.class, "234.4").equals(new Double(234.4)));
+		assertTrue(ClassUtils.getValeByType(Double.class, "").equals(new Double(0.0)));
 		assertTrue(ClassUtils.getValeByType(String.class, "234.4").equals(String.valueOf(234.4)));
 		List<Integer> list = (List<Integer>) ClassUtils.getValeByType(List.class, "[100,200,300]");
 		assertTrue(list.contains(new Double(100)));
 		Map<String, String> map = (Map<String, String>) ClassUtils.getValeByType(Map.class, "{\"name\":\"zxh\",\"city\":\"shenzhen\"}");
 		assertTrue(map.get("name").equals("zxh"));
+		assertTrue(ClassUtils.getValeByType(List.class, "234.4,123") == null);
 	}
 
 }