~change serial name to contain FQN all across the codebase

qwwdfsad · qwwdfsad · commit 25743304f699 · 2024-02-27T18:32:08.000+01:00
diff --git a/core/common/src/serializers/DateTimePeriodSerializers.kt b/core/common/src/serializers/DateTimePeriodSerializers.kt
@@ -19,7 +19,7 @@ import kotlinx.serialization.encoding.*
 public object DateTimePeriodComponentSerializer: KSerializer<DateTimePeriod> {
 
     override val descriptor: SerialDescriptor =
-        buildClassSerialDescriptor("DateTimePeriod") {
+        buildClassSerialDescriptor("kotlinx.datetime.DateTimePeriod") {
             element<Int>("years", isOptional = true)
             element<Int>("months", isOptional = true)
             element<Int>("days", isOptional = true)
@@ -81,7 +81,7 @@ public object DateTimePeriodComponentSerializer: KSerializer<DateTimePeriod> {
 public object DateTimePeriodIso8601Serializer: KSerializer<DateTimePeriod> {
 
     override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("DateTimePeriod", PrimitiveKind.STRING)
+        PrimitiveSerialDescriptor("kotlinx.datetime.DateTimePeriod", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): DateTimePeriod =
         DateTimePeriod.parse(decoder.decodeString())
@@ -110,7 +110,7 @@ public object DatePeriodComponentSerializer: KSerializer<DatePeriod> {
     private fun unexpectedNonzero(fieldName: String, value: Int) = unexpectedNonzero(fieldName, value.toLong())
 
     override val descriptor: SerialDescriptor =
-        buildClassSerialDescriptor("DatePeriod") {
+        buildClassSerialDescriptor("kotlinx.datetime.DatePeriod") {
             element<Int>("years", isOptional = true)
             element<Int>("months", isOptional = true)
             element<Int>("days", isOptional = true)
@@ -166,7 +166,7 @@ public object DatePeriodComponentSerializer: KSerializer<DatePeriod> {
 public object DatePeriodIso8601Serializer: KSerializer<DatePeriod> {
 
     override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("DatePeriod", PrimitiveKind.STRING)
+        PrimitiveSerialDescriptor("kotlinx.datetime.DatePeriod", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): DatePeriod =
         when (val period = DateTimePeriod.parse(decoder.decodeString())) {
@@ -178,4 +178,4 @@ public object DatePeriodIso8601Serializer: KSerializer<DatePeriod> {
         encoder.encodeString(value.toString())
     }
 
-}
+}
diff --git a/core/common/src/serializers/DateTimeUnitSerializers.kt b/core/common/src/serializers/DateTimeUnitSerializers.kt
@@ -23,7 +23,7 @@ public object TimeBasedDateTimeUnitSerializer: KSerializer<DateTimeUnit.TimeBase
 
     // https://youtrack.jetbrains.com/issue/KT-63939
     override val descriptor: SerialDescriptor by lazy(LazyThreadSafetyMode.PUBLICATION) {
-        buildClassSerialDescriptor("TimeBased") {
+        buildClassSerialDescriptor("kotlinx.datetime.TimeBased") {
             element<Long>("nanoseconds")
         }
     }
@@ -69,7 +69,7 @@ public object DayBasedDateTimeUnitSerializer: KSerializer<DateTimeUnit.DayBased>
 
     // https://youtrack.jetbrains.com/issue/KT-63939
     override val descriptor: SerialDescriptor by lazy(LazyThreadSafetyMode.PUBLICATION) {
-        buildClassSerialDescriptor("DayBased") {
+        buildClassSerialDescriptor("kotlinx.datetime.DayBased") {
             element<Int>("days")
         }
     }
@@ -115,7 +115,7 @@ public object MonthBasedDateTimeUnitSerializer: KSerializer<DateTimeUnit.MonthBa
 
     // https://youtrack.jetbrains.com/issue/KT-63939
     override val descriptor: SerialDescriptor by lazy(LazyThreadSafetyMode.PUBLICATION) {
-        buildClassSerialDescriptor("MonthBased") {
+        buildClassSerialDescriptor("kotlinx.datetime.MonthBased") {
             element<Int>("months")
         }
     }
diff --git a/core/common/src/serializers/DayOfWeekSerializers.kt b/core/common/src/serializers/DayOfWeekSerializers.kt
@@ -16,7 +16,8 @@ import kotlinx.serialization.internal.*
  *
  * JSON example: `"MONDAY"`
  */
+@Suppress("EnumValuesSoftDeprecate") // createEnumSerializer requires an array
 public object DayOfWeekSerializer : KSerializer<DayOfWeek> by createEnumSerializer<DayOfWeek>(
-    "kotlinx.datetime.serializers.DayOfWeek",
+    "kotlinx.datetime.DayOfWeek",
     DayOfWeek.values()
 )
diff --git a/core/common/src/serializers/InstantSerializers.kt b/core/common/src/serializers/InstantSerializers.kt
@@ -21,7 +21,7 @@ import kotlinx.serialization.encoding.*
 public object InstantIso8601Serializer : KSerializer<Instant> {
 
     override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("Instant", PrimitiveKind.STRING)
+        PrimitiveSerialDescriptor("kotlinx.datetime.Instant", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): Instant =
         Instant.parse(decoder.decodeString())
@@ -40,7 +40,7 @@ public object InstantIso8601Serializer : KSerializer<Instant> {
 public object InstantComponentSerializer : KSerializer<Instant> {
 
     override val descriptor: SerialDescriptor =
-        buildClassSerialDescriptor("Instant") {
+        buildClassSerialDescriptor("kotlinx.datetime.Instant") {
             element<Long>("epochSeconds")
             element<Long>("nanosecondsOfSecond", isOptional = true)
         }
diff --git a/core/common/src/serializers/LocalDateSerializers.kt b/core/common/src/serializers/LocalDateSerializers.kt
@@ -21,7 +21,7 @@ import kotlinx.serialization.encoding.*
 public object LocalDateIso8601Serializer: KSerializer<LocalDate> {
 
     override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("LocalDate", PrimitiveKind.STRING)
+        PrimitiveSerialDescriptor("kotlinx.datetime.LocalDate", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): LocalDate =
         LocalDate.parse(decoder.decodeString())
@@ -40,7 +40,7 @@ public object LocalDateIso8601Serializer: KSerializer<LocalDate> {
 public object LocalDateComponentSerializer: KSerializer<LocalDate> {
 
     override val descriptor: SerialDescriptor =
-        buildClassSerialDescriptor("LocalDate") {
+        buildClassSerialDescriptor("kotlinx.datetime.LocalDate") {
             element<Int>("year")
             element<Short>("month")
             element<Short>("day")
diff --git a/core/common/src/serializers/LocalDateTimeSerializers.kt b/core/common/src/serializers/LocalDateTimeSerializers.kt
@@ -21,7 +21,7 @@ import kotlinx.serialization.encoding.*
 public object LocalDateTimeIso8601Serializer: KSerializer<LocalDateTime> {
 
     override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("LocalDateTime", PrimitiveKind.STRING)
+        PrimitiveSerialDescriptor("kotlinx.datetime.LocalDateTime", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): LocalDateTime =
         LocalDateTime.parse(decoder.decodeString())
@@ -40,7 +40,7 @@ public object LocalDateTimeIso8601Serializer: KSerializer<LocalDateTime> {
 public object LocalDateTimeComponentSerializer: KSerializer<LocalDateTime> {
 
     override val descriptor: SerialDescriptor =
-        buildClassSerialDescriptor("LocalDateTime") {
+        buildClassSerialDescriptor("kotlinx.datetime.LocalDateTime") {
             element<Int>("year")
             element<Short>("month")
             element<Short>("day")
diff --git a/core/common/src/serializers/LocalTimeSerializers.kt b/core/common/src/serializers/LocalTimeSerializers.kt
@@ -21,7 +21,7 @@ import kotlinx.serialization.encoding.*
 public object LocalTimeIso8601Serializer : KSerializer<LocalTime> {
 
     override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("LocalTime", PrimitiveKind.STRING)
+        PrimitiveSerialDescriptor("kotlinx.datetime.LocalTime", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): LocalTime =
         LocalTime.parse(decoder.decodeString())
@@ -39,7 +39,7 @@ public object LocalTimeIso8601Serializer : KSerializer<LocalTime> {
 public object LocalTimeComponentSerializer : KSerializer<LocalTime> {
 
     override val descriptor: SerialDescriptor =
-        buildClassSerialDescriptor("LocalTime") {
+        buildClassSerialDescriptor("kotlinx.datetime.LocalTime") {
             element<Short>("hour")
             element<Short>("minute")
             element<Short>("second", isOptional = true)
diff --git a/core/common/src/serializers/MonthSerializers.kt b/core/common/src/serializers/MonthSerializers.kt
@@ -16,8 +16,9 @@ import kotlinx.serialization.internal.*
  *
  * JSON example: `"JANUARY"`
  */
+@Suppress("EnumValuesSoftDeprecate") // createEnumSerializer requires an array
 public object MonthSerializer : KSerializer<Month> by createEnumSerializer<Month>(
-    "kotlinx.datetime.serializers.Month",
+    "kotlinx.datetime.Month",
     Month.values())
 
 // Until https://github.com/Kotlin/kotlinx.serialization/issues/2459 is resolved
diff --git a/core/common/src/serializers/TimeZoneSerializers.kt b/core/common/src/serializers/TimeZoneSerializers.kt
@@ -19,7 +19,7 @@ import kotlinx.serialization.encoding.*
  */
 public object TimeZoneSerializer: KSerializer<TimeZone> {
 
-    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("TimeZone", PrimitiveKind.STRING)
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("kotlinx.datetime.TimeZone", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): TimeZone = TimeZone.of(decoder.decodeString())
 
@@ -36,7 +36,7 @@ public object TimeZoneSerializer: KSerializer<TimeZone> {
  */
 public object FixedOffsetTimeZoneSerializer: KSerializer<FixedOffsetTimeZone> {
 
-    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("FixedOffsetTimeZone", PrimitiveKind.STRING)
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("kotlinx.datetime.FixedOffsetTimeZone", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): FixedOffsetTimeZone {
         val zone = TimeZone.of(decoder.decodeString())
@@ -63,7 +63,7 @@ public object FixedOffsetTimeZoneSerializer: KSerializer<FixedOffsetTimeZone> {
  */
 public object UtcOffsetSerializer: KSerializer<UtcOffset> {
 
-    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("UtcOffset", PrimitiveKind.STRING)
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("kotlinx.datetime.UtcOffset", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): UtcOffset {
         return UtcOffset.parse(decoder.decodeString())

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public object TimeBasedDateTimeUnitSerializer: KSerializer<DateTimeUnit.TimeBase`
`23`	`23`
`24`	`24`	`// https://youtrack.jetbrains.com/issue/KT-63939`
`25`	`25`	`override val descriptor: SerialDescriptor by lazy(LazyThreadSafetyMode.PUBLICATION) {`
`26`		`- buildClassSerialDescriptor("TimeBased") {`
	`26`	`+ buildClassSerialDescriptor("kotlinx.datetime.TimeBased") {`
`27`	`27`	`element<Long>("nanoseconds")`
`28`	`28`	`}`
`29`	`29`	`}`
`@@ -69,7 +69,7 @@ public object DayBasedDateTimeUnitSerializer: KSerializer<DateTimeUnit.DayBased>`
`69`	`69`
`70`	`70`	`// https://youtrack.jetbrains.com/issue/KT-63939`
`71`	`71`	`override val descriptor: SerialDescriptor by lazy(LazyThreadSafetyMode.PUBLICATION) {`
`72`		`- buildClassSerialDescriptor("DayBased") {`
	`72`	`+ buildClassSerialDescriptor("kotlinx.datetime.DayBased") {`
`73`	`73`	`element<Int>("days")`
`74`	`74`	`}`
`75`	`75`	`}`
`@@ -115,7 +115,7 @@ public object MonthBasedDateTimeUnitSerializer: KSerializer<DateTimeUnit.MonthBa`
`115`	`115`
`116`	`116`	`// https://youtrack.jetbrains.com/issue/KT-63939`
`117`	`117`	`override val descriptor: SerialDescriptor by lazy(LazyThreadSafetyMode.PUBLICATION) {`
`118`		`- buildClassSerialDescriptor("MonthBased") {`
	`118`	`+ buildClassSerialDescriptor("kotlinx.datetime.MonthBased") {`
`119`	`119`	`element<Int>("months")`
`120`	`120`	`}`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ import kotlinx.serialization.internal.*`
`16`	`16`	`*`
`17`	`17`	* JSON example: `"MONDAY"`
`18`	`18`	`*/`
	`19`	`+@Suppress("EnumValuesSoftDeprecate") // createEnumSerializer requires an array`
`19`	`20`	`public object DayOfWeekSerializer : KSerializer<DayOfWeek> by createEnumSerializer<DayOfWeek>(`
`20`		`- "kotlinx.datetime.serializers.DayOfWeek",`
	`21`	`+ "kotlinx.datetime.DayOfWeek",`
`21`	`22`	`DayOfWeek.values()`
`22`	`23`	`)`