Merge pull request #7 from ProjectMapK/fix_github558

Fix jackson github558.

Author: k163377

build.gradle.kts

@@ -29,6 +29,8 @@ dependencies {
     // test libs
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    // https://mvnrepository.com/artifact/io.mockk/mockk
+    testImplementation("io.mockk:mockk:1.12.2")
 
     testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
 }

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

@@ -3,11 +3,14 @@ package com.fasterxml.jackson.module.kotlin
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.core.TreeNode
 import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.JsonDeserializer
 import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.MappingIterator
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.ObjectReader
 import com.fasterxml.jackson.databind.json.JsonMapper
+import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.databind.node.ArrayNode
 import com.fasterxml.jackson.databind.node.ObjectNode
 import java.io.File
@@ -16,6 +19,7 @@ import java.io.Reader
 import java.math.BigDecimal
 import java.math.BigInteger
 import java.net.URL
+import kotlin.reflect.KClass
 
 fun kotlinModule(initializer: KotlinModule.Builder.() -> Unit = {}): KotlinModule {
     val builder = KotlinModule.Builder()
@@ -87,3 +91,17 @@ operator fun ObjectNode.minusAssign(fields: Collection<String>) { remove(fields)
 
 operator fun JsonNode.contains(field: String) = has(field)
 operator fun JsonNode.contains(index: Int) = has(index)
+
+public fun <T : Any> SimpleModule.addSerializer(
+    kClass: KClass<T>, serializer: JsonSerializer<T>
+): SimpleModule = this.apply {
+    kClass.javaPrimitiveType?.let { addSerializer(it, serializer) }
+    addSerializer(kClass.javaObjectType, serializer)
+}
+
+public fun <T : Any> SimpleModule.addDeserializer(
+    kClass: KClass<T>, deserializer: JsonDeserializer<T>
+): SimpleModule = this.apply {
+    kClass.javaPrimitiveType?.let { addDeserializer(it, deserializer) }
+    addDeserializer(kClass.javaObjectType, deserializer)
+}

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

@@ -1,27 +1,13 @@
 package com.fasterxml.jackson.module.kotlin
 
-import com.fasterxml.jackson.databind.JsonDeserializer
 import com.fasterxml.jackson.databind.JsonMappingException
-import com.fasterxml.jackson.databind.JsonSerializer
-import com.fasterxml.jackson.databind.module.SimpleModule
 import java.util.*
-import kotlin.reflect.KClass
 import kotlin.reflect.KType
 import kotlin.reflect.jvm.jvmErasure
 
 internal fun JsonMappingException.wrapWithPath(refFrom: Any?, refFieldName: String) = JsonMappingException.wrapWithPath(this, refFrom, refFieldName)
 internal fun JsonMappingException.wrapWithPath(refFrom: Any?, index: Int) = JsonMappingException.wrapWithPath(this, refFrom, index)
 
-inline fun <reified T : Any> SimpleModule.addSerializer(kClass: KClass<T>, serializer: JsonSerializer<T>) = this.apply {
-    addSerializer(kClass.java, serializer)
-    addSerializer(kClass.javaObjectType, serializer)
-}
-
-inline fun <reified T : Any> SimpleModule.addDeserializer(kClass: KClass<T>, deserializer: JsonDeserializer<T>) = this.apply {
-    addDeserializer(kClass.java, deserializer)
-    addDeserializer(kClass.javaObjectType, deserializer)
-}
-
 internal fun Int.toBitSet(): BitSet {
     var i = this
     var index = 0

src/test/kotlin/com/fasterxml/jackson/module/kotlin/ExtensionsTest.kt

@@ -0,0 +1,83 @@
+package com.fasterxml.jackson.module.kotlin
+
+import com.fasterxml.jackson.databind.JsonDeserializer
+import com.fasterxml.jackson.databind.JsonSerializer
+import com.fasterxml.jackson.databind.module.SimpleModule
+import io.mockk.confirmVerified
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
+
+class ExtensionsTest {
+    @Nested
+    inner class AddDeserializerTest {
+        val module = mockk<SimpleModule> {
+            every { addDeserializer(any<Class<*>>(), any()) } returns this
+        }
+
+        @Test
+        fun primitiveType() {
+            val mockDeserializer: JsonDeserializer<Double> = mockk()
+            module.addDeserializer(Double::class, mockDeserializer)
+
+            verify(exactly = 1) { module.addDeserializer(Double::class.javaPrimitiveType, mockDeserializer) }
+            verify(exactly = 1) { module.addDeserializer(Double::class.javaObjectType, mockDeserializer) }
+        }
+
+        @Test
+        fun objectType() {
+            val mockDeserializer: JsonDeserializer<Any> = mockk()
+            module.addDeserializer(Any::class, mockDeserializer)
+
+            verify(exactly = 1) { module.addDeserializer(Any::class.javaObjectType, mockDeserializer) }
+            confirmVerified(module)
+        }
+
+        @Test
+        @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
+        fun wrapperType() {
+            val mockDeserializer: JsonDeserializer<Integer> = mockk()
+            module.addDeserializer(Integer::class, mockDeserializer)
+
+            verify(exactly = 1) { module.addDeserializer(Integer::class.javaPrimitiveType, mockDeserializer) }
+            verify(exactly = 1) { module.addDeserializer(Integer::class.javaObjectType, mockDeserializer) }
+        }
+    }
+
+    @Nested
+    inner class AddSerializerTest {
+        val module = mockk<SimpleModule> {
+            every { addSerializer(any<Class<*>>(), any()) } returns this
+        }
+
+        @Test
+        fun primitiveType() {
+            val mockSerializer: JsonSerializer<Double> = mockk()
+            module.addSerializer(Double::class, mockSerializer)
+
+            verify(exactly = 1) { module.addSerializer(Double::class.javaPrimitiveType, mockSerializer) }
+            verify(exactly = 1) { module.addSerializer(Double::class.javaObjectType, mockSerializer) }
+        }
+
+        @Test
+        fun objectType() {
+            val mockSerializer: JsonSerializer<Any> = mockk()
+            module.addSerializer(Any::class, mockSerializer)
+
+            verify(exactly = 1) { module.addSerializer(Any::class.javaObjectType, mockSerializer) }
+            confirmVerified(module)
+        }
+
+        @Test
+        @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
+        fun wrapperType() {
+            val mockSerializer: JsonSerializer<Integer> = mockk()
+            module.addSerializer(Integer::class, mockSerializer)
+
+            verify(exactly = 1) { module.addSerializer(Integer::class.javaPrimitiveType, mockSerializer) }
+            verify(exactly = 1) { module.addSerializer(Integer::class.javaObjectType, mockSerializer) }
+        }
+    }
+}