From 94cb769106c757d40bd5d1ac4719a75236a496af Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 17:45:25 +0900 Subject: [PATCH 01/12] =?UTF-8?q?=E5=87=A6=E7=90=86=E7=B5=90=E6=9E=9C?= =?UTF-8?q?=E3=81=8Cnull=E3=81=AB=E3=81=AA=E3=82=89=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=82=E3=81=AE=E3=82=92non-null=E3=81=AB=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/ParameterForMap.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/mapk/kmapper/ParameterForMap.kt b/src/main/kotlin/com/mapk/kmapper/ParameterForMap.kt index 1baa3f5..dc80abc 100644 --- a/src/main/kotlin/com/mapk/kmapper/ParameterForMap.kt +++ b/src/main/kotlin/com/mapk/kmapper/ParameterForMap.kt @@ -61,7 +61,7 @@ private sealed class ParameterProcessor { abstract fun process(value: Any): Any? object Plain : ParameterProcessor() { - override fun process(value: Any): Any? = value + override fun process(value: Any): Any = value } class UseConverter(private val converter: KFunction<*>) : ParameterProcessor() { @@ -82,6 +82,6 @@ private sealed class ParameterProcessor { } object ToString : ParameterProcessor() { - override fun process(value: Any): Any? = value.toString() + override fun process(value: Any): Any = value.toString() } } From 2e7cfe4dc0546b5e363a259e83d450a38a1d6f52 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:02:52 +0900 Subject: [PATCH 02/12] =?UTF-8?q?shared=E3=81=AE=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= 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 63f6639..2656fae 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,7 +30,7 @@ repositories { dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation(kotlin("reflect")) - api("com.github.ProjectMapK:Shared:0.15") + api("com.github.ProjectMapK:Shared:0.16") // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.6.2") { From 26564767ec0b5c1d4d46781780ca425e00db459e Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:04:22 +0900 Subject: [PATCH 03/12] =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E5=90=8D=E5=A4=89=E6=8F=9B=E3=81=AFnullable=E3=81=AB?= =?UTF-8?q?=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/BoundParameterForMap.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/mapk/kmapper/BoundParameterForMap.kt b/src/main/kotlin/com/mapk/kmapper/BoundParameterForMap.kt index 8a956ba..1f1a598 100644 --- a/src/main/kotlin/com/mapk/kmapper/BoundParameterForMap.kt +++ b/src/main/kotlin/com/mapk/kmapper/BoundParameterForMap.kt @@ -68,7 +68,7 @@ internal sealed class BoundParameterForMap { fun newInstance( param: ValueParameter<*>, property: KProperty1, - parameterNameConverter: (String) -> String + parameterNameConverter: ((String) -> String)? ): BoundParameterForMap { // ゲッターが無いならエラー val propertyGetter = property.javaGetter From e4d96d2e472c40936452a6a0a879cdb582ba6141 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:04:42 +0900 Subject: [PATCH 04/12] =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E5=90=8D=E5=A4=89=E6=8F=9B=E3=81=AFnullable=E3=81=AB?= =?UTF-8?q?=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/ParameterForMap.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/mapk/kmapper/ParameterForMap.kt b/src/main/kotlin/com/mapk/kmapper/ParameterForMap.kt index dc80abc..22b813f 100644 --- a/src/main/kotlin/com/mapk/kmapper/ParameterForMap.kt +++ b/src/main/kotlin/com/mapk/kmapper/ParameterForMap.kt @@ -10,7 +10,7 @@ import kotlin.reflect.full.isSuperclassOf internal class ParameterForMap( param: ValueParameter, - private val parameterNameConverter: (String) -> String + private val parameterNameConverter: ((String) -> String)? ) { val name: String = param.name private val clazz: KClass = param.requiredClazz From fad8fdef4e6e8617d118c80ff6fc2e981bbed24d Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:04:59 +0900 Subject: [PATCH 05/12] =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E5=90=8D=E5=A4=89=E6=8F=9B=E3=81=AFnullable=E3=81=AB?= =?UTF-8?q?=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 2dc5d47..73e185f 100644 --- a/src/main/kotlin/com/mapk/kmapper/KMapper.kt +++ b/src/main/kotlin/com/mapk/kmapper/KMapper.kt @@ -16,7 +16,7 @@ import kotlin.reflect.jvm.javaGetter class KMapper private constructor( private val function: KFunctionForCall, - parameterNameConverter: (String) -> String + parameterNameConverter: ((String) -> String)? ) { constructor(function: KFunction, parameterNameConverter: (String) -> String = { it }) : this( KFunctionForCall(function, parameterNameConverter), parameterNameConverter From 8367cf89941fb9d0c579dff4e13aa27fbdb2ef7b Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:05:04 +0900 Subject: [PATCH 06/12] =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E5=90=8D=E5=A4=89=E6=8F=9B=E3=81=AFnullable=E3=81=AB?= =?UTF-8?q?=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/BoundKMapper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/mapk/kmapper/BoundKMapper.kt b/src/main/kotlin/com/mapk/kmapper/BoundKMapper.kt index 1d6aa04..7eab11d 100644 --- a/src/main/kotlin/com/mapk/kmapper/BoundKMapper.kt +++ b/src/main/kotlin/com/mapk/kmapper/BoundKMapper.kt @@ -16,7 +16,7 @@ import kotlin.reflect.jvm.jvmName class BoundKMapper private constructor( private val function: KFunctionForCall, src: KClass, - parameterNameConverter: (String) -> String + parameterNameConverter: ((String) -> String)? ) { constructor(function: KFunction, src: KClass, parameterNameConverter: (String) -> String = { it }) : this( KFunctionForCall(function, parameterNameConverter), src, parameterNameConverter From 81a65d5ba2b954b5560b339e4416a2905353d933 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:05:20 +0900 Subject: [PATCH 07/12] =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?= =?UTF-8?q?=E3=83=88=E5=BC=95=E6=95=B0=E3=81=AFnull=E3=81=AB=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/kmapper/BoundKMapper.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/mapk/kmapper/BoundKMapper.kt b/src/main/kotlin/com/mapk/kmapper/BoundKMapper.kt index 7eab11d..54f7890 100644 --- a/src/main/kotlin/com/mapk/kmapper/BoundKMapper.kt +++ b/src/main/kotlin/com/mapk/kmapper/BoundKMapper.kt @@ -18,11 +18,11 @@ class BoundKMapper private constructor( src: KClass, parameterNameConverter: ((String) -> String)? ) { - constructor(function: KFunction, src: KClass, parameterNameConverter: (String) -> String = { it }) : this( + constructor(function: KFunction, src: KClass, parameterNameConverter: ((String) -> String)? = null) : this( KFunctionForCall(function, parameterNameConverter), src, parameterNameConverter ) - constructor(clazz: KClass, src: KClass, parameterNameConverter: (String) -> String = { it }) : this( + constructor(clazz: KClass, src: KClass, parameterNameConverter: ((String) -> String)? = null) : this( clazz.toKConstructor(parameterNameConverter), src, parameterNameConverter ) From c88e9a4146899f72dfb5d5d02710314af7fcbc3d Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:05:31 +0900 Subject: [PATCH 08/12] =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?= =?UTF-8?q?=E3=83=88=E5=BC=95=E6=95=B0=E3=81=AFnull=E3=81=AB=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/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 73e185f..95c4131 100644 --- a/src/main/kotlin/com/mapk/kmapper/KMapper.kt +++ b/src/main/kotlin/com/mapk/kmapper/KMapper.kt @@ -18,11 +18,11 @@ class KMapper private constructor( private val function: KFunctionForCall, parameterNameConverter: ((String) -> String)? ) { - constructor(function: KFunction, parameterNameConverter: (String) -> String = { it }) : this( + constructor(function: KFunction, parameterNameConverter: ((String) -> String)? = null) : this( KFunctionForCall(function, parameterNameConverter), parameterNameConverter ) - constructor(clazz: KClass, parameterNameConverter: (String) -> String = { it }) : this( + constructor(clazz: KClass, parameterNameConverter: ((String) -> String)? = null) : this( clazz.toKConstructor(parameterNameConverter), parameterNameConverter ) From 99d046f6ef51723002881b410a5131e50364c92c Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:09:06 +0900 Subject: [PATCH 09/12] =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E5=90=8D=E5=A4=89=E6=8F=9B=E3=81=AFnullable=E3=81=AB?= =?UTF-8?q?=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/PlainParameterForMap.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/mapk/kmapper/PlainParameterForMap.kt b/src/main/kotlin/com/mapk/kmapper/PlainParameterForMap.kt index cc2ddda..bc39cef 100644 --- a/src/main/kotlin/com/mapk/kmapper/PlainParameterForMap.kt +++ b/src/main/kotlin/com/mapk/kmapper/PlainParameterForMap.kt @@ -8,7 +8,7 @@ import kotlin.reflect.full.isSuperclassOf internal class PlainParameterForMap( param: ValueParameter, - private val parameterNameConverter: (String) -> String + private val parameterNameConverter: ((String) -> String)? ) { private val clazz: KClass = param.requiredClazz From 2158f962cf1df51bbb71b77908c8b8d1bec308dd Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:09:11 +0900 Subject: [PATCH 10/12] =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E5=90=8D=E5=A4=89=E6=8F=9B=E3=81=AFnullable=E3=81=AB?= =?UTF-8?q?=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/PlainKMapper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/mapk/kmapper/PlainKMapper.kt b/src/main/kotlin/com/mapk/kmapper/PlainKMapper.kt index 3bdb25e..e6f5289 100644 --- a/src/main/kotlin/com/mapk/kmapper/PlainKMapper.kt +++ b/src/main/kotlin/com/mapk/kmapper/PlainKMapper.kt @@ -14,7 +14,7 @@ import kotlin.reflect.jvm.javaGetter class PlainKMapper private constructor( private val function: KFunctionForCall, - parameterNameConverter: (String) -> String + parameterNameConverter: ((String) -> String)? ) { constructor(function: KFunction, parameterNameConverter: (String) -> String = { it }) : this( KFunctionForCall(function, parameterNameConverter), parameterNameConverter From 36c25d8b368b0e13bdafbf1ee3901ca83cf007d4 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:09:20 +0900 Subject: [PATCH 11/12] =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?= =?UTF-8?q?=E3=83=88=E5=BC=95=E6=95=B0=E3=81=AFnull=E3=81=AB=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/kmapper/PlainKMapper.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/mapk/kmapper/PlainKMapper.kt b/src/main/kotlin/com/mapk/kmapper/PlainKMapper.kt index e6f5289..462c8ff 100644 --- a/src/main/kotlin/com/mapk/kmapper/PlainKMapper.kt +++ b/src/main/kotlin/com/mapk/kmapper/PlainKMapper.kt @@ -16,11 +16,11 @@ class PlainKMapper private constructor( private val function: KFunctionForCall, parameterNameConverter: ((String) -> String)? ) { - constructor(function: KFunction, parameterNameConverter: (String) -> String = { it }) : this( + constructor(function: KFunction, parameterNameConverter: ((String) -> String)? = null) : this( KFunctionForCall(function, parameterNameConverter), parameterNameConverter ) - constructor(clazz: KClass, parameterNameConverter: (String) -> String = { it }) : this( + constructor(clazz: KClass, parameterNameConverter: ((String) -> String)? = null) : this( clazz.toKConstructor(parameterNameConverter), parameterNameConverter ) From af8b11b3512b5eaf397c8d1492f51ef29f6f5d6d Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 23 May 2020 20:38:03 +0900 Subject: [PATCH 12/12] =?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 2656fae..74c2cb0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } group = "com.mapk" -version = "0.29" +version = "0.30" java { sourceCompatibility = JavaVersion.VERSION_1_8