feat: add ZoneOffset codec and serializer; implement error handling for invalid ZoneOffsets

Author: twisti-dev

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

@@ -19,6 +19,7 @@ import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.offset.O
 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.datetime.zone.offset.ZoneOffsetCodec
 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
@@ -103,5 +104,6 @@ object SurfCodecs {
     val ZONED_DATE_TIME = ZonedDateTimeCodec.CODEC
     val LOCAL_TIME = LocalTimeCodec.CODEC
     val ZONE_ID = ZoneIdCodec.CODEC
+    val ZONE_OFFSET = ZoneOffsetCodec.CODEC
     // endregion
 }

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

@@ -20,6 +20,7 @@ import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.offset.O
 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.datetime.zone.offset.ZoneOffsetSerializer
 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
@@ -108,6 +109,7 @@ object SurfSerializerModule {
         contextual(ZonedDateTimeSerializer)
         contextual(LocalTimeSerializer)
         contextual(ZonedIdSerializer)
+        contextual(ZoneOffsetSerializer)
     }
 
     val all = SerializersModule {

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

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

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

@@ -23,6 +23,6 @@ object ZoneOffsetSerializer : KSerializer<ZoneOffset> {
         encoder.encodeString(value.id)
     }
 
-    override fun deserialize(decoder: Decoder) =
+    override fun deserialize(decoder: Decoder): ZoneOffset =
         ZoneOffset.of(decoder.decodeString())
 }