[ECO-5375] Updated code as per review comments

1. Updated enum ObjectOperationAction with PascalCase values
2. Created separate file for adapter that extends LiveObjectsAdapter
3. Added custom Binary type to handle ByteArray values

Author: sacOO7

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

@@ -0,0 +1,32 @@
+package io.ably.lib.objects;
+
+import io.ably.lib.realtime.AblyRealtime;
+import io.ably.lib.realtime.CompletionListener;
+import io.ably.lib.types.AblyException;
+import io.ably.lib.types.ProtocolMessage;
+import io.ably.lib.util.Log;
+import org.jetbrains.annotations.NotNull;
+
+public class Adapter implements LiveObjectsAdapter {
+    private final AblyRealtime ably;
+    private static final String TAG = LiveObjectsAdapter.class.getName();
+
+    public Adapter(@NotNull AblyRealtime ably) {
+        this.ably = ably;
+    }
+
+    @Override
+    public void setChannelSerial(@NotNull String channelName, @NotNull String channelSerial) {
+        if (ably.channels.containsKey(channelName)) {
+            ably.channels.get(channelName).properties.channelSerial = channelSerial;
+        } else {
+            Log.e(TAG, "setChannelSerial(): channel not found: " + channelName);
+        }
+    }
+
+    @Override
+    public void send(ProtocolMessage msg, CompletionListener listener) throws AblyException {
+        // Always queue LiveObjects messages to ensure reliable state synchronization and proper acknowledgment
+        ably.connection.connectionManager.send(msg, true, listener);
+    }
+}

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

@@ -1,37 +1,27 @@
 package io.ably.lib.objects;
 
-import io.ably.lib.plugins.PluginConnectionAdapter;
-import io.ably.lib.realtime.AblyRealtime;
 import io.ably.lib.realtime.CompletionListener;
 import io.ably.lib.types.AblyException;
 import io.ably.lib.types.ProtocolMessage;
-import io.ably.lib.util.Log;
 import org.jetbrains.annotations.NotNull;
 
