Fixed conversion to be done by converter only

Author: k163377

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

@@ -21,10 +21,14 @@ internal class SequenceToIteratorConverter(private val input: JavaType) : StdCon
         ?: typeFactory.constructType(Iterator::class.java)
 }
 
+internal object KotlinDurationValueToJavaDurationConverter : StdConverter<Long, JavaDuration>() {
+    private val boxConverter by lazy { ValueClassBoxConverter(Long::class.java, KotlinDuration::class) }
+
+    override fun convert(value: Long): JavaDuration = KotlinToJavaDurationConverter.convert(boxConverter.convert(value))
+}
+
 internal object KotlinToJavaDurationConverter : StdConverter<KotlinDuration, JavaDuration>() {
     override fun convert(value: KotlinDuration) = value.toJavaDuration()
-
-    val delegatingSerializer: StdDelegatingSerializer by lazy { StdDelegatingSerializer(this) }
 }
 
 /**

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

@@ -13,7 +13,6 @@ import java.lang.reflect.AccessibleObject
 import java.lang.reflect.Constructor
 import java.lang.reflect.Field
 import java.lang.reflect.Method
-import java.lang.reflect.Modifier
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KMutableProperty1
@@ -71,7 +70,16 @@ internal class KotlinAnnotationIntrospector(
 
     override fun findSerializationConverter(a: Annotated): Converter<*, *>? = when (a) {
         // Find a converter to handle the case where the getter returns an unboxed value from the value class.
-        is AnnotatedMethod -> a.findValueClassReturnType()?.let { cache.getValueClassBoxConverter(a.rawReturnType, it) }
+        is AnnotatedMethod -> a.findValueClassReturnType()?.let {
+            if (useJavaDurationConversion && it == Duration::class) {
+                if (a.rawReturnType == Duration::class.java)
+                    KotlinToJavaDurationConverter
+                else
+                    KotlinDurationValueToJavaDurationConverter
+            } else {
+                cache.getValueClassBoxConverter(a.rawReturnType, it)
+            }
+        }
         is AnnotatedClass -> lookupKotlinTypeConverter(a)
         else -> null
     }
@@ -94,11 +102,6 @@ internal class KotlinAnnotationIntrospector(
         ?.takeIf { it.requireRebox() }
         ?.let { cache.getValueClassBoxConverter(am.rawReturnType, it).delegatingSerializer }
 
-    override fun findSerializer(am: Annotated): Any? = when ((am as? AnnotatedMethod)?.findValueClassReturnType()) {
-        Duration::class -> KotlinToJavaDurationConverter.delegatingSerializer.takeIf { useJavaDurationConversion }
-        else -> null
-    } ?: super.findSerializer(am)
-
     override fun findDeserializationConverter(a: Annotated): Any? {
         if (!useJavaDurationConversion) return null