Skip to content

Commit 20d998a

Browse files
committed
Merge remote-tracking branch 'FasterXML/2.17'
2 parents d38c9a6 + 32730dc commit 20d998a

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

release-notes/CREDITS-2.x

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ Authors:
1515

1616
Contributors:
1717

18-
# 2.17.0 (not yet released)
18+
# 2.17.1 (not yet released)
19+
20+
WrongWrong (@k163377)
21+
* #776: Delete Duration conversion that was no longer needed
22+
23+
# 2.17.0
1924

2025
WrongWrong (@k163377)
2126
* #768: Added value class deserialization support.

release-notes/VERSION-2.x

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ Co-maintainers:
1616
=== Releases ===
1717
------------------------------------------------------------------------
1818

19+
2.17.1 (not yet released)
20+
21+
#776: Delete Duration conversion that was no longer needed.
22+
1923
2.17.0 (12-Mar-2024)
2024

2125
#768: Added value class deserialization support.

src/main/kotlin/tools/jackson/module/kotlin/KotlinAnnotationIntrospector.kt

-14
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,6 @@ internal class KotlinAnnotationIntrospector(
9090
?.takeIf { it.wrapsNullable() }
9191
?.let { cache.getValueClassBoxConverter(am.rawReturnType, it).delegatingSerializer }
9292

93-
override fun findDeserializationConverter(config: MapperConfig<*>, a: Annotated): Any? {
94-
if (!useJavaDurationConversion) return null
95-
96-
return (a as? AnnotatedParameter)?.let { param ->
97-
val valueParameter = cache.findKotlinParameter(param) ?: return@let null
98-
99-
if (valueParameter.type.classifier == Duration::class) {
100-
JavaToKotlinDurationConverter
101-
} else {
102-
null
103-
}
104-
}
105-
}
106-
10793
/**
10894
* Subclasses can be detected automatically for sealed classes, since all possible subclasses are known
10995
* at compile-time to Kotlin. This makes [com.fasterxml.jackson.annotation.JsonSubTypes] redundant.

0 commit comments

Comments
 (0)