@@ -3,7 +3,7 @@ package com.mapk.krowmapper
33import com.mapk.annotations.KColumnDeserializer
44import com.mapk.core.EnumMapper
55import com.mapk.core.KFunctionWithInstance
6- import com.mapk.core.getAliasOrName
6+ import com.mapk.core.ValueParameter
77import com.mapk.deserialization.AbstractKColumnDeserializer
88import com.mapk.deserialization.KColumnDeserializeBy
99import java.lang.IllegalArgumentException
@@ -51,24 +51,20 @@ internal sealed class ParameterForMap {
5151 }
5252
5353 companion object {
54- fun newInstance (param : KParameter , parameterNameConverter : (String ) -> String ): ParameterForMap {
55- val name = parameterNameConverter(param.getAliasOrName()!! )
56-
54+ fun <T : Any > newInstance (param : ValueParameter <T >): ParameterForMap {
5755 param.getDeserializer()?.let {
58- return Deserializer (param, name, it)
56+ return Deserializer (param. name, it)
5957 }
6058
61- val parameterKClazz = param.type.classifier as KClass <* >
62-
63- parameterKClazz.getDeserializer()?.let {
59+ param.requiredClazz.getDeserializer()?.let {
6460 val targetClass = (it.parameters.single().type.classifier as KClass <* >).javaObjectType
65- return Deserializer (param, name, targetClass, it)
61+ return Deserializer (param. name, targetClass, it)
6662 }
6763
68- return parameterKClazz .javaObjectType.let {
64+ return param.requiredClazz .javaObjectType.let {
6965 when (it.isEnum) {
70- true -> Enum (param, name, it)
71- false -> Plain (param, name, it)
66+ true -> Enum (param. name, it)
67+ false -> Plain (param. name, it)
7268 }
7369 }
7470 }
0 commit comments