修改节点为空时，转字符串的bug

wmz46 · Mar 8, 2021 · f4427cf · f4427cf
1 parent 882f4dc
commit f4427cf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 <dependency>
   <groupId>com.iceolive</groupId>
   <artifactId>xpathmapper</artifactId>
-  <version>1.2.3</version>
+  <version>1.2.4</version>
 </dependency>
 ```
 ## 二、快速开始

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.iceolive</groupId>
     <artifactId>xpathmapper</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
     <description>xpathmapper is a XML processor (XML parser + XML generator) written in Java</description>
     <licenses>
         <license>

diff --git a/src/main/java/com/iceolive/xpathmapper/JsonPathMapper.java b/src/main/java/com/iceolive/xpathmapper/JsonPathMapper.java
@@ -33,7 +33,11 @@ public static <T> T parse(Object obj, Class<T> clazz) {
 
     private static <T> T parse(Object obj, Class<T> clazz, String format) {
         if (ReflectUtil.isBasicType(clazz)) {
-            return (T) StringUtil.parse(obj.toString(), format, clazz);
+            if (obj != null) {
+                return (T) StringUtil.parse(obj.toString(), format, clazz);
+            } else {
+                return null;
+            }
         }
         List<Field> fields = ReflectUtil.getAllFields(clazz);
         T newObj = ReflectUtil.newInstance(clazz);
@@ -43,8 +47,8 @@ private static <T> T parse(Object obj, Class<T> clazz, String format) {
                 continue;
             }
             JSONField jsonField = field.getAnnotation(JSONField.class);
-            String dateFormat ="";
-            if(jsonField !=null && !StringUtil.isEmpty(jsonField.format())){
+            String dateFormat = "";
+            if (jsonField != null && !StringUtil.isEmpty(jsonField.format())) {
                 dateFormat = jsonField.format();
             }
             boolean isList = false;
@@ -113,9 +117,9 @@ private static <T> T parse(Object obj, Class<T> clazz, String format) {
                     ReflectUtil.setValue(newObj, field.getName(), values);
 
                 } else if (List.class.isAssignableFrom(currentObj.getClass())) {
-                    Object values = ReflectUtil.newInstance(field, ((List)currentObj).size());
-                    for (int i = 0; i < ((List)currentObj).size(); i++) {
-                        Object item = parse(((List)currentObj).get(i), type, dateFormat);
+                    Object values = ReflectUtil.newInstance(field, ((List) currentObj).size());
+                    for (int i = 0; i < ((List) currentObj).size(); i++) {
+                        Object item = parse(((List) currentObj).get(i), type, dateFormat);
                         ((List) values).add(item);
                     }
                     ReflectUtil.setValue(newObj, field.getName(), values);
@@ -143,8 +147,8 @@ private static <T> T parse(Object obj, Class<T> clazz, String format) {
                     ReflectUtil.setValue(newObj, field.getName(), values);
 
                 } else if (Set.class.isAssignableFrom(currentObj.getClass())) {
-                    Object values = ReflectUtil.newInstance(field,((Set)currentObj).size());
-                    for (Object c : (Set)currentObj) {
+                    Object values = ReflectUtil.newInstance(field, ((Set) currentObj).size());
+                    for (Object c : (Set) currentObj) {
                         Object item = parse(c, type, dateFormat);
                         ((Set) values).add(item);
                     }
@@ -164,5 +168,5 @@ private static <T> T parse(Object obj, Class<T> clazz, String format) {
         }
         return newObj;
     }
- 
+
 }