Use formatters by kotlinx.datetime instead of ones from java time

icpc · Apr 11, 2024 · 94da26a · 94da26a
1 parent d9e5bb3
commit 94da26a
Show file tree

Hide file tree

Showing 15 changed files with 343 additions and 305 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 ktor = "2.3.8"                     # https://ktor.io/
-datetime = "0.5.0"                 # https://github.com/Kotlin/kotlinx-datetime
+datetime = "0.6.0-RC"              # https://github.com/Kotlin/kotlinx-datetime
 serialization = "1.6.3"            # https://github.com/Kotlin/kotlinx.serialization
 kotlin = "2.0.0-Beta4"
 ksp = "2.0.0-Beta4-1.0.17"         # https://github.com/google/ksp

diff --git a/src/cds/plugins/cats/src/main/kotlin/org/icpclive/cds/plugins/cats/CATSDataSource.kt b/src/cds/plugins/cats/src/main/kotlin/org/icpclive/cds/plugins/cats/CATSDataSource.kt
@@ -1,45 +1,38 @@
 package org.icpclive.cds.plugins.cats
 
 import kotlinx.datetime.*
+import kotlinx.datetime.format.*
 import kotlinx.serialization.*
-import kotlinx.serialization.descriptors.*
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
 import org.icpclive.cds.*
 import org.icpclive.cds.api.*
 import org.icpclive.cds.ksp.Builder
 import org.icpclive.cds.ktor.*
 import org.icpclive.cds.settings.CDSSettings
 import org.icpclive.cds.settings.Credential
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
+import org.icpclive.util.FormatterInstantSerializer
+import org.icpclive.util.FormatterLocalDateSerializer
 import kotlin.time.Duration.Companion.seconds
 
-private object ContestTimeSerializer : KSerializer<LocalDateTime> {
-    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("InstantConstand", PrimitiveKind.STRING)
-    private val formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")
-
-    override fun serialize(encoder: Encoder, value: LocalDateTime) {
-        encoder.encodeString(formatter.format(value.toJavaLocalDateTime()))
-    }
-
-    override fun deserialize(decoder: Decoder): LocalDateTime {
-        return java.time.LocalDateTime.parse(decoder.decodeString(), formatter).toKotlinLocalDateTime()
-    }
-}
-
-private object SubmissionTimeSerializer : KSerializer<Instant> {
-    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("InstantConstand", PrimitiveKind.STRING)
-    private val formatter = DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmssZ")
-
-    override fun serialize(encoder: Encoder, value: Instant) {
-        encoder.encodeString(formatter.format(value.toJavaInstant()))
-    }
-
-    override fun deserialize(decoder: Decoder): Instant {
-        return ZonedDateTime.parse(decoder.decodeString(), formatter).toInstant().toKotlinInstant()
-    }
-}
+private object ContestTimeSerializer : FormatterLocalDateSerializer(LocalDateTime.Format {
+    dayOfMonth()
+    char('.')
+    monthNumber()
+    char('.')
+    year()
+    char(' ')
+    hour()
+    char(':')
+    minute()
+})
+
+private object SubmissionTimeSerializer : FormatterInstantSerializer(DateTimeComponents.Format {
+    date(LocalDate.Formats.ISO_BASIC)
+    char('T')
+    hour()
+    minute()
+    second()
+    offset(UtcOffset.Formats.ISO_BASIC)
+})
 
 @Builder("cats")
 public sealed interface CatsSettings : CDSSettings {

diff --git a/src/cds/plugins/ejudge/src/main/kotlin/org/icpclive/cds/plugins/ejudge/EjudgeDataSource.kt b/src/cds/plugins/ejudge/src/main/kotlin/org/icpclive/cds/plugins/ejudge/EjudgeDataSource.kt
@@ -1,6 +1,8 @@
 package org.icpclive.cds.plugins.ejudge
 
 import kotlinx.datetime.*
+import kotlinx.datetime.format.alternativeParsing
+import kotlinx.datetime.format.char
 import org.icpclive.cds.*
 import org.icpclive.cds.api.*
 import org.icpclive.cds.ksp.Builder
@@ -9,7 +11,6 @@ import org.icpclive.cds.settings.CDSSettings
 import org.icpclive.cds.settings.UrlOrLocalPath
 import org.icpclive.util.*
 import org.w3c.dom.Element
-import java.time.format.DateTimeFormatter
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.nanoseconds
@@ -66,14 +67,21 @@ internal class EjudgeDataSource(val settings: EjudgeSettings) : FullReloadContes
             )
         }.toList()
 
