Merge pull request #10 from k163377/feature

Updates and fixes.

Author: k163377

build.gradle.kts

@@ -1,12 +1,12 @@
 plugins {
     id("maven")
     id("java")
-    id("org.jetbrains.kotlin.jvm") version "1.3.70"
+    id("org.jetbrains.kotlin.jvm") version "1.3.71"
     id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
 }
 
 group = "com.mapk"
-version = "0.7"
+version = "0.8"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -18,7 +18,7 @@ buildscript {
     }
 
     dependencies {
-        classpath(kotlin("gradle-plugin", version = "1.3.70"))
+        classpath(kotlin("gradle-plugin", version = "1.3.71"))
     }
 }
 
@@ -30,7 +30,7 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(kotlin("reflect"))
-    api("com.github.ProjectMapK:Shared:0.9")
+    api("com.github.ProjectMapK:Shared:0.10")
     // 使うのはRowMapperのみなため他はexclude、またバージョンそのものは使う相手に合わせるためcompileOnly
     compileOnly(group = "org.springframework", name = "spring-jdbc", version = "5.2.4.RELEASE") {
         exclude(module = "spring-beans")
@@ -39,7 +39,7 @@ dependencies {
     }
 
     // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter
-    testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.6.0") {
+    testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.6.1") {
         exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
     }
     // https://mvnrepository.com/artifact/io.mockk/mockk

src/main/kotlin/com/mapk/krowmapper/KRowMapper.kt

@@ -11,7 +11,7 @@ import org.springframework.jdbc.core.RowMapper
 
 class KRowMapper<T : Any> private constructor(
     private val function: KFunctionForCall<T>,
-    propertyNameConverter: (String) -> String = { it }
+    parameterNameConverter: (String) -> String = { it }
 ) : RowMapper<T> {
     constructor(function: KFunction<T>, propertyNameConverter: (String) -> String = { it }) : this(
         KFunctionForCall(function), propertyNameConverter
@@ -23,7 +23,7 @@ class KRowMapper<T : Any> private constructor(
 
     private val parameters: List<ParameterForMap> = function.parameters
         .filter { it.kind != KParameter.Kind.INSTANCE && !it.isUseDefaultArgument() }
-        .map { ParameterForMap.newInstance(it, propertyNameConverter) }
+        .map { ParameterForMap.newInstance(it, parameterNameConverter) }
 
     override fun mapRow(rs: ResultSet, rowNum: Int): T {
         val argumentBucket = function.getArgumentBucket()

src/main/kotlin/com/mapk/krowmapper/ParameterForMap.kt

@@ -19,7 +19,7 @@ import kotlin.reflect.full.staticFunctions
 import kotlin.reflect.jvm.isAccessible
 import kotlin.reflect.jvm.jvmName
 
-class ParameterForMap private constructor(
+internal class ParameterForMap private constructor(
     val param: KParameter,
     name: String,
     parameterKClazz: KClass<*>
@@ -62,10 +62,10 @@ class ParameterForMap private constructor(
     fun getObject(rs: ResultSet): Any? = objectGetter(rs)
 
     companion object {
-        fun newInstance(param: KParameter, propertyNameConverter: (String) -> String = { it }): ParameterForMap {
+        fun newInstance(param: KParameter, parameterNameConverter: (String) -> String = { it }): ParameterForMap {
             return ParameterForMap(
                 param,
-                propertyNameConverter(param.getAliasOrName()!!),
+                parameterNameConverter(param.getAliasOrName()!!),
                 param.type.classifier as KClass<*>
             )
         }