[CHAT-5063] refactor: make implicit calls overrides instead of patching client

Author: ttypic

android/src/main/java/io/ably/lib/rest/AblyRest.java

@@ -1,8 +1,6 @@
 package io.ably.lib.rest;
 
 import android.content.Context;
-import io.ably.lib.http.Http;
-import io.ably.lib.http.HttpCore;
 import io.ably.lib.push.LocalDevice;
 import io.ably.lib.types.AblyException;
 import io.ably.lib.types.ClientOptions;
@@ -38,24 +36,6 @@ public AblyRest(ClientOptions options) throws AblyException {
         super(options, new AndroidPlatformAgentProvider());
     }
 
-    /**
-     * Constructor implementation to be able to have shallow copy of the client,
-     * allowing us to modify certain fields while implementing a proxy for the Realtime/Rest SDK wrapper
-     */
-    protected AblyRest(AblyRest underlyingClient, HttpCore httpCore, Http http) {
-        super(underlyingClient, httpCore, http);
-    }
-
-    /**
-     * [Internal Method]
-     * <p/>
-     * We use this method to create a shallow copy of the client, allowing us to modify certain fields
-     * while implementing a proxy for the Realtime/Rest SDK wrapper
-     */
-    public AblyRest createShallowCopy(HttpCore httpCore, Http http) {
-        return new AblyRest(this, httpCore, http);
-    }
-
     /**
      * Retrieves a {@link LocalDevice} object that represents the current state of the device as a target for push notifications.
      * <p>

java/src/main/java/io/ably/lib/rest/AblyRest.java

@@ -1,7 +1,5 @@
 package io.ably.lib.rest;
 
-import io.ably.lib.http.Http;
-import io.ably.lib.http.HttpCore;
 import io.ably.lib.types.AblyException;
 import io.ably.lib.types.ClientOptions;
 import io.ably.lib.util.JavaPlatformAgentProvider;
@@ -34,22 +32,4 @@ public AblyRest(String key) throws AblyException {
     public AblyRest(ClientOptions options) throws AblyException {
         super(options, new JavaPlatformAgentProvider());
     }
-
-    /**
-     * Constructor implementation to be able to have shallow copy of the client,
-     * allowing us to modify certain fields while implementing a proxy for the Realtime/Rest SDK wrapper
-     */
-    protected AblyRest(AblyRest underlyingClient, HttpCore httpCore, Http http) {
-        super(underlyingClient, httpCore, http);
-    }
-
-    /**
-     * [Internal Method]
-     * <p/>
-     * We use this method to create a shallow copy of the client, allowing us to modify certain fields
-     * while implementing a proxy for the Realtime/Rest SDK wrapper
-     */
-    public AblyRest createShallowCopy(HttpCore httpCore, Http http) {
-        return new AblyRest(this, httpCore, http);
-    }
 }

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

@@ -85,16 +85,6 @@ public void onConnectionStateChanged(ConnectionStateListener.ConnectionStateChan
         if(options.autoConnect) connection.connect();
     }
 
-    /**
-     * Constructor implementation to be able to have shallow copy of the client,
-     * allowing us to modify certain fields while implementing a proxy for the Realtime/Rest SDK wrapper
-     */
-    AblyRealtime(AblyRealtime underlyingClient, HttpCore httpCore, Http http) {
-        super(underlyingClient, httpCore, http);
-        this.channels = underlyingClient.channels;
-        this.connection = underlyingClient.connection;
-    }
-
     /**
      * Calls {@link Connection#connect} and causes the connection to open,
      * entering the connecting state. Explicitly calling connect() is unnecessary
@@ -130,16 +120,6 @@ public void close() {
         connection.close();
     }
 
-    /**
-     * [Internal Method]
-     * <p/>
-     * We use this method to create a shallow copy of the client, allowing us to modify certain fields
-     * while implementing a proxy for the Realtime/Rest SDK wrapper
-     */
-    public AblyRealtime createShallowCopy(HttpCore httpCore, Http http) {
-        return new AblyRealtime(this, httpCore, http);
-    }
-
     /**
      * Authentication token has changed.
      */

lib/src/main/java/io/ably/lib/rest/AblyBase.java

@@ -114,20 +114,6 @@ public AblyBase(ClientOptions options, PlatformAgentProvider platformAgentProvid
         push = new Push(this);
     }
 
