From a24a74fa2351d53693226ba0d0018fb9589cddc9 Mon Sep 17 00:00:00 2001 From: nea Date: Wed, 31 May 2023 00:46:23 +0200 Subject: [WIP] Add really shitty pv. This is mostly so I have something to be bothered to improve --- .../kotlin/moe/nea/firmament/util/json/DashlessUUIDSerializer.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main/kotlin/moe/nea/firmament/util/json/DashlessUUIDSerializer.kt') diff --git a/src/main/kotlin/moe/nea/firmament/util/json/DashlessUUIDSerializer.kt b/src/main/kotlin/moe/nea/firmament/util/json/DashlessUUIDSerializer.kt index c95b343..3dca217 100644 --- a/src/main/kotlin/moe/nea/firmament/util/json/DashlessUUIDSerializer.kt +++ b/src/main/kotlin/moe/nea/firmament/util/json/DashlessUUIDSerializer.kt @@ -2,7 +2,6 @@ package moe.nea.firmament.util.json import java.util.UUID import kotlinx.serialization.KSerializer -import kotlinx.serialization.Serializer import kotlinx.serialization.descriptors.PrimitiveKind import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor import kotlinx.serialization.descriptors.SerialDescriptor @@ -15,7 +14,11 @@ object DashlessUUIDSerializer : KSerializer { PrimitiveSerialDescriptor("DashlessUUIDSerializer", PrimitiveKind.STRING) override fun deserialize(decoder: Decoder): UUID { - return parseDashlessUUID(decoder.decodeString()) + val str = decoder.decodeString() + if ("-" in str) { + return UUID.fromString(str) + } + return parseDashlessUUID(str) } override fun serialize(encoder: Encoder, value: UUID) { -- cgit