From 932a7b7bdae6c90fbcadb563775a9721cf4741cd Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Sat, 22 Dec 2018 22:39:42 +0100
Subject: Fix incompatible date formats between platforms.

---
 .../src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.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-spring-boot/src/main/kotlin/pl/treksoft')

diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
index 45c5c565..24c6c9db 100644
--- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
+++ b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
@@ -28,6 +28,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import pl.treksoft.kvision.types.KV_DATE_FORMAT
 import java.text.SimpleDateFormat
 import javax.servlet.http.HttpServletResponse
 import kotlin.reflect.KClass
@@ -48,7 +49,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
     val optionsRequests: MutableMap<String, (Request, HttpServletResponse) -> Unit> = mutableMapOf()
 
     val mapper = jacksonObjectMapper().apply {
-        dateFormat = SimpleDateFormat("YYYY-MM-DD HH:mm:ss")
+        dateFormat = SimpleDateFormat(KV_DATE_FORMAT)
     }
     var counter: Int = 0
 
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 32c8923e..8ce8cbd4 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
@@ -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