-    private val timePattern: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+    private val timePattern = LocalDateTime.Format {
+        year()
+        alternativeParsing({ char('/') }) { char('-') }
+        monthNumber()
+        alternativeParsing({ char('/') }) { char('-') }
+        dayOfMonth()
+        char(' ')
+        time(LocalTime.Formats.ISO)
+    }
 
     private fun parseEjudgeTime(time: String): Instant {
-        return java.time.LocalDateTime.parse(
-            time.replace("/", "-"), // snark's ejudge uses '/' instead of '-'
+        return LocalDateTime.parse(
+            time,
             timePattern
-        ).toKotlinLocalDateTime()
-            .toInstant(settings.timeZone)
+        ).toInstant(settings.timeZone)
     }
 
     private fun parseContestInfo(element: Element): ContestParseResult {

diff --git a/src/cds/plugins/eolymp/src/main/kotlin/org/icpclive/cds/plugins/eolymp/EOlympDataSource.kt b/src/cds/plugins/eolymp/src/main/kotlin/org/icpclive/cds/plugins/eolymp/EOlympDataSource.kt
@@ -3,7 +3,8 @@ package org.icpclive.cds.plugins.eolymp
 import com.eolymp.graphql.*
 import com.expediagroup.graphql.client.ktor.GraphQLKtorClient
 import com.expediagroup.graphql.client.types.GraphQLClientRequest
-import kotlinx.datetime.toKotlinInstant
+import kotlinx.datetime.Instant
+import kotlinx.datetime.format.DateTimeComponents
 import org.icpclive.cds.*
 import org.icpclive.cds.api.*
 import org.icpclive.cds.ksp.Builder
@@ -12,10 +13,6 @@ import org.icpclive.cds.settings.CDSSettings
 import org.icpclive.cds.settings.Credential
 import org.icpclive.util.getLogger
 import java.net.URL
-import java.time.chrono.IsoChronology
-import java.time.format.DateTimeFormatterBuilder
-import java.time.format.ResolverStyle
-import java.time.temporal.ChronoField
 import kotlin.time.Duration.Companion.ZERO
 import kotlin.time.Duration.Companion.seconds
 
@@ -91,27 +88,6 @@ internal class EOlympDataSource(val settings: EOlympSettings) : FullReloadContes
         else -> error("Unknown contest format: $format")
     }
 
-    private val dateTimeFormatter = DateTimeFormatterBuilder()
-        .parseCaseInsensitive()
-        .appendValue(ChronoField.YEAR, 4)
-        .appendLiteral('-')
-        .appendValue(ChronoField.MONTH_OF_YEAR, 2)
-        .appendLiteral('-')
-        .appendValue(ChronoField.DAY_OF_MONTH, 2)
-        .appendLiteral('T')
-        .appendValue(ChronoField.HOUR_OF_DAY, 2)
-        .appendLiteral(':')
-        .appendValue(ChronoField.MINUTE_OF_HOUR, 2)
-        .appendLiteral(':')
-        .appendValue(ChronoField.SECOND_OF_MINUTE, 2)
-        .optionalStart()
-        .appendFraction(ChronoField.NANO_OF_SECOND, 2, 9, true)
-        .optionalEnd()
-        .appendOffset("+HH:MM", "Z")
-        .toFormatter()
-        .withResolverStyle(ResolverStyle.STRICT)
-        .withChronology(IsoChronology.INSTANCE)
-
     private var previousDays: List<ContestParseResult> = emptyList()
 
     @OptIn(InefficientContestInfoApi::class)
@@ -271,7 +247,7 @@ internal class EOlympDataSource(val settings: EOlympSettings) : FullReloadContes
         }
     }
 
-    private fun parseTime(s: String) = java.time.Instant.from(dateTimeFormatter.parse(s)).toKotlinInstant()
+    private fun parseTime(s: String) = Instant.parse(s, DateTimeComponents.Formats.ISO_DATE_TIME_OFFSET)
 
     companion object {
         val log = getLogger(EOlympDataSource::class)

diff --git a/src/cds/plugins/nsu/src/main/kotlin/org/icpclive/cds/plugins/nsu/NSUDataSource.kt b/src/cds/plugins/nsu/src/main/kotlin/org/icpclive/cds/plugins/nsu/NSUDataSource.kt
@@ -9,6 +9,7 @@ import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
 import kotlinx.datetime.*
+import kotlinx.datetime.format.char
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.*
 import org.icpclive.cds.*
@@ -17,7 +18,6 @@ import org.icpclive.cds.ksp.Builder
 import org.icpclive.cds.settings.CDSSettings
 import org.icpclive.cds.settings.Credential
 import org.icpclive.cds.ktor.*
-import java.time.format.DateTimeFormatter
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -198,13 +198,14 @@ internal class NSUDataSource(val settings: NSUSettings) : FullReloadContestDataS
         return verdict?.toICPCRunResult()
     }
 
-    private val timePattern = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+    private val timePattern = LocalDateTime.Format {
+        date(LocalDate.Formats.ISO)
+        char(' ')
+        time(LocalTime.Formats.ISO)
+    }
 
     private fun parseNSUTime(time: String): Instant {
-        return java.time.LocalDateTime.parse(
-            time, timePattern
-        ).toKotlinLocalDateTime()
-            .toInstant(settings.timeZone)
+        return timePattern.parse(time).toInstant(settings.timeZone)
     }
 
     @Serializable

diff --git a/...cds/plugins/testsys/src/main/kotlin/org/icpclive/cds/plugins/testsys/TestSysDataSource.kt b/...cds/plugins/testsys/src/main/kotlin/org/icpclive/cds/plugins/testsys/TestSysDataSource.kt
@@ -1,14 +1,14 @@
 package org.icpclive.cds.plugins.testsys
 
 import kotlinx.datetime.*
