Skip to content

Commit 07e9d01

Browse files
dkhalanskyjbdkhalanskyjb
committed
Change the serial descriptor names to avoid spaces
User-visible error messages include serial descriptors verbatim.
1 parent 4a36fc9 commit 07e9d01

6 files changed

+18
-18
lines changed

‎core/common/src/serializers/DateTimePeriodSerializers.kt

Lines changed: 4 additions & 4 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("kotlinx.datetime.DateTimePeriod components") {
22+
buildClassSerialDescriptor("kotlinx.datetime.DateTimePeriod/components") {
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("kotlinx.datetime.DateTimePeriod ISO", PrimitiveKind.STRING)
84+
PrimitiveSerialDescriptor("kotlinx.datetime.DateTimePeriod/ISO", 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("kotlinx.datetime.DatePeriod components") {
113+
buildClassSerialDescriptor("kotlinx.datetime.DatePeriod/components") {
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("kotlinx.datetime.DatePeriod ISO", PrimitiveKind.STRING)
169+
PrimitiveSerialDescriptor("kotlinx.datetime.DatePeriod/ISO", PrimitiveKind.STRING)
170170

171171
override fun deserialize(decoder: Decoder): DatePeriod =
172172
when (val period = DateTimePeriod.parse(decoder.decodeString())) {

‎core/common/src/serializers/InstantSerializers.kt

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

2424
override val descriptor: SerialDescriptor =
25-
PrimitiveSerialDescriptor("kotlinx.datetime.Instant ISO", PrimitiveKind.STRING)
25+
PrimitiveSerialDescriptor("kotlinx.datetime.Instant/ISO", PrimitiveKind.STRING)
2626

2727
override fun deserialize(decoder: Decoder): Instant =
2828
Instant.parse(decoder.decodeString(), DateTimeComponents.Formats.ISO_DATE_TIME_OFFSET)
@@ -41,7 +41,7 @@ public object InstantIso8601Serializer : KSerializer<Instant> {
4141
public object InstantComponentSerializer : KSerializer<Instant> {
4242

4343
override val descriptor: SerialDescriptor =
44-
buildClassSerialDescriptor("kotlinx.datetime.Instant components") {
44+
buildClassSerialDescriptor("kotlinx.datetime.Instant/components") {
4545
element<Long>("epochSeconds")
4646
element<Long>("nanosecondsOfSecond", isOptional = true)
4747
}
@@ -112,7 +112,7 @@ public abstract class FormattedInstantSerializer(
112112
private val format: DateTimeFormat<DateTimeComponents>,
113113
) : KSerializer<Instant> {
114114
override val descriptor: SerialDescriptor =
115-
PrimitiveSerialDescriptor("kotlinx.datetime.Instant serializer $name", PrimitiveKind.STRING)
115+
PrimitiveSerialDescriptor("kotlinx.datetime.Instant/serializer/$name", PrimitiveKind.STRING)
116116

117117
override fun deserialize(decoder: Decoder): Instant =
118118
Instant.parse(decoder.decodeString(), format)

‎core/common/src/serializers/LocalDateSerializers.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import kotlinx.serialization.encoding.*
1919
* @see LocalDate.Formats.ISO
2020
*/
2121
public object LocalDateIso8601Serializer : KSerializer<LocalDate>
22-
by LocalDate.Formats.ISO.asKSerializer("kotlinx.datetime.LocalDate ISO")
22+
by LocalDate.Formats.ISO.asKSerializer("kotlinx.datetime.LocalDate/ISO")
2323

2424
/**
2525
* A serializer for [LocalDate] that represents a value as its components.
@@ -29,7 +29,7 @@ by LocalDate.Formats.ISO.asKSerializer("kotlinx.datetime.LocalDate ISO")
2929
public object LocalDateComponentSerializer: KSerializer<LocalDate> {
3030

3131
override val descriptor: SerialDescriptor =
32-
buildClassSerialDescriptor("kotlinx.datetime.LocalDate components") {
32+
buildClassSerialDescriptor("kotlinx.datetime.LocalDate/components") {
3333
element<Int>("year")
3434
element<Short>("month")
3535
element<Short>("day")
@@ -90,7 +90,7 @@ public object LocalDateComponentSerializer: KSerializer<LocalDate> {
9090
*/
9191
public abstract class FormattedLocalDateSerializer(
9292
name: String, format: DateTimeFormat<LocalDate>
93-
) : KSerializer<LocalDate> by format.asKSerializer("kotlinx.datetime.LocalDate serializer $name")
93+
) : KSerializer<LocalDate> by format.asKSerializer("kotlinx.datetime.LocalDate/serializer/$name")
9494

9595
internal fun <T> DateTimeFormat<T>.asKSerializer(serialName: String): KSerializer<T> =
9696
object : KSerializer<T> {

‎core/common/src/serializers/LocalDateTimeSerializers.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import kotlinx.serialization.encoding.*
1919
* @see LocalDateTime.Formats.ISO
2020
*/
2121
public object LocalDateTimeIso8601Serializer : KSerializer<LocalDateTime>
22-
by LocalDateTime.Formats.ISO.asKSerializer("kotlinx.datetime.LocalDateTime ISO")
22+
by LocalDateTime.Formats.ISO.asKSerializer("kotlinx.datetime.LocalDateTime/ISO")
2323

2424
/**
2525
* A serializer for [LocalDateTime] that represents a value as its components.
@@ -29,7 +29,7 @@ by LocalDateTime.Formats.ISO.asKSerializer("kotlinx.datetime.LocalDateTime ISO")
2929
public object LocalDateTimeComponentSerializer: KSerializer<LocalDateTime> {
3030

3131
override val descriptor: SerialDescriptor =
32-
buildClassSerialDescriptor("kotlinx.datetime.LocalDateTime components") {
32+
buildClassSerialDescriptor("kotlinx.datetime.LocalDateTime/components") {
3333
element<Int>("year")
3434
element<Short>("month")
3535
element<Short>("day")
@@ -117,7 +117,7 @@ public object LocalDateTimeComponentSerializer: KSerializer<LocalDateTime> {
117117
*/
118118
public abstract class FormattedLocalDateTimeSerializer(
119119
name: String, format: DateTimeFormat<LocalDateTime>
120-
) : KSerializer<LocalDateTime> by format.asKSerializer("kotlinx.datetime.LocalDateTime serializer $name")
120+
) : KSerializer<LocalDateTime> by format.asKSerializer("kotlinx.datetime.LocalDateTime/serializer/$name")
121121

122122
/**
123123
* A serializer for [LocalDateTime] that uses the default [LocalDateTime.toString]/[LocalDateTime.parse].

‎core/common/src/serializers/LocalTimeSerializers.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import kotlinx.serialization.encoding.*
1919
* @see LocalTime.Formats.ISO
2020
*/
2121
public object LocalTimeIso8601Serializer : KSerializer<LocalTime>
22-
by LocalTime.Formats.ISO.asKSerializer("kotlinx.datetime.LocalTime ISO")
22+
by LocalTime.Formats.ISO.asKSerializer("kotlinx.datetime.LocalTime/ISO")
2323

2424
/**
2525
* A serializer for [LocalTime] that represents a value as its components.
@@ -29,7 +29,7 @@ by LocalTime.Formats.ISO.asKSerializer("kotlinx.datetime.LocalTime ISO")
2929
public object LocalTimeComponentSerializer : KSerializer<LocalTime> {
3030

3131
override val descriptor: SerialDescriptor =
32-
buildClassSerialDescriptor("kotlinx.datetime.LocalTime components") {
32+
buildClassSerialDescriptor("kotlinx.datetime.LocalTime/components") {
3333
element<Short>("hour")
3434
element<Short>("minute")
3535
element<Short>("second", isOptional = true)
@@ -97,7 +97,7 @@ public object LocalTimeComponentSerializer : KSerializer<LocalTime> {
9797
*/
9898
public abstract class FormattedLocalTimeSerializer(
9999
name: String, format: DateTimeFormat<LocalTime>
100-
) : KSerializer<LocalTime> by format.asKSerializer("kotlinx.datetime.LocalTime serializer $name")
100+
) : KSerializer<LocalTime> by format.asKSerializer("kotlinx.datetime.LocalTime/serializer/$name")
101101

102102
/**
103103
* A serializer for [LocalTime] that uses the ISO 8601 representation.

‎core/common/src/serializers/TimeZoneSerializers.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public object FixedOffsetTimeZoneSerializer: KSerializer<FixedOffsetTimeZone> {
6060
* @see UtcOffset.Formats.ISO
6161
*/
6262
public object UtcOffsetIso8601Serializer : KSerializer<UtcOffset>
63-
by UtcOffset.Formats.ISO.asKSerializer("kotlinx.datetime.UtcOffset ISO")
63+
by UtcOffset.Formats.ISO.asKSerializer("kotlinx.datetime.UtcOffset/ISO")
6464

6565
/**
6666
* A serializer for [UtcOffset] that uses the default [UtcOffset.toString]/[UtcOffset.parse].
@@ -107,4 +107,4 @@ public object UtcOffsetSerializer: KSerializer<UtcOffset> {
107107
*/
108108
public abstract class FormattedUtcOffsetSerializer(
109109
name: String, format: DateTimeFormat<UtcOffset>
110-
) : KSerializer<UtcOffset> by format.asKSerializer("kotlinx.datetime.UtcOffset serializer $name")
110+
) : KSerializer<UtcOffset> by format.asKSerializer("kotlinx.datetime.UtcOffset/serializer/$name")

0 commit comments

Comments
 (0)