[ECO-5418] Marked ObjectsPlugin field as Nullable in AblyRealtime

and RealtimeChannel classes

Author: sacOO7

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

@@ -3,9 +3,10 @@
 import io.ably.lib.objects.ObjectsPlugin;
 import io.ably.lib.types.AblyException;
 import io.ably.lib.types.ChannelOptions;
+import org.jetbrains.annotations.Nullable;
 
 public class Channel extends ChannelBase {
-    Channel(AblyRealtime ably, String name, ChannelOptions options, ObjectsPlugin objectsPlugin) throws AblyException {
+    Channel(AblyRealtime ably, String name, ChannelOptions options, @Nullable ObjectsPlugin objectsPlugin) throws AblyException {
         super(ably, name, options, objectsPlugin);
     }
 

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

@@ -2,6 +2,7 @@
 
 import io.ably.lib.realtime.AblyRealtime;
 import io.ably.lib.util.Log;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -10,6 +11,7 @@ public class ObjectsHelper {
     private static final String TAG = ObjectsHelper.class.getName();
     private static volatile ObjectsSerializer objectsSerializer;
 
+    @Nullable
     public static ObjectsPlugin tryInitializeObjectsPlugin(AblyRealtime ablyRealtime) {
         try {
             Class<?> objectsImplementation = Class.forName("io.ably.lib.objects.DefaultObjectsPlugin");
@@ -24,6 +26,7 @@ public static ObjectsPlugin tryInitializeObjectsPlugin(AblyRealtime ablyRealtime
         }
     }
 
+    @Nullable
     public static ObjectsSerializer getSerializer() {
         if (objectsSerializer == null) {
             synchronized (ObjectsHelper.class) {

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

@@ -20,6 +20,7 @@
 import io.ably.lib.util.InternalMap;
 import io.ably.lib.util.Log;
 import io.ably.lib.util.StringUtils;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A client that extends the functionality of the {@link AblyRest} and provides additional realtime-specific features.
@@ -47,6 +48,7 @@ public class AblyRealtime extends AblyRest {
      * <p>
      * This field is initialized only if the LiveObjects plugin is present in the classpath.
      */
+    @Nullable
     private final ObjectsPlugin objectsPlugin;
 
     /**

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

@@ -43,6 +43,7 @@
 import io.ably.lib.util.Log;
 import io.ably.lib.util.ReconnectionStrategy;
 import io.ably.lib.util.StringUtils;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Enables messages to be published and subscribed to.
@@ -94,7 +95,7 @@ public abstract class ChannelBase extends EventEmitter<ChannelEvent, ChannelStat
      */
     private boolean released = false;
 
-    private final ObjectsPlugin objectsPlugin;
+    @Nullable private final ObjectsPlugin objectsPlugin;
 
     public RealtimeObjects getObjects() throws AblyException {
         if (objectsPlugin == null) {
@@ -1325,7 +1326,7 @@ else if(stateChange.current.equals(failureState)) {
         }
     }
 
-    ChannelBase(AblyRealtime ably, String name, ChannelOptions options, ObjectsPlugin objectsPlugin) throws AblyException {
+    ChannelBase(AblyRealtime ably, String name, ChannelOptions options, @Nullable ObjectsPlugin objectsPlugin) throws AblyException {
         Log.v(TAG, "RealtimeChannel(); channel = " + name);
         this.ably = ably;
         this.name = name;

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

@@ -22,8 +22,8 @@ public class DefaultObjectsPlugin(private val adapter: ObjectsAdapter) : Objects
   }
 
   override fun dispose(channelName: String) {
-    objects[channelName]?.dispose(clientError("Channel has been released using channels.release()"))
     objects.remove(channelName)
+      ?.dispose(clientError("Channel has been released using channels.release()"))
   }
 
   override fun dispose() {

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

@@ -33,7 +33,7 @@ internal class ObjectsManager(private val realtimeObjects: DefaultRealtimeObject
       // Some of the incoming object messages may have already been applied to the objects described in
       // the sync sequence, but others may not; therefore we must buffer these messages so that we can apply
       // them to the objects once the sync is complete.
-      Log.v(tag, "Buffering ${objectMessages.size} object messages, state: $realtimeObjects.state")
+      Log.v(tag, "Buffering ${objectMessages.size} object messages, state: ${realtimeObjects.state}")
       bufferedObjectOperations.addAll(objectMessages) // RTO8a
       return
     }