Use ArgumentBucket and SpreadWrapper

FasterXML · Jan 11, 2021 · 18ed9b2 · 18ed9b2
1 parent 25b3c79
commit 18ed9b2
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinValueInstantiator.kt b/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinValueInstantiator.kt
@@ -162,13 +162,18 @@ internal class KotlinValueInstantiator(
             ) {
                 callable.isAccessible = true
             }
-            val callableParametersByName = linkedMapOf<KParameter, Any?>()
-            callableParameters.mapIndexed { idx, paramDef ->
-                if (paramDef != null) {
-                    callableParametersByName[paramDef] = jsonParamValueList[idx]
+            ArgumentBucket(callable.parameters).apply {
+                callableParameters.forEachIndexed { idx, paramDef ->
+                    if (paramDef != null) {
+                        this[paramDef] = jsonParamValueList[idx]
+                    }
                 }
+            }.let {
+                if (it.isFullInitialized())
+                    SpreadWrapper.call(callable, it.valueArray)
+                else
+                    callable.callBy(it)
             }
-            callable.callBy(callableParametersByName)
         }
 
     }