Skip to content
This repository was archived by the owner on Jan 20, 2023. It is now read-only.

Commit f280008

Browse files
authored
Merge pull request #7 from k163377/feature
Change abstract deserializer class name.
2 parents 45e775e + 51e3dd9 commit f280008

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import kotlin.reflect.KClass
55
@Target(AnnotationTarget.ANNOTATION_CLASS)
66
@Retention(AnnotationRetention.RUNTIME)
77
@MustBeDocumented
8-
annotation class KColumnDeserializeBy(val deserializer: KClass<out KColumnDeserializer<*, *, *>>)
8+
annotation class KColumnDeserializeBy(val deserializer: KClass<out AbstractKColumnDeserializer<*, *, *>>)
99

10-
abstract class KColumnDeserializer<A : Annotation, S : Any, D : Any>(protected val annotation: A) {
10+
abstract class AbstractKColumnDeserializer<A : Annotation, S : Any, D : Any>(protected val annotation: A) {
1111
abstract val srcClass: Class<S>
1212
abstract fun deserialize(source: S?): D?
1313
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.mapk.annotations.KColumnDeserializer
44
import com.mapk.core.EnumMapper
55
import com.mapk.core.KFunctionWithInstance
66
import com.mapk.core.getAliasOrName
7+
import com.mapk.deserialization.AbstractKColumnDeserializer
78
import com.mapk.deserialization.KColumnDeserializeBy
89
import java.lang.IllegalArgumentException
910
import java.sql.ResultSet
@@ -71,7 +72,7 @@ class ParameterForMap private constructor(
7172
}
7273
}
7374

74-
private fun KParameter.getDeserializer(): com.mapk.deserialization.KColumnDeserializer<*, *, *>? {
75+
private fun KParameter.getDeserializer(): AbstractKColumnDeserializer<*, *, *>? {
7576
val deserializers = this.annotations.mapNotNull { paramAnnotation ->
7677
paramAnnotation.annotationClass
7778
.findAnnotation<KColumnDeserializeBy>()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.mapk.krowmapper
22

3+
import com.mapk.deserialization.AbstractKColumnDeserializer
34
import com.mapk.deserialization.KColumnDeserializeBy
4-
import com.mapk.deserialization.KColumnDeserializer
55
import io.mockk.every
66
import io.mockk.mockk
77
import java.sql.ResultSet
@@ -21,7 +21,7 @@ class DeserializerTest {
2121

2222
class LocalDateTimeDeserializerImpl(
2323
annotation: LocalDateTimeDeserializer
24-
) : KColumnDeserializer<LocalDateTimeDeserializer, String, LocalDateTime>(annotation) {
24+
) : AbstractKColumnDeserializer<LocalDateTimeDeserializer, String, LocalDateTime>(annotation) {
2525
private val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern(annotation.pattern)
2626

2727
override val srcClass: Class<String> = String::class.javaObjectType

0 commit comments

Comments
 (0)