Recaftor

Cut out strictNullCheck

Author: k163377

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

@@ -28,6 +28,31 @@ internal class KotlinValueInstantiator(
     // @see com.fasterxml.jackson.module.kotlin._ported.test.StrictNullChecksTest#testListOfGenericWithNullValue
     private fun ValueParameter.isNullishTypeAt(index: Int) = arguments.getOrNull(index)?.isNullable ?: true
 
+    private fun strictNullCheck(
+        ctxt: DeserializationContext,
+        jsonProp: SettableBeanProperty,
+        paramDef: ValueParameter,
+        paramVal: Any
+    ) {
+        // If an error occurs, Argument.name is always non-null
+        // @see com.fasterxml.jackson.module.kotlin.deser.value_instantiator.creator.Argument
+        when {
+            paramVal is Collection<*> && !paramDef.isNullishTypeAt(0) && paramVal.any { it == null } ->
+                "collection" to paramDef.arguments[0].name!!
+            paramVal is Array<*> && !paramDef.isNullishTypeAt(0) && paramVal.any { it == null } ->
+                "array" to paramDef.arguments[0].name!!
+            paramVal is Map<*, *> && !paramDef.isNullishTypeAt(1) && paramVal.values.any { it == null } ->
+                "map" to paramDef.arguments[1].name!!
+            else -> null
+        }?.let { (paramType, itemType) ->
+            throw MissingKotlinParameterException(
+                parameter = paramDef,
+                processor = ctxt.parser,
+                msg = "Instantiation of $itemType $paramType failed for JSON property ${jsonProp.name} due to null value in a $paramType that does not allow null values"
+            ).wrapWithPath(this.valueClass, jsonProp.name)
+        }
+    }
+
     override fun createFromObjectWith(
         ctxt: DeserializationContext,
         props: Array<out SettableBeanProperty>,
@@ -75,25 +100,7 @@ internal class KotlinValueInstantiator(
                 ).wrapWithPath(this.valueClass, jsonProp.name)
             }
 
-            if (strictNullChecks && paramVal != null) {
-                // If an error occurs, Argument.name is always non-null
-                // @see com.fasterxml.jackson.module.kotlin.deser.value_instantiator.creator.Argument
-                when {
-                    paramVal is Collection<*> && !paramDef.isNullishTypeAt(0) && paramVal.any { it == null } ->
-                        "collection" to paramDef.arguments[0].name!!
-                    paramVal is Array<*> && !paramDef.isNullishTypeAt(0) && paramVal.any { it == null } ->
-                        "array" to paramDef.arguments[0].name!!
-                    paramVal is Map<*, *> && !paramDef.isNullishTypeAt(1) && paramVal.values.any { it == null } ->
-                        "map" to paramDef.arguments[1].name!!
-                    else -> null
-                }?.let { (paramType, itemType) ->
-                    throw MissingKotlinParameterException(
-                        parameter = paramDef,
-                        processor = ctxt.parser,
-                        msg = "Instantiation of $itemType $paramType failed for JSON property ${jsonProp.name} due to null value in a $paramType that does not allow null values"
-                    ).wrapWithPath(this.valueClass, jsonProp.name)
-                }
-            }
+            if (strictNullChecks && paramVal != null) strictNullCheck(ctxt, jsonProp, paramDef, paramVal)
 
             bucket[idx] = paramVal
         }