反序列化支持正则，解决string的反序列问题

wmz46 · Jun 23, 2020 · f78b655 · f78b655
1 parent 7c2106d
commit f78b655
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/com/iceolive/xpathmapper/XPathMapper.java b/src/main/java/com/iceolive/xpathmapper/XPathMapper.java
@@ -126,7 +126,10 @@ private static Object getObject(XPath xPath, Class<?> type, String str) {
         if (!StringUtil.isEmpty(str)) {
             if (type.isAssignableFrom(boolean.class) || type.isAssignableFrom(Boolean.class)) {
                 val = StringUtil.parseBoolean(str, xPath.trueString(), xPath.falseString(), type);
-            } else {
+            } else if(StringUtil.isNotEmpty(xPath.regex())) {
+                str = StringUtil.matchOne(str,xPath.regex(),1);
+                val = StringUtil.parse(str,xPath.format(),type);
+            }else{
                 val = StringUtil.parse(str, xPath.format(), type);
             }
         }

diff --git a/src/main/java/com/iceolive/xpathmapper/annotation/XPath.java b/src/main/java/com/iceolive/xpathmapper/annotation/XPath.java
@@ -35,4 +35,10 @@
     String trueString() default "true";
 
     String falseString() default "false";
+
+    /**
+     * 正则，反序列化时取第一个group
+     * @return
+     */
+    String regex() default "";
 }
diff --git a/src/main/java/com/iceolive/xpathmapper/util/ReflectUtil.java b/src/main/java/com/iceolive/xpathmapper/util/ReflectUtil.java
@@ -195,6 +195,8 @@ public static boolean isBasicType(Class<?> clazz){
             return  true;
         }else if(isDateType(clazz)){
             return  true;
+        }else if(clazz.isAssignableFrom(String.class)){
+            return  true;
         }
         return false;
     }