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

Commit 5ab12b9

Browse files
committed
変数名を使い方に合わせて修正
1 parent 7a3fcf9 commit 5ab12b9

File tree

1 file changed

+15
-15
lines changed
  • src/main/kotlin/com/wrongwrong/mapk/core

1 file changed

+15
-15
lines changed

src/main/kotlin/com/wrongwrong/mapk/core/KMapper.kt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,50 +40,50 @@ class KMapper<T : Any> private constructor(
4040
if (parameterMap.isEmpty()) throw IllegalArgumentException("This function is not require arguments.")
4141
}
4242

43-
private fun bindParameters(targetArray: Array<Any?>, src: Any) {
43+
private fun bindParameters(targetBucket: Array<Any?>, src: Any) {
4444
src::class.memberProperties.forEach { property ->
4545
val javaGetter: Method? = property.javaGetter
4646
if (javaGetter != null && property.visibility == KVisibility.PUBLIC && property.annotations.none { annotation -> annotation is KPropertyIgnore }) {
4747
parameterMap[property.findAnnotation<KGetterAlias>()?.value ?: property.name]?.let {
4848
// javaGetterを呼び出す方が高速
4949
javaGetter.isAccessible = true
50-
targetArray[it.index] = javaGetter.invoke(src)?.let { value -> mapObject(it, value) }
50+
targetBucket[it.index] = javaGetter.invoke(src)?.let { value -> mapObject(it, value) }
5151
}
5252
}
5353
}
5454
}
5555

56-
private fun bindParameters(targetArray: Array<Any?>, src: Map<*, *>) {
56+
private fun bindParameters(targetBucket: Array<Any?>, src: Map<*, *>) {
5757
src.forEach { (key, value) ->
5858
parameterMap[key]?.let { param ->
5959
// 取得した内容がnullでなければ適切にmapする
60-
targetArray[param.index] = value?.let { mapObject(param, it) }
60+
targetBucket[param.index] = value?.let { mapObject(param, it) }
6161
}
6262
}
6363
}
6464

65-
private fun bindParameters(targetArray: Array<Any?>, srcPair: Pair<*, *>) {
65+
private fun bindParameters(targetBucket: Array<Any?>, srcPair: Pair<*, *>) {
6666
parameterMap.getValue(srcPair.first.toString()).let {
67-
targetArray[it.index] = srcPair.second?.let { value -> mapObject(it, value) }
67+
targetBucket[it.index] = srcPair.second?.let { value -> mapObject(it, value) }
6868
}
6969
}
7070

7171
fun map(srcMap: Map<String, Any?>): T {
72-
val array: Array<Any?> = function.argumentBucket
73-
bindParameters(array, srcMap)
74-
return function.call(array)
72+
val bucket: Array<Any?> = function.argumentBucket
73+
bindParameters(bucket, srcMap)
74+
return function.call(bucket)
7575
}
7676

7777
fun map(srcPair: Pair<String, Any?>): T {
78-
val array: Array<Any?> = function.argumentBucket
79-
bindParameters(array, srcPair)
80-
return function.call(array)
78+
val bucket: Array<Any?> = function.argumentBucket
79+
bindParameters(bucket, srcPair)
80+
return function.call(bucket)
8181
}
8282

8383
fun map(src: Any): T {
84-
val array: Array<Any?> = function.argumentBucket
85-
bindParameters(array, src)
86-
return function.call(array)
84+
val bucket: Array<Any?> = function.argumentBucket
85+
bindParameters(bucket, src)
86+
return function.call(bucket)
8787
}
8888

8989
fun map(vararg args: Any): T {

0 commit comments

Comments
 (0)