Rename DateTimeUnit serializers

Author: dkhalanskyjb

core/common/src/DateTimeUnit.kt

@@ -14,7 +14,7 @@ sealed class DateTimeUnit {
 
     abstract operator fun times(scalar: Int): DateTimeUnit
 
-    @Serializable(with = TimeBasedSerializer::class)
+    @Serializable(with = TimeBasedDateTimeUnitSerializer::class)
     class TimeBased(val nanoseconds: Long) : DateTimeUnit() {
         private val unitName: String
         private val unitScale: Long
@@ -64,10 +64,10 @@ sealed class DateTimeUnit {
         override fun toString(): String = formatToString(unitScale, unitName)
     }
 
-    @Serializable(with = DateBasedSerializer::class)
+    @Serializable(with = DateBasedDateTimeUnitSerializer::class)
     sealed class DateBased : DateTimeUnit() {
         // TODO: investigate how to move subclasses up to DateTimeUnit scope
-        @Serializable(with = DayBasedSerializer::class)
+        @Serializable(with = DayBasedDateTimeUnitSerializer::class)
         class DayBased(val days: Int) : DateBased() {
             init {
                 require(days > 0) { "Unit duration must be positive, but was $days days." }
@@ -85,7 +85,7 @@ sealed class DateTimeUnit {
             else
                 formatToString(days, "DAY")
         }
-        @Serializable(with = MonthBasedSerializer::class)
+        @Serializable(with = MonthBasedDateTimeUnitSerializer::class)
         class MonthBased(val months: Int) : DateBased() {
             init {
                 require(months > 0) { "Unit duration must be positive, but was $months months." }

core/common/src/serializers/DateTimeUnitSerializers.kt

@@ -14,7 +14,7 @@ import kotlinx.serialization.encoding.*
 import kotlinx.serialization.internal.AbstractPolymorphicSerializer
 import kotlin.reflect.KClass
 
-object TimeBasedSerializer: KSerializer<DateTimeUnit.TimeBased> {
+object TimeBasedDateTimeUnitSerializer: KSerializer<DateTimeUnit.TimeBased> {
 
     override val descriptor: SerialDescriptor = buildClassSerialDescriptor("TimeBased") {
         element<Long>("nanoseconds")
@@ -53,7 +53,7 @@ object TimeBasedSerializer: KSerializer<DateTimeUnit.TimeBased> {
     }
 }
 
-object DayBasedSerializer: KSerializer<DateTimeUnit.DateBased.DayBased> {
+object DayBasedDateTimeUnitSerializer: KSerializer<DateTimeUnit.DateBased.DayBased> {
 
     override val descriptor: SerialDescriptor = buildClassSerialDescriptor("DayBased") {
         element<Int>("days")
@@ -92,7 +92,7 @@ object DayBasedSerializer: KSerializer<DateTimeUnit.DateBased.DayBased> {
     }
 }
 
-object MonthBasedSerializer: KSerializer<DateTimeUnit.DateBased.MonthBased> {
+object MonthBasedDateTimeUnitSerializer: KSerializer<DateTimeUnit.DateBased.MonthBased> {
 
     override val descriptor: SerialDescriptor = buildClassSerialDescriptor("MonthBased") {
         element<Int>("months")
@@ -132,12 +132,12 @@ object MonthBasedSerializer: KSerializer<DateTimeUnit.DateBased.MonthBased> {
 }
 
 @Suppress("EXPERIMENTAL_API_USAGE_ERROR", "INVISIBLE_MEMBER")
-object DateBasedSerializer: AbstractPolymorphicSerializer<DateTimeUnit.DateBased>() {
+object DateBasedDateTimeUnitSerializer: AbstractPolymorphicSerializer<DateTimeUnit.DateBased>() {
 
     private val impl = SealedClassSerializer("kotlinx.datetime.DateTimeUnit.DateBased",
         DateTimeUnit.DateBased::class,
         arrayOf(DateTimeUnit.DateBased.DayBased::class, DateTimeUnit.DateBased.MonthBased::class),
-        arrayOf(DayBasedSerializer, MonthBasedSerializer))
+        arrayOf(DayBasedDateTimeUnitSerializer, MonthBasedDateTimeUnitSerializer))
 
     @InternalSerializationApi
     override fun findPolymorphicSerializerOrNull(decoder: CompositeDecoder, klassName: String?):
@@ -165,7 +165,7 @@ object DateTimeUnitSerializer: AbstractPolymorphicSerializer<DateTimeUnit>() {
     private val impl = SealedClassSerializer("kotlinx.datetime.DateTimeUnit",
         DateTimeUnit::class,
         arrayOf(DateTimeUnit.DateBased.DayBased::class, DateTimeUnit.DateBased.MonthBased::class, DateTimeUnit.TimeBased::class),
-        arrayOf(DayBasedSerializer, MonthBasedSerializer, TimeBasedSerializer))
+        arrayOf(DayBasedDateTimeUnitSerializer, MonthBasedDateTimeUnitSerializer, TimeBasedDateTimeUnitSerializer))
 
     @InternalSerializationApi
     override fun findPolymorphicSerializerOrNull(decoder: CompositeDecoder, klassName: String?): DeserializationStrategy<out DateTimeUnit>? =

serialization/common/test/DateTimeUnitSerializationTest.kt

@@ -18,8 +18,8 @@ class DateTimeUnitSerializationTest {
             val nanoseconds = Random.nextLong(1, Long.MAX_VALUE)
             val unit = DateTimeUnit.TimeBased(nanoseconds)
             val json = "{\"nanoseconds\":${nanoseconds.toString()}}" // https://youtrack.jetbrains.com/issue/KT-39891
-            assertEquals(json, Json.encodeToString(TimeBasedSerializer, unit))
-            assertEquals(unit, Json.decodeFromString(TimeBasedSerializer, json))
+            assertEquals(json, Json.encodeToString(TimeBasedDateTimeUnitSerializer, unit))
+            assertEquals(unit, Json.decodeFromString(TimeBasedDateTimeUnitSerializer, json))
         }
     }
 
@@ -29,8 +29,8 @@ class DateTimeUnitSerializationTest {
             val days = Random.nextInt(1, Int.MAX_VALUE)
             val unit = DateTimeUnit.DateBased.DayBased(days)
             val json = "{\"days\":$days}"
-            assertEquals(json, Json.encodeToString(DayBasedSerializer, unit))
-            assertEquals(unit, Json.decodeFromString(DayBasedSerializer, json))
+            assertEquals(json, Json.encodeToString(DayBasedDateTimeUnitSerializer, unit))
+            assertEquals(unit, Json.decodeFromString(DayBasedDateTimeUnitSerializer, json))
         }
     }
 
@@ -40,8 +40,8 @@ class DateTimeUnitSerializationTest {
             val months = Random.nextInt(1, Int.MAX_VALUE)
             val unit = DateTimeUnit.DateBased.MonthBased(months)
             val json = "{\"months\":$months}"
-            assertEquals(json, Json.encodeToString(MonthBasedSerializer, unit))
-            assertEquals(unit, Json.decodeFromString(MonthBasedSerializer, json))
+            assertEquals(json, Json.encodeToString(MonthBasedDateTimeUnitSerializer, unit))
+            assertEquals(unit, Json.decodeFromString(MonthBasedDateTimeUnitSerializer, json))
         }
     }
 
@@ -51,15 +51,15 @@ class DateTimeUnitSerializationTest {
             val days = Random.nextInt(1, Int.MAX_VALUE)
             val unit = DateTimeUnit.DateBased.DayBased(days)
             val json = "{\"type\":\"DayBased\",\"days\":$days}"
-            assertEquals(json, Json.encodeToString(DateBasedSerializer, unit))
-            assertEquals(unit, Json.decodeFromString(DateBasedSerializer, json))
+            assertEquals(json, Json.encodeToString(DateBasedDateTimeUnitSerializer, unit))
+            assertEquals(unit, Json.decodeFromString(DateBasedDateTimeUnitSerializer, json))
         }
         repeat(100) {
             val months = Random.nextInt(1, Int.MAX_VALUE)
             val unit = DateTimeUnit.DateBased.MonthBased(months)
             val json = "{\"type\":\"MonthBased\",\"months\":$months}"
-            assertEquals(json, Json.encodeToString(DateBasedSerializer, unit))
-            assertEquals(unit, Json.decodeFromString(DateBasedSerializer, json))
+            assertEquals(json, Json.encodeToString(DateBasedDateTimeUnitSerializer, unit))
+            assertEquals(unit, Json.decodeFromString(DateBasedDateTimeUnitSerializer, json))
         }
     }