Remove MissingKotlinParameterException and replace with MismatchedInp…

…utException FasterXML/jackson-module-kotlin#617
ProjectMapK · Mar 18, 2023 · 8143470 · 8143470
1 parent 0a14f44
commit 8143470
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 26 deletions.
diff --git a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/Exceptions.kt b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/Exceptions.kt
diff --git a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/deser/Converters.kt b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/deser/Converters.kt
@@ -1,10 +1,10 @@
 package com.fasterxml.jackson.module.kotlin.deser
 
 import com.fasterxml.jackson.databind.JavaType
+import com.fasterxml.jackson.databind.exc.MismatchedInputException
 import com.fasterxml.jackson.databind.type.TypeFactory
 import com.fasterxml.jackson.databind.util.Converter
 import com.fasterxml.jackson.databind.util.StdConverter
-import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
 import com.fasterxml.jackson.module.kotlin.deser.value_instantiator.creator.ValueParameter
 
 internal class ValueClassUnboxConverter<T : Any>(private val valueClass: Class<T>) : StdConverter<T, Any?>() {
@@ -26,9 +26,9 @@ internal sealed class CollectionValueStrictNullChecksConverter<T : Any> : Conver
     override fun convert(value: T): T {
         getValues(value).forEach {
             if (it == null) {
-                throw MissingKotlinParameterException(
-                    valueParameter,
+                throw MismatchedInputException.from(
                     null,
+                    null as JavaType?,
                     "A null value was entered for the parameter ${valueParameter.name}."
                 )
             }
@@ -62,9 +62,9 @@ internal class MapValueStrictNullChecksConverter(
     override fun convert(value: Map<*, *>): Map<*, *> = value.apply {
         entries.forEach { (k, v) ->
             if (v == null) {
-                throw MissingKotlinParameterException(
-                    valueParameter,
+                throw MismatchedInputException.from(
                     null,
+                    null as JavaType?,
                     "A null value was entered for key $k of the parameter ${valueParameter.name}."
                 )
             }

diff --git a/...n/com/fasterxml/jackson/module/kotlin/deser/value_instantiator/KotlinValueInstantiator.kt b/...n/com/fasterxml/jackson/module/kotlin/deser/value_instantiator/KotlinValueInstantiator.kt
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.deser.ValueInstantiators
 import com.fasterxml.jackson.databind.deser.impl.NullsAsEmptyProvider
 import com.fasterxml.jackson.databind.deser.impl.PropertyValueBuffer
 import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator
-import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
+import com.fasterxml.jackson.databind.exc.MismatchedInputException
 import com.fasterxml.jackson.module.kotlin.ReflectionCache
 import com.fasterxml.jackson.module.kotlin.deser.value_instantiator.creator.ValueCreator
 import java.lang.reflect.Executable
@@ -67,10 +67,10 @@ internal class KotlinValueInstantiator(
                 } else {
                     val isMissingAndRequired = isMissing && jsonProp.isRequired
                     if (isMissingAndRequired || (!paramDef.isGenericType && !paramDef.isNullable)) {
-                        throw MissingKotlinParameterException(
-                            parameter = paramDef,
-                            processor = ctxt.parser,
-                            msg = "Instantiation of $valueTypeDesc value failed for JSON property ${jsonProp.name} " +
+                        throw MismatchedInputException.from(
+                            ctxt.parser,
+                            jsonProp.type,
+                            "Instantiation of $valueTypeDesc value failed for JSON property ${jsonProp.name} " +
                                 "due to missing (therefore NULL) value for creator parameter ${paramDef.name} " +
                                 "which is a non-nullable type"
                         ).wrapWithPath(this.valueClass, jsonProp.name)