Remove old strictNullChecks backend

Author: k163377

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

@@ -47,7 +47,7 @@ class KotlinModule private constructor(
     strictNullChecks: Boolean = StrictNullChecks.enabledByDefault,
     val kotlinPropertyNameAsImplicitName: Boolean = KotlinPropertyNameAsImplicitName.enabledByDefault,
     val useJavaDurationConversion: Boolean = UseJavaDurationConversion.enabledByDefault,
-    private val newStrictNullChecks: Boolean = NewStrictNullChecks.enabledByDefault,
+    newStrictNullChecks: Boolean = NewStrictNullChecks.enabledByDefault,
 ) : SimpleModule(KotlinModule::class.java.name, PackageVersion.VERSION) {
     /*
      * Prior to 2.18, an older Enum called SingletonSupport was used to manage feature.
@@ -67,8 +67,6 @@ class KotlinModule private constructor(
     )
     val enabledSingletonSupport: Boolean get() = singletonSupport
 
-    private val oldStrictNullChecks: Boolean = strictNullChecks
-
     // To reduce the amount of destructive changes, no properties will be added to the public.
     val strictNullChecks: Boolean = if (strictNullChecks) {
         if (newStrictNullChecks) {
@@ -113,7 +111,7 @@ class KotlinModule private constructor(
 
         val cache = ReflectionCache(reflectionCacheSize)
 
-        context.addValueInstantiators(KotlinInstantiators(cache, nullToEmptyCollection, nullToEmptyMap, nullIsSameAsDefault, oldStrictNullChecks))
+        context.addValueInstantiators(KotlinInstantiators(cache, nullToEmptyCollection, nullToEmptyMap, nullIsSameAsDefault))
 
         if (singletonSupport) {
             context.addBeanDeserializerModifier(KotlinBeanDeserializerModifier)
@@ -128,7 +126,7 @@ class KotlinModule private constructor(
             useJavaDurationConversion
         ))
         context.appendAnnotationIntrospector(
-            KotlinNamesAnnotationIntrospector(cache, newStrictNullChecks, kotlinPropertyNameAsImplicitName)
+            KotlinNamesAnnotationIntrospector(cache, strictNullChecks, kotlinPropertyNameAsImplicitName)
         )
 
         context.addDeserializers(KotlinDeserializers(cache, useJavaDurationConversion))

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

@@ -22,16 +22,13 @@ internal class KotlinValueInstantiator(
     private val cache: ReflectionCache,
     private val nullToEmptyCollection: Boolean,
     private val nullToEmptyMap: Boolean,
-    private val nullIsSameAsDefault: Boolean,
-    private val strictNullChecks: Boolean
+    private val nullIsSameAsDefault: Boolean
 ) : StdValueInstantiator(src) {
     private fun JavaType.requireEmptyValue() =
         (nullToEmptyCollection && this.isCollectionLikeType) || (nullToEmptyMap && this.isMapLikeType)
 
     private fun KType.isGenericTypeVar() = javaType is TypeVariable<*>
 
-    private fun List<KTypeProjection>.markedNonNullAt(index: Int) = getOrNull(index)?.type?.isMarkedNullable == false
-
     // If the argument is a value class that wraps nullable and non-null,
     // and the input is explicit null, the value class is instantiated with null as input.
     private fun requireValueClassSpecialNullValue(
@@ -104,35 +101,6 @@ internal class KotlinValueInstantiator(
                         ).wrapWithPath(this.valueClass, pname)
                     }
                 }
-            } else if (strictNullChecks) {
-                val arguments = paramType.arguments
-
-                // To make the behavior the same as deserialization of each element using NullsFailProvider,
-                // first wrapWithPath with paramVal and key.
-                val ex = when {
-                    propType.isCollectionLikeType && arguments.markedNonNullAt(0) -> {
-                        (paramVal as Collection<*>).indexOf(null).takeIf { it >= 0 }?.let {
-                            InvalidNullException.from(ctxt, jsonProp.fullName, jsonProp.type)
-                                .wrapWithPath(paramVal, it)
-                        }
-                    }
-                    propType.isMapLikeType && arguments.markedNonNullAt(1) -> {
-                        (paramVal as Map<*, *>).entries.find { (_, v) -> v == null }?.let { (k, _) ->
-                            InvalidNullException.from(ctxt, jsonProp.fullName, jsonProp.type)
-                                .wrapWithPath(paramVal, k.toString())
-                        }
-                    }
-                    propType.isArrayType && arguments.markedNonNullAt(0) -> {
-                        (paramVal as Array<*>).indexOf(null).takeIf { it >= 0 }?.let {
-                            InvalidNullException.from(ctxt, jsonProp.fullName, jsonProp.type)
-                                .wrapWithPath(paramVal, it)
-                        }
-                    }
-                    else -> null
-                }
-
-                // Then, wrapWithPath with this property.
-                ex?.let { throw it.wrapWithPath(this.valueClass, jsonProp.name) }
             }
 
             bucket[paramDef] = paramVal
@@ -151,7 +119,6 @@ internal class KotlinInstantiators(
     private val nullToEmptyCollection: Boolean,
     private val nullToEmptyMap: Boolean,
     private val nullIsSameAsDefault: Boolean,
-    private val strictNullChecks: Boolean
 ) : ValueInstantiators {
     override fun findValueInstantiator(
         deserConfig: DeserializationConfig,
@@ -165,8 +132,7 @@ internal class KotlinInstantiators(
                     cache,
                     nullToEmptyCollection,
                     nullToEmptyMap,
-                    nullIsSameAsDefault,
-                    strictNullChecks
+                    nullIsSameAsDefault
                 )
             } else {
                 // TODO: return defaultInstantiator and let default method parameters and nullability go unused?  or die with exception:

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

@@ -11,8 +11,7 @@ class KotlinInstantiatorsTest {
         ReflectionCache(10),
         nullToEmptyCollection = false,
         nullToEmptyMap = false,
-        nullIsSameAsDefault = false,
-        strictNullChecks = false
+        nullIsSameAsDefault = false
     )
 
     @Test