Retarget path-based serializers to WireObjectMessage model

Point the JSON and MsgPack serializers in io.ably.lib.object.serialization
at the new WireObjectMessage wire model instead of the legacy
io.ably.lib.objects.ObjectMessage, so the new `object` package has no
dependency on the legacy `objects` package.

- DefaultSerialization: implement the new ObjectSerializer interface and
  (de)serialize WireObjectMessage arrays (reflectively loaded via
  ObjectSerializer.Holder).
- Json/MsgpackSerialization: bind the Wire* types; replace legacy
  objectError with the object package's objectStateError (same 500/92000).
- WireObjectMessage: restore the gson annotations required for wire-format
  fidelity - @SerializedName("object") on objectState and
  @JsonAdapter(WireObjectDataJsonSerializer) on WireObjectData.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: sacOO7

liveobjects/src/main/kotlin/io/ably/lib/object/message/WireObjectMessage.kt

@@ -3,6 +3,9 @@ package io.ably.lib.`object`.message
 import com.google.gson.Gson
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import io.ably.lib.`object`.serialization.WireObjectDataJsonSerializer
 import java.nio.charset.StandardCharsets
 import java.util.Base64
 
@@ -36,6 +39,7 @@ internal enum class WireObjectsMapSemantics(val code: Int) {
 }
 
 /** Spec: OD1, OD2 - binary carried as base64 string on the wire */
