Merge remote-tracking branch 'FasterXML/2.17'

FasterXML · Mar 16, 2024 · 20d998a · 20d998a
2 parents d38c9a6 + 32730dc
commit 20d998a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -15,7 +15,12 @@ Authors:
 
 Contributors:
 
-# 2.17.0 (not yet released)
+# 2.17.1 (not yet released)
+
+WrongWrong (@k163377)
+* #776: Delete Duration conversion that was no longer needed
+
+# 2.17.0
 
 WrongWrong (@k163377)
 * #768: Added value class deserialization support.

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -16,6 +16,10 @@ Co-maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.17.1 (not yet released)
+
+#776: Delete Duration conversion that was no longer needed.
+
 2.17.0 (12-Mar-2024)
 
 #768: Added value class deserialization support.

diff --git a/src/main/kotlin/tools/jackson/module/kotlin/KotlinAnnotationIntrospector.kt b/src/main/kotlin/tools/jackson/module/kotlin/KotlinAnnotationIntrospector.kt
@@ -90,20 +90,6 @@ internal class KotlinAnnotationIntrospector(
         ?.takeIf { it.wrapsNullable() }
         ?.let { cache.getValueClassBoxConverter(am.rawReturnType, it).delegatingSerializer }
 
-    override fun findDeserializationConverter(config: MapperConfig<*>, a: Annotated): Any? {
-        if (!useJavaDurationConversion) return null
-
-        return (a as? AnnotatedParameter)?.let { param ->
-            val valueParameter = cache.findKotlinParameter(param) ?: return@let null
-
-            if (valueParameter.type.classifier == Duration::class) {
-                JavaToKotlinDurationConverter
-            } else {
-                null
-            }
-        }
-    }
-
     /**
      * Subclasses can be detected automatically for sealed classes, since all possible subclasses are known
      * at compile-time to Kotlin. This makes [com.fasterxml.jackson.annotation.JsonSubTypes] redundant.