[ECO-5426] Updated json values to be passed into json key

- Removed unnecessary `encoding` field used to detect json values

Author: sacOO7

live-objects/src/main/kotlin/io/ably/lib/objects/serialization/JsonSerialization.kt

@@ -52,11 +52,7 @@ internal class ObjectDataJsonSerializer : JsonSerializer<ObjectData>, JsonDeseri
         is String -> obj.addProperty("string", v)
         is Number -> obj.addProperty("number", v.toDouble())
         is Binary -> obj.addProperty("bytes", Base64.getEncoder().encodeToString(v.data))
-        // Spec: OD4c5
-        is JsonObject, is JsonArray -> {
-          obj.addProperty("string", v.toString())
-          obj.addProperty("encoding", "json")
-        }
+        is JsonObject, is JsonArray -> obj.addProperty("json", v.toString()) // Spec: OD4c5
       }
     }
     return obj
@@ -65,24 +61,12 @@ internal class ObjectDataJsonSerializer : JsonSerializer<ObjectData>, JsonDeseri
   override fun deserialize(json: JsonElement, typeOfT: Type?, context: JsonDeserializationContext?): ObjectData {
     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 encoding = if (obj.has("encoding")) obj.get("encoding").asString else null
     val value = when {
       obj.has("boolean") -> ObjectValue(obj.get("boolean").asBoolean)
-      // Spec: OD5b3
-      obj.has("string") && encoding == "json" -> {
-        val jsonStr = obj.get("string").asString
-        val parsed = JsonParser.parseString(jsonStr)
-        ObjectValue(
-          when {
-            parsed.isJsonObject -> parsed.asJsonObject
-            parsed.isJsonArray -> parsed.asJsonArray
-            else -> throw JsonParseException("Invalid JSON string for encoding=json")
-          }
-        )
-      }
       obj.has("string") -> ObjectValue(obj.get("string").asString)
       obj.has("number") -> ObjectValue(obj.get("number").asDouble)
       obj.has("bytes") -> ObjectValue(Binary(Base64.getDecoder().decode(obj.get("bytes").asString)))
+      obj.has("json") -> ObjectValue(JsonParser.parseString(obj.get("json").asString))
       else -> {
         if (objectId != null)
           null

live-objects/src/main/kotlin/io/ably/lib/objects/serialization/MsgpackSerialization.kt

@@ -1,7 +1,6 @@
 package io.ably.lib.objects.serialization
 
 import com.google.gson.JsonArray
-import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import io.ably.lib.objects.*
@@ -617,9 +616,6 @@ private fun ObjectData.writeMsgpack(packer: MessagePacker) {
   if (objectId != null) fieldCount++
   value?.let {
     fieldCount++
-    if (it.value is JsonElement) {
-      fieldCount += 1 // For extra "encoding" field
-    }
   }
 
   packer.packMapHeader(fieldCount)
@@ -649,10 +645,8 @@ private fun ObjectData.writeMsgpack(packer: MessagePacker) {
         packer.writePayload(v.data)
       }
       is JsonObject, is JsonArray -> {
-        packer.packString("string")
-        packer.packString(v.toString())
-        packer.packString("encoding")
         packer.packString("json")
+        packer.packString(v.toString())
       }
     }
   }
@@ -665,8 +659,6 @@ private fun readObjectData(unpacker: MessageUnpacker): ObjectData {
   val fieldCount = unpacker.unpackMapHeader()
   var objectId: String? = null
   var value: ObjectValue? = null
-  var encoding: String? = null
-  var stringValue: String? = null
 
   for (i in 0 until fieldCount) {
     val fieldName = unpacker.unpackString().intern()
@@ -680,33 +672,29 @@ private fun readObjectData(unpacker: MessageUnpacker): ObjectData {
     when (fieldName) {
       "objectId" -> objectId = unpacker.unpackString()
       "boolean" -> value = ObjectValue(unpacker.unpackBoolean())
-      "string" -> stringValue = unpacker.unpackString()
+      "string" -> value = ObjectValue(unpacker.unpackString())
       "number" -> value = ObjectValue(unpacker.unpackDouble())
       "bytes" -> {
         val size = unpacker.unpackBinaryHeader()
         val bytes = ByteArray(size)
         unpacker.readPayload(bytes)
         value = ObjectValue(Binary(bytes))
       }
-      "encoding" -> encoding = unpacker.unpackString()
+      "json" -> {
+        val jsonString = unpacker.unpackString()
+        val parsed = JsonParser.parseString(jsonString)
+        value = ObjectValue(
+          when {
+            parsed.isJsonObject -> parsed.asJsonObject
+            parsed.isJsonArray -> parsed.asJsonArray
+            else ->
+              throw ablyException("Invalid JSON string for json field", ErrorCode.MapValueDataTypeUnsupported, HttpStatusCode.InternalServerError)
+          }
+        )
+      }
       else -> unpacker.skipValue()
     }
   }
 
-  // Handle string with encoding if needed
-  if (stringValue != null && encoding == "json") {
-    val parsed = JsonParser.parseString(stringValue)
-    value = ObjectValue(
-      when {
-        parsed.isJsonObject -> parsed.asJsonObject
-        parsed.isJsonArray -> parsed.asJsonArray
-        else ->
-          throw ablyException("Invalid JSON string for encoding=json", ErrorCode.MapValueDataTypeUnsupported, HttpStatusCode.InternalServerError)
-      }
-    )
-  } else if (stringValue != null) {
-    value = ObjectValue(stringValue)
-  }
-
   return ObjectData(objectId = objectId, value = value)
 }