Make ConnectionInfoStore non-singleton (#97)

Author: deepanshu42

mqtt-client/src/main/java/com/gojek/mqtt/client/connectioninfo/ConnectionInfoStore.kt

@@ -1,6 +1,6 @@
 package com.gojek.mqtt.client.connectioninfo
 
-internal object ConnectionInfoStore {
+internal class ConnectionInfoStore {
     @Volatile
     private var state: State = State.UninitialisedState
 

mqtt-client/src/main/java/com/gojek/mqtt/client/event/interceptor/ConnectionInfoInterceptor.kt

@@ -3,9 +3,11 @@ package com.gojek.mqtt.client.event.interceptor
 import com.gojek.mqtt.client.connectioninfo.ConnectionInfoStore
 import com.gojek.mqtt.event.MqttEvent
 
-internal class ConnectionInfoInterceptor : EventInterceptor {
+internal class ConnectionInfoInterceptor(
+    private val connectionInfoStore: ConnectionInfoStore
+) : EventInterceptor {
     override fun intercept(mqttEvent: MqttEvent): MqttEvent {
-        mqttEvent.connectionInfo = ConnectionInfoStore.getConnectionInfo()
+        mqttEvent.connectionInfo = connectionInfoStore.getConnectionInfo()
         return mqttEvent
     }
 }

mqtt-client/src/main/java/com/gojek/mqtt/client/event/interceptor/MqttEventHandler.kt

@@ -1,5 +1,6 @@
 package com.gojek.mqtt.client.event.interceptor
 
+import com.gojek.mqtt.client.connectioninfo.ConnectionInfoStore
 import com.gojek.mqtt.event.EventHandler
 import com.gojek.mqtt.event.MqttEvent
 import com.gojek.mqtt.utils.MqttUtils
@@ -9,7 +10,8 @@ import java.util.concurrent.ThreadPoolExecutor
 import java.util.concurrent.TimeUnit.SECONDS
 
 internal class MqttEventHandler(
-    mqttUtils: MqttUtils
+    mqttUtils: MqttUtils,
+    connectionInfoStore: ConnectionInfoStore
 ) : EventHandler {
 
     private val eventScheduler = ThreadPoolExecutor(
@@ -24,7 +26,7 @@ internal class MqttEventHandler(
     private val eventHandlers = CopyOnWriteArrayList<EventHandler>()
 
     init {
-        interceptorList.add(ConnectionInfoInterceptor())
+        interceptorList.add(ConnectionInfoInterceptor(connectionInfoStore))
     }
 
     override fun onEvent(mqttEvent: MqttEvent) {

mqtt-client/src/main/java/com/gojek/mqtt/client/factory/IAndroidMqttClientFactory.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import com.gojek.courier.logging.NoOpLogger
 import com.gojek.keepalive.KeepAliveFailureHandler
 import com.gojek.mqtt.client.config.v3.MqttV3Configuration
+import com.gojek.mqtt.client.connectioninfo.ConnectionInfoStore
 import com.gojek.mqtt.client.internal.KeepAliveProvider
 import com.gojek.mqtt.client.v3.IAndroidMqttClient
 import com.gojek.mqtt.client.v3.impl.AndroidMqttClient
@@ -21,7 +22,8 @@ internal interface IAndroidMqttClientFactory {
         keepAliveProvider: KeepAliveProvider,
         keepAliveFailureHandler: KeepAliveFailureHandler,
         eventHandler: EventHandler,
-        pingEventHandler: IPingSenderEvents
+        pingEventHandler: IPingSenderEvents,
+        connectionInfoStore: ConnectionInfoStore
     ): IAndroidMqttClient
     fun createAdaptiveAndroidMqttClient(
         pingSender: MqttPingSender,
@@ -30,7 +32,8 @@ internal interface IAndroidMqttClientFactory {
         networkStateTracker: NetworkStateTracker,
         keepAliveProvider: KeepAliveProvider,
         keepAliveFailureHandler: KeepAliveFailureHandler,
-        pingEventHandler: IPingSenderEvents
+        pingEventHandler: IPingSenderEvents,
+        connectionInfoStore: ConnectionInfoStore
     ): IAndroidMqttClient
 }
 
@@ -42,7 +45,8 @@ internal class AndroidMqttClientFactory : IAndroidMqttClientFactory {
         keepAliveProvider: KeepAliveProvider,
         keepAliveFailureHandler: KeepAliveFailureHandler,
         eventHandler: EventHandler,
-        pingEventHandler: IPingSenderEvents
+        pingEventHandler: IPingSenderEvents,
+        connectionInfoStore: ConnectionInfoStore
     ): IAndroidMqttClient {
         val pingSender = mqttConfiguration.pingSender
         pingSender.setPingEventHandler(pingEventHandler)
@@ -53,7 +57,8 @@ internal class AndroidMqttClientFactory : IAndroidMqttClientFactory {
             mqttPingSender = pingSender,
             keepAliveProvider = keepAliveProvider,
             keepAliveFailureHandler = keepAliveFailureHandler,
-            eventHandler = eventHandler
+            eventHandler = eventHandler,
+            connectionInfoStore = connectionInfoStore
         )
     }
 
@@ -64,7 +69,8 @@ internal class AndroidMqttClientFactory : IAndroidMqttClientFactory {
         networkStateTracker: NetworkStateTracker,
         keepAliveProvider: KeepAliveProvider,
         keepAliveFailureHandler: KeepAliveFailureHandler,
-        pingEventHandler: IPingSenderEvents
+        pingEventHandler: IPingSenderEvents,
+        connectionInfoStore: ConnectionInfoStore
     ): IAndroidMqttClient {
         pingSender.setPingEventHandler(pingEventHandler)
         return AndroidMqttClient(
@@ -77,7 +83,8 @@ internal class AndroidMqttClientFactory : IAndroidMqttClientFactory {
             isAdaptiveKAConnection = true,
             keepAliveProvider = keepAliveProvider,
             keepAliveFailureHandler = keepAliveFailureHandler,
-            eventHandler = NoOpEventHandler()
+            eventHandler = NoOpEventHandler(),
+            connectionInfoStore = connectionInfoStore
         )
     }
 }

mqtt-client/src/main/java/com/gojek/mqtt/client/internal/MqttClientInternal.kt

@@ -10,6 +10,7 @@ import com.gojek.keepalive.OptimalKeepAliveObserver
 import com.gojek.keepalive.OptimalKeepAliveProvider
 import com.gojek.keepalive.config.AdaptiveKeepAliveConfig as AdaptiveKAConfig
 import com.gojek.mqtt.client.config.v3.MqttV3Configuration
+import com.gojek.mqtt.client.connectioninfo.ConnectionInfoStore
 import com.gojek.mqtt.client.event.interceptor.MqttEventHandler
 import com.gojek.mqtt.client.factory.getAndroidMqttClientFactory
 import com.gojek.mqtt.client.listener.MessageListener
@@ -43,7 +44,9 @@ internal class MqttClientInternal(
     private var keepAliveProvider: KeepAliveProvider = NonAdaptiveKeepAliveProvider()
     private var keepAliveFailureHandler: KeepAliveFailureHandler = NoOpKeepAliveFailureHandler()
 
-    private val eventHandler = MqttEventHandler(MqttUtils())
+    private val connectionInfoStore = ConnectionInfoStore()
+
+    private val eventHandler = MqttEventHandler(MqttUtils(), connectionInfoStore)
 
     private val optimalKeepAliveObserver = object : OptimalKeepAliveObserver {
         override fun onOptimalKeepAliveFound(
@@ -72,7 +75,8 @@ internal class MqttClientInternal(
             keepAliveProvider = keepAliveProvider,
             keepAliveFailureHandler = keepAliveFailureHandler,
             eventHandler = eventHandler,
-            pingEventHandler = PingEventHandler(eventHandler)
+            pingEventHandler = PingEventHandler(eventHandler),
+            connectionInfoStore = connectionInfoStore
         )
     }
 
@@ -145,7 +149,8 @@ internal class MqttClientInternal(
                                     adaptiveKeepAliveConfig.upperBoundMinutes * 60
                                 ),
                                 keepAliveFailureHandler = NoOpKeepAliveFailureHandler(),
-                                pingEventHandler = AdaptivePingEventHandler(eventHandler)
+                                pingEventHandler = AdaptivePingEventHandler(eventHandler),
+                                connectionInfoStore = connectionInfoStore
                             )
                     }
                 }

mqtt-client/src/main/java/com/gojek/mqtt/client/v3/impl/AndroidMqttClient.kt

@@ -84,7 +84,8 @@ internal class AndroidMqttClient(
     private val isAdaptiveKAConnection: Boolean = false,
     private val keepAliveProvider: KeepAliveProvider,
     private val eventHandler: EventHandler,
-    keepAliveFailureHandler: KeepAliveFailureHandler
+    keepAliveFailureHandler: KeepAliveFailureHandler,
+    private val connectionInfoStore: ConnectionInfoStore
 ) : IAndroidMqttClient, IClientSchedulerBridge {
 
     private val runnableScheduler: IRunnableScheduler
@@ -516,7 +517,7 @@ internal class AndroidMqttClient(
         }
 
         if (isAdaptiveKAConnection.not()) {
-            ConnectionInfoStore.updateConnectionInfo(
+            connectionInfoStore.updateConnectionInfo(
                 ConnectionInfo(
                     clientId = mqttConnectOptions.clientId,
                     username = mqttConnectOptions.username,