fix deserialize kotlin data class error, for issue #2231

alibaba · Feb 8, 2024 · f71cd4b · f71cd4b
1 parent 2838c3a
commit f71cd4b
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderCreator.java b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderCreator.java
@@ -1647,7 +1647,7 @@ boolean record = BeanUtils.isRecord(objectClass);
             }
 
             Class mixIn = provider.getMixIn(objectClass);
-            BeanUtils.setters(objectClass, mixIn, method -> {
+            BeanUtils.setters(objectClass, beanInfo, mixIn, method -> {
                 fieldInfo.init();
                 fieldInfo.features |= beanFeatures;
                 fieldInfo.format = beanFormat;

diff --git a/core/src/main/java/com/alibaba/fastjson2/util/BeanUtils.java b/core/src/main/java/com/alibaba/fastjson2/util/BeanUtils.java
@@ -420,10 +420,14 @@ public static Constructor getDefaultConstructor(Class objectClass, boolean inclu
     }
 
     public static void setters(Class objectClass, Consumer<Method> methodConsumer) {
-        setters(objectClass, null, methodConsumer);
+        setters(objectClass, null, null, methodConsumer);
     }
 
     public static void setters(Class objectClass, Class mixin, Consumer<Method> methodConsumer) {
+        setters(objectClass, null, mixin, methodConsumer);
+    }
+
+    public static void setters(Class objectClass, BeanInfo beanInfo, Class mixin, Consumer<Method> methodConsumer) {
         if (ignore(objectClass)) {
             return;
         }
@@ -453,6 +457,11 @@ public static void setters(Class objectClass, Class mixin, Consumer<Method> meth
                 case "toString":
                     methodSkip = true;
                     break;
+                case "copy":
+                    if (beanInfo != null && beanInfo.kotlin) {
+                        methodSkip = true;
+                    }
+                    break;
                 default:
                     break;
             }

diff --git a/core/src/test/java/com/alibaba/fastjson2/issues_2200/Issue2231.kt b/core/src/test/java/com/alibaba/fastjson2/issues_2200/Issue2231.kt
@@ -0,0 +1,33 @@
+package com.alibaba.fastjson2.issues_2200
+
+import com.alibaba.fastjson2.JSON
+import com.alibaba.fastjson2.JSONB
+import com.alibaba.fastjson2.JSONReader
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class Issue2231 {
+    @Test
+    fun test() {
+        var data = JSON.parseObject("""{}""", Hello::class.java)
+        assertEquals("hello", data.value)
+
+        var jsonb = JSONB.toBytes(data)
+
+        assertEquals(
+            """{
+	"value":"hello"
+}""",
+            JSONB.toJSONString(jsonb)
+        )
+        val data1 = JSONB.parseObject(jsonb, Hello::class.java)
+        assertEquals(data.value, data1.value)
+
+        val data2 = JSONB.parseObject(jsonb, Hello::class.java, JSONReader.Feature.FieldBased)
+        assertEquals(data.value, data2.value)
+    }
+}
+
+data class Hello(
+    val value: String = "hello"
+)