Merge pull request #206 from ProjectMapK/refactors

Refactors and add tests

Author: k163377

build.gradle.kts

@@ -32,6 +32,7 @@ dependencies {
     api(libs.jackson.annotations)
 
     // test libs
+    testImplementation("${libs.kotlin.reflect.get()}:${kotlinVersion}")
     testImplementation(libs.junit.api)
     testImplementation(libs.junit.params)
     testRuntimeOnly(libs.junit.engine)

gradle/libs.versions.toml

@@ -12,6 +12,7 @@ jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", ver
 jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
 
 # test libs
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" }
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 junit-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
 junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }

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

@@ -12,7 +12,7 @@ import java.lang.reflect.Method
 internal typealias JavaDuration = java.time.Duration
 internal typealias KotlinDuration = kotlin.time.Duration
 
-internal fun Class<*>.isUnboxableValueClass() = this.getAnnotation(JvmInline::class.java) != null
+internal fun Class<*>.isUnboxableValueClass() = this.isAnnotationPresent(JvmInline::class.java)
 
 // JmClass must be value class.
 internal fun JmClass.wrapsNullValueClass() = inlineClassUnderlyingType!!.isNullable

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

@@ -50,7 +50,7 @@ internal object KotlinClassIntrospector : BasicClassIntrospector() {
             ?: run {
                 val coll = collectProperties(config, type, r, true)
 
-                if (type.rawClass.annotations.any { it is Metadata }) {
+                if (type.rawClass.isAnnotationPresent(Metadata::class.java)) {
                     KotlinBeanDescription(coll)
                 } else {
                     BasicBeanDescription.forDeserialization(coll)
@@ -71,7 +71,7 @@ internal object KotlinClassIntrospector : BasicClassIntrospector() {
             ?: run {
                 val coll = collectProperties(config, type, r, false)
 
-                if (type.rawClass.annotations.any { it is Metadata }) {
+                if (type.rawClass.isAnnotationPresent(Metadata::class.java)) {
                     KotlinBeanDescription(coll)
                 } else {
                     BasicBeanDescription.forDeserialization(coll)

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

@@ -82,7 +82,7 @@ internal class KotlinFallbackAnnotationIntrospector(
                 }
             } else {
                 // If JsonUnbox is specified, the unboxed getter is used as is.
-                if (a.hasAnnotation(JsonKUnbox::class.java) || it.getAnnotation(JsonKUnbox::class.java) != null) {
+                if (a.hasAnnotation(JsonKUnbox::class.java) || it.isAnnotationPresent(JsonKUnbox::class.java)) {
                     null
                 } else {
                     cache.getValueClassBoxConverter(a.rawReturnType, it)

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/TestCommons.kt

@@ -4,6 +4,9 @@ import com.fasterxml.jackson.core.util.DefaultIndenter
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.ObjectWriter
+import org.junit.jupiter.api.Assertions.assertEquals
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.full.primaryConstructor
 
 // This `printer` is used to match the output from Jackson to the newline char of the source code.
 // If this is removed, comparisons will fail in a Windows-like platform.
@@ -13,3 +16,17 @@ internal val LF_PRINTER: DefaultPrettyPrinter =
 internal fun ObjectMapper.testPrettyWriter(): ObjectWriter = this.writer(LF_PRINTER)
 
 internal fun Class<*>.isKotlinClass() = declaredAnnotations.any { it is Metadata }
+
+internal val defaultMapper = jacksonObjectMapper()
+
+internal inline fun <reified T : Any> callPrimaryConstructorByParamName(): T = T::class.primaryConstructor!!.run {
+    val args = parameters.associateWith { it.name }
+    return callBy(args)
+}
+
+// Function for comparing non-data classes.
+internal inline fun <reified T : Any> assertReflectEquals(expected: T, actual: T) {
+    T::class.memberProperties.forEach {
+        assertEquals(it.get(expected), it.get(actual))
+    }
+}

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/InitModuleTest.kt

@@ -1,12 +1,14 @@
 package io.github.projectmapk.jackson.module.kogera.zIntegration
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertDoesNotThrow
 
 class InitModuleTest {
     @Test
     fun findAndRegisterModulesTest() {
-        assertDoesNotThrow { ObjectMapper().findAndRegisterModules() }
+        val mapper = assertDoesNotThrow { ObjectMapper().findAndRegisterModules() }
+        assertTrue(mapper.registeredModuleIds.contains("io.github.projectmapk.jackson.module.kogera.KotlinModule"))
     }
 }