[ECO-5386] Updated unit tests for ObjectMesssage serialization

1. Updated test for testOmitNullsInObjectMessageSerialization
2. Added test HandleNullsInObjectMessageDeserialization

Author: sacOO7

gradle/libs.versions.toml

@@ -26,7 +26,7 @@ turbine = "1.2.0"
 ktor = "3.1.3"
 jetbrains-annoations = "26.0.2"
 jackson-msgpack = "0.8.11" # Compatible with msgpack-core 0.8.11
-jackson-param = "2.18.0" # Compatible with jackson-msgpack
+jackson-param = "2.19.1" # Compatible with jackson-msgpack
 
 [libraries]
 gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }

lib/src/main/java/io/ably/lib/objects/LiveObjectsHelper.java

@@ -27,7 +27,7 @@ public static LiveObjectsPlugin tryInitializeLiveObjectsPlugin(AblyRealtime ably
     public static LiveObjectSerializer getLiveObjectSerializer() {
         if (liveObjectSerializer == null) {
             try {
-                Class<?> serializerClass = Class.forName("io.ably.lib.objects.DefaultLiveObjectSerializer");
+                Class<?> serializerClass = Class.forName("io.ably.lib.objects.serialization.DefaultLiveObjectSerializer");
                 liveObjectSerializer = (LiveObjectSerializer) serializerClass.getDeclaredConstructor().newInstance();
             } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException |
                      InvocationTargetException e) {

lib/src/main/java/io/ably/lib/types/ProtocolSerializer.java

@@ -14,7 +14,7 @@ public class ProtocolSerializer {
     /****************************************
      *            Msgpack decode
      ****************************************/
-    
+
     public static ProtocolMessage readMsgpack(byte[] packed) throws AblyException {
         try {
             MessageUnpacker unpacker = Serialisation.msgpackUnpackerConfig.newUnpacker(packed);
@@ -27,30 +27,31 @@ public static ProtocolMessage readMsgpack(byte[] packed) throws AblyException {
     /****************************************
      *            Msgpack encode
      ****************************************/
-    
-    public static byte[] writeMsgpack(ProtocolMessage message) {
+
+    public static byte[] writeMsgpack(ProtocolMessage message) throws AblyException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         MessagePacker packer = Serialisation.msgpackPackerConfig.newPacker(out);
         try {
             message.writeMsgpack(packer);
-    
             packer.flush();
             return out.toByteArray();
-        } catch(IOException e) { return null; }
+        } catch (IOException ioe) {
+            throw AblyException.fromThrowable(ioe);
+        }
     }
 
     /****************************************
      *              JSON decode
      ****************************************/
-    
+
     public static ProtocolMessage fromJSON(String packed) throws AblyException {
         return Serialisation.gson.fromJson(packed, ProtocolMessage.class);
     }
 
     /****************************************
      *              JSON encode
      ****************************************/
-    
+
     public static byte[] writeJSON(ProtocolMessage message) throws AblyException {
         return Serialisation.gson.toJson(message).getBytes(Charset.forName("UTF-8"));
     }

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

@@ -39,18 +39,18 @@ internal enum class ProtocolMessageFormat(private val value: String) {
   override fun toString(): String = value
 }
 
-internal class Binary(val data: ByteArray?) {
+internal class Binary(val data: ByteArray) {
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (other !is Binary) return false
-    return data?.contentEquals(other.data) == true
+    return data.contentEquals(other.data)
   }
 
   override fun hashCode(): Int {
-    return data?.contentHashCode() ?: 0
+    return data.contentHashCode()
   }
 }
 
 internal fun Binary.size(): Int {
-  return data?.size ?: 0
+  return data.size
 }

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

@@ -8,6 +8,14 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
+import io.ably.lib.objects.serialization.*
+import io.ably.lib.objects.serialization.InitialValueJsonSerializer
+import io.ably.lib.objects.serialization.InitialValueMsgpackDeserializer
+import io.ably.lib.objects.serialization.InitialValueMsgpackSerializer
+import io.ably.lib.objects.serialization.ObjectDataJsonSerializer
+import io.ably.lib.objects.serialization.ObjectDataMsgpackDeserializer
+import io.ably.lib.objects.serialization.ObjectDataMsgpackSerializer
+import io.ably.lib.objects.serialization.gson
 
 /**
  * An enum class representing the different actions that can be performed on an object.
@@ -319,7 +327,9 @@ internal data class ObjectMessage(
    * or validation of the @extras@ field itself, but should treat it opaquely, encoding it and passing it to realtime unaltered
    * Spec: OM2d
    */
-  val extras: Any? = null,
+  @JsonSerialize(using = JsonObjectMsgpackSerializer::class)
+  @JsonDeserialize(using = JsonObjectMsgpackDeserializer::class)
+  val extras: JsonObject? = null,
 
   /**
    * Describes an operation to be applied to an object.