Merge pull request #16 from ProjectMapK/ser-only-property

Serialize only Kotlin property.

Author: k163377

src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinAnnotationIntrospector.kt

@@ -177,13 +177,11 @@ internal class KotlinAnnotationIntrospector(
     private fun Method.getRequiredMarkerFromAccessorLikeMethod(): Boolean? = this.kotlinFunction?.let { method ->
         val byAnnotation = this.isRequiredByAnnotation()
         return when {
-            method.isGetterLike() -> requiredAnnotationOrNullability(byAnnotation, method.returnType.isRequired())
             method.isSetterLike() -> requiredAnnotationOrNullability(byAnnotation, method.isMethodParameterRequired(0))
             else -> null
         }
     }
 
-    private fun KFunction<*>.isGetterLike(): Boolean = parameters.size == 1
     private fun KFunction<*>.isSetterLike(): Boolean = parameters.size == 2 && returnType == UNIT_TYPE
 
     private fun AnnotatedParameter.hasRequiredMarker(): Boolean? {
@@ -220,8 +218,6 @@ internal class KotlinAnnotationIntrospector(
             !(isPrimitive && !context.isEnabled(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES))
     }
 
-    private fun KType.isRequired(): Boolean = !isMarkedNullable
-
     companion object {
         val UNIT_TYPE: KType = Unit::class.createType()
     }

src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinNamesAnnotationIntrospector.kt

@@ -2,19 +2,17 @@ package com.fasterxml.jackson.module.kotlin
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.databind.PropertyName
-import com.fasterxml.jackson.databind.cfg.MapperConfig
 import com.fasterxml.jackson.databind.introspect.Annotated
 import com.fasterxml.jackson.databind.introspect.AnnotatedConstructor
 import com.fasterxml.jackson.databind.introspect.AnnotatedField
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod
 import com.fasterxml.jackson.databind.introspect.AnnotatedParameter
 import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector
-import com.fasterxml.jackson.databind.util.BeanUtil
+import kotlinx.metadata.jvm.fieldSignature
+import kotlinx.metadata.jvm.getterSignature
 import java.lang.reflect.Constructor
 import java.lang.reflect.Method
-import java.util.Locale
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
@@ -30,35 +28,35 @@ import kotlin.reflect.jvm.kotlinFunction
 internal class KotlinNamesAnnotationIntrospector(val module: KotlinModule, val cache: ReflectionCache, val ignoredClassesForImplyingJsonCreator: Set<KClass<*>>) : NopAnnotationIntrospector() {
     // since 2.4
     override fun findImplicitPropertyName(member: AnnotatedMember): String? = when (member) {
-        is AnnotatedMethod -> if (member.name.contains('-') && member.parameterCount == 0) {
-            when {
-                member.name.startsWith("get") -> member.name.substringAfter("get")
-                member.name.startsWith("is") -> member.name.substringAfter("is")
-                else -> null
-            }?.replaceFirstChar { it.lowercase(Locale.getDefault()) }?.substringBefore('-')
-        } else null
+        is AnnotatedMethod -> member.annotated.declaringClass.toKmClass()?.let { kmClass ->
+            val methodSignature = member.annotated.toSignature()
+
+            kmClass.properties.find { it.getterSignature == methodSignature }?.name
+        }
+        is AnnotatedField -> member.annotated.declaringClass.toKmClass()?.let { kmClass ->
+            val fieldSignature = member.annotated.toSignature()
+
+            kmClass.properties.find { it.fieldSignature == fieldSignature }?.name
+        }
         is AnnotatedParameter -> findKotlinParameterName(member)
         else -> null
     }
 
-    // since 2.11: support Kotlin's way of handling "isXxx" backed properties where
-    // logical property name needs to remain "isXxx" and not become "xxx" as with Java Beans
-    // (see https://kotlinlang.org/docs/reference/java-to-kotlin-interop.html and
-    //  https://github.com/FasterXML/jackson-databind/issues/2527
-    //  for details)
-    override fun findRenameByField(
-        config: MapperConfig<*>,
-        field: AnnotatedField,
-        implName: PropertyName
-    ): PropertyName? {
-        val origSimple = implName.simpleName
-        if (field.declaringClass.isKotlinClass() && origSimple.startsWith("is")) {
-            val mangledName: String? = BeanUtil.stdManglePropertyName(origSimple, 2)
-            if ((mangledName != null) && !mangledName.equals(origSimple)) {
-                return PropertyName.construct(mangledName)
-            }
-        }
-        return null
+    // If it is not a property on Kotlin, it is not used to serialization
+    override fun findPropertyAccess(ann: Annotated): JsonProperty.Access? = when (ann) {
+        is AnnotatedMethod ->
+            ann.annotated
+                .takeIf { it.parameters.isEmpty() } // Ignore target is only getter
+                ?.let { method ->
+                    method.declaringClass.toKmClass()?.let { kmClass ->
+                        val methodSignature = method.toSignature()
+
+                        JsonProperty.Access.WRITE_ONLY.takeIf {
+                            kmClass.properties.none { it.getterSignature == methodSignature }
+                        }
+                    }
+                }
+        else -> null
     }
 
     @Suppress("UNCHECKED_CAST")

src/test/kotlin/com/fasterxml/jackson/module/kotlin/_integration/ser/PropertySerializeTest.kt

@@ -0,0 +1,30 @@
+package com.fasterxml.jackson.module.kotlin._integration.ser
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class PropertySerializeTest {
+    data class Src(
+        // Serialized by property name in Kotlin even when not following getter naming conventions
+        @get:JvmName("renamed") val fooFoo: Int,
+        // https://github.com/FasterXML/jackson-module-kotlin/issues/600
+        val isBar: Boolean,
+        val bar: String,
+        // https://github.com/FasterXML/jackson-module-kotlin/pull/451
+        @Suppress("PropertyName") val `baz-baz`: String,
+        // https://github.com/FasterXML/jackson-module-kotlin/issues/503
+        val nQux: Int
+    ) {
+        // Ignored because it is not a Kotlin property
+        fun getZzz(): Int = -1
+    }
+
+    @Test
+    fun test() {
+        assertEquals(
+            """{"fooFoo":0,"isBar":true,"bar":"bar","baz-baz":"baz-baz","nQux":1}""",
+            jacksonObjectMapper().writeValueAsString(Src(0, true, "bar", "baz-baz", 1))
+        )
+    }
+}

src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/PropertyRequirednessTests.kt

@@ -41,7 +41,7 @@ class TestPropertyRequiredness {
         "c".isOptionalForDeserializationOf(testClass, mapper)
         "d".isOptionalForDeserializationOf(testClass, mapper)
 
-        "e".isRequiredForSerializationOf(testClass, mapper)
+        "e".isOptionalForSerializationOf(testClass, mapper)
         "f".isOptionalForSerializationOf(testClass, mapper)
 
         "g".isRequiredForDeserializationOf(testClass, mapper)

src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github464.kt

@@ -33,12 +33,12 @@ class Github464 {
     abstract class AbstractGetter<T> {
         abstract val qux: T
 
-        fun <T> getPlugh() = qux
+        val plugh: T get() = qux
     }
     interface IGetter<T> {
         val quux: T
 
-        fun <T> getXyzzy() = quux
+        val xyzzy: T get() = quux
     }
 
     class Poko(

src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/failing/Github340.kt

@@ -1,8 +1,6 @@
 package com.fasterxml.jackson.module.kotlin._ported.test.github.failing
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException
-import com.fasterxml.jackson.module.kotlin._ported.test.expectFailure
 import com.fasterxml.jackson.module.kotlin.kotlinModule
 import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -21,10 +19,8 @@ class OwnerRequestTest {
 
     @Test
     fun testDeserHit340() {
-        expectFailure<UnrecognizedPropertyException>("GitHub #340 has been fixed!") {
-            val value: IsField = jackson.readValue(json)
-            assertEquals("Got a foo", value.foo)
-        }
+        val value: IsField = jackson.readValue(json)
+        assertEquals("Got a foo", value.foo)
     }
 
     @Test