Skip to content

Commit e41adc2

Browse files
committed
~change serial name to contain FQN all across the codebase
1 parent 5243070 commit e41adc2

8 files changed

+17
-15
lines changed

core/common/src/serializers/DateTimePeriodSerializers.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import kotlinx.serialization.encoding.*
1919
public object DateTimePeriodComponentSerializer: KSerializer<DateTimePeriod> {
2020

2121
override val descriptor: SerialDescriptor =
22-
buildClassSerialDescriptor("DateTimePeriod") {
22+
buildClassSerialDescriptor("kotlinx.datetime.DateTimePeriod") {
2323
element<Int>("years", isOptional = true)
2424
element<Int>("months", isOptional = true)
2525
element<Int>("days", isOptional = true)
@@ -81,7 +81,7 @@ public object DateTimePeriodComponentSerializer: KSerializer<DateTimePeriod> {
8181
public object DateTimePeriodIso8601Serializer: KSerializer<DateTimePeriod> {
8282

8383
override val descriptor: SerialDescriptor =
84-
PrimitiveSerialDescriptor("DateTimePeriod", PrimitiveKind.STRING)
84+
PrimitiveSerialDescriptor("kotlinx.datetime.DateTimePeriod", PrimitiveKind.STRING)
8585

8686
override fun deserialize(decoder: Decoder): DateTimePeriod =
8787
DateTimePeriod.parse(decoder.decodeString())
@@ -110,7 +110,7 @@ public object DatePeriodComponentSerializer: KSerializer<DatePeriod> {
110110
private fun unexpectedNonzero(fieldName: String, value: Int) = unexpectedNonzero(fieldName, value.toLong())
111111

112112
override val descriptor: SerialDescriptor =
113-
buildClassSerialDescriptor("DatePeriod") {
113+
buildClassSerialDescriptor("kotlinx.datetime.DatePeriod") {
114114
element<Int>("years", isOptional = true)
115115
element<Int>("months", isOptional = true)
116116
element<Int>("days", isOptional = true)
@@ -166,7 +166,7 @@ public object DatePeriodComponentSerializer: KSerializer<DatePeriod> {
166166
public object DatePeriodIso8601Serializer: KSerializer<DatePeriod> {
167167

168168
override val descriptor: SerialDescriptor =
169-
PrimitiveSerialDescriptor("DatePeriod", PrimitiveKind.STRING)
169+
PrimitiveSerialDescriptor("kotlinx.datetime.DatePeriod", PrimitiveKind.STRING)
170170

171171
override fun deserialize(decoder: Decoder): DatePeriod =
172172
when (val period = DateTimePeriod.parse(decoder.decodeString())) {
@@ -178,4 +178,4 @@ public object DatePeriodIso8601Serializer: KSerializer<DatePeriod> {
178178
encoder.encodeString(value.toString())
179179
}
180180

181-
}
181+
}

core/common/src/serializers/DayOfWeekSerializers.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import kotlinx.serialization.internal.*
1616
*
1717
* JSON example: `"MONDAY"`
1818
*/
19+
@Suppress("EnumValuesSoftDeprecate") // createEnumSerializer requires an array
1920
public object DayOfWeekSerializer : KSerializer<DayOfWeek> by createEnumSerializer<DayOfWeek>(
20-
"kotlinx.datetime.serializers.DayOfWeek",
21+
"kotlinx.datetime.DayOfWeek",
2122
DayOfWeek.values()
2223
)

core/common/src/serializers/InstantSerializers.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import kotlinx.serialization.encoding.*
2121
public object InstantIso8601Serializer : KSerializer<Instant> {
2222

2323
override val descriptor: SerialDescriptor =
24-
PrimitiveSerialDescriptor("Instant", PrimitiveKind.STRING)
24+
PrimitiveSerialDescriptor("kotlinx.datetime.Instant", PrimitiveKind.STRING)
2525

2626
override fun deserialize(decoder: Decoder): Instant =
2727
Instant.parse(decoder.decodeString())
@@ -40,7 +40,7 @@ public object InstantIso8601Serializer : KSerializer<Instant> {
4040
public object InstantComponentSerializer : KSerializer<Instant> {
4141

4242
override val descriptor: SerialDescriptor =
43-
buildClassSerialDescriptor("Instant") {
43+
buildClassSerialDescriptor("kotlinx.datetime.Instant") {
4444
element<Long>("epochSeconds")
4545
element<Long>("nanosecondsOfSecond", isOptional = true)
4646
}

core/common/src/serializers/LocalDateSerializers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import kotlinx.serialization.encoding.*
2121
public object LocalDateIso8601Serializer: KSerializer<LocalDate> {
2222

2323
override val descriptor: SerialDescriptor =
24-
PrimitiveSerialDescriptor("LocalDate", PrimitiveKind.STRING)
24+
PrimitiveSerialDescriptor("kotlinx.datetime.LocalDate", PrimitiveKind.STRING)
2525

2626
override fun deserialize(decoder: Decoder): LocalDate =
2727
LocalDate.parse(decoder.decodeString())

core/common/src/serializers/LocalDateTimeSerializers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import kotlinx.serialization.encoding.*
2121
public object LocalDateTimeIso8601Serializer: KSerializer<LocalDateTime> {
2222

2323
override val descriptor: SerialDescriptor =
24-
PrimitiveSerialDescriptor("LocalDateTime", PrimitiveKind.STRING)
24+
PrimitiveSerialDescriptor("kotlinx.datetime.LocalDateTime", PrimitiveKind.STRING)
2525

2626
override fun deserialize(decoder: Decoder): LocalDateTime =
2727
LocalDateTime.parse(decoder.decodeString())

core/common/src/serializers/LocalTimeSerializers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import kotlinx.serialization.encoding.*
2121
public object LocalTimeIso8601Serializer : KSerializer<LocalTime> {
2222

2323
override val descriptor: SerialDescriptor =
24-
PrimitiveSerialDescriptor("LocalTime", PrimitiveKind.STRING)
24+
PrimitiveSerialDescriptor("kotlinx.datetime.LocalTime", PrimitiveKind.STRING)
2525

2626
override fun deserialize(decoder: Decoder): LocalTime =
2727
LocalTime.parse(decoder.decodeString())

core/common/src/serializers/MonthSerializers.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ import kotlinx.serialization.internal.*
1616
*
1717
* JSON example: `"JANUARY"`
1818
*/
19+
@Suppress("EnumValuesSoftDeprecate") // createEnumSerializer requires an array
1920
public object MonthSerializer : KSerializer<Month> by createEnumSerializer<Month>(
20-
"kotlinx.datetime.serializers.Month",
21+
"kotlinx.datetime.Month",
2122
Month.values())
2223

2324
// Until https://github.com/Kotlin/kotlinx.serialization/issues/2459 is resolved

core/common/src/serializers/TimeZoneSerializers.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import kotlinx.serialization.encoding.*
1919
*/
2020
public object TimeZoneSerializer: KSerializer<TimeZone> {
2121

22-
override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("TimeZone", PrimitiveKind.STRING)
22+
override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("kotlinx.datetime.TimeZone", PrimitiveKind.STRING)
2323

2424
override fun deserialize(decoder: Decoder): TimeZone = TimeZone.of(decoder.decodeString())
2525

@@ -36,7 +36,7 @@ public object TimeZoneSerializer: KSerializer<TimeZone> {
3636
*/
3737
public object FixedOffsetTimeZoneSerializer: KSerializer<FixedOffsetTimeZone> {
3838

39-
override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("FixedOffsetTimeZone", PrimitiveKind.STRING)
39+
override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("kotlinx.datetime.FixedOffsetTimeZone", PrimitiveKind.STRING)
4040

4141
override fun deserialize(decoder: Decoder): FixedOffsetTimeZone {
4242
val zone = TimeZone.of(decoder.decodeString())
@@ -63,7 +63,7 @@ public object FixedOffsetTimeZoneSerializer: KSerializer<FixedOffsetTimeZone> {
6363
*/
6464
public object UtcOffsetSerializer: KSerializer<UtcOffset> {
6565

66-
override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("UtcOffset", PrimitiveKind.STRING)
66+
override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("kotlinx.datetime.UtcOffset", PrimitiveKind.STRING)
6767

6868
override fun deserialize(decoder: Decoder): UtcOffset {
6969
return UtcOffset.parse(decoder.decodeString())

0 commit comments

Comments
 (0)