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

Fixed an issue that could cause unexpected behavior when an instance that inherits from StdValueInstantiator is passed to defaultInstantiator. #521

Merged
merged 6 commits into from
Nov 26, 2021
Merged

Fixed an issue that could cause unexpected behavior when an instance that inherits from StdValueInstantiator is passed to defaultInstantiator. #521

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ced96c
Fixed comparison process.
k163377 Nov 25, 2021
e4f1f96
Basic test for KI
dinomite Nov 26, 2021
fade3f6
Test for Kotlin class
dinomite Nov 26, 2021
9838ab4
Update test to to work with #521
dinomite Nov 26, 2021
d85cc9e
Merge branch 'test-for-kotlin-instantiators' into fix-findValueInstan…
dinomite Nov 26, 2021
7b59597
Add credit for #521
dinomite Nov 26, 2021
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
11 changes: 9 additions & 2 deletions src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinValueInstantiator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,15 @@ internal class KotlinInstantiators(
defaultInstantiator: ValueInstantiator
): ValueInstantiator {
return if (beanDescriptor.beanClass.isKotlinClass()) {
if (defaultInstantiator is StdValueInstantiator) {
KotlinValueInstantiator(defaultInstantiator, cache, nullToEmptyCollection, nullToEmptyMap, nullIsSameAsDefault, strictNullChecks)
if (defaultInstantiator::class == StdValueInstantiator::class) {
KotlinValueInstantiator(
defaultInstantiator as StdValueInstantiator,
cache,
nullToEmptyCollection,
nullToEmptyMap,
nullIsSameAsDefault,
strictNullChecks
)
} else {
// TODO: return defaultInstantiator and let default method parameters and nullability go unused? or die with exception:
throw IllegalStateException("KotlinValueInstantiator requires that the default ValueInstantiator is StdValueInstantiator")
Expand Down