firebase · hiranya911 · Apr 17, 2017 · Apr 6, 2017 · Apr 6, 2017 · Apr 6, 2017
diff --git a/src/main/java/com/google/firebase/FirebaseApp.java b/src/main/java/com/google/firebase/FirebaseApp.java
@@ -1,10 +1,15 @@
 package com.google.firebase;
 
-import static com.google.firebase.internal.Base64Utils.encodeUrlSafeNoPadding;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
+import com.google.common.io.BaseEncoding;
 import com.google.firebase.internal.AuthStateListener;
 import com.google.firebase.internal.FirebaseAppStore;
 import com.google.firebase.internal.FirebaseExecutors;
@@ -13,8 +18,6 @@
 import com.google.firebase.internal.Joiner;
 import com.google.firebase.internal.NonNull;
 import com.google.firebase.internal.Nullable;
-import com.google.firebase.internal.Objects;
-import com.google.firebase.internal.Preconditions;
 import com.google.firebase.tasks.Continuation;
 import com.google.firebase.tasks.Task;
 
@@ -69,9 +72,10 @@ public class FirebaseApp {
 
   /** Default constructor. */
   private FirebaseApp(String name, FirebaseOptions options, TokenRefresher.Factory factory) {
-    this.name = Preconditions.checkNotEmpty(name);
-    this.options = Preconditions.checkNotNull(options);
-    tokenRefresher = Preconditions.checkNotNull(factory).create(this);
+    checkArgument(!Strings.isNullOrEmpty(name));
+    this.name = name;
+    this.options = checkNotNull(options);
+    tokenRefresher = checkNotNull(factory).create(this);
   }
 
   /** Returns a mutable list of all FirebaseApps. */
@@ -177,7 +181,7 @@ static void clearInstancesForTest() {
    * the app has been deleted.
    */
   static String getPersistenceKey(String name, FirebaseOptions options) {
-    return encodeUrlSafeNoPadding(name.getBytes(UTF_8));
+    return BaseEncoding.base64Url().omitPadding().encode(name.getBytes(UTF_8));
   }
 
   /** Use this key to store data per FirebaseApp. */
@@ -203,7 +207,7 @@ private static List<String> getAllAppNames() {
 
   /** Normalizes the app name. */
   private static String normalize(@NonNull String name) {
-    return name.trim();
+    return checkNotNull(name).trim();
   }
 
   /** Returns the unique name of this app. */
@@ -237,7 +241,7 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this).add("name", name).add("options", options).toString();
+    return MoreObjects.toStringHelper(this).add("name", name).add("options", options).toString();
   }
 
   /**
@@ -321,19 +325,17 @@ boolean isDefaultApp() {
   // initialized using reflection when an app is deleted (for v5).
   void addLifecycleEventListener(@NonNull FirebaseAppLifecycleListener listener) {
     checkNotDeleted();
-    Preconditions.checkNotNull(listener);
-    lifecycleListeners.add(listener);
+    lifecycleListeners.add(checkNotNull(listener));
   }
 
   void removeLifecycleEventListener(@NonNull FirebaseAppLifecycleListener listener) {
     checkNotDeleted();
-    Preconditions.checkNotNull(listener);
-    lifecycleListeners.remove(listener);
+    lifecycleListeners.remove(checkNotNull(listener));
   }
 
   void addAuthStateListener(@NonNull final AuthStateListener listener) {
     checkNotDeleted();
-    Preconditions.checkNotNull(listener);
+    checkNotNull(listener);
 
     GetTokenResult currentToken;
     synchronized (authStateListeners) {
@@ -350,7 +352,7 @@ void addAuthStateListener(@NonNull final AuthStateListener listener) {
 
   void removeAuthStateListener(@NonNull AuthStateListener listener) {
     checkNotDeleted();
-    Preconditions.checkNotNull(listener);
+    checkNotNull(listener);
     synchronized (authStateListeners) {
       authStateListeners.remove(listener);
     }
@@ -371,7 +373,7 @@ static class TokenRefresher {
     private ScheduledFuture<Task<GetTokenResult>> future;
 
     TokenRefresher(FirebaseApp app) {
-      this.firebaseApp = Preconditions.checkNotNull(app);
+      this.firebaseApp = checkNotNull(app);
     }
 
     /**

diff --git a/src/main/java/com/google/firebase/FirebaseException.java b/src/main/java/com/google/firebase/FirebaseException.java
@@ -1,7 +1,9 @@
 package com.google.firebase;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.google.common.base.Strings;
 import com.google.firebase.internal.NonNull;
-import com.google.firebase.internal.Preconditions;
 
 /** Base class for all Firebase exceptions. */
 public class FirebaseException extends Exception {
@@ -11,10 +13,12 @@ public class FirebaseException extends Exception {
   protected FirebaseException() {}
 
   public FirebaseException(@NonNull String detailMessage) {
-    super(Preconditions.checkNotEmpty(detailMessage, "Detail message must not be empty"));
+    super(detailMessage);
+    checkArgument(!Strings.isNullOrEmpty(detailMessage), "Detail message must not be empty");
   }
 
   public FirebaseException(@NonNull String detailMessage, Throwable cause) {
-    super(Preconditions.checkNotEmpty(detailMessage, "Detail message must not be empty"), cause);
+    super(detailMessage, cause);
+    checkArgument(!Strings.isNullOrEmpty(detailMessage), "Detail message must not be empty");
   }
 }
diff --git a/src/main/java/com/google/firebase/FirebaseOptions.java b/src/main/java/com/google/firebase/FirebaseOptions.java
@@ -1,11 +1,13 @@
 package com.google.firebase;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
 import com.google.firebase.auth.FirebaseCredential;
 import com.google.firebase.auth.FirebaseCredentials;
 import com.google.firebase.internal.NonNull;
 import com.google.firebase.internal.Nullable;
-import com.google.firebase.internal.Objects;
-import com.google.firebase.internal.Preconditions;
 
 import java.io.InputStream;
 import java.util.HashMap;
@@ -24,10 +26,9 @@ private FirebaseOptions(
       @Nullable String databaseUrl,
       @NonNull FirebaseCredential firebaseCredential,
       @Nullable Map<String, Object> databaseAuthVariableOverride) {
-    Preconditions.checkArgument(firebaseCredential != null, "Service Account must be provided.");
 
     this.databaseUrl = databaseUrl;
-    this.firebaseCredential = firebaseCredential;
+    this.firebaseCredential = checkNotNull(firebaseCredential, "Service Account must be provided.");
     this.databaseAuthVariableOverride = databaseAuthVariableOverride;
   }
 
@@ -72,7 +73,7 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
         .add("databaseUrl", databaseUrl)
         .add("credential", firebaseCredential)
         .add("databaseAuthVariableOverride", databaseAuthVariableOverride)
@@ -148,8 +149,7 @@ public Builder setServiceAccount(@NonNull InputStream stream) {
      * @return This <code>Builder</code> instance is returned so subsequent calls can be chained.
      */
     public Builder setCredential(@NonNull FirebaseCredential credential) {
-      Preconditions.checkArgument(credential != null);
-      firebaseCredential = credential;
+      firebaseCredential = checkNotNull(credential);
       return this;
     }
 

diff --git a/src/main/java/com/google/firebase/auth/FirebaseAuthException.java b/src/main/java/com/google/firebase/auth/FirebaseAuthException.java
@@ -6,9 +6,11 @@
 // TODO(rahulrav/isachen): Decide if changing this not enforcing an error code. Need to align
 // with the decision in http://b/27677218. Also, need to turn this into abstract later.
 
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.google.common.base.Strings;
 import com.google.firebase.FirebaseException;
 import com.google.firebase.internal.NonNull;
-import com.google.firebase.internal.Preconditions;
 
 /**
  * Generic exception related to Firebase Authentication. Check the error code and message for more
@@ -20,7 +22,8 @@ public class FirebaseAuthException extends FirebaseException {
 
   public FirebaseAuthException(@NonNull String errorCode, @NonNull String detailMessage) {
     super(detailMessage);
-    this.errorCode = Preconditions.checkNotEmpty(errorCode);
+    checkArgument(!Strings.isNullOrEmpty(errorCode));
+    this.errorCode = errorCode;
   }
 
   /** Returns an error code that may provide more information about the error. */

diff --git a/src/main/java/com/google/firebase/auth/FirebaseCredentials.java b/src/main/java/com/google/firebase/auth/FirebaseCredentials.java
@@ -1,6 +1,6 @@
 package com.google.firebase.auth;
 
-import static com.google.firebase.internal.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.api.client.googleapis.util.Utils;
@@ -87,9 +87,8 @@ static FirebaseCredential applicationDefault(HttpTransport transport, JsonFactor
    */
   @NonNull
   public static FirebaseCredential fromCertificate(InputStream serviceAccount) {
-    checkNotNull(serviceAccount);
-    return fromCertificate(
-        serviceAccount, Utils.getDefaultTransport(), Utils.getDefaultJsonFactory());
+    return fromCertificate(serviceAccount,
+        Utils.getDefaultTransport(), Utils.getDefaultJsonFactory());
   }
 
   @VisibleForTesting
@@ -112,7 +111,6 @@ static FirebaseCredential fromCertificate(
    */
   @NonNull
   public static FirebaseCredential fromRefreshToken(InputStream refreshToken) {
-    checkNotNull(refreshToken);
     return fromRefreshToken(
         refreshToken, Utils.getDefaultTransport(), Utils.getDefaultJsonFactory());
   }
@@ -232,7 +230,7 @@ static class CertCredential extends BaseCredential {
     CertCredential(InputStream inputStream, HttpTransport transport, JsonFactory jsonFactory) {
       super(transport, jsonFactory);
       try {
-        jsonData = streamToString(inputStream);
+        jsonData = streamToString(checkNotNull(inputStream));
         JSONObject jsonObject = new JSONObject(jsonData);
         projectId = jsonObject.getString("project_id");
       } catch (IOException e) {
@@ -309,7 +307,7 @@ static class RefreshTokenCredential extends BaseCredential {
         InputStream inputStream, HttpTransport transport, JsonFactory jsonFactory) {
       super(transport, jsonFactory);
       try {
-        jsonData = streamToString(inputStream);
+        jsonData = streamToString(checkNotNull(inputStream));
       } catch (IOException e) {
         streamException = new IOException("Failed to read refresh token", e);
       }
@@ -366,12 +364,12 @@ static class FirebaseAccessToken {
 
     FirebaseAccessToken(GoogleCredential credential, Clock clock) {
       checkNotNull(credential, "Google credential is required");
-      checkNotNull(clock, "Clock is required");
+
       token =
           checkNotNull(
               credential.getAccessToken(), "Access token should not be null after refresh.");
       expirationTime = credential.getExpirationTimeMilliseconds();
-      this.clock = clock;
+      this.clock = checkNotNull(clock, "Clock is required");
     }
 
     String getToken() {

diff --git a/src/main/java/com/google/firebase/database/FirebaseDatabase.java b/src/main/java/com/google/firebase/database/FirebaseDatabase.java
@@ -1,5 +1,7 @@
 package com.google.firebase.database;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.ImplFirebaseTrampolines;
@@ -12,7 +14,6 @@
 import com.google.firebase.database.utilities.Utilities;
 import com.google.firebase.database.utilities.Validation;
 
-import com.google.firebase.internal.Preconditions;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
@@ -332,9 +333,8 @@ DatabaseConfig getConfig() {
   private static String loadSdkVersion() {
     try (InputStream in = FirebaseDatabase.class.getClassLoader()
         .getResourceAsStream(ADMIN_SDK_PROPERTIES)) {
-      Preconditions.checkNotNull(in, "Failed to load: " + ADMIN_SDK_PROPERTIES);
       Properties properties = new Properties();
-      properties.load(in);
+      properties.load(checkNotNull(in, "Failed to load: " + ADMIN_SDK_PROPERTIES));
       return properties.getProperty("sdk.version");
     } catch (IOException e) {
       throw new RuntimeException(e);

diff --git a/src/main/java/com/google/firebase/database/core/GaePlatform.java b/src/main/java/com/google/firebase/database/core/GaePlatform.java
@@ -1,5 +1,7 @@
 package com.google.firebase.database.core;
 
+import static com.google.common.base.Preconditions.checkState;
+
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.connection.ConnectionContext;
@@ -13,7 +15,6 @@
 import com.google.firebase.database.tubesock.WebSocket;
 import com.google.firebase.database.utilities.DefaultRunLoop;
 import com.google.firebase.internal.GaeThreadFactory;
-import com.google.firebase.internal.Preconditions;
 import com.google.firebase.internal.RevivingScheduledExecutor;
 
 import java.util.List;
@@ -47,8 +48,7 @@ public Logger newLogger(Context ctx, Logger.Level level, List<String> components
 
   private ThreadFactory getGaeThreadFactory() {
     GaeThreadFactory threadFactory = GaeThreadFactory.getInstance();
-    Preconditions.checkState(
-        threadFactory.isUsingBackgroundThreads(),
+    checkState(threadFactory.isUsingBackgroundThreads(),
         "Failed to initialize a GAE background thread factory");
     return threadFactory;
   }

diff --git a/src/main/java/com/google/firebase/database/core/JvmAuthTokenProvider.java b/src/main/java/com/google/firebase/database/core/JvmAuthTokenProvider.java
@@ -1,6 +1,6 @@
 package com.google.firebase.database.core;
 
-import static com.google.firebase.internal.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.ImplFirebaseTrampolines;

diff --git a/src/main/java/com/google/firebase/database/core/ThreadPoolEventTarget.java b/src/main/java/com/google/firebase/database/core/ThreadPoolEventTarget.java
@@ -1,17 +1,19 @@
 package com.google.firebase.database.core;
 
-import com.google.firebase.internal.Preconditions;
+import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 /** ThreadPoolEventTarget is an event target using a configurable threadpool. */
-class ThreadPoolEventTarget implements EventTarget {
+class ThreadPoolEventTarget implements EventTarget, UncaughtExceptionHandler {
 
   private final ThreadPoolExecutor executor;
+  private UncaughtExceptionHandler exceptionHandler;
 
   public ThreadPoolEventTarget(
       final ThreadFactory wrappedFactory, final ThreadInitializer threadInitializer) {
@@ -25,17 +27,14 @@ public Thread newThread(Runnable r) {
             Thread thread = wrappedFactory.newThread(r);
             threadInitializer.setName(thread, "FirebaseDatabaseEventTarget");
             threadInitializer.setDaemon(thread, true);
-            // TODO: should we set an uncaught exception handler here? Probably want
-            // to let
-            // exceptions happen...
+            threadInitializer.setUncaughtExceptionHandler(thread, ThreadPoolEventTarget.this);
             return thread;
           }
         });
   }
 
   public ThreadPoolEventTarget(final ThreadPoolExecutor executor) {
-    Preconditions.checkNotNull(executor);
-    this.executor = executor;
+    this.executor = checkNotNull(executor);
   }
 
   @Override
@@ -62,4 +61,23 @@ public void shutdown() {
   public void restart() {
     executor.setCorePoolSize(1);
   }
+
+  synchronized UncaughtExceptionHandler getExceptionHandler() {
+    return exceptionHandler;
+  }
+
+  synchronized void setExceptionHandler(UncaughtExceptionHandler exceptionHandler) {
+    this.exceptionHandler = exceptionHandler;
+  }
+
+  @Override
+  public void uncaughtException(Thread t, Throwable e) {
+    UncaughtExceptionHandler delegate;
+    synchronized (this) {
+      delegate = exceptionHandler;
+    }
+    if (delegate != null) {
+      delegate.uncaughtException(t, e);
+    }
+  }
 }