+import kotlinx.datetime.format.*
 import org.icpclive.cds.*
 import org.icpclive.cds.api.*
 import org.icpclive.cds.ksp.Builder
 import org.icpclive.cds.ktor.*
 import org.icpclive.cds.settings.CDSSettings
 import org.icpclive.cds.settings.UrlOrLocalPath
 import java.nio.charset.Charset
-import java.time.format.DateTimeFormatter
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
@@ -122,10 +122,19 @@ internal class TestSysDataSource(val settings: TestSysSettings) : FullReloadCont
         add(builder.toString())
     }
 
-    private fun String.toDate() =
-        java.time.LocalDateTime.parse(this, DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss"))
-            .toKotlinLocalDateTime()
-            .toInstant(settings.timeZone)
+    private val dateFormat = LocalDateTime.Format {
+        dayOfMonth()
+        char('.')
+        monthNumber()
+        char('.')
+        year()
+        char(' ')
+        time(LocalTime.Formats.ISO)
+    }
+
+    private fun String.toDate(): Instant {
+        return dateFormat.parse(this).toInstant(settings.timeZone)
+    }
 
     private fun String.toStatus() = when (this) {
         "RESULTS" -> ContestStatus.OVER

diff --git a/src/cds/utils/api/utils.api b/src/cds/utils/api/utils.api
@@ -12,6 +12,7 @@ public final class org/icpclive/util/ColorSerializer : kotlinx/serialization/KSe
 }
 
 public final class org/icpclive/util/DateTimeSerializersKt {
+	public static final fun format (Lkotlinx/datetime/Instant;Lkotlinx/datetime/format/DateTimeFormat;Lkotlinx/datetime/TimeZone;)Ljava/lang/String;
 	public static final fun getHumanReadable (Lkotlinx/datetime/Instant;)Ljava/lang/String;
 }
 
@@ -52,6 +53,24 @@ public final class org/icpclive/util/FlowUtilsKt {
 	public static final fun logAndRetryWithDelay-8Mi8wO0 (Lkotlinx/coroutines/flow/Flow;JLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
 }
 
+public abstract class org/icpclive/util/FormatterInstantSerializer : kotlinx/serialization/KSerializer {
+	public fun <init> (Lkotlinx/datetime/format/DateTimeFormat;)V
+	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lkotlinx/datetime/Instant;
+	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lkotlinx/datetime/Instant;)V
+}
+
+public abstract class org/icpclive/util/FormatterLocalDateSerializer : kotlinx/serialization/KSerializer {
+	public fun <init> (Lkotlinx/datetime/format/DateTimeFormat;)V
+	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lkotlinx/datetime/LocalDateTime;
+	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lkotlinx/datetime/LocalDateTime;)V
+}
+
 public final class org/icpclive/util/HumanTimeSerializer : kotlinx/serialization/KSerializer {
 	public static final field INSTANCE Lorg/icpclive/util/HumanTimeSerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;

diff --git a/src/cds/utils/src/main/kotlin/org/icpclive/util/DateTimeSerializers.kt b/src/cds/utils/src/main/kotlin/org/icpclive/util/DateTimeSerializers.kt
@@ -2,6 +2,7 @@ package org.icpclive.util
 
 import kotlinx.datetime.*
 import kotlinx.datetime.TimeZone
+import kotlinx.datetime.format.*
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.descriptors.*
@@ -75,6 +76,27 @@ public object UnixSecondsSerializer : KSerializer<Instant> {
     }
 }
 
+public abstract class FormatterInstantSerializer(private val formatter: DateTimeFormat<DateTimeComponents>) : KSerializer<Instant> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("Instant", PrimitiveKind.STRING)
+    override fun serialize(encoder: Encoder, value: Instant) {
+        encoder.encodeString(value.format(formatter, TimeZone.currentSystemDefault()))
+    }
+    override fun deserialize(decoder: Decoder): Instant {
+        return Instant.parse(decoder.decodeString(), formatter)
+    }
+}
+
+public abstract class FormatterLocalDateSerializer(private val formatter: DateTimeFormat<LocalDateTime>) : KSerializer<LocalDateTime> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("LocalDateTime", PrimitiveKind.STRING)
+    override fun serialize(encoder: Encoder, value: LocalDateTime) {
+        encoder.encodeString(formatter.format(value))
+    }
+    override fun deserialize(decoder: Decoder): LocalDateTime {
+        return formatter.parse(decoder.decodeString())
+    }
+}
+
+
 public object HumanTimeSerializer : KSerializer<Instant> {
     override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("InstantH", PrimitiveKind.STRING)
 
@@ -121,5 +143,8 @@ public object TimeZoneSerializer : KSerializer<TimeZone> {
     }
 }
 
+public fun Instant.format(formatter: DateTimeFormat<DateTimeComponents>, timeZone: TimeZone): String =
+    format(formatter, timeZone.offsetAt(this))
+
 public val Instant.humanReadable: String
-    get() = Date(this.toEpochMilliseconds()).toString()
+    get() = Date(this.toEpochMilliseconds()).toString()