Merge pull request #25 from k163377/fix_deserializer_nullability

Fix deserializer's nullability.

Author: k163377

README.ja.md

@@ -310,11 +310,7 @@ class LocalDateTimeDeserializerImpl(
 
     override val srcClass: Class<String> = String::class.javaObjectType
 
-    override fun deserialize(source: String?): LocalDateTime? {
-        return source?.let {
-            LocalDateTime.parse(it, formatter)
-        }
-    }
+    override fun deserialize(source: String): LocalDateTime = LocalDateTime.parse(source, formatter)
 }
 ```
 
@@ -340,11 +336,7 @@ class LocalDateTimeDeserializerImpl(
 
     override val srcClass: Class<String> = String::class.javaObjectType
 
-    override fun deserialize(source: String?): LocalDateTime? {
-        return source?.let {
-            LocalDateTime.parse(it, formatter)
-        }
-    }
+    override fun deserialize(source: String): LocalDateTime = LocalDateTime.parse(source, formatter)
 }
 ```
 

README.md

@@ -72,11 +72,11 @@ Please see [here](https://jitpack.io/#ProjectMapK/KRowMapper/) for the formal in
 **2. add dependency**
 
 ```xml
-	<dependency>
-	    <groupId>com.github.ProjectMapK</groupId>
-	    <artifactId>KRowMapper</artifactId>
-	    <version>Tag</version>
-	</dependency>
+    <dependency>
+        <groupId>com.github.ProjectMapK</groupId>
+        <artifactId>KRowMapper</artifactId>
+        <version>Tag</version>
+    </dependency>
 ```
 
 ## Principle of operation

src/main/kotlin/com/mapk/deserialization/KColumnDeserialize.kt

@@ -9,5 +9,5 @@ annotation class KColumnDeserializeBy(val deserializer: KClass<out AbstractKColu
 
 abstract class AbstractKColumnDeserializer<A : Annotation, S : Any, D>(protected val annotation: A) {
     abstract val srcClass: Class<S>
-    abstract fun deserialize(source: S?): D?
+    abstract fun deserialize(source: S): D?
 }

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

@@ -41,7 +41,7 @@ internal sealed class ParameterForMap<S, D> {
             deserializer: AbstractKColumnDeserializer<*, S, D>
         ) : this(name, deserializer.srcClass, deserializer::deserialize)
 
-        override fun getObject(rs: ResultSet): D? = deserializer.call(rs.getObject(name, srcClazz))
+        override fun getObject(rs: ResultSet): D? = rs.getObject(name, srcClazz)?.let { deserializer.call(it) }
     }
 
     companion object {

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

@@ -7,6 +7,7 @@ import java.sql.ResultSet
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
 
 class DeserializeByMethodTest {
     data class ByConstructor @KColumnDeserializer constructor(val fooString: String)
@@ -29,8 +30,8 @@ class DeserializeByMethodTest {
     )
 
     @Test
-    @DisplayName("マッピングテスト")
-    fun test() {
+    @DisplayName("正常なマッピングの場合")
+    fun isCollect() {
         val resultSet = mockk<ResultSet>()
         every { resultSet.getObject("foo", any<Class<*>>()) } returns "foo"
         every { resultSet.getObject("bar", any<Class<*>>()) } returns "123"
@@ -44,4 +45,21 @@ class DeserializeByMethodTest {
         Assertions.assertEquals(321, result.baz.bazInt)
         Assertions.assertEquals("777", result.qux.quxString)
     }
+
+    data class MultipleDeserializer(val qux: Int) {
+        @KColumnDeserializer
+        constructor(qux: String) : this(qux.toInt())
+
+        companion object {
+            @KColumnDeserializer
+            fun factory(qux: Double) = MultipleDeserializer(qux.toInt())
+        }
+    }
+    data class IllegalDst(val param: MultipleDeserializer)
+
+    @Test
+    @DisplayName("複数のKColumnDeserializerが定義されていた場合")
+    fun hasMultipleDeserializer() {
+        assertThrows<IllegalArgumentException> { KRowMapper(::IllegalDst) }
+    }
 }

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

@@ -8,6 +8,7 @@ import java.sql.ResultSet
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 
@@ -26,25 +27,37 @@ class DeserializerTest {
 
         override val srcClass: Class<String> = String::class.javaObjectType
 
-        override fun deserialize(source: String?): LocalDateTime? {
-            return source?.let {
-                LocalDateTime.parse(it, formatter)
-            }
-        }
+        override fun deserialize(source: String): LocalDateTime = LocalDateTime.parse(source, formatter)
     }
 
-    data class Dst(@LocalDateTimeDeserializer val dateTime: LocalDateTime)
+    data class Dst(@LocalDateTimeDeserializer val dateTime: LocalDateTime?)
+
+    val mapper = KRowMapper(::Dst)
 
     @Test
-    fun test() {
-        val resultSet = mockk<ResultSet>()
-        every { resultSet.getObject("dateTime", any<Class<*>>()) } returns "2020-02-01T01:23:45"
+    @DisplayName("正常に変換した場合")
+    fun isCollect() {
+        val resultSet = mockk<ResultSet> {
+            every { getObject("dateTime", any<Class<*>>()) } returns "2020-02-01T01:23:45"
+        }
 
-        val result = KRowMapper(::Dst).mapRow(resultSet, 0)
+        val result = mapper.mapRow(resultSet, 0)
 
         assertEquals(
             LocalDateTime.parse("2020-02-01T01:23:45", DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss")),
             result.dateTime
         )
     }
+
+    @Test
+    @DisplayName("取得結果がnullだった場合")
+    fun isNull() {
+        val resultSet = mockk<ResultSet> {
+            every { getObject("dateTime", any<Class<*>>()) } returns null
+        }
+
+        val result = mapper.mapRow(resultSet, 0)
+
+        assertNull(result.dateTime)
+    }
 }