Reduction of information held in property-related

Author: k163377

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotationIntrospector/KotlinPrimaryAnnotationIntrospector.kt

@@ -16,17 +16,13 @@ import io.github.projectmapk.jackson.module.kogera.JSON_PROPERTY_CLASS
 import io.github.projectmapk.jackson.module.kogera.ReflectionCache
 import io.github.projectmapk.jackson.module.kogera.hasCreatorAnnotation
 import io.github.projectmapk.jackson.module.kogera.jmClass.JmClass
+import io.github.projectmapk.jackson.module.kogera.jmClass.JmProperty
 import io.github.projectmapk.jackson.module.kogera.reconstructClass
 import io.github.projectmapk.jackson.module.kogera.toSignature
 import kotlinx.metadata.KmClassifier
-import kotlinx.metadata.KmProperty
 import kotlinx.metadata.KmValueParameter
 import kotlinx.metadata.declaresDefaultValue
 import kotlinx.metadata.isNullable
-import kotlinx.metadata.isSecondary
-import kotlinx.metadata.jvm.getterSignature
-import kotlinx.metadata.jvm.setterSignature
-import kotlinx.metadata.jvm.signature
 import java.lang.reflect.Constructor
 import java.lang.reflect.Executable
 import java.lang.reflect.Method
@@ -71,11 +67,11 @@ internal class KotlinPrimaryAnnotationIntrospector(
             // only a check for the existence of a getter is performed.
             // https://youtrack.jetbrains.com/issue/KT-6519
             ?.let {
-                if (it.getterSignature == null) !(it.returnType.isNullable || type.hasDefaultEmptyValue()) else null
+                if (it.getterName == null) !(it.returnType.isNullable || type.hasDefaultEmptyValue()) else null
             }
     }
 
-    private fun KmProperty.isRequiredByNullability(): Boolean = !this.returnType.isNullable
+    private fun JmProperty.isRequiredByNullability(): Boolean = !this.returnType.isNullable
 
     private fun AnnotatedMethod.getRequiredMarkerFromCorrespondingAccessor(jmClass: JmClass): Boolean? =
         when (parameterCount) {

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/jmClass/JmClass.kt

@@ -7,9 +7,7 @@ import kotlinx.metadata.ClassKind
 import kotlinx.metadata.ClassName
 import kotlinx.metadata.KmClass
 import kotlinx.metadata.KmFunction
-import kotlinx.metadata.KmProperty
 import kotlinx.metadata.isNullable
-import kotlinx.metadata.jvm.getterSignature
 import kotlinx.metadata.jvm.signature
 import kotlinx.metadata.kind
 import java.lang.reflect.Constructor
@@ -40,7 +38,7 @@ internal sealed interface JmClass {
     val constructors: List<JmConstructor>
     val sealedSubclasses: List<ClassName>
     val propertyNameSet: Set<String>
-    val properties: List<KmProperty>
+    val properties: List<JmProperty>
     val companion: CompanionObject?
     // endregion
 
@@ -49,8 +47,8 @@ internal sealed interface JmClass {
     // endregion
 
     fun findKmConstructor(constructor: Constructor<*>): JmConstructor?
-    fun findPropertyByField(field: Field): KmProperty?
-    fun findPropertyByGetter(getter: Method): KmProperty?
+    fun findPropertyByField(field: Field): JmProperty?
+    fun findPropertyByGetter(getter: Method): JmProperty?
 }
 
 private class JmClassImpl(
@@ -59,10 +57,10 @@ private class JmClassImpl(
     superJmClass: JmClass?,
     interfaceJmClasses: List<JmClass>
 ) : JmClass {
-    private val allPropsMap: Map<String, KmProperty>
+    private val allPropsMap: Map<String, JmProperty>
 
     // Defined as non-lazy because it is always read in both serialization and deserialization
-    override val properties: List<KmProperty>
+    override val properties: List<JmProperty>
 
     private val companionPropName: String? = kmClass.companionObject
     override val kind: ClassKind = kmClass.kind
@@ -77,7 +75,7 @@ private class JmClassImpl(
         // it is necessary to obtain a more specific type, so always add it from the abstract class first.
         val tempPropsMap = ((superJmClass as JmClassImpl?)?.allPropsMap?.toMutableMap() ?: mutableMapOf()).apply {
             kmClass.properties.forEach {
-                this[it.name] = it
+                this[it.name] = JmProperty(it)
             }
         }
 
@@ -119,11 +117,11 @@ private class JmClassImpl(
     }
 
     // Field name always matches property name
-    override fun findPropertyByField(field: Field): KmProperty? = allPropsMap[field.name]
+    override fun findPropertyByField(field: Field): JmProperty? = allPropsMap[field.name]
 
-    override fun findPropertyByGetter(getter: Method): KmProperty? {
+    override fun findPropertyByGetter(getter: Method): JmProperty? {
         val getterName = getter.name
-        return properties.find { it.getterSignature?.name == getterName }
+        return properties.find { it.getterName == getterName }
     }
 }
 

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/jmClass/JmProperty.kt

@@ -0,0 +1,21 @@
+package io.github.projectmapk.jackson.module.kogera.jmClass
+
+import kotlinx.metadata.KmProperty
+import kotlinx.metadata.KmType
+import kotlinx.metadata.jvm.JvmMemberSignature
+import kotlinx.metadata.jvm.getterSignature
+import kotlinx.metadata.jvm.setterSignature
+
+internal data class JmProperty(
+    val name: String?,
+    val getterName: String?,
+    val setterSignature: JvmMemberSignature?,
+    val returnType: KmType
+) {
+    constructor(kmProperty: KmProperty) : this(
+        name = kmProperty.name,
+        getterName = kmProperty.getterSignature?.name,
+        setterSignature = kmProperty.setterSignature,
+        returnType = kmProperty.returnType
+    )
+}