feat: add ZoneId codec and serializer; implement error handling for invalid ZoneIDs

Author: twisti-dev

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

@@ -18,6 +18,7 @@ import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.ldt.Loca
 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.datetime.time.local.LocalTimeCodec
+import dev.slne.surf.surfapi.core.api.serializer.java.datetime.zone.id.ZoneIdCodec
 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
@@ -101,5 +102,6 @@ object SurfCodecs {
     val OFFSET_DATE_TIME = OffsetDateTimeCodec.CODEC
     val ZONED_DATE_TIME = ZonedDateTimeCodec.CODEC
     val LOCAL_TIME = LocalTimeCodec.CODEC
+    val ZONE_ID = ZoneIdCodec.CODEC
     // endregion
 }

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

@@ -19,6 +19,7 @@ import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.ldt.Loca
 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.datetime.time.local.LocalTimeSerializer
+import dev.slne.surf.surfapi.core.api.serializer.java.datetime.zone.id.ZonedIdSerializer
 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
@@ -106,6 +107,7 @@ object SurfSerializerModule {
         contextual(OffsetDateTimeSerializer)
         contextual(ZonedDateTimeSerializer)
         contextual(LocalTimeSerializer)
+        contextual(ZonedIdSerializer)
     }
 
     val all = SerializersModule {

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/java/datetime/zone/id/ZoneIdCodec.kt

@@ -1,8 +1,20 @@
 package dev.slne.surf.surfapi.core.api.serializer.java.datetime.zone.id
 
 import com.mojang.serialization.Codec
+import com.mojang.serialization.DataResult
+import java.time.DateTimeException
 import java.time.ZoneId
+import java.time.zone.ZoneRulesException
 
 object ZoneIdCodec {
-    val CODEC: Codec<ZoneId> = Codec.STRING.xmap({ ZoneId.of(it) }, { it.id })
+    val CODEC: Codec<ZoneId> = Codec.STRING
+        .comapFlatMap({ id ->
+            try {
+                DataResult.success(ZoneId.of(id))
+            } catch (e: ZoneRulesException) {
+                DataResult.error { "Unknown ZoneID $id: ${e.message}" }
+            } catch (e: DateTimeException) {
+                DataResult.error { "Invalid ZoneID $id: ${e.message}" }
+            }
+        }, ZoneId::getId)
 }