improved kotlin support, for issue #2069

alibaba · Dec 23, 2023 · a9e0ec6 · a9e0ec6
1 parent e7f6244
commit a9e0ec6
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 4 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/util/BeanUtils.java b/core/src/main/java/com/alibaba/fastjson2/util/BeanUtils.java
@@ -816,6 +816,10 @@ public static void getters(Class objectClass, Consumer<Method> methodConsumer) {
     }
 
     public static void getters(Class objectClass, Class mixinSource, Consumer<Method> methodConsumer) {
+        getters(objectClass, mixinSource, false, methodConsumer);
+    }
+
+    public static void getters(Class objectClass, Class mixinSource, boolean kotlin, Consumer<Method> methodConsumer) {
         if (objectClass == null) {
             return;
         }
@@ -955,7 +959,7 @@ && findAnnotation(method, JSONField.class) == null) {
                 if (firstChar >= 'a' && firstChar <= 'z' && methodNameLength == 4) {
                     nameMatch = false;
                 }
-            } else if (returnClass == boolean.class || returnClass == Boolean.class) {
+            } else if (returnClass == boolean.class || returnClass == Boolean.class || kotlin) {
                 nameMatch = methodNameLength > 2 && methodName.startsWith("is");
                 if (nameMatch) {
                     char firstChar = methodName.charAt(2);
@@ -1143,7 +1147,15 @@ public static String setterName(String methodName, int prefixLength) {
     }
 
     public static String getterName(Method method, String namingStrategy) {
-        String fieldName = getterName(method.getName(), namingStrategy);
+        String methodName = method.getName();
+        if (methodName.startsWith("is")) {
+            Class<?> returnType = method.getReturnType();
+            if (returnType != Boolean.class && returnType != boolean.class) {
+                return methodName;
+            }
+        }
+
+        String fieldName = getterName(methodName, namingStrategy);
 
         if (fieldName.length() > 2
                 && fieldName.charAt(0) >= 'A' && fieldName.charAt(0) <= 'Z'

diff --git a/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreator.java b/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreator.java
@@ -374,7 +374,7 @@ boolean record = BeanUtils.isRecord(objectClass);
 
                 Class mixIn = provider.getMixIn(objectClass);
 
-                BeanUtils.getters(objectClass, mixIn, method -> {
+                BeanUtils.getters(objectClass, mixIn, beanInfo.kotlin, method -> {
                     fieldInfo.init();
                     fieldInfo.features = writerFieldFeatures;
                     fieldInfo.format = beanInfo.format;

diff --git a/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreatorASM.java b/core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreatorASM.java
@@ -230,7 +230,7 @@ boolean record = BeanUtils.isRecord(objectClass);
                 }
 
                 Class mixIn = provider.getMixIn(objectClass);
-                BeanUtils.getters(objectClass, mixIn, method -> {
+                BeanUtils.getters(objectClass, mixIn, beanInfo.kotlin, method -> {
                     fieldInfo.init();
                     fieldInfo.features |= writerFieldFeatures;
                     fieldInfo.format = beanInfo.format;

diff --git a/core/src/test/java/com/alibaba/fastjson2/issues_1900/Issue2069.kt b/core/src/test/java/com/alibaba/fastjson2/issues_1900/Issue2069.kt
@@ -0,0 +1,36 @@
+package com.alibaba.fastjson2.issues_1900
+
+import com.alibaba.fastjson2.JSON
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class Issue2069 {
+    data class User(
+        val id: Long?,
+        val username: String?,
+        val isTrue: String?,
+        val isMain: Int?,
+        val isBoolean: Boolean?
+    ) {
+        var isNormal: String? = null
+
+        override fun toString(): String {
+            return "User(id=$id, username=$username, isTrue=$isTrue, isMain=$isMain, isBoolean=$isBoolean, isNormal=$isNormal)"
+        }
+    }
+
+    @Test
+    fun test() {
+        val user = User(1, "lili", "是", 1, true)
+        user.isNormal = "否"
+        var jsonStr = JSON.toJSONString(user)
+        jsonStr = "{\"id\":1,\"username\":\"lili\",\"isTrue\":\"是\",\"isMain\":1,\"isBoolean\": true,\"isNormal\":\"否\"}"
+        val parseObject = JSON.parseObject(jsonStr, User::class.java)
+        assertEquals(parseObject.id, parseObject.id);
+        assertEquals(parseObject.username, parseObject.username);
+        assertEquals(parseObject.isMain, parseObject.isMain);
+        assertEquals(parseObject.isBoolean, parseObject.isBoolean);
+        assertEquals(parseObject.isTrue, parseObject.isTrue);
+        assertEquals(parseObject.isNormal, parseObject.isNormal);
+    }
+}