diff options
author | Torsten Grote <t@grobox.de> | 2020-08-05 15:49:18 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-08-05 15:49:18 -0300 |
commit | 78096abeb8ca000e3480e98d300bec86350f9d13 (patch) | |
tree | 28d697cf0f248b58eed419c353e1b2f29def40ad /taler-kotlin-common/src/commonMain | |
parent | b1acd03f70a33f069a321c6755943421330d2d8d (diff) | |
download | taler-android-78096abeb8ca000e3480e98d300bec86350f9d13.tar.gz taler-android-78096abeb8ca000e3480e98d300bec86350f9d13.tar.bz2 taler-android-78096abeb8ca000e3480e98d300bec86350f9d13.zip |
[wallet] support Timestamp with "never"
Diffstat (limited to 'taler-kotlin-common/src/commonMain')
-rw-r--r-- | taler-kotlin-common/src/commonMain/kotlin/net/taler/common/Time.kt | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/taler-kotlin-common/src/commonMain/kotlin/net/taler/common/Time.kt b/taler-kotlin-common/src/commonMain/kotlin/net/taler/common/Time.kt index 962e004..37b6606 100644 --- a/taler-kotlin-common/src/commonMain/kotlin/net/taler/common/Time.kt +++ b/taler-kotlin-common/src/commonMain/kotlin/net/taler/common/Time.kt @@ -18,6 +18,12 @@ package net.taler.common import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import kotlinx.serialization.builtins.serializer +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.JsonPrimitive +import kotlinx.serialization.json.JsonTransformingSerializer +import kotlinx.serialization.json.contentOrNull +import kotlinx.serialization.json.longOrNull import net.taler.common.Duration.Companion.FOREVER import kotlin.math.max @@ -26,11 +32,12 @@ expect fun nowMillis(): Long @Serializable data class Timestamp( @SerialName("t_ms") + @Serializable(NeverSerializer::class) val ms: Long ) : Comparable<Timestamp> { companion object { - const val NEVER: Long = -1 // TODO or UINT64_MAX? + const val NEVER: Long = -1 fun now(): Timestamp = Timestamp(nowMillis()) } @@ -73,9 +80,27 @@ data class Duration( * Duration in milliseconds. */ @SerialName("d_ms") + @Serializable(ForeverSerializer::class) val ms: Long ) { companion object { - const val FOREVER: Long = -1 // TODO or UINT64_MAX? + const val FOREVER: Long = -1 } } + +abstract class MinusOneSerializer(private val keyword: String) : + JsonTransformingSerializer<Long>(Long.serializer(), keyword) { + + override fun readTransform(element: JsonElement): JsonElement { + return if (element.contentOrNull == keyword) return JsonPrimitive(-1) + else super.readTransform(element) + } + + override fun writeTransform(element: JsonElement): JsonElement { + return if (element.longOrNull == -1L) return JsonPrimitive(keyword) + else element + } +} + +object NeverSerializer : MinusOneSerializer("never") +object ForeverSerializer : MinusOneSerializer("forever") |