Rename serialization surrogate and annotate with PublishedAPI

Author: ilya-g

core/jvm/src/Instant.kt

@@ -101,7 +101,7 @@ public actual class Instant internal constructor(
         internal actual val MAX: Instant = Instant(jtInstant.MAX)
     }
 
-    private fun writeReplace(): Any = SerializedValue(SerializedValue.INSTANT_TAG, this)
+    private fun writeReplace(): Any = Ser(Ser.INSTANT_TAG, this)
 }
 
 private fun Instant.atZone(zone: TimeZone): java.time.ZonedDateTime = try {

core/jvm/src/LocalDate.kt

@@ -91,7 +91,7 @@ public actual class LocalDate internal constructor(
     @JvmName("toEpochDays")
     internal fun toEpochDaysJvm(): Int = value.toEpochDay().clampToInt()
 
-    private fun writeReplace(): Any = SerializedValue(SerializedValue.DATE_TAG, this)
+    private fun writeReplace(): Any = Ser(Ser.DATE_TAG, this)
 }
 
 @Deprecated("Use the plus overload with an explicit number of units", ReplaceWith("this.plus(1, unit)"))

core/jvm/src/LocalDateTime.kt

@@ -7,7 +7,6 @@ package kotlinx.datetime
 
 import kotlinx.datetime.format.*
 import kotlinx.datetime.internal.removeLeadingZerosFromLongYearFormLocalDateTime
-import kotlinx.datetime.internal.SerializedValue
 import kotlinx.datetime.serializers.LocalDateTimeIso8601Serializer
 import kotlinx.serialization.Serializable
 import java.time.DateTimeException
@@ -89,5 +88,5 @@ public actual class LocalDateTime internal constructor(
         public actual val ISO: DateTimeFormat<LocalDateTime> = ISO_DATETIME
     }
 
-    private fun writeReplace(): Any = SerializedValue(SerializedValue.DATE_TIME_TAG, this)
+    private fun writeReplace(): Any = Ser(Ser.DATE_TIME_TAG, this)
 }

core/jvm/src/LocalTime.kt

@@ -92,5 +92,5 @@ public actual class LocalTime internal constructor(
 
     }
 
-    private fun writeReplace(): Any = SerializedValue(SerializedValue.TIME_TAG, this)
+    private fun writeReplace(): Any = Ser(Ser.TIME_TAG, this)
 }

core/jvm/src/UtcOffsetJvm.kt

@@ -6,7 +6,6 @@
 package kotlinx.datetime
 
 import kotlinx.datetime.format.*
-import kotlinx.datetime.internal.SerializedValue
 import kotlinx.datetime.serializers.UtcOffsetSerializer
 import kotlinx.serialization.Serializable
 import java.time.DateTimeException
@@ -48,7 +47,7 @@ public actual class UtcOffset(
         public actual val FOUR_DIGITS: DateTimeFormat<UtcOffset> get() = FOUR_DIGIT_OFFSET
     }
 
-    private fun writeReplace(): Any = SerializedValue(SerializedValue.UTC_OFFSET_TAG, this)
+    private fun writeReplace(): Any = Ser(Ser.UTC_OFFSET_TAG, this)
 }
 
 @Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")

core/jvm/src/internal/SerializedValue.kt renamed to core/jvm/src/internal/Ser.kt

@@ -3,12 +3,13 @@
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
 
-package kotlinx.datetime.internal
+@file:Suppress("PackageDirectoryMismatch")
+package kotlinx.datetime
 
-import kotlinx.datetime.*
 import java.io.*
 
-internal class SerializedValue(var typeTag: Int, var value: Any?) : Externalizable {
+@PublishedApi // changing the class name would result in serialization incompatibility
+internal class Ser(private var typeTag: Int, private var value: Any?) : Externalizable {
     constructor() : this(0, null)
 
     override fun writeExternal(out: ObjectOutput) {

core/jvm/test/JvmSerializationTest.kt

@@ -79,12 +79,16 @@ class JvmSerializationTest {
 
     @OptIn(ExperimentalStdlibApi::class)
     private fun expectedDeserialization(expected: Any, blockData: String) {
-        val serialized = "aced0005737200296b6f746c696e782e6461746574696d652e696e7465726e616c2e53657269616c697a656456616c756500000000000000000c0000787077${blockData}78"
+        val serialized = "aced0005737200146b6f746c696e782e6461746574696d652e53657200000000000000000c0000787077${blockData}78"
         val hexFormat = HexFormat { bytes.byteSeparator = "" }
 
-        val deserialized = deserialize(serialized.hexToByteArray(hexFormat))
-        if (expected != deserialized) {
-            assertEquals(expected, deserialized, "Golden serial form: $serialized\nActual serial form: ${serialize(expected).toHexString(hexFormat)}")
+        try {
+            val deserialized = deserialize(serialized.hexToByteArray(hexFormat))
+            if (expected != deserialized) {
+                assertEquals(expected, deserialized, "Golden serial form: $serialized\nActual serial form: ${serialize(expected).toHexString(hexFormat)}")
+            }
+        } catch (e: Throwable) {
+            fail("Failed to deserialize $serialized\nActual serial form: ${serialize(expected).toHexString(hexFormat)}", e)
         }
     }