+@JsonAdapter(WireObjectDataJsonSerializer::class)
 internal data class WireObjectData(
   val objectId: String? = null, // OD2a
   val string: String? = null, // OD2f
@@ -145,6 +149,7 @@ internal data class WireObjectMessage(
   val connectionId: String? = null, // OM2c
   val extras: JsonObject? = null, // OM2d
   val operation: WireObjectOperation? = null, // OM2f
+  @SerializedName("object")
   val objectState: WireObjectState? = null, // OM2g - wire key "object"
   val serial: String? = null, // OM2h
   val serialTimestamp: Long? = null, // OM2j

liveobjects/src/main/kotlin/io/ably/lib/object/serialization/DefaultSerialization.kt

@@ -1,27 +1,25 @@
 package io.ably.lib.`object`.serialization
 
 import com.google.gson.*
-import io.ably.lib.objects.*
-
-import io.ably.lib.objects.ObjectMessage
+import io.ably.lib.`object`.message.WireObjectMessage
 import org.msgpack.core.MessagePacker
 import org.msgpack.core.MessageUnpacker
 
 /**
- * Default implementation of {@link ObjectsSerializer} that handles serialization/deserialization
- * of ObjectMessage arrays for both JSON and MessagePack formats using Jackson and Gson.
- * Dynamically loaded by ObjectsHelper#getSerializer() to avoid hard dependencies.
+ * Default implementation of {@link ObjectSerializer} that handles serialization/deserialization
+ * of WireObjectMessage arrays for both JSON and MessagePack formats using Gson and MessagePack.
+ * Dynamically loaded by ObjectSerializer#tryGet() to avoid hard dependencies.
  */
-@Suppress("unused") // Used via reflection in ObjectsHelper
-internal class DefaultObjectsSerializer : ObjectsSerializer {
+@Suppress("unused") // Used via reflection in ObjectSerializer.Holder
+internal class DefaultObjectsSerializer : ObjectSerializer {
 
   override fun readMsgpackArray(unpacker: MessageUnpacker): Array<Any> {
     val objectMessagesCount = unpacker.unpackArrayHeader()
     return Array(objectMessagesCount) { readObjectMessage(unpacker) }
   }
 
   override fun writeMsgpackArray(objects: Array<out Any>, packer: MessagePacker) {
-    val objectMessages = objects.map { it as ObjectMessage }
+    val objectMessages = objects.map { it as WireObjectMessage }
     packer.packArrayHeader(objectMessages.size)
     objectMessages.forEach { it.writeMsgpack(packer) }
   }
@@ -34,7 +32,7 @@ internal class DefaultObjectsSerializer : ObjectsSerializer {
   }
 
   override fun asJsonArray(objects: Array<out Any>): JsonArray {
-    val objectMessages = objects.map { it as ObjectMessage }
+    val objectMessages = objects.map { it as WireObjectMessage }
     val jsonArray = JsonArray()
     for (objectMessage in objectMessages) {
       jsonArray.add(objectMessage.toJsonObject())

liveobjects/src/main/kotlin/io/ably/lib/object/serialization/JsonSerialization.kt

@@ -1,26 +1,25 @@
 package io.ably.lib.`object`.serialization
 
 import com.google.gson.*
-import io.ably.lib.objects.ObjectsMapSemantics
-import io.ably.lib.objects.ObjectData
-import io.ably.lib.objects.ObjectMessage
-import io.ably.lib.objects.ObjectOperationAction
-import io.ably.lib.objects.serialization.EnumCodeTypeAdapter
+import io.ably.lib.`object`.message.WireObjectData
+import io.ably.lib.`object`.message.WireObjectMessage
+import io.ably.lib.`object`.message.WireObjectOperationAction
+import io.ably.lib.`object`.message.WireObjectsMapSemantics
 import java.lang.reflect.Type
 import kotlin.enums.EnumEntries
 
 // Gson instance for JSON serialization/deserialization
 internal val gson = GsonBuilder()
-  .registerTypeAdapter(ObjectOperationAction::class.java, EnumCodeTypeAdapter({ it.code }, ObjectOperationAction.entries))
-  .registerTypeAdapter(ObjectsMapSemantics::class.java, EnumCodeTypeAdapter({ it.code }, ObjectsMapSemantics.entries))
+  .registerTypeAdapter(WireObjectOperationAction::class.java, EnumCodeTypeAdapter({ it.code }, WireObjectOperationAction.entries))
+  .registerTypeAdapter(WireObjectsMapSemantics::class.java, EnumCodeTypeAdapter({ it.code }, WireObjectsMapSemantics.entries))
   .create()
 
-internal fun ObjectMessage.toJsonObject(): JsonObject {
+internal fun WireObjectMessage.toJsonObject(): JsonObject {
   return gson.toJsonTree(this).asJsonObject
 }
 
-internal fun JsonObject.toObjectMessage(): ObjectMessage {
-  return gson.fromJson(this, ObjectMessage::class.java)
+internal fun JsonObject.toObjectMessage(): WireObjectMessage {
+  return gson.fromJson(this, WireObjectMessage::class.java)
 }
 
 internal class EnumCodeTypeAdapter<T : Enum<T>>(
@@ -39,8 +38,8 @@ internal class EnumCodeTypeAdapter<T : Enum<T>>(
   }
 }
 
-internal class ObjectDataJsonSerializer : JsonSerializer<ObjectData>, JsonDeserializer<ObjectData> {
-  override fun serialize(src: ObjectData, typeOfSrc: Type?, context: JsonSerializationContext?): JsonElement {
+internal class WireObjectDataJsonSerializer : JsonSerializer<WireObjectData>, JsonDeserializer<WireObjectData> {
+  override fun serialize(src: WireObjectData, typeOfSrc: Type?, context: JsonSerializationContext?): JsonElement {
     val obj = JsonObject()
     src.objectId?.let { obj.addProperty("objectId", it) }
     src.string?.let { obj.addProperty("string", it) }
@@ -51,7 +50,7 @@ internal class ObjectDataJsonSerializer : JsonSerializer<ObjectData>, JsonDeseri
     return obj
   }
 
-  override fun deserialize(json: JsonElement, typeOfT: Type?, context: JsonDeserializationContext?): ObjectData {
+  override fun deserialize(json: JsonElement, typeOfT: Type?, context: JsonDeserializationContext?): WireObjectData {
     val obj = if (json.isJsonObject) json.asJsonObject else throw JsonParseException("Expected JsonObject")
     val objectId = if (obj.has("objectId")) obj.get("objectId").asString else null
     val string = if (obj.has("string")) obj.get("string").asString else null
@@ -63,6 +62,6 @@ internal class ObjectDataJsonSerializer : JsonSerializer<ObjectData>, JsonDeseri
     if (objectId == null && string == null && number == null && boolean == null && bytes == null && json == null) {
       throw JsonParseException("Since objectId is not present, at least one of the value fields must be present")
     }
-    return ObjectData(objectId = objectId, string = string, number = number, boolean = boolean, bytes = bytes, json = json)
+    return WireObjectData(objectId = objectId, string = string, number = number, boolean = boolean, bytes = bytes, json = json)
   }
 }