From 9f37e87d5e3703c53d24bad286e4361dc2b9eb2a Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 13 Oct 2024 12:51:24 +0900 Subject: [PATCH] Fixed not to reference enabledSingletonSupport Omission to correct in #835 --- .../com/fasterxml/jackson/module/kotlin/KotlinModule.kt | 2 +- .../kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt | 2 +- .../fasterxml/jackson/module/kotlin/KotlinModuleTest.kt | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt index 0e106e0f..843c65ab 100644 --- a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt +++ b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt @@ -106,7 +106,7 @@ class KotlinModule private constructor( context.addValueInstantiators(KotlinInstantiators(cache, nullToEmptyCollection, nullToEmptyMap, nullIsSameAsDefault, strictNullChecks)) - if (enabledSingletonSupport) { + if (singletonSupport) { context.addBeanDeserializerModifier(KotlinBeanDeserializerModifier) } diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt index e1e00ba2..1aef3f55 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt @@ -43,7 +43,7 @@ class DslTest { assertTrue(module.nullToEmptyCollection) assertTrue(module.nullToEmptyMap) assertTrue(module.nullIsSameAsDefault) - assertTrue(module.enabledSingletonSupport) + assertTrue(module.singletonSupport) assertTrue(module.strictNullChecks) } diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModuleTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModuleTest.kt index 5b8fd0aa..b49ce279 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModuleTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModuleTest.kt @@ -17,7 +17,7 @@ class KotlinModuleTest { assertFalse(module.nullToEmptyCollection) assertFalse(module.nullToEmptyMap) assertFalse(module.nullIsSameAsDefault) - assertFalse(module.enabledSingletonSupport) + assertFalse(module.singletonSupport) assertFalse(module.strictNullChecks) assertFalse(module.kotlinPropertyNameAsImplicitName) assertFalse(module.useJavaDurationConversion) @@ -40,7 +40,7 @@ class KotlinModuleTest { assertTrue(module.nullToEmptyCollection) assertTrue(module.nullToEmptyMap) assertTrue(module.nullIsSameAsDefault) - assertTrue(module.enabledSingletonSupport) + assertTrue(module.singletonSupport) assertTrue(module.strictNullChecks) assertTrue(module.kotlinPropertyNameAsImplicitName) assertTrue(module.useJavaDurationConversion) @@ -79,7 +79,7 @@ class KotlinModuleTest { enable(SingletonSupport) }.build() - assertTrue(module.enabledSingletonSupport) + assertTrue(module.singletonSupport) } @Test @@ -110,7 +110,7 @@ class KotlinModuleTest { assertTrue(deserialized.nullToEmptyCollection) assertTrue(deserialized.nullToEmptyMap) assertTrue(deserialized.nullIsSameAsDefault) - assertTrue(deserialized.enabledSingletonSupport) + assertTrue(deserialized.singletonSupport) assertTrue(deserialized.strictNullChecks) }