From 667b3f983a3a77865e4fb89c0cf531ce982904ac Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Mon, 18 Feb 2019 17:10:10 +0100 Subject: Make kvision-remote module independent of kvision itself. Change the default JSON serialization format of Date objects (plain long value). --- .../src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt | 6 +----- .../src/main/kotlin/pl/treksoft/kvision/types/Date.kt | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'kvision-modules/kvision-server-spring-boot/src/main') 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 838abd67..66dc4b99 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 @@ -29,8 +29,6 @@ import kotlinx.coroutines.launch import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.context.ApplicationContext -import pl.treksoft.kvision.types.KV_JSON_DATE_FORMAT -import java.text.SimpleDateFormat import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse import kotlin.reflect.KClass @@ -56,9 +54,7 @@ actual open class KVServiceManager actual constructor(val serviceClass: val optionsRequests: MutableMap Unit> = mutableMapOf() - val mapper = jacksonObjectMapper().apply { - dateFormat = SimpleDateFormat(KV_JSON_DATE_FORMAT) - } + val mapper = jacksonObjectMapper() 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 86fab30a..b1f72d6f 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 @@ -25,8 +25,6 @@ import java.text.SimpleDateFormat actual val KV_DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss" -actual val KV_JSON_DATE_FORMAT = "yyyy-MM-dd HH:mm:ssZ" - actual typealias Date = java.util.Date actual fun String.toDateF(format: String): Date = SimpleDateFormat(format).parse(this) -- cgit