From 5178fc613b673367ceef2e907cda7c6386f7ac40 Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Mon, 18 Feb 2019 19:12:10 +0100 Subject: Simplifications for multiplatform Date type. --- .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 6 ------ .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 22 ---------------------- .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 6 +++--- .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 6 +++--- .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 6 +++--- src/main/kotlin/pl/treksoft/kvision/types/Date.kt | 6 +++--- 6 files changed, 12 insertions(+), 40 deletions(-) diff --git a/kvision-modules/kvision-common-types/src/main/kotlin/pl/treksoft/kvision/types/Date.kt b/kvision-modules/kvision-common-types/src/main/kotlin/pl/treksoft/kvision/types/Date.kt index 909b0b95..55e1b15f 100644 --- a/kvision-modules/kvision-common-types/src/main/kotlin/pl/treksoft/kvision/types/Date.kt +++ b/kvision-modules/kvision-common-types/src/main/kotlin/pl/treksoft/kvision/types/Date.kt @@ -21,10 +21,4 @@ */ package pl.treksoft.kvision.types -expect val KV_DEFAULT_DATE_FORMAT: String - expect class Date - -expect fun String.toDateF(format: String = KV_DEFAULT_DATE_FORMAT): Date - -expect fun Date.toStringF(format: String = KV_DEFAULT_DATE_FORMAT): String diff --git a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/types/Date.kt b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/types/Date.kt index 8cab5348..6dc85060 100644 --- a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/types/Date.kt +++ b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/types/Date.kt @@ -44,25 +44,3 @@ object JsonDateSerializer : KSerializer { encoder.encodeLong(obj.getTime().toLong()) } } - -/** - * @suppress - * Not used in this module. - */ -actual val KV_DEFAULT_DATE_FORMAT = "" - -/** - * @suppress - * Not used in this module. - */ -actual fun String.toDateF(format: String): Date { - TODO("Unimplemented") -} - -/** - * @suppress - * Not used in this module. - */ -actual fun Date.toStringF(format: String): String { - TODO("Unimplemented") -} 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 b1f72d6f..678d6828 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 @@ -23,10 +23,10 @@ package pl.treksoft.kvision.types import java.text.SimpleDateFormat -actual val KV_DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss" +val KV_DEFAULT_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) +fun String.toDateF(format: String = KV_DEFAULT_DATE_FORMAT): Date = SimpleDateFormat(format).parse(this) -actual fun Date.toStringF(format: String): String = SimpleDateFormat(format).format(this) +fun Date.toStringF(format: String = KV_DEFAULT_DATE_FORMAT): String = SimpleDateFormat(format).format(this) 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 b1f72d6f..678d6828 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 @@ -23,10 +23,10 @@ package pl.treksoft.kvision.types import java.text.SimpleDateFormat -actual val KV_DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss" +val KV_DEFAULT_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) +fun String.toDateF(format: String = KV_DEFAULT_DATE_FORMAT): Date = SimpleDateFormat(format).parse(this) -actual fun Date.toStringF(format: String): String = SimpleDateFormat(format).format(this) +fun Date.toStringF(format: String = KV_DEFAULT_DATE_FORMAT): String = SimpleDateFormat(format).format(this) 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 b1f72d6f..678d6828 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 @@ -23,10 +23,10 @@ package pl.treksoft.kvision.types import java.text.SimpleDateFormat -actual val KV_DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss" +val KV_DEFAULT_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) +fun String.toDateF(format: String = KV_DEFAULT_DATE_FORMAT): Date = SimpleDateFormat(format).parse(this) -actual fun Date.toStringF(format: String): String = SimpleDateFormat(format).format(this) +fun Date.toStringF(format: String = KV_DEFAULT_DATE_FORMAT): String = SimpleDateFormat(format).format(this) diff --git a/src/main/kotlin/pl/treksoft/kvision/types/Date.kt b/src/main/kotlin/pl/treksoft/kvision/types/Date.kt index ffa5008a..4feaa181 100644 --- a/src/main/kotlin/pl/treksoft/kvision/types/Date.kt +++ b/src/main/kotlin/pl/treksoft/kvision/types/Date.kt @@ -29,7 +29,7 @@ import kotlinx.serialization.internal.SerialClassDescImpl import pl.treksoft.kvision.KVManager import kotlin.js.Date -actual val KV_DEFAULT_DATE_FORMAT = "YYYY-MM-DD HH:mm:ss" +val KV_DEFAULT_DATE_FORMAT = "YYYY-MM-DD HH:mm:ss" actual typealias Date = kotlin.js.Date @@ -39,7 +39,7 @@ actual typealias Date = kotlin.js.Date * @return Date object */ @Suppress("UnsafeCastFromDynamic") -actual fun String.toDateF(format: String): Date { +fun String.toDateF(format: String = KV_DEFAULT_DATE_FORMAT): Date { val result = KVManager.fecha.parse(this, format) return if (result) result else Date() } @@ -50,7 +50,7 @@ actual fun String.toDateF(format: String): Date { * @return String object */ @Suppress("UnsafeCastFromDynamic") -actual fun Date.toStringF(format: String): String { +fun Date.toStringF(format: String = KV_DEFAULT_DATE_FORMAT): String { return KVManager.fecha.format(this, format) } -- cgit