Merge remote-tracking branch 'FasterXML/2.19'

Author: k163377

src/test/kotlin/tools/jackson/module/kotlin/KotlinModuleTest.kt

@@ -46,7 +46,7 @@ class KotlinModuleTest {
             enable(NullToEmptyMap)
             enable(NullIsSameAsDefault)
             enable(SingletonSupport)
-            enable(StrictNullChecks)
+            enable(NewStrictNullChecks)
             enable(KotlinPropertyNameAsImplicitName)
             enable(UseJavaDurationConversion)
         }.build()
@@ -100,7 +100,7 @@ class KotlinModuleTest {
     @Test
     fun builder_EnableStrictNullChecks() {
         val module = KotlinModule.Builder().apply {
-            enable(StrictNullChecks)
+            enable(NewStrictNullChecks)
         }.build()
 
         assertTrue(module.strictNullChecks)
@@ -114,7 +114,7 @@ class KotlinModuleTest {
             enable(NullToEmptyMap)
             enable(NullIsSameAsDefault)
             enable(SingletonSupport)
-            enable(StrictNullChecks)
+            enable(NewStrictNullChecks)
         }.build()
 
         val serialized = jdkSerialize(module)

src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTestOld.kt

@@ -1,21 +1,21 @@
 package tools.jackson.module.kotlin.test
 
-import tools.jackson.databind.json.JsonMapper
-import tools.jackson.module.kotlin.KotlinFeature.StrictNullChecks
 import tools.jackson.module.kotlin.MissingKotlinParameterException
-import tools.jackson.module.kotlin.kotlinModule
 import tools.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
+import tools.jackson.module.kotlin.KotlinFeature
+import tools.jackson.module.kotlin.jacksonObjectMapper
 import kotlin.test.assertNull
 
 class StrictNullChecksTestOld {
-    private val mapper = JsonMapper.builder()
-        .addModule(kotlinModule { enable(StrictNullChecks) })
-        .build()
+    private val mapper = jacksonObjectMapper {
+        disable(KotlinFeature.NewStrictNullChecks)
+        enable(KotlinFeature.StrictNullChecks)
+    }
 
     /** collection tests */
 

src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub757.kt

@@ -11,7 +11,7 @@ class GitHub757 {
     @Test
     fun test() {
         val kotlinModule = KotlinModule.Builder()
-            .enable(KotlinFeature.StrictNullChecks)
+            .enable(KotlinFeature.NewStrictNullChecks)
             .build()
         val mapper = JsonMapper.builder()
             .addModule(kotlinModule)