From 932a7b7bdae6c90fbcadb563775a9721cf4741cd Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Sat, 22 Dec 2018 22:39:42 +0100 Subject: Fix incompatible date formats between platforms. --- .../src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt | 3 ++- .../src/main/kotlin/pl/treksoft/kvision/types/Date.kt | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'kvision-modules/kvision-server-jooby/src/main') diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt index 79a02e87..05681349 100644 --- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt +++ b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt @@ -25,6 +25,7 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import org.jooby.Kooby import org.jooby.json.Jackson import org.pac4j.core.profile.CommonProfile +import pl.treksoft.kvision.types.KV_DATE_FORMAT import java.text.SimpleDateFormat import kotlinx.coroutines.async as coroutinesAsync @@ -38,7 +39,7 @@ actual open class KVServer(init: KVServer.() -> Unit) : Kooby() { @Suppress("LeakingThis") assets("/**").onMissing(0) val mapper = jacksonObjectMapper().apply { - dateFormat = SimpleDateFormat("YYYY-MM-DD HH:mm:ss") + dateFormat = SimpleDateFormat(KV_DATE_FORMAT) } @Suppress("LeakingThis") use(Jackson(mapper)) 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 32c8923e..8ce8cbd4 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 @@ -29,6 +29,8 @@ import com.github.andrewoma.kwery.mapper.util.camelToLowerUnderscore import java.sql.Timestamp import java.text.SimpleDateFormat +actual val KV_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss" + actual typealias Date = java.util.Date actual fun String.toDateF(format: String): Date = SimpleDateFormat(format).parse(this) -- cgit