@@ -3,17 +3,16 @@ package com.mapk.kmapper
33import com.mapk.annotations.KConstructor
44import com.mapk.annotations.KGetterAlias
55import com.mapk.annotations.KGetterIgnore
6- import com.mapk.annotations.KParameterAlias
76import com.mapk.core.ArgumentBucket
87import com.mapk.core.EnumMapper
98import com.mapk.core.KFunctionForCall
9+ import com.mapk.core.getAliasOrName
1010import java.lang.reflect.Method
1111import kotlin.reflect.KClass
1212import kotlin.reflect.KFunction
1313import kotlin.reflect.KParameter
1414import kotlin.reflect.KVisibility
1515import kotlin.reflect.full.companionObjectInstance
16- import kotlin.reflect.full.findAnnotation
1716import kotlin.reflect.full.functions
1817import kotlin.reflect.full.isSuperclassOf
1918import kotlin.reflect.full.memberProperties
@@ -34,10 +33,7 @@ class KMapper<T : Any> private constructor(
3433
3534 private val parameterMap: Map <String , ParameterForMap <* >> = function.parameters
3635 .filter { it.kind != KParameter .Kind .INSTANCE }
37- .associate {
38- (it.findAnnotation<KParameterAlias >()?.value ? : propertyNameConverter(it.name!! )) to
39- ParameterForMap .newInstance(it)
40- }
36+ .associate { (propertyNameConverter(it.getAliasOrName()!! )) to ParameterForMap .newInstance(it) }
4137
4238 private fun bindArguments (argumentBucket : ArgumentBucket , src : Any ) {
4339 src::class .memberProperties.forEach outer@{ property ->
0 commit comments