From 477d06c5ae37e36a94962cf99e9dbcb26badc773 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 25 Apr 2020 19:55:08 +0900 Subject: [PATCH 1/3] =?UTF-8?q?@MustBeDocumented=E3=81=8C=E6=8A=9C?= =?UTF-8?q?=E3=81=91=E3=81=A6=E3=81=84=E3=81=9F=E3=81=9F=E3=82=81=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/mapk/annotations/KGetterAlias.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/com/mapk/annotations/KGetterAlias.kt b/src/main/kotlin/com/mapk/annotations/KGetterAlias.kt index 8aed5f4..d5d8d0e 100644 --- a/src/main/kotlin/com/mapk/annotations/KGetterAlias.kt +++ b/src/main/kotlin/com/mapk/annotations/KGetterAlias.kt @@ -2,4 +2,5 @@ package com.mapk.annotations @Target(AnnotationTarget.PROPERTY_GETTER) @Retention(AnnotationRetention.RUNTIME) +@MustBeDocumented annotation class KGetterAlias(val value: String) From 07f51dcbb6cb758ae808e8fc2343e1c2616399a0 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 25 Apr 2020 23:54:26 +0900 Subject: [PATCH 2/3] =?UTF-8?q?src::class=E3=81=AE=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E3=81=8C2=E5=9B=9E=E8=A1=8C=E3=82=8F=E3=82=8C=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/mapk/kmapper/KMapper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/mapk/kmapper/KMapper.kt b/src/main/kotlin/com/mapk/kmapper/KMapper.kt index 037f8a2..23c836f 100644 --- a/src/main/kotlin/com/mapk/kmapper/KMapper.kt +++ b/src/main/kotlin/com/mapk/kmapper/KMapper.kt @@ -49,7 +49,7 @@ class KMapper private constructor( val tempBinderArrayList = ArrayList() - src::class.memberProperties.forEach outer@{ property -> + clazz.memberProperties.forEach outer@{ property -> // propertyが公開されていない場合は処理を行わない if (property.visibility != KVisibility.PUBLIC) return@outer From 4616d8d4dbaa07ea1459786a50fce695387c85a6 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 26 Apr 2020 00:07:45 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=89=E6=95=B0=E3=81=AE=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E8=A6=8F=E5=89=87=E3=81=8C=E3=83=96=E3=83=AC=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/mapk/kmapper/KMapper.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/mapk/kmapper/KMapper.kt b/src/main/kotlin/com/mapk/kmapper/KMapper.kt index 23c836f..5d89c6d 100644 --- a/src/main/kotlin/com/mapk/kmapper/KMapper.kt +++ b/src/main/kotlin/com/mapk/kmapper/KMapper.kt @@ -130,11 +130,11 @@ class KMapper private constructor( } private class ArgumentBinder(private val param: ParameterForMap<*>, private val javaGetter: Method) { - fun bindArgument(value: Any, bucket: ArgumentBucket) { + fun bindArgument(src: Any, bucket: ArgumentBucket) { // 初期化済みであれば高コストな取得処理は行わない if (!bucket.containsKey(param.param)) { // javaGetterを呼び出す方が高速 - bucket.putIfAbsent(param.param, javaGetter.invoke(value)?.let { param.mapObject(it) }) + bucket.putIfAbsent(param.param, javaGetter.invoke(src)?.let { param.mapObject(it) }) } } }