Skip to content

Commit 8c971d0

Browse files
authored
Merge pull request #838 from k163377/fix-dep2
Fixed not to reference enabledSingletonSupport
2 parents 0c52167 + 9f37e87 commit 8c971d0

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class KotlinModule private constructor(
106106

107107
context.addValueInstantiators(KotlinInstantiators(cache, nullToEmptyCollection, nullToEmptyMap, nullIsSameAsDefault, strictNullChecks))
108108

109-
if (enabledSingletonSupport) {
109+
if (singletonSupport) {
110110
context.addBeanDeserializerModifier(KotlinBeanDeserializerModifier)
111111
}
112112

src/test/kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class DslTest {
4343
assertTrue(module.nullToEmptyCollection)
4444
assertTrue(module.nullToEmptyMap)
4545
assertTrue(module.nullIsSameAsDefault)
46-
assertTrue(module.enabledSingletonSupport)
46+
assertTrue(module.singletonSupport)
4747
assertTrue(module.strictNullChecks)
4848
}
4949

src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModuleTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class KotlinModuleTest {
1717
assertFalse(module.nullToEmptyCollection)
1818
assertFalse(module.nullToEmptyMap)
1919
assertFalse(module.nullIsSameAsDefault)
20-
assertFalse(module.enabledSingletonSupport)
20+
assertFalse(module.singletonSupport)
2121
assertFalse(module.strictNullChecks)
2222
assertFalse(module.kotlinPropertyNameAsImplicitName)
2323
assertFalse(module.useJavaDurationConversion)
@@ -40,7 +40,7 @@ class KotlinModuleTest {
4040
assertTrue(module.nullToEmptyCollection)
4141
assertTrue(module.nullToEmptyMap)
4242
assertTrue(module.nullIsSameAsDefault)
43-
assertTrue(module.enabledSingletonSupport)
43+
assertTrue(module.singletonSupport)
4444
assertTrue(module.strictNullChecks)
4545
assertTrue(module.kotlinPropertyNameAsImplicitName)
4646
assertTrue(module.useJavaDurationConversion)
@@ -79,7 +79,7 @@ class KotlinModuleTest {
7979
enable(SingletonSupport)
8080
}.build()
8181

82-
assertTrue(module.enabledSingletonSupport)
82+
assertTrue(module.singletonSupport)
8383
}
8484

8585
@Test
@@ -110,7 +110,7 @@ class KotlinModuleTest {
110110
assertTrue(deserialized.nullToEmptyCollection)
111111
assertTrue(deserialized.nullToEmptyMap)
112112
assertTrue(deserialized.nullIsSameAsDefault)
113-
assertTrue(deserialized.enabledSingletonSupport)
113+
assertTrue(deserialized.singletonSupport)
114114
assertTrue(deserialized.strictNullChecks)
115115
}
116116

0 commit comments

Comments
 (0)