Skip to content
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

Jump to bottom

Fix KotlinAnnotationIntrospector.findSubtypes returning wrong value in super edge case. #447

Merged
merged 1 commit into from
May 18, 2021
Merged

Fix KotlinAnnotationIntrospector.findSubtypes returning wrong value in super edge case. #447

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
21 changes: 7 additions & 14 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 @@ -63,22 +63,15 @@ internal class KotlinAnnotationIntrospector(private val context: Module.SetupCon
* 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.
*/
override fun findSubtypes(a: Annotated): MutableList<NamedType>? {

val rawType = a.rawType
if (rawType.isKotlinClass()) {
val kClass = rawType.kotlin
if (kClass.isSealed) {
return kClass.sealedSubclasses
.map { NamedType(it.java) }
.toMutableList()
}
override fun findSubtypes(a: Annotated): MutableList<NamedType>? = a.rawType
.takeIf { it.isKotlinClass() }
?.let { rawType ->
rawType.kotlin.sealedSubclasses
.map { NamedType(it.java) }
.toMutableList()
.ifEmpty { null }
}

return null

}

private fun AnnotatedField.hasRequiredMarker(): Boolean? {
val byAnnotation = (member as Field).isRequiredByAnnotation()
val byNullability = (member as Field).kotlinProperty?.returnType?.isRequired()
Expand Down