From 1314480e1b9c477d726e495dca0366153a084299 Mon Sep 17 00:00:00 2001
From: tursom <tursom@foxmail.com>
Date: Tue, 11 Aug 2020 00:54:28 +0800
Subject: [PATCH] add TypeAdapter

---
 .../cn/tursom/database/TypeAdapterFactory.kt  | 28 +++++++++++--------
 .../database/typeadapter/BooleanAdapter.kt    |  2 +-
 .../database/typeadapter/BytesAdapter.kt      |  2 +-
 .../database/typeadapter/DateAdapter.kt       |  2 +-
 .../database/typeadapter/DoubleAdapter.kt     |  2 +-
 .../database/typeadapter/EnumAdapter.kt       |  7 +++--
 .../database/typeadapter/FloatAdapter.kt      |  2 +-
 .../database/typeadapter/InstantAdapter.kt    |  2 +-
 .../tursom/database/typeadapter/IntAdapter.kt |  2 +-
 .../database/typeadapter/IntAdapterAdapter.kt |  2 +-
 .../database/typeadapter/JsonAdapter.kt       |  2 +-
 .../database/typeadapter/LocalDateAdapter.kt  |  2 +-
 .../typeadapter/LocalDateTimeAdapter.kt       |  2 +-
 .../database/typeadapter/LocalTimeAdapter.kt  |  2 +-
 .../database/typeadapter/LongAdapter.kt       |  2 +-
 .../database/typeadapter/MonthDayAdapter.kt   |  2 +-
 .../database/typeadapter/StringAdapter.kt     |  2 +-
 .../database/typeadapter/TimeAdapter.kt       |  2 +-
 .../database/typeadapter/TimestampAdapter.kt  |  2 +-
 .../database/typeadapter/UUIDAdapter.kt       |  2 +-
 .../database/typeadapter/YearAdapter.kt       |  2 +-
 .../database/typeadapter/YearMonthAdapter.kt  |  2 +-
 22 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/database/src/main/kotlin/cn/tursom/database/TypeAdapterFactory.kt b/database/src/main/kotlin/cn/tursom/database/TypeAdapterFactory.kt
