From d3bb2f285d2aee978a74698ac571bc0f7c8d58bf Mon Sep 17 00:00:00 2001
From: wrongwrong <boranti1995@gmail.com>
Date: Sun, 17 May 2020 08:22:33 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=82=92=E8=8B=A5?=
 =?UTF-8?q?=E5=B9=B2=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/core/ArgumentAdaptor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt b/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt
index b011f1c..e9eae51 100644
--- a/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt
+++ b/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt
@@ -13,7 +13,7 @@ class ArgumentAdaptor(private val requiredParameters: Map<String, ValueParameter
     }
 
     fun putIfAbsent(key: String, value: Any?) {
-        if (!isInitialized(key) && !(!requiredParameters.getValue(key).isNullable && value == null)) {
+        if (!isInitialized(key) && (value != null || requiredParameters.getValue(key).isNullable)) {
             argumentMap[key] = value
         }
     }

From 0fd67a633ffefa1fab252998361f4d0492675312 Mon Sep 17 00:00:00 2001
From: wrongwrong <boranti1995@gmail.com>
Date: Sun, 17 May 2020 08:23:19 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=E5=BC=B7=E5=88=B6put=E9=96=A2=E6=95=B0?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BoundKMapperやKRowMapperなど、事前に対応が見えてる場合のみ使う想定
---
 src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt b/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt
index e9eae51..630f66b 100644
--- a/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt
+++ b/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt
@@ -18,6 +18,12 @@ class ArgumentAdaptor(private val requiredParameters: Map<String, ValueParameter
         }
     }
 
+    fun forcePut(key: String, value: Any?) {
+        if (value != null || requiredParameters.getValue(key).isNullable) {
+            argumentMap[key] = value
+        }
+    }
+
     // 事前に存在チェックはやるものと仮定してここでは読み出しだけ実装
     internal fun readout(key: String): Any? = argumentMap[key]
 }

From a95216ea7586670b0ebd4155b295b3c1ed0d7b2d Mon Sep 17 00:00:00 2001
From: wrongwrong <boranti1995@gmail.com>
Date: Sun, 17 May 2020 08:25:17 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=E8=AA=AD=E3=81=BF=E5=87=BA=E3=81=97?=
 =?UTF-8?q?=E3=81=8C=E9=87=8D=E3=81=84=E6=83=B3=E5=AE=9A=E3=81=A7consumer?=
 =?UTF-8?q?=E3=82=92=E5=85=A5=E3=82=8C=E3=82=8B=E3=82=A4=E3=83=B3=E3=82=BF?=
 =?UTF-8?q?=E3=83=BC=E3=83=95=E3=82=A7=E3=83=BC=E3=82=B9=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt b/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt
index 630f66b..af561d7 100644
--- a/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt
+++ b/src/main/kotlin/com/mapk/core/ArgumentAdaptor.kt
@@ -18,6 +18,15 @@ class ArgumentAdaptor(private val requiredParameters: Map<String, ValueParameter
         }
     }
 
+    fun putIfAbsent(key: String, consumer: () -> Any?) {
+        if (isInitialized(key)) return
+
+        val value = consumer()
+        if (value != null || requiredParameters.getValue(key).isNullable) {
+            argumentMap[key] = value
+        }
+    }
+
     fun forcePut(key: String, value: Any?) {
         if (value != null || requiredParameters.getValue(key).isNullable) {
             argumentMap[key] = value

From 75989d1ea5a64e7f16f1f7f3a3bfa9d824b774bf Mon Sep 17 00:00:00 2001
From: wrongwrong <boranti1995@gmail.com>
Date: Sun, 17 May 2020 08:44:17 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 52c988f..cee5e1d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.mapk"
-version = "0.13"
+version = "0.14"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8