Merge pull request #17 from ProjectMapK/set-only-kotlin-property

Set only kotlin property

Author: k163377

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

@@ -26,8 +26,6 @@ import java.lang.reflect.Constructor
 import java.lang.reflect.Field
 import java.lang.reflect.Method
 import kotlin.reflect.KFunction
-import kotlin.reflect.KType
-import kotlin.reflect.full.createType
 import kotlin.reflect.jvm.javaType
 import kotlin.reflect.jvm.kotlinFunction
 
@@ -159,7 +157,6 @@ internal class KotlinAnnotationIntrospector(
     // This could be a setter or a getter of a class property or
     // a setter-like/getter-like method.
     private fun AnnotatedMethod.hasRequiredMarker(): Boolean? = this.getRequiredMarkerFromCorrespondingAccessor()
-        ?: this.member.getRequiredMarkerFromAccessorLikeMethod()
 
     private fun AnnotatedMethod.getRequiredMarkerFromCorrespondingAccessor(): Boolean? {
         val memberSignature = member.toSignature()
@@ -173,17 +170,6 @@ internal class KotlinAnnotationIntrospector(
         return null
     }
 
-    // Is the member method a regular method of the data class or
-    private fun Method.getRequiredMarkerFromAccessorLikeMethod(): Boolean? = this.kotlinFunction?.let { method ->
-        val byAnnotation = this.isRequiredByAnnotation()
-        return when {
-            method.isSetterLike() -> requiredAnnotationOrNullability(byAnnotation, method.isMethodParameterRequired(0))
-            else -> null
-        }
-    }
-
-    private fun KFunction<*>.isSetterLike(): Boolean = parameters.size == 2 && returnType == UNIT_TYPE
-
     private fun AnnotatedParameter.hasRequiredMarker(): Boolean? {
         val member = this.member
         val byAnnotation = this.getAnnotation(JsonProperty::class.java)?.required
@@ -217,8 +203,4 @@ internal class KotlinAnnotationIntrospector(
         return !paramType.isMarkedNullable && !param.isOptional &&
             !(isPrimitive && !context.isEnabled(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES))
     }
-
-    companion object {
-        val UNIT_TYPE: KType = Unit::class.createType()
-    }
 }

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

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.introspect.AnnotatedParameter
 import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector
 import kotlinx.metadata.jvm.fieldSignature
 import kotlinx.metadata.jvm.getterSignature
+import kotlinx.metadata.jvm.setterSignature
 import java.lang.reflect.Constructor
 import java.lang.reflect.Method
 import kotlin.reflect.KClass
@@ -59,6 +60,14 @@ internal class KotlinNamesAnnotationIntrospector(val module: KotlinModule, val c
         else -> null
     }
 
+    override fun hasIgnoreMarker(m: AnnotatedMember): Boolean = (m as? AnnotatedMethod)?.member
+        ?.takeIf { it.parameters.size == 1 /* && it.returnType == Void::class.java */ }
+        ?.let { it.declaringClass.toKmClass() }
+        ?.let { kmClass ->
+            val methodSignature = m.annotated.toSignature()
+            kmClass.properties.none { it.setterSignature == methodSignature }
+        } ?: false
+
     @Suppress("UNCHECKED_CAST")
     private fun hasCreatorAnnotation(member: AnnotatedConstructor): Boolean {
         // don't add a JsonCreator to any constructor if one is declared already

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

@@ -50,7 +50,7 @@ class TestPropertyRequiredness {
         "h".isOptionalForSerializationOf(testClass, mapper)
         "h".isOptionalForDeserializationOf(testClass, mapper)
 
-        "i".isRequiredForDeserializationOf(testClass, mapper)
+        "i".isOptionalForDeserializationOf(testClass, mapper)
         "j".isOptionalForDeserializationOf(testClass, mapper)
         "k".isOptionalForDeserializationOf(testClass, mapper)
         "l".isOptionalForDeserializationOf(testClass, mapper)
@@ -59,7 +59,7 @@ class TestPropertyRequiredness {
     @Test fun shouldHandleTrueFailOnNullForPrimitives() {
         val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, true)
         val testClass = TestClass::class.java
-        "a".isRequiredForDeserializationOf(testClass, mapper)
+        "a".isOptionalForDeserializationOf(testClass, mapper)
         "b".isOptionalForDeserializationOf(testClass, mapper)
         "c".isOptionalForDeserializationOf(testClass, mapper)
         "d".isOptionalForDeserializationOf(testClass, mapper)
@@ -68,7 +68,7 @@ class TestPropertyRequiredness {
 
         "h".isOptionalForDeserializationOf(testClass, mapper)
 
-        "i".isRequiredForDeserializationOf(testClass, mapper)
+        "i".isOptionalForDeserializationOf(testClass, mapper)
         "j".isOptionalForDeserializationOf(testClass, mapper)
         "k".isOptionalForDeserializationOf(testClass, mapper)
         "l".isOptionalForDeserializationOf(testClass, mapper)
@@ -194,5 +194,5 @@ class TestPropertyRequiredness {
         mapper.deserializationConfig.introspect(mapper.deserializationConfig.constructType(type))
 
     private fun BeanDescription.isRequired(propertyName: String): Boolean =
-        this.findProperties().find { it.name == propertyName }!!.isRequired
+        this.findProperties().find { it.name == propertyName }?.isRequired ?: false
 }

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

@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.module.kotlin._ported.test.github
 
+import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.annotation.JsonSetter
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.fasterxml.jackson.module.kotlin.test.github._ported.Github165JavaTest
@@ -15,20 +15,21 @@ class TestGithub165 {
         var yearSetterCalled: Boolean = false
         var nameSetterCalled: Boolean = false
 
-        @JsonProperty("year")
-        lateinit var showYear: String
+        var showYear: String? = null
+            @JsonProperty("year")
+            set(value) {
+                yearSetterCalled = true
+                field = value
+            }
 
-        @JsonSetter("year")
-        fun setYear(value: String) {
-            yearSetterCalled = true
-            this.showYear = value
-        }
+        var name: String
+            @JsonIgnore get() = showName // Why define get: https://youtrack.jetbrains.com/issue/KT-6519
 
-        @JsonSetter("name")
-        fun setName(value: String) {
-            nameSetterCalled = true
-            this.showName = value
-        }
+            @JsonProperty("name")
+            set(value) {
+                nameSetterCalled = true
+                this.showName = value
+            }
     }
 
     @Test

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

@@ -17,10 +17,11 @@ class TestGithub308 {
         var id: Long? = null,
         var cityId: Int? = null
     ) {
-        @JsonProperty("id")
-        private fun unpackId(idObj: Int?) {
-            cityId = idObj
-        }
+        private var unpackId: Int?
+            get() = cityId // Why define get: https://youtrack.jetbrains.com/issue/KT-6519
+
+            @JsonProperty("id")
+            set(value) { cityId = value }
     }
 
     @Test