Merge pull request #12 from k163377/refactor

Refactors.

Author: k163377

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>,
-    parameterNameConverter: (String) -> String = { it }
+    parameterNameConverter: (String) -> String
 ) : RowMapper<T> {
     constructor(function: KFunction<T>, propertyNameConverter: (String) -> String = { it }) : this(
         KFunctionForCall(function), propertyNameConverter

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

@@ -62,7 +62,7 @@ internal class ParameterForMap private constructor(
     fun getObject(rs: ResultSet): Any? = objectGetter(rs)
 
     companion object {
-        fun newInstance(param: KParameter, parameterNameConverter: (String) -> String = { it }): ParameterForMap {
+        fun newInstance(param: KParameter, parameterNameConverter: (String) -> String): ParameterForMap {
             return ParameterForMap(
                 param,
                 parameterNameConverter(param.getAliasOrName()!!),
@@ -91,18 +91,14 @@ private fun <T : Any> KClass<T>.getDeserializer(): KFunction<T>? {
             deserializerFromCompanionObject(this)
 
     return when {
-        deserializers.isEmpty() -> null
-        deserializers.size == 1 -> deserializers.single()
+        deserializers.size <= 1 -> deserializers.singleOrNull()
         else -> throw IllegalArgumentException("Find multiple deserializer from $jvmName")
     }
 }
 
 private fun <T> Collection<KFunction<T>>.getDeserializerFromFunctions(): Collection<KFunction<T>> {
     return filter { it.annotations.any { annotation -> annotation is KColumnDeserializer } }
-        .map { func ->
-            func.isAccessible = true
-            func
-        }
+        .onEach { it.isAccessible = true }
 }
 
 private fun <T : Any> deserializerFromConstructors(clazz: KClass<T>): Collection<KFunction<T>> {

src/test/kotlin/com/mapk/krowmapper/UseDBMappingTest.kt

@@ -6,13 +6,15 @@ import org.h2.jdbcx.JdbcDataSource
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.springframework.jdbc.core.JdbcTemplate
 import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource
 import org.springframework.jdbc.core.simple.SimpleJdbcInsert
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@DisplayName("DBを用いてマッピングを行うテスト")
 class UseDBMappingTest {
     enum class FooStatus {
         active, archive, deleted