diff options
Diffstat (limited to 'kvision-modules')
6 files changed, 0 insertions, 51 deletions
diff --git a/kvision-modules/kvision-server-jooby/build.gradle b/kvision-modules/kvision-server-jooby/build.gradle index 74ccbad5..deafd40a 100644 --- a/kvision-modules/kvision-server-jooby/build.gradle +++ b/kvision-modules/kvision-server-jooby/build.gradle @@ -20,7 +20,6 @@ dependencies { compile "org.jooby:jooby-lang-kotlin" compile "org.jooby:jooby-jackson" compile "org.jooby:jooby-pac4j2" - compile "com.github.andrewoma.kwery:mapper:${kweryVersion}" compile "com.fasterxml.jackson.module:jackson-module-kotlin:${jacksonModuleKotlinVersion}" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" testCompile project(":kvision-modules:kvision-common-types") diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/types/Date.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/types/Date.kt index 57853c8b..86fab30a 100644 --- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/types/Date.kt +++ b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/types/Date.kt @@ -21,12 +21,6 @@ */ package pl.treksoft.kvision.types -import com.github.andrewoma.kwery.mapper.SimpleConverter -import com.github.andrewoma.kwery.mapper.TableConfiguration -import com.github.andrewoma.kwery.mapper.reifiedConverter -import com.github.andrewoma.kwery.mapper.standardConverters -import com.github.andrewoma.kwery.mapper.util.camelToLowerUnderscore -import java.sql.Timestamp import java.text.SimpleDateFormat actual val KV_DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss" @@ -38,13 +32,3 @@ actual typealias Date = java.util.Date actual fun String.toDateF(format: String): Date = SimpleDateFormat(format).parse(this) actual fun Date.toStringF(format: String): String = SimpleDateFormat(format).format(this) - -object DateConverter : SimpleConverter<Date>( - { row, c -> Date(row.timestamp(c).time) }, - { Timestamp(it.time) } -) - -val kvTableConfig = TableConfiguration( - converters = standardConverters + reifiedConverter(DateConverter), - namingConvention = camelToLowerUnderscore -) diff --git a/kvision-modules/kvision-server-ktor/build.gradle b/kvision-modules/kvision-server-ktor/build.gradle index bdc9c4c1..62b5fe83 100644 --- a/kvision-modules/kvision-server-ktor/build.gradle +++ b/kvision-modules/kvision-server-ktor/build.gradle @@ -11,7 +11,6 @@ dependencies { compile "io.ktor:ktor-server-core:$ktorVersion" compile "io.ktor:ktor-jackson:$ktorVersion" compile "com.google.inject:guice:$guiceVersion" - compile "com.github.andrewoma.kwery:mapper:$kweryVersion" compile "com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonModuleKotlinVersion" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" testCompile project(":kvision-modules:kvision-common-types") diff --git a/kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/types/Date.kt b/kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/types/Date.kt index 57853c8b..86fab30a 100644 --- a/kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/types/Date.kt +++ b/kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/types/Date.kt @@ -21,12 +21,6 @@ */ package pl.treksoft.kvision.types -import com.github.andrewoma.kwery.mapper.SimpleConverter -import com.github.andrewoma.kwery.mapper.TableConfiguration -import com.github.andrewoma.kwery.mapper.reifiedConverter -import com.github.andrewoma.kwery.mapper.standardConverters -import com.github.andrewoma.kwery.mapper.util.camelToLowerUnderscore -import java.sql.Timestamp import java.text.SimpleDateFormat actual val KV_DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss" @@ -38,13 +32,3 @@ actual typealias Date = java.util.Date actual fun String.toDateF(format: String): Date = SimpleDateFormat(format).parse(this) actual fun Date.toStringF(format: String): String = SimpleDateFormat(format).format(this) - -object DateConverter : SimpleConverter<Date>( - { row, c -> Date(row.timestamp(c).time) }, - { Timestamp(it.time) } -) - -val kvTableConfig = TableConfiguration( - converters = standardConverters + reifiedConverter(DateConverter), - namingConvention = camelToLowerUnderscore -) diff --git a/kvision-modules/kvision-server-spring-boot/build.gradle b/kvision-modules/kvision-server-spring-boot/build.gradle index 2b9727ac..3bb2b2aa 100644 --- a/kvision-modules/kvision-server-spring-boot/build.gradle +++ b/kvision-modules/kvision-server-spring-boot/build.gradle @@ -13,7 +13,6 @@ dependencies { compile "org.springframework.boot:spring-boot-starter:$springBootVersion" compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" compile "org.pac4j:pac4j-core:$pac4jVersion" - compile "com.github.andrewoma.kwery:mapper:${kweryVersion}" compile "com.fasterxml.jackson.module:jackson-module-kotlin:${jacksonModuleKotlinVersion}" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" testCompile project(":kvision-modules:kvision-common-types") diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/types/Date.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/types/Date.kt index 57853c8b..86fab30a 100644 --- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/types/Date.kt +++ b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/types/Date.kt @@ -21,12 +21,6 @@ */ package pl.treksoft.kvision.types -import com.github.andrewoma.kwery.mapper.SimpleConverter -import com.github.andrewoma.kwery.mapper.TableConfiguration -import com.github.andrewoma.kwery.mapper.reifiedConverter -import com.github.andrewoma.kwery.mapper.standardConverters -import com.github.andrewoma.kwery.mapper.util.camelToLowerUnderscore -import java.sql.Timestamp import java.text.SimpleDateFormat actual val KV_DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss" @@ -38,13 +32,3 @@ actual typealias Date = java.util.Date actual fun String.toDateF(format: String): Date = SimpleDateFormat(format).parse(this) actual fun Date.toStringF(format: String): String = SimpleDateFormat(format).format(this) - -object DateConverter : SimpleConverter<Date>( - { row, c -> Date(row.timestamp(c).time) }, - { Timestamp(it.time) } -) - -val kvTableConfig = TableConfiguration( - converters = standardConverters + reifiedConverter(DateConverter), - namingConvention = camelToLowerUnderscore -) |