-public interface LiveObjectsAdapter extends PluginConnectionAdapter {
-    void setChannelSerial(@NotNull String channelName, @NotNull String channelSerial);
-
-    class Adapter implements LiveObjectsAdapter {
-        private final AblyRealtime ably;
-        private static final String TAG = LiveObjectsAdapter.class.getName();
-
-        public Adapter(@NotNull AblyRealtime ably) {
-            this.ably = ably;
-        }
+public interface LiveObjectsAdapter {
+    /**
+     * Sends a protocol message to its intended recipient.
+     * This method transmits a protocol message, allowing for queuing events if necessary,
+     * and notifies the provided listener upon the success or failure of the send operation.
+     *
+     * @param msg the protocol message to send.
+     * @param listener a listener to be notified of the success or failure of the send operation.
+     * @throws AblyException if an error occurs during the send operation.
+     */
+    void send(ProtocolMessage msg, CompletionListener listener) throws AblyException;
 
-        @Override
-        public void setChannelSerial(@NotNull String channelName, @NotNull String channelSerial) {
-            if (ably.channels.containsKey(channelName)) {
-                ably.channels.get(channelName).properties.channelSerial = channelSerial;
-            } else {
-                Log.e(TAG, "setChannelSerial(): channel not found: " + channelName);
-            }
-        }
-
-        @Override
-        public void send(ProtocolMessage msg, CompletionListener listener) throws AblyException {
-            // Always queue LiveObjects messages to ensure reliable state synchronization and proper acknowledgment
-            ably.connection.connectionManager.send(msg, true, listener);
-        }
-    }
+    /**
+     * Sets the channel serial for a specific channel.
+     * @param channelName the name of the channel for which to set the serial
+     * @param channelSerial the serial to set for the channel
+     */
+    void setChannelSerial(@NotNull String channelName, @NotNull String channelSerial);
 }
+

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

@@ -1,14 +1,14 @@
 package io.ably.lib.objects;
 
-import io.ably.lib.plugins.PluginInstance;
+import io.ably.lib.types.ProtocolMessage;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * The LiveObjectsPlugin interface provides a mechanism for managing and interacting with
  * live data objects in a real-time environment. It allows for the retrieval, disposal, and
  * management of LiveObjects instances associated with specific channel names.
  */
-public interface LiveObjectsPlugin extends PluginInstance {
+public interface LiveObjectsPlugin {
 
     /**
      * Retrieves an instance of LiveObjects associated with the specified channel name.
@@ -21,6 +21,15 @@ public interface LiveObjectsPlugin extends PluginInstance {
     @NotNull
     LiveObjects getInstance(@NotNull String channelName);
 
+    /**
+     * Handles a protocol message.
+     * This method is invoked whenever a protocol message is received, allowing the implementation
+     * to process the message and take appropriate actions.
+     *
+     * @param message the protocol message to handle.
+     */
+    void handle(@NotNull ProtocolMessage message);
+
     /**
      * Disposes of the LiveObjects instance associated with the specified channel name.
      * This method removes the LiveObjects instance for the given channel, releasing any
@@ -29,4 +38,9 @@ public interface LiveObjectsPlugin extends PluginInstance {
      * @param channelName the name of the channel whose LiveObjects instance is to be removed.
      */
     void dispose(@NotNull String channelName);
+
+    /**
+     * Disposes of the plugin instance and all underlying resources.
+     */
+    void dispose();
 }

lib/src/main/java/io/ably/lib/plugins/PluginConnectionAdapter.java

@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Map;
 
+import io.ably.lib.objects.Adapter;
 import io.ably.lib.objects.LiveObjectsAdapter;
 import io.ably.lib.objects.LiveObjectsPlugin;
 import io.ably.lib.rest.AblyRest;
@@ -187,7 +188,7 @@ public interface Channels extends ReadOnlyMap<String, Channel> {
     private LiveObjectsPlugin tryInitializeLiveObjectsPlugin() {
         try {
             Class<?> liveObjectsImplementation = Class.forName("io.ably.lib.objects.DefaultLiveObjectsPlugin");
-            LiveObjectsAdapter adapter = new LiveObjectsAdapter.Adapter(this);
+            LiveObjectsAdapter adapter = new Adapter(this);
             return (LiveObjectsPlugin) liveObjectsImplementation
                 .getDeclaredConstructor(LiveObjectsAdapter.class)
                 .newInstance(adapter);

lib/src/main/java/io/ably/lib/plugins/PluginInstance.java

@@ -23,9 +23,21 @@ internal suspend fun LiveObjectsAdapter.sendAsync(message: ProtocolMessage) {
   deferred.await()
 }
 
-internal enum class MessageFormat(private val value: String) {
-  MSGPACK("msgpack"),
-  JSON("json");
+internal enum class ProtocolMessageFormat(private val value: String) {
+  Msgpack("msgpack"),
+  Json("json");
 
   override fun toString(): String = value
 }
+
+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
+  }
+
+  override fun hashCode(): Int {
+    return data?.contentHashCode() ?: 0
+  }
+}

lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java

@@ -1,18 +1,16 @@
 package io.ably.lib.objects
 
-import java.nio.ByteBuffer
-
 /**
  * An enum class representing the different actions that can be performed on an object.
  * Spec: OOP2
  */
 internal enum class ObjectOperationAction(val code: Int) {
-  MAP_CREATE(0),
-  MAP_SET(1),
-  MAP_REMOVE(2),
-  COUNTER_CREATE(3),
-  COUNTER_INC(4),
-  OBJECT_DELETE(5);
+  MapCreate(0),
+  MapSet(1),
+  MapRemove(2),
+  CounterCreate(3),
+  CounterInc(4),
+  ObjectDelete(5);
 }
 
 /**
@@ -190,12 +188,12 @@ internal data class ObjectOperation(
    * the initialValue, nonce, and initialValueEncoding will be removed.
    * Spec: OOP3h
    */
-  val initialValue: ByteBuffer? = null,
+  val initialValue: Binary? = null,
 
   /** The initial value encoding defines how the initialValue should be interpreted.
    * Spec: OOP3i
    */
-  val initialValueEncoding: MessageFormat? = null
+  val initialValueEncoding: ProtocolMessageFormat? = null
 )
 
 /**
@@ -301,7 +299,7 @@ internal data class ObjectMessage(
    * the `ProtocolMessage` encapsulating it is `OBJECT_SYNC`.
    * Spec: OM2g
    */
-  val `object`: ObjectState? = null,
+  val objectState: ObjectState? = null,
 
   /**
    * An opaque string that uniquely identifies this object message.