More code clean up and removing tubesock package

Author: hiranya911

src/main/java/com/google/firebase/database/FirebaseDatabase.java

@@ -33,6 +33,8 @@
 import com.google.firebase.internal.FirebaseService;
 
 import com.google.firebase.internal.SdkUtils;
+import io.netty.util.concurrent.FastThreadLocal;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -358,12 +360,8 @@ void destroy() {
       if (destroyed.get()) {
         return;
       }
-
-      if (repo != null) {
-        RepoManager.interrupt(repo);
-        repo = null;
-      }
-      RepoManager.interrupt(getConfig());
+      RepoManager.destroy(getConfig());
+      FastThreadLocal.removeAll();
       destroyed.compareAndSet(false, true);
     }
   }

src/main/java/com/google/firebase/database/connection/ConnectionContext.java

@@ -17,9 +17,9 @@
 package com.google.firebase.database.connection;
 
 import com.google.firebase.database.logging.Logger;
-import com.google.firebase.database.tubesock.ThreadConfig;
 
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
 
 public class ConnectionContext {
 
@@ -29,7 +29,7 @@ public class ConnectionContext {
   private final boolean persistenceEnabled;
   private final String clientSdkVersion;
   private final String userAgent;
-  private final ThreadConfig threadConfig;
+  private final ThreadFactory threadFactory;
 
   public ConnectionContext(
       Logger logger,
@@ -38,14 +38,14 @@ public ConnectionContext(
       boolean persistenceEnabled,
       String clientSdkVersion,
       String userAgent,
-      ThreadConfig threadConfig) {
+      ThreadFactory threadFactory) {
     this.logger = logger;
     this.authTokenProvider = authTokenProvider;
     this.executorService = executorService;
     this.persistenceEnabled = persistenceEnabled;
     this.clientSdkVersion = clientSdkVersion;
     this.userAgent = userAgent;
-    this.threadConfig = threadConfig;
+    this.threadFactory = threadFactory;
   }
 
   public Logger getLogger() {
@@ -72,7 +72,7 @@ public String getUserAgent() {
     return this.userAgent;
   }
 
-  public ThreadConfig getThreadConfig() {
-    return threadConfig;
+  public ThreadFactory getThreadFactory() {
+    return threadFactory;
   }
 }

src/main/java/com/google/firebase/database/connection/PersistentConnectionImpl.java

@@ -284,6 +284,11 @@ public void onDisconnect(Connection.DisconnectReason reason) {
     this.realtime = null;
     this.hasOnDisconnects = false;
     requestCBHash.clear();
+    if (inactivityTimer != null) {
+      logger.debug("cancelling idle time checker");
+      inactivityTimer.cancel(false);
+      inactivityTimer = null;
+    }
     cancelSentTransactions();
     if (shouldReconnect()) {
       long timeSinceLastConnectSucceeded =

src/main/java/com/google/firebase/database/connection/WebsocketConnection.java

@@ -98,7 +98,7 @@ public void start() {
     // No-op in java
   }
 
-  public void close() {
+  void close() {
     if (logger.logsDebug()) {
       logger.debug("websocket is being closed");
     }
@@ -111,6 +111,7 @@ public void close() {
     }
     if (keepAlive != null) {
       keepAlive.cancel(true);
+      keepAlive = null;
     }
   }
 
@@ -304,13 +305,15 @@ public void onClose() {
       if (logger.logsDebug()) {
         logger.debug("closed");
       }
-      executorService.execute(
-          new Runnable() {
-            @Override
-            public void run() {
-              onClosed();
-            }
-          });
+      if (!isClosed) {
+        executorService.execute(
+            new Runnable() {
+              @Override
+              public void run() {
+                onClosed();
+              }
+            });
+      }
     }
 
     @Override

src/main/java/com/google/firebase/database/core/Context.java

@@ -28,7 +28,6 @@
 import com.google.firebase.database.core.persistence.PersistenceManager;
 import com.google.firebase.database.logging.LogWrapper;
 import com.google.firebase.database.logging.Logger;
-import com.google.firebase.database.tubesock.ThreadConfig;
 import com.google.firebase.database.utilities.DefaultRunLoop;
 
 import java.util.List;
@@ -39,17 +38,18 @@ public class Context {
   private static final long DEFAULT_CACHE_SIZE = 10 * 1024 * 1024;
 
   protected Logger logger;
-  protected EventTarget eventTarget;
-  protected AuthTokenProvider authTokenProvider;
-  protected RunLoop runLoop;
-  protected String persistenceKey;
-  protected List<String> loggedComponents;
-  protected String userAgent;
-  protected Logger.Level logLevel = Logger.Level.INFO;
-  protected boolean persistenceEnabled;
-  protected long cacheSize = DEFAULT_CACHE_SIZE;
-  protected FirebaseApp firebaseApp;
-  private PersistenceManager forcedPersistenceManager;
+
+  EventTarget eventTarget;
+  AuthTokenProvider authTokenProvider;
+  RunLoop runLoop;
+  String persistenceKey;
+  List<String> loggedComponents;
+  Logger.Level logLevel = Logger.Level.INFO;
+  boolean persistenceEnabled;
+  long cacheSize = DEFAULT_CACHE_SIZE;
+  FirebaseApp firebaseApp;
+
+  private String userAgent;
   private boolean frozen = false;
   private boolean stopped = false;
 
@@ -88,10 +88,6 @@ private Platform getPlatform() {
     return platform;
   }
 
-  public boolean isFrozen() {
-    return frozen;
-  }
-
   public boolean isStopped() {
     return stopped;
   }
@@ -103,7 +99,7 @@ synchronized void freeze() {
     }
   }
 
-  public void requireStarted() {
+  void requireStarted() {
     if (stopped) {
       restartServices();
       stopped = false;
@@ -130,12 +126,16 @@ private void restartServices() {
 
   void stop() {
     stopped = true;
-    eventTarget.shutdown();
-    runLoop.shutdown();
+    if (eventTarget != null) {
+      eventTarget.shutdown();
+    }
+    if (runLoop != null) {
+      runLoop.shutdown();
+    }
   }
 
-  protected void assertUnfrozen() {
-    if (isFrozen()) {
+  void assertUnfrozen() {
+    if (frozen) {
       throw new DatabaseException(
           "Modifications to DatabaseConfig objects must occur before they are in use");
     }
@@ -153,27 +153,19 @@ public LogWrapper getLogger(Class component, String prefix) {
     return new LogWrapper(logger, component, prefix);
   }
 
-  private ThreadConfig getThreadConfig() {
-    return new ThreadConfig(ImplFirebaseTrampolines.getThreadFactory(firebaseApp),
-        getPlatform().getThreadInitializer());
-  }
-
-  public ConnectionContext getConnectionContext() {
+  ConnectionContext getConnectionContext() {
     return new ConnectionContext(
         this.logger,
         wrapAuthTokenProvider(this.getAuthTokenProvider()),
         this.getExecutorService(),
         this.isPersistenceEnabled(),
         FirebaseDatabase.getSdkVersion(),
         this.getUserAgent(),
-        this.getThreadConfig());
+        ImplFirebaseTrampolines.getThreadFactory(firebaseApp));
   }
 
   PersistenceManager getPersistenceManager(String firebaseId) {
     // TODO[persistence]: Create this once and store it.
-    if (forcedPersistenceManager != null) {
-      return forcedPersistenceManager;
-    }
     if (this.persistenceEnabled) {
       PersistenceManager cache = platform.createPersistenceManager(this, firebaseId);
       if (cache == null) {
@@ -187,19 +179,14 @@ PersistenceManager getPersistenceManager(String firebaseId) {
     }
   }
 
-  public boolean isPersistenceEnabled() {
+  boolean isPersistenceEnabled() {
     return this.persistenceEnabled;
   }
 
   public long getPersistenceCacheSizeBytes() {
     return this.cacheSize;
   }
 
-  // For testing
-  void forcePersistenceManager(PersistenceManager persistenceManager) {
-    this.forcedPersistenceManager = persistenceManager;
-  }
-
   public EventTarget getEventTarget() {
     return eventTarget;
   }
@@ -208,23 +195,15 @@ public RunLoop getRunLoop() {
     return runLoop;
   }
 
-  public String getUserAgent() {
+  String getUserAgent() {
     return userAgent;
   }
 
-  public String getPlatformVersion() {
-    return getPlatform().getPlatformVersion();
-  }
-
-  public String getSessionPersistenceKey() {
-    return this.persistenceKey;
-  }
-
   public AuthTokenProvider getAuthTokenProvider() {
     return this.authTokenProvider;
   }
 
-  public PersistentConnection newPersistentConnection(
+  PersistentConnection newPersistentConnection(
       HostInfo info, PersistentConnection.Delegate delegate) {
     return getPlatform().newPersistentConnection(this, this.getConnectionContext(), info, delegate);
   }

src/main/java/com/google/firebase/database/core/RepoManager.java

@@ -49,6 +49,14 @@ public static Repo createRepo(Context ctx, RepoInfo info, FirebaseDatabase datab
     return instance.createLocalRepo(ctx, info, database);
   }
 
+  public static void destroy(Context ctx) {
+    try {
+      instance.destroyInternal(ctx);
+    } finally {
+      ctx.stop();
+    }
+  }
+
   public static void interrupt(Context ctx) {
     instance.interruptInternal(ctx);
   }
@@ -134,6 +142,16 @@ public void run() {
     }
   }
 
+  private void destroyInternal(final Context ctx) {
+    synchronized (repos) {
+      if (repos.containsKey(ctx)) {
+        for (Repo repo : repos.get(ctx).values()) {
+          repo.interrupt();
+        }
+      }
+    }
+  }
+
   private void resumeInternal(final Context ctx) {
     RunLoop runLoop = ctx.getRunLoop();
     if (runLoop != null) {