Merge pull request #242 from ProjectMapK/refactors

Refactors

Author: k163377

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

@@ -125,7 +125,7 @@ internal class KotlinFallbackAnnotationIntrospector(
 private fun JmValueParameter.isNullishTypeAt(index: Int): Boolean = arguments.getOrNull(index)?.let {
     // If it is not a StarProjection, type is not null
     it === KmTypeProjection.STAR || it.type!!.isNullable
-} ?: true // If a type argument cannot be taken, treat it as nullable to avoid unexpected failure.
+} != false // If a type argument cannot be taken, treat it as nullable to avoid unexpected failure.
 
 private fun JmValueParameter.requireStrictNullCheck(type: JavaType): Boolean =
     ((type.isArrayType || type.isCollectionLikeType) && !this.isNullishTypeAt(0)) ||

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

@@ -20,7 +20,6 @@ import io.github.projectmapk.jackson.module.kogera.jmClass.JmProperty
 import io.github.projectmapk.jackson.module.kogera.jmClass.JmValueParameter
 import io.github.projectmapk.jackson.module.kogera.reconstructClass
 import io.github.projectmapk.jackson.module.kogera.toSignature
-import kotlinx.metadata.KmClassifier
 import kotlinx.metadata.isNullable
 import java.lang.reflect.Constructor
 import java.lang.reflect.Executable
@@ -137,10 +136,7 @@ internal class KotlinPrimaryAnnotationIntrospector(
 }
 
 private fun Constructor<*>.isPrimarilyConstructorOf(jmClass: JmClass): Boolean = jmClass.findJmConstructor(this)
-    ?.let { !it.isSecondary || jmClass.constructors.size == 1 }
-    ?: false
-
-private fun KmClassifier.isString(): Boolean = this is KmClassifier.Class && this.name == "kotlin/String"
+    ?.let { !it.isSecondary || jmClass.constructors.size == 1 } == true
 
 private fun isPossibleSingleString(
     kotlinParams: List<JmValueParameter>,