-    /**
-     * We use empty constructor to be able to create proxy implementation of Realtime and Rest client
-     */
-    protected AblyBase(AblyBase underlyingClient, HttpCore httpCore, Http http) {
-        this.options = underlyingClient.options;
-        this.auth = underlyingClient.auth;
-        this.httpCore = httpCore;
-        this.http = http;
-        this.platform = underlyingClient.platform;
-        this.push = underlyingClient.push;
-        this.channels = underlyingClient.channels;
-        this.platformAgentProvider = underlyingClient.platformAgentProvider;
-    }
-
     /**
      * Causes the connection to close, entering the [{@link io.ably.lib.realtime.ConnectionState#closing} state.
      * Once closed, the library does not attempt to re-establish the connection without an explicit call to
@@ -193,7 +179,11 @@ public void release(String channelName) {
      * @throws AblyException
      */
     public long time() throws AblyException {
-        return timeImpl().sync().longValue();
+        return time(http);
+    }
+
+    long time(Http http) throws AblyException {
+        return timeImpl(http).sync();
     }
 
     /**
@@ -210,10 +200,14 @@ public long time() throws AblyException {
      * This callback is invoked on a background thread
      */
     public void timeAsync(Callback<Long> callback) {
-        timeImpl().async(callback);
+        timeAsync(http, callback);
+    }
+
+    void timeAsync(Http http, Callback<Long> callback) {
+        timeImpl(http).async(callback);
     }
 
-    private Http.Request<Long> timeImpl() {
+    private Http.Request<Long> timeImpl(Http http) {
         final Param[] params = this.options.addRequestIds ? Param.array(Crypto.generateRandomRequestId()) : null; // RSC7c
         return http.request(new Http.Execute<Long>() {
             @Override
@@ -251,7 +245,11 @@ public Long handleResponse(HttpCore.Response response, ErrorInfo error) throws A
      * @throws AblyException
      */
     public PaginatedResult<Stats> stats(Param[] params) throws AblyException {
-        return new PaginatedQuery<Stats>(http, "/stats", HttpUtils.defaultAcceptHeaders(false), params, StatsReader.statsResponseHandler).get();
+        return stats(http, params);
+    }
+
+    PaginatedResult<Stats> stats(Http http, Param[] params) throws AblyException {
+        return new PaginatedQuery<>(http, "/stats", HttpUtils.defaultAcceptHeaders(false), params, StatsReader.statsResponseHandler).get();
     }
 
     /**
@@ -275,6 +273,10 @@ public PaginatedResult<Stats> stats(Param[] params) throws AblyException {
      * This callback is invoked on a background thread
      */
     public void statsAsync(Param[] params, Callback<AsyncPaginatedResult<Stats>> callback)  {
+        statsAsync(http, params, callback);
+    }
+
+    void statsAsync(Http http, Param[] params, Callback<AsyncPaginatedResult<Stats>> callback)  {
         (new AsyncPaginatedQuery<Stats>(http, "/stats", HttpUtils.defaultAcceptHeaders(false), params, StatsReader.statsResponseHandler)).get(callback);
     }
 
@@ -298,6 +300,10 @@ public void statsAsync(Param[] params, Callback<AsyncPaginatedResult<Stats>> cal
      * @throws AblyException if it was not possible to complete the request, or an error response was received
      */
     public HttpPaginatedResponse request(String method, String path, Param[] params, HttpCore.RequestBody body, Param[] headers) throws AblyException {
+        return request(http, method, path, params, body, headers);
+    }
+
+    HttpPaginatedResponse request(Http http, String method, String path, Param[] params, HttpCore.RequestBody body, Param[] headers) throws AblyException {
         headers = HttpUtils.mergeHeaders(HttpUtils.defaultAcceptHeaders(false), headers);
         return new HttpPaginatedQuery(http, method, path, headers, params, body).exec();
     }
@@ -325,6 +331,10 @@ public HttpPaginatedResponse request(String method, String path, Param[] params,
      * This callback is invoked on a background thread
      */
     public void requestAsync(String method, String path, Param[] params, HttpCore.RequestBody body, Param[] headers, final AsyncHttpPaginatedResponse.Callback callback)  {
+        requestAsync(http, method, path, params, body, headers, callback);
+    }
+
+    void requestAsync(Http http, String method, String path, Param[] params, HttpCore.RequestBody body, Param[] headers, final AsyncHttpPaginatedResponse.Callback callback)  {
         headers = HttpUtils.mergeHeaders(HttpUtils.defaultAcceptHeaders(false), headers);
         (new AsyncHttpPaginatedQuery(http, method, path, headers, params, body)).exec(callback);
     }

pubsub-adapter/src/main/kotlin/io/ably/lib/realtime/RealtimeClientAdapter.kt

@@ -70,7 +70,6 @@ internal class RealtimeClientAdapter(private val javaClient: AblyRealtime) : Rea
   override fun createWrapperSdkProxy(options: WrapperSdkProxyOptions): RealtimeClient {
     val httpCoreWithAgents = javaClient.httpCore.injectDynamicAgents(options.agents)
     val httpModule = javaClient.http.exchangeHttpCore(httpCoreWithAgents)
-    val javaClientWithInjectedAgents = javaClient.createShallowCopy(httpCoreWithAgents, httpModule)
-    return WrapperRealtimeClient(javaClientWithInjectedAgents, httpModule, options.agents)
+    return WrapperRealtimeClient(javaClient, this, httpModule, options.agents)
   }
 }