Skip to content

2.19 #1004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: 2.x
merged 2 commits into from
May 31, 2025
Merged

2.19 #1004

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3811252
Added comments regarding Duration conversion
k163377 May 31, 2025
7cf0f24
Merge pull request #1003 from k163377/add-comments
k163377 May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinAnnotationIntrospector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ 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 {
// To make annotations that process JavaDuration work,
// it is necessary to set up the conversion to JavaDuration here.
// This conversion will cause the deserialization settings for KotlinDuration to be ignored.
if (useJavaDurationConversion && it == Duration::class) {
// For early return, the same process is placed as the branch regarding AnnotatedClass.
if (a.rawReturnType == Duration::class.java)
KotlinToJavaDurationConverter
else
Expand Down