@@ -3,7 +3,7 @@ package com.mapk.krowmapper
3
3
import com.mapk.annotations.KColumnDeserializer
4
4
import com.mapk.core.EnumMapper
5
5
import com.mapk.core.KFunctionWithInstance
6
- import com.mapk.core.getAliasOrName
6
+ import com.mapk.core.ValueParameter
7
7
import com.mapk.deserialization.AbstractKColumnDeserializer
8
8
import com.mapk.deserialization.KColumnDeserializeBy
9
9
import java.lang.IllegalArgumentException
@@ -51,24 +51,20 @@ internal sealed class ParameterForMap {
51
51
}
52
52
53
53
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 {
57
55
param.getDeserializer()?.let {
58
- return Deserializer (param, name, it)
56
+ return Deserializer (param. name, it)
59
57
}
60
58
61
- val parameterKClazz = param.type.classifier as KClass <* >
62
-
63
- parameterKClazz.getDeserializer()?.let {
59
+ param.requiredClazz.getDeserializer()?.let {
64
60
val targetClass = (it.parameters.single().type.classifier as KClass <* >).javaObjectType
65
- return Deserializer (param, name, targetClass, it)
61
+ return Deserializer (param. name, targetClass, it)
66
62
}
67
63
68
- return parameterKClazz .javaObjectType.let {
64
+ return param.requiredClazz .javaObjectType.let {
69
65
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)
72
68
}
73
69
}
74
70
}
0 commit comments