Skip to content

Fix most of databind/5094 change compilation problems #950

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 2 commits into from
Apr 16, 2025
Merged

Fix most of databind/5094 change compilation problems #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e1fef2
Fix most of databind/5094 change compilation problems
cowtowncoder Apr 16, 2025
6d93838
...
cowtowncoder Apr 16, 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
2 changes: 1 addition & 1 deletion src/main/kotlin/tools/jackson/module/kotlin/KotlinDeserializers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ internal class KotlinDeserializers(
override fun findBeanDeserializer(
type: JavaType,
config: DeserializationConfig?,
beanDesc: BeanDescription?,
beanDescRef: BeanDescription.Supplier?,
): ValueDeserializer<*>? {
val rawClass = type.rawClass

Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/tools/jackson/module/kotlin/KotlinValueDeserializerModifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ object KotlinValueDeserializerModifier : ValueDeserializerModifier() {

override fun modifyDeserializer(
config: DeserializationConfig,
beanDesc: BeanDescription,
beanDescRef: BeanDescription.Supplier,
deserializer: ValueDeserializer<*>
): ValueDeserializer<out Any> {
val modifiedFromParent = super.modifyDeserializer(config, beanDesc, deserializer)
val modifiedFromParent = super.modifyDeserializer(config, beanDescRef, deserializer)

val objectSingletonInstance = objectSingletonInstance(beanDesc.beanClass)
val objectSingletonInstance = objectSingletonInstance(beanDescRef.beanClass)
return if (objectSingletonInstance != null) {
KotlinObjectSingletonDeserializer(objectSingletonInstance, modifiedFromParent)
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/tools/jackson/module/kotlin/KotlinValueInstantiator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ internal class KotlinInstantiators(
) : ValueInstantiators.Base() {
override fun modifyValueInstantiator(
deserConfig: DeserializationConfig,
beanDescriptor: BeanDescription,
beanDescriptorRef: BeanDescription.Supplier,
defaultInstantiator: ValueInstantiator
): ValueInstantiator {
return if (beanDescriptor.beanClass.isKotlinClass()) {
return if (beanDescriptorRef.beanClass.isKotlinClass()) {
if (defaultInstantiator::class == StdValueInstantiator::class) {
KotlinValueInstantiator(
defaultInstantiator as StdValueInstantiator,
Expand Down
6 changes: 3 additions & 3 deletions src/test/kotlin/tools/jackson/module/kotlin/KotlinInstantiatorsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class KotlinInstantiatorsTest {
val defaultInstantiator = StdValueInstantiator(deserConfig, javaType)
val instantiator = kotlinInstantiators.modifyValueInstantiator(
deserConfig,
deserConfig.classIntrospectorInstance().introspectForDeserialization(javaType),
deserConfig.classIntrospectorInstance().introspectForDeserialization(javaType).supplier(),
defaultInstantiator
)

Expand All @@ -36,7 +36,7 @@ class KotlinInstantiatorsTest {
val javaType = mapper.constructType(TestClass::class.java)
val instantiator = kotlinInstantiators.modifyValueInstantiator(
deserConfig,
deserConfig.classIntrospectorInstance().introspectForDeserialization(javaType),
deserConfig.classIntrospectorInstance().introspectForDeserialization(javaType).supplier(),
StdValueInstantiator(deserConfig, javaType)
)

Expand All @@ -58,7 +58,7 @@ class KotlinInstantiatorsTest {
kotlinInstantiators.modifyValueInstantiator(
deserConfig,
deserConfig.classIntrospectorInstance()
.introspectForDeserialization(mapper.constructType(TestClass::class.java)),
.introspectForDeserialization(mapper.constructType(TestClass::class.java)).supplier(),
subClassInstantiator
)
}
Expand Down
Loading