Merge pull request #8 from ProjectMapK/refactors

Refactors.

Author: k163377

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

@@ -11,7 +11,7 @@ internal fun JsonMappingException.wrapWithPath(refFrom: Any?, index: Int) = Json
 internal fun Int.toBitSet(): BitSet {
     var i = this
     var index = 0
-    val bits = BitSet(32)
+    val bits = BitSet(Int.SIZE_BITS)
     while (i != 0) {
         if (i % 2 != 0) {
             bits.set(index)
@@ -22,10 +22,7 @@ internal fun Int.toBitSet(): BitSet {
     return bits
 }
 
-// In the future, value classes without @JvmInline will be available, and unboxing may not be able to handle it.
-// https://github.com/FasterXML/jackson-module-kotlin/issues/464
-// The JvmInline annotation can be added to Java classes,
-// so the isKotlinClass decision is necessary (the order is preferable in terms of possible frequency).
-internal fun Class<*>.isUnboxableValueClass() = annotations.any { it is JvmInline } && this.isKotlinClass()
+internal fun Class<*>.isKotlinClass(): Boolean = declaredAnnotations.any { it is Metadata }
+internal fun Class<*>.isUnboxableValueClass() = annotations.any { it is JvmInline }
 
 internal fun KType.erasedType(): Class<out Any> = this.jvmErasure.java

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

@@ -17,12 +17,6 @@ import com.fasterxml.jackson.module.kotlin.ser.serializers.KotlinSerializers
 import java.util.*
 import kotlin.reflect.KClass
 
-private const val metadataFqName = "kotlin.Metadata"
-
-fun Class<*>.isKotlinClass(): Boolean {
-    return declaredAnnotations.any { it.annotationClass.java.name == metadataFqName }
-}
-
 /**
  * @param   reflectionCacheSize     Default: 512.  Size, in items, of the caches used for mapping objects.
  * @param   nullToEmptyCollection   Default: false.  Whether to deserialize null values for collection properties as

src/main/kotlin/com/fasterxml/jackson/module/kotlin/deser/singleton_support/KotlinBeanDeserializerModifier.kt

@@ -7,25 +7,19 @@ import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier
 import com.fasterxml.jackson.module.kotlin.isKotlinClass
 
 // [module-kotlin#225]: keep Kotlin singletons as singletons
-object KotlinBeanDeserializerModifier : BeanDeserializerModifier() {
+internal object KotlinBeanDeserializerModifier : BeanDeserializerModifier() {
     override fun modifyDeserializer(
         config: DeserializationConfig,
         beanDesc: BeanDescription,
         deserializer: JsonDeserializer<*>
     ): JsonDeserializer<out Any> {
         val modifiedFromParent = super.modifyDeserializer(config, beanDesc, deserializer)
 
-        val objectSingletonInstance = objectSingletonInstance(beanDesc.beanClass)
-        return if (objectSingletonInstance != null) {
-            KotlinObjectSingletonDeserializer(objectSingletonInstance, modifiedFromParent)
-        } else {
-            modifiedFromParent
-        }
+        return objectSingletonInstance(beanDesc.beanClass)
+            ?.let { KotlinObjectSingletonDeserializer(it, modifiedFromParent) }
+            ?: modifiedFromParent
     }
 }
 
-private fun objectSingletonInstance(beanClass: Class<*>): Any? = if (!beanClass.isKotlinClass()) {
-    null
-} else {
-    beanClass.kotlin.objectInstance
-}
+private fun objectSingletonInstance(beanClass: Class<*>): Any? = beanClass.takeIf { beanClass.isKotlinClass() }
+    ?.let { it.kotlin.objectInstance }

src/main/kotlin/com/fasterxml/jackson/module/kotlin/deser/singleton_support/KotlinObjectSingletonDeserializer.kt

@@ -8,35 +8,30 @@ import com.fasterxml.jackson.databind.deser.ContextualDeserializer
 import com.fasterxml.jackson.databind.deser.ResolvableDeserializer
 
 internal fun JsonDeserializer<*>.asSingletonDeserializer(singleton: Any) =
-        KotlinObjectSingletonDeserializer(singleton, this)
+    KotlinObjectSingletonDeserializer(singleton, this)
 
 /** deserialize as normal, but return the canonical singleton instance. */
 internal class KotlinObjectSingletonDeserializer(
-        private val singletonInstance: Any,
-        private val defaultDeserializer: JsonDeserializer<*>
+    private val singletonInstance: Any,
+    private val defaultDeserializer: JsonDeserializer<*>
 ) : JsonDeserializer<Any>(),
-        // Additional interfaces of a specific 'JsonDeserializer' must be supported
-        // Kotlin objectInstances are currently handled by a BeanSerializer which
-        // implements 'ContextualDeserializer' and 'ResolvableDeserializer'.
-        ContextualDeserializer,
-        ResolvableDeserializer {
+    // Additional interfaces of a specific 'JsonDeserializer' must be supported
+    // Kotlin objectInstances are currently handled by a BeanSerializer which
+    // implements 'ContextualDeserializer' and 'ResolvableDeserializer'.
+    ContextualDeserializer,
+    ResolvableDeserializer {
 
     override fun resolve(ctxt: DeserializationContext?) {
-        if (defaultDeserializer is ResolvableDeserializer) {
-            defaultDeserializer.resolve(ctxt)
-        }
+        if (defaultDeserializer is ResolvableDeserializer) defaultDeserializer.resolve(ctxt)
     }
 
     override fun createContextual(ctxt: DeserializationContext?, property: BeanProperty?): JsonDeserializer<*> =
-            if (defaultDeserializer is ContextualDeserializer) {
-                defaultDeserializer.createContextual(ctxt, property)
-                        .asSingletonDeserializer(singletonInstance)
-            } else {
-                this
-            }
+        (defaultDeserializer as? ContextualDeserializer)
+            ?.let { it.createContextual(ctxt, property).asSingletonDeserializer(singletonInstance) }
+            ?: this
 
     override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Any {
         defaultDeserializer.deserialize(p, ctxt)
         return singletonInstance
     }
-}
+}