feat: add ZonedDateTime codec and serializer; implement serialization logic and integrate into SurfCodecs

Author: twisti-dev

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/SurfCodecs.kt

@@ -16,6 +16,7 @@ import dev.slne.surf.surfapi.core.api.serializer.java.datetime.date.local.LocalD
 import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.instant.InstantCodec
 import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.ldt.LocalDateTimeCodec
 import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.offset.OffsetDateTimeCodec
+import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.zdt.ZonedDateTimeCodec
 import dev.slne.surf.surfapi.core.api.serializer.java.uri.URICodec
 import dev.slne.surf.surfapi.core.api.serializer.java.uuid.JavaUUIDCodec
 import dev.slne.surf.surfapi.core.api.serializer.spongepowered.math.matrix.m2d.SpongeMatrix2dCodec
@@ -97,5 +98,6 @@ object SurfCodecs {
     val INSTANT = InstantCodec.CODEC
     val LOCAL_DATE_TIME = LocalDateTimeCodec.CODEC
     val OFFSET_DATE_TIME = OffsetDateTimeCodec.CODEC
+    val ZONED_DATE_TIME = ZonedDateTimeCodec.CODEC
     // endregion
 }

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/SurfSerializerModule.kt

@@ -17,6 +17,7 @@ import dev.slne.surf.surfapi.core.api.serializer.java.datetime.date.local.LocalD
 import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.instant.InstantSerializer
 import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.ldt.LocalDateTimeSerializer
 import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.offset.OffsetDateTimeSerializer
+import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.zdt.ZonedDateTimeSerializer
 import dev.slne.surf.surfapi.core.api.serializer.java.uri.URISerializer
 import dev.slne.surf.surfapi.core.api.serializer.java.uuid.JavaUUIDSerializer
 import dev.slne.surf.surfapi.core.api.serializer.spongepowered.math.matrix.m2d.SpongeMatrix2dSerializer
@@ -102,6 +103,7 @@ object SurfSerializerModule {
         contextual(InstantSerializer)
         contextual(LocalDateTimeSerializer)
         contextual(OffsetDateTimeSerializer)
+        contextual(ZonedDateTimeSerializer)
     }
 
     val all = SerializersModule {

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/java/datetime/datetime/zdt/ZonedDateTimeCodec.kt

@@ -9,10 +9,8 @@ import java.time.ZonedDateTime
 object ZonedDateTimeCodec {
     val CODEC: Codec<ZonedDateTime> = RecordCodecBuilder.create { instance ->
         instance.group(
-            ZoneIdCodec.CODEC.fieldOf("zoneId").forGetter(ZonedDateTime::getZone),
-            InstantCodec.CODEC.fieldOf("instant").forGetter(ZonedDateTime::toInstant)
-        ).apply(instance) { zoneId, instant ->
-            ZonedDateTime.ofInstant(instant, zoneId)
-        }
+            InstantCodec.CODEC.fieldOf("instant").forGetter(ZonedDateTime::toInstant),
+            ZoneIdCodec.CODEC.fieldOf("zoneId").forGetter(ZonedDateTime::getZone)
+        ).apply(instance, ZonedDateTime::ofInstant)
     }
 }

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/java/datetime/datetime/zdt/ZonedDateTimeSerializer.kt

@@ -8,10 +8,7 @@ import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.encoding.decodeStructure
-import kotlinx.serialization.encoding.encodeStructure
+import kotlinx.serialization.encoding.*
 import java.time.Instant
 import java.time.ZoneId
 import java.time.ZonedDateTime
@@ -28,32 +25,32 @@ object ZonedDateTimeSerializer : KSerializer<ZonedDateTime> {
     override fun serialize(
         encoder: Encoder,
         value: ZonedDateTime,
-    ) {
-        encoder.encodeStructure(descriptor) {
-            encodeSerializableElement(descriptor, 0, ZonedIdSerializer, value.zone)
-            encodeSerializableElement(descriptor, 1, InstantSerializer, value.toInstant())
-        }
+    ) = encoder.encodeStructure(descriptor) {
+        encodeSerializableElement(descriptor, 0, ZonedIdSerializer, value.zone)
+        encodeSerializableElement(descriptor, 1, InstantSerializer, value.toInstant())
     }
 
-    override fun deserialize(decoder: Decoder): ZonedDateTime =
-        decoder.decodeStructure(descriptor) {
-            var zoneId: ZoneId? = null
-            var instant: Instant? = null
-
-            if (decodeSequentially()) {
-                zoneId = decodeSerializableElement(descriptor, 0, ZonedIdSerializer)
-                instant = decodeSerializableElement(descriptor, 1, InstantSerializer)
-            } else while (true) {
-                when (decodeElementIndex(descriptor)) {
-                    0 -> zoneId = decodeSerializableElement(descriptor, 0, ZonedIdSerializer)
-                    1 -> instant = decodeSerializableElement(descriptor, 1, InstantSerializer)
-                    else -> break
-                }
+    override fun deserialize(
+        decoder: Decoder,
+    ): ZonedDateTime = decoder.decodeStructure(descriptor) {
+        var zoneId: ZoneId? = null
+        var instant: Instant? = null
+
+        if (decodeSequentially()) {
+            zoneId = decodeSerializableElement(descriptor, 0, ZonedIdSerializer)
+            instant = decodeSerializableElement(descriptor, 1, InstantSerializer)
+        } else while (true) {
+            when (val index = decodeElementIndex(descriptor)) {
+                0 -> zoneId = decodeSerializableElement(descriptor, 0, ZonedIdSerializer)
+                1 -> instant = decodeSerializableElement(descriptor, 1, InstantSerializer)
+                CompositeDecoder.DECODE_DONE -> break
+                else -> error("Unexpected index: $index")
             }
+        }
 
-            require(zoneId != null) { "Missing value for zoneId" }
-            require(instant != null) { "Missing value for instant" }
+        require(zoneId != null) { "Missing value for zoneId" }
+        require(instant != null) { "Missing value for instant" }
 
-            ZonedDateTime.ofInstant(instant, zoneId)
-        }
+        ZonedDateTime.ofInstant(instant, zoneId)
+    }
 }