Skip to content
This repository was archived by the owner on Jan 20, 2023. It is now read-only.

Commit cb4ede1

Browse files
committed
名前の取り方をSharedで共通化したものに変更
ついでにコンバータは絶対かけるように修正(実際にアノテーションを振る場合はキャメルケースに合わせたいだろうという判断から)
1 parent ba83821 commit cb4ede1

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/main/kotlin/com/mapk/kmapper/KMapper.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ package com.mapk.kmapper
33
import com.mapk.annotations.KConstructor
44
import com.mapk.annotations.KGetterAlias
55
import com.mapk.annotations.KGetterIgnore
6-
import com.mapk.annotations.KParameterAlias
76
import com.mapk.core.ArgumentBucket
87
import com.mapk.core.EnumMapper
98
import com.mapk.core.KFunctionForCall
9+
import com.mapk.core.getAliasOrName
1010
import java.lang.reflect.Method
1111
import kotlin.reflect.KClass
1212
import kotlin.reflect.KFunction
1313
import kotlin.reflect.KParameter
1414
import kotlin.reflect.KVisibility
1515
import kotlin.reflect.full.companionObjectInstance
16-
import kotlin.reflect.full.findAnnotation
1716
import kotlin.reflect.full.functions
1817
import kotlin.reflect.full.isSuperclassOf
1918
import 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

Comments
 (0)