improved kotlin support, fix #3274

alibaba · Jun 25, 2020 · 2143fdb · 2143fdb
1 parent 974b413
commit 2143fdb
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 5 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/JavaBeanDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/JavaBeanDeserializer.java
@@ -1545,12 +1545,16 @@ public Object createInstance(Map<String, Object> map, ParserConfig config) //
             boolean hasNull = false;
             if (beanInfo.kotlin) {
                 for (int i = 0; i < params.length; i++) {
-                    if (params[i] == null && beanInfo.fields != null && i < beanInfo.fields.length) {
-                        FieldInfo fieldInfo = beanInfo.fields[i];
-                        if (fieldInfo.fieldClass == String.class) {
-                            hasNull = true;
+                    Object param = params[i];
+                    if (param == null) {
+                        if (beanInfo.fields != null && i < beanInfo.fields.length) {
+                            FieldInfo fieldInfo = beanInfo.fields[i];
+                            if (fieldInfo.fieldClass == String.class) {
+                                hasNull = true;
+                            }
                         }
-                        break;
+                    } else if (param.getClass() != beanInfo.fields[i].fieldClass){
+                        params[i] = TypeUtils.cast(param, beanInfo.fields[i].fieldClass, config);
                     }
                 }
             }

diff --git a/src/test/java/com/alibaba/json/bvt/issue_3200/Issue3274.kt b/src/test/java/com/alibaba/json/bvt/issue_3200/Issue3274.kt
@@ -0,0 +1,34 @@
+package com.alibaba.json.bvt.issue_3200
+
+import com.alibaba.fastjson.JSON
+import junit.framework.Assert.assertEquals
+import org.junit.Test
+import java.util.*
+
+class TestFJ {
+
+    @Test
+    fun test() {
+        val str = """
+            {"data": {"id": "1", "name":"n1"}}
+        """.trimIndent()
+
+
+        val d1 = JSON.parseObject(str, Data2::class.java)
+
+        val data = JSON.parseObject(str)
+        val d2 = data.getObject("data", Data::class.java)
+
+        assertEquals(1, d1.data.id)
+        assertEquals(1, d2.id)
+    }
+}
+
+data class Data(
+        val id: Int = 0,
+        val name: String = "",
+        val date: Date? = null
+)
+data class Data2(
+        val data: Data
+)