Skip to content

Fixed hasRequiredMarker to not override processing by other modules #316

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
merged 1 commit into from
May 4, 2025
Merged

Fixed hasRequiredMarker to not override processing by other modules #316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions ...tmapk/jackson/module/kogera/annotationIntrospector/KotlinPrimaryAnnotationIntrospector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@ internal class KotlinPrimaryAnnotationIntrospector(
// If JsonProperty.required is true, the behavior is clearly specified and the result is paramount.
// Otherwise, the required is determined from the configuration and the definition on Kotlin.
override fun hasRequiredMarker(m: AnnotatedMember): Boolean? {
val byAnnotation = _findAnnotation(m, JSON_PROPERTY_CLASS)
?.let { if (it.required) return true else false }
return cache.getJmClass(m.member.declaringClass)?.let { jmClass ->
// To avoid overwriting processing by other modules, annotations are checked after JmClass has been obtained
_findAnnotation(m, JSON_PROPERTY_CLASS)
?.let { if (it.required) return true }

return cache.getJmClass(m.member.declaringClass)?.let {
when (m) {
is AnnotatedField -> m.hasRequiredMarker(it)
is AnnotatedMethod -> m.getRequiredMarkerFromCorrespondingAccessor(it)
is AnnotatedParameter -> m.hasRequiredMarker(it)
is AnnotatedField -> m.hasRequiredMarker(jmClass)
is AnnotatedMethod -> m.getRequiredMarkerFromCorrespondingAccessor(jmClass)
is AnnotatedParameter -> m.hasRequiredMarker(jmClass)
else -> null
}
} ?: byAnnotation // If a JsonProperty is available, use it to reduce processing costs.
}
}

// Functions that call this may return incorrect results for value classes whose value type is Collection or Map,
Expand Down
Loading