index 1bae34d..3f9fbd1 100644
--- a/database/src/main/kotlin/cn/tursom/database/TypeAdapterFactory.kt
+++ b/database/src/main/kotlin/cn/tursom/database/TypeAdapterFactory.kt
@@ -15,18 +15,7 @@ object TypeAdapterFactory {
   private val adapterQueue = ConcurrentLinkedQueue<TypeAdapter<*>>()
 
   init {
-    getClassByPackage("cn.tursom.database.typeadapter").forEach {
-      try {
-        val clazz = Class.forName(it).kotlin
-        if (clazz.isSubclassOf(TypeAdapter::class)) {
-          val adapter: TypeAdapter<*> = clazz.objectInstance?.cast() ?: run {
-            clazz.createInstance()
-          }.cast()
-          registerAdapter(adapter)
-        }
-      } catch (e: Error) {
-      }
-    }
+    scanPackage("cn.tursom.database.typeadapter")
   }
 
   private fun getAdapterQueue(level: Int): ConcurrentLinkedQueue<TypeAdapter<*>> {
@@ -40,6 +29,21 @@ object TypeAdapterFactory {
     return queue!!
   }
 
+  fun scanPackage(pkg: String) {
+    getClassByPackage(pkg).forEach {
+      try {
+        val clazz = Class.forName(it).kotlin
+        if (clazz.isSubclassOf(TypeAdapter::class)) {
+          val adapter: TypeAdapter<*> = clazz.objectInstance?.cast() ?: run {
+            clazz.createInstance()
+          }.cast()
+          registerAdapter(adapter)
+        }
+      } catch (e: Error) {
+      }
+    }
+  }
+
   fun registerAdapter(adapter: TypeAdapter<*>) {
     getAdapterQueue(adapter.level).add(adapter)
   }
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/BooleanAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/BooleanAdapter.kt
index ff21260..a456477 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/BooleanAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/BooleanAdapter.kt
@@ -7,7 +7,7 @@ import me.liuwj.ktorm.schema.Column
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class BooleanAdapter : TypeAdapter<Boolean> {
+object BooleanAdapter : TypeAdapter<Boolean> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Boolean>): Column<Boolean>? {
     return if (field.returnType.jvmErasure == Boolean::class) {
       table.boolean(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/BytesAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/BytesAdapter.kt
index e24913a..f3c72ba 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/BytesAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/BytesAdapter.kt
@@ -7,7 +7,7 @@ import me.liuwj.ktorm.schema.Column
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class BytesAdapter : TypeAdapter<ByteArray> {
+object BytesAdapter : TypeAdapter<ByteArray> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, ByteArray>): Column<ByteArray>? {
     return if (field.returnType.jvmErasure == ByteArray::class) {
       table.bytes(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/DateAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/DateAdapter.kt
index 303efbf..bb79e05 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/DateAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/DateAdapter.kt
@@ -8,7 +8,7 @@ import java.sql.Date
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class DateAdapter : TypeAdapter<Date> {
+object DateAdapter : TypeAdapter<Date> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Date>): Column<Date>? {
     return if (field.returnType.jvmErasure == Date::class) {
       table.jdbcDate(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/DoubleAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/DoubleAdapter.kt
index 669514b..1427365 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/DoubleAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/DoubleAdapter.kt
@@ -7,7 +7,7 @@ import me.liuwj.ktorm.schema.Column
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class DoubleAdapter : TypeAdapter<Double> {
+object DoubleAdapter : TypeAdapter<Double> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Double>): Column<Double>? {
     return if (field.returnType.jvmErasure == Double::class) {
       table.double(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/EnumAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/EnumAdapter.kt
index 893bee1..0abdf57 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/EnumAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/EnumAdapter.kt
@@ -10,10 +10,10 @@ import kotlin.reflect.KProperty1
 import kotlin.reflect.full.isSubclassOf
 import kotlin.reflect.jvm.jvmErasure
 
-class EnumAdapter<E : Enum<E>> : TypeAdapter<E> {
-  private enum class EnumType
+object EnumAdapter : TypeAdapter<EnumAdapter.EnumType> {
+  enum class EnumType
 
-  override fun register(table: BaseTable<Any>, field: KProperty1<Any, E>): Column<E>? {
+  override fun register(table: BaseTable<Any>, field: KProperty1<Any, EnumType>): Column<EnumType>? {
     val kClass = field.returnType.jvmErasure
     return if (kClass.isSubclassOf(Enum::class)) {
       table.registerColumn(SqlUtils { field.tableField }, EnumSqlType<EnumType>(kClass.java.cast())).cast()
@@ -21,4 +21,5 @@ class EnumAdapter<E : Enum<E>> : TypeAdapter<E> {
       null
     }
   }
+
 }
\ No newline at end of file
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/FloatAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/FloatAdapter.kt
index bc294af..b0a01f3 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/FloatAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/FloatAdapter.kt
@@ -7,7 +7,7 @@ import me.liuwj.ktorm.schema.Column
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class FloatAdapter : TypeAdapter<Float> {
+object FloatAdapter : TypeAdapter<Float> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Float>): Column<Float>? {
     return if (field.returnType.jvmErasure == Float::class) {
       table.float(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/InstantAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/InstantAdapter.kt
index 9d63923..ef5cf16 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/InstantAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/InstantAdapter.kt
@@ -8,7 +8,7 @@ import java.time.Instant
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class InstantAdapter : TypeAdapter<Instant> {
+object InstantAdapter : TypeAdapter<Instant> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Instant>): Column<Instant>? {
     return if (field.returnType.jvmErasure == Instant::class) {
       table.timestamp(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/IntAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/IntAdapter.kt
index 980aaab..33c7d81 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/IntAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/IntAdapter.kt
@@ -7,7 +7,7 @@ import me.liuwj.ktorm.schema.Column
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class IntAdapter : TypeAdapter<Int> {
+object IntAdapter : TypeAdapter<Int> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Int>): Column<Int>? {
     return if (field.returnType.jvmErasure == Int::class) {
       table.int(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/IntAdapterAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/IntAdapterAdapter.kt
index 399c36b..a4dc704 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/IntAdapterAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/IntAdapterAdapter.kt
@@ -8,7 +8,7 @@ import java.math.BigDecimal
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class IntAdapterAdapter : TypeAdapter<BigDecimal> {
+object IntAdapterAdapter : TypeAdapter<BigDecimal> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, BigDecimal>): Column<BigDecimal>? {
     return if (field.returnType.jvmErasure == BigDecimal::class) {
       table.decimal(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/JsonAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/JsonAdapter.kt
index ffd0e60..b5af7a8 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/JsonAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/JsonAdapter.kt
@@ -8,7 +8,7 @@ import me.liuwj.ktorm.schema.Column
 import kotlin.reflect.KProperty1
 import kotlin.reflect.full.findAnnotation
 
-class JsonAdapter : TypeAdapter<Int> {
+object JsonAdapter : TypeAdapter<Int> {
   override val level: Int get() = -16
 
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Int>): Column<Int>? {
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalDateAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalDateAdapter.kt
index 57514fd..a533ddf 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalDateAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalDateAdapter.kt
@@ -8,7 +8,7 @@ import java.time.LocalDate
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class LocalDateAdapter : TypeAdapter<LocalDate> {
+object LocalDateAdapter : TypeAdapter<LocalDate> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, LocalDate>): Column<LocalDate>? {
     return if (field.returnType.jvmErasure == LocalDate::class) {
       table.date(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalDateTimeAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalDateTimeAdapter.kt
index 53b2d8d..c9bceda 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalDateTimeAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalDateTimeAdapter.kt
@@ -8,7 +8,7 @@ import java.time.LocalDateTime
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class LocalDateTimeAdapter : TypeAdapter<LocalDateTime> {
+object LocalDateTimeAdapter : TypeAdapter<LocalDateTime> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, LocalDateTime>): Column<LocalDateTime>? {
     return if (field.returnType.jvmErasure == LocalDateTime::class) {
       table.datetime(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalTimeAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalTimeAdapter.kt
index b22fd21..19a2eb0 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalTimeAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/LocalTimeAdapter.kt
@@ -8,7 +8,7 @@ import java.time.LocalTime
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class LocalTimeAdapter : TypeAdapter<LocalTime> {
+object LocalTimeAdapter : TypeAdapter<LocalTime> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, LocalTime>): Column<LocalTime>? {
     return if (field.returnType.jvmErasure == LocalTime::class) {
       table.time(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/LongAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/LongAdapter.kt
index a86c0ee..7dd7e0d 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/LongAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/LongAdapter.kt
@@ -7,7 +7,7 @@ import me.liuwj.ktorm.schema.Column
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class LongAdapter : TypeAdapter<Long> {
+object LongAdapter : TypeAdapter<Long> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Long>): Column<Long>? {
     return if (field.returnType.jvmErasure == Long::class) {
       table.long(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/MonthDayAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/MonthDayAdapter.kt
index 510be39..aa33053 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/MonthDayAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/MonthDayAdapter.kt
@@ -8,7 +8,7 @@ import java.time.MonthDay
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class MonthDayAdapter : TypeAdapter<MonthDay> {
+object MonthDayAdapter : TypeAdapter<MonthDay> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, MonthDay>): Column<MonthDay>? {
     return if (field.returnType.jvmErasure == MonthDay::class) {
       table.monthDay(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/StringAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/StringAdapter.kt
index 041ab67..26a58f4 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/StringAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/StringAdapter.kt
@@ -7,7 +7,7 @@ import me.liuwj.ktorm.schema.Column
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class StringAdapter : TypeAdapter<String> {
+object StringAdapter : TypeAdapter<String> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, String>): Column<String>? {
     return if (field.returnType.jvmErasure == String::class) {
       table.varchar(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/TimeAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/TimeAdapter.kt
index b6396ba..2cd5ec7 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/TimeAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/TimeAdapter.kt
@@ -8,7 +8,7 @@ import java.sql.Time
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class TimeAdapter : TypeAdapter<Time> {
+object TimeAdapter : TypeAdapter<Time> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Time>): Column<Time>? {
     return if (field.returnType.jvmErasure == Time::class) {
       table.jdbcTime(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/TimestampAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/TimestampAdapter.kt
index fcc192c..9d7edd6 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/TimestampAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/TimestampAdapter.kt
@@ -8,7 +8,7 @@ import java.sql.Timestamp
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class TimestampAdapter : TypeAdapter<Timestamp> {
+object TimestampAdapter : TypeAdapter<Timestamp> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Timestamp>): Column<Timestamp>? {
     return if (field.returnType.jvmErasure == Timestamp::class) {
       table.jdbcTimestamp(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/UUIDAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/UUIDAdapter.kt
index f1032e5..1b9e053 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/UUIDAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/UUIDAdapter.kt
@@ -8,7 +8,7 @@ import java.util.*
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class UUIDAdapter : TypeAdapter<UUID> {
+object UUIDAdapter : TypeAdapter<UUID> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, UUID>): Column<UUID>? {
     return if (field.returnType.jvmErasure == UUID::class) {
       table.uuid(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/YearAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/YearAdapter.kt
index d0eebf3..86a1933 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/YearAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/YearAdapter.kt
@@ -8,7 +8,7 @@ import java.time.Year
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class YearAdapter : TypeAdapter<Year> {
+object YearAdapter : TypeAdapter<Year> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, Year>): Column<Year>? {
     return if (field.returnType.jvmErasure == Year::class) {
       table.year(field)
diff --git a/database/src/main/kotlin/cn/tursom/database/typeadapter/YearMonthAdapter.kt b/database/src/main/kotlin/cn/tursom/database/typeadapter/YearMonthAdapter.kt
index d9057d2..0e0c466 100644
--- a/database/src/main/kotlin/cn/tursom/database/typeadapter/YearMonthAdapter.kt
+++ b/database/src/main/kotlin/cn/tursom/database/typeadapter/YearMonthAdapter.kt
@@ -8,7 +8,7 @@ import java.time.YearMonth
 import kotlin.reflect.KProperty1
 import kotlin.reflect.jvm.jvmErasure
 
-class YearMonthAdapter : TypeAdapter<YearMonth> {
+object YearMonthAdapter : TypeAdapter<YearMonth> {
   override fun register(table: BaseTable<Any>, field: KProperty1<Any, YearMonth>): Column<YearMonth>? {
     return if (field.returnType.jvmErasure == YearMonth::class) {
       table.yearMonth(field)