3.2.54

noear · Feb 20, 2023 · 543c8f2 · 543c8f2
1 parent 1dcdfc6
commit 543c8f2
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 9 deletions.
diff --git a/snack3/src/main/java/org/noear/snack/core/exts/ClassWrap.java b/snack3/src/main/java/org/noear/snack/core/exts/ClassWrap.java
@@ -1,9 +1,8 @@
 package org.noear.snack.core.exts;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Parameter;
+import org.noear.snack.ONode;
+
+import java.lang.reflect.*;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -58,14 +57,17 @@ protected ClassWrap(Class<?> clz) {
 
         //支持 kotlin data 类型
         Constructor<?>[] constructors = clz.getConstructors();
-        if (constructors.length == 1 && constructors[0].getParameterCount() > 0) {
-            _recordable = true;
-        }
 
         if (_recordable) {
             //如果合字段只读
             _recordConstructor = constructors[0];
             _recordParams = _recordConstructor.getParameters();
+        }else{
+            if (constructors.length == 1 && constructors[0].getParameterCount() > 0) {
+                //如果合字段只读
+                _recordConstructor = constructors[0];
+                _recordParams = _recordConstructor.getParameters();
+            }
         }
     }
 

diff --git a/snack3/src/main/java/org/noear/snack/to/ObjectToer.java b/snack3/src/main/java/org/noear/snack/to/ObjectToer.java
@@ -477,11 +477,35 @@ public Object analyseBean(Context ctx, ONode o, Object rst, Class<?> clz, Type t
             try {
                 rst = clzWrap.recordConstructor().newInstance(argsV);
             }catch (IllegalArgumentException e){
-                throw new IllegalArgumentException("The constructor missing parameters: " +clz.getName());
+                throw new IllegalArgumentException("The constructor missing parameters: " +clz.getName(), e);
             }
         } else {
             if (rst == null) {
-                rst = BeanUtil.newInstance(clz);
+                if(clzWrap.recordConstructor() == null) {
+                    rst = BeanUtil.newInstance(clz);
+                }else{
+                    //只有带参数的构造函（像 kotlin data）
+                    Parameter[] argsP = clzWrap.recordParams();
+                    Object[] argsV = new Object[argsP.length];
+
+                    for (int j = 0; j < argsP.length; j++) {
+                        Parameter f = argsP[j];
+                        String fieldK = f.getName();
+                        if (o.contains(fieldK)) {
+                            Class fieldT = f.getType();
+                            Type fieldGt = f.getParameterizedType();
+
+                            Object val = analyseBeanOfValue(fieldK, fieldT, fieldGt, ctx, o, null, genericInfo);
+                            argsV[j] = val;
+                        }
+                    }
+
+                    try {
+                        rst = clzWrap.recordConstructor().newInstance(argsV);
+                    }catch (IllegalArgumentException e){
+                        throw new IllegalArgumentException("The constructor missing parameters: " +clz.getName(), e);
+                    }
+                }
             }
 
             if (rst == null) {