Merge pull request #11 from k163377/feature

Improve Bucket.

Author: k163377

build.gradle.kts

@@ -30,7 +30,7 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(kotlin("reflect"))
-    implementation("com.github.ProjectMapK:Shared:0.4")
+    implementation("com.github.ProjectMapK:Shared:0.5")
 
     // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter
     testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.6.0") {

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

@@ -57,7 +57,7 @@ class KMapper<T : Any> private constructor(
             parameterMap[alias ?: property.name]?.let {
                 // javaGetterを呼び出す方が高速
                 javaGetter.isAccessible = true
-                argumentBucket.setArgument(it.param, javaGetter.invoke(src)?.let { value -> mapObject(it, value) })
+                argumentBucket.putIfAbsent(it.param, javaGetter.invoke(src)?.let { value -> mapObject(it, value) })
                 // 終了判定
                 if (argumentBucket.isInitialized) return
             }
@@ -68,7 +68,7 @@ class KMapper<T : Any> private constructor(
         src.forEach { (key, value) ->
             parameterMap[key]?.let { param ->
                 // 取得した内容がnullでなければ適切にmapする
-                argumentBucket.setArgument(param.param, value?.let { mapObject(param, it) })
+                argumentBucket.putIfAbsent(param.param, value?.let { mapObject(param, it) })
                 // 終了判定
                 if (argumentBucket.isInitialized) return
             }
@@ -77,7 +77,7 @@ class KMapper<T : Any> private constructor(
 
     private fun bindArguments(argumentBucket: ArgumentBucket, srcPair: Pair<*, *>) {
         parameterMap[srcPair.first.toString()]?.let {
-            argumentBucket.setArgument(it.param, srcPair.second?.let { value -> mapObject(it, value) })
+            argumentBucket.putIfAbsent(it.param, srcPair.second?.let { value -> mapObject(it, value) })
         }
     }