WebSocket Implementation Based on Netty

pom.xml

@@ -347,7 +347,12 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
-            <version>1.2.1</version>
+            <version>1.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-firestore</artifactId>
+            <version>0.25.0-beta</version>
         </dependency>
 
         <!-- Utilities -->
@@ -367,7 +372,7 @@
             <version>1.7.25</version>
         </dependency>
 
-        <!-- Test dependencies -->
+        <!-- Test Dependencies -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

src/main/java/com/google/firebase/FirebaseOptions.java

@@ -97,6 +97,11 @@ public Map<String, Object> getDatabaseAuthVariableOverride() {
     return databaseAuthVariableOverride;
   }
 
+  /**
+   * Returns the Google Cloud project ID.
+   *
+   * @return The project ID set via {@link Builder#setProjectId(String)}
+   */
   public String getProjectId() {
     return projectId;
   }
@@ -251,7 +256,13 @@ public Builder setDatabaseAuthVariableOverride(
       return this;
     }
 
-    public Builder setProjectId(String projectId) {
+    /**
+     * Sets the Google Cloud project ID that should be associated with an app.
+     *
+     * @param projectId A non-null, non-empty project ID string.
+     * @return This <code>Builder</code> instance is returned so subsequent calls can be chained.
+     */
+    public Builder setProjectId(@NonNull String projectId) {
       checkArgument(!Strings.isNullOrEmpty(projectId), "Project ID must not be null or empty");
       this.projectId = projectId;
       return this;

src/main/java/com/google/firebase/auth/internal/BaseCredential.java

@@ -46,7 +46,11 @@ public abstract class BaseCredential implements FirebaseCredential {
           "https://www.googleapis.com/auth/identitytoolkit",
 
           // Enables access to Google Cloud Storage.
-          "https://www.googleapis.com/auth/devstorage.full_control");
+          "https://www.googleapis.com/auth/devstorage.full_control",
+
+          // Enables access to Google Cloud Firestore
+          "https://www.googleapis.com/auth/cloud-platform",
+          "https://www.googleapis.com/auth/datastore");
 
   private final GoogleCredentials googleCredentials;
 

src/main/java/com/google/firebase/cloud/FirestoreClient.java

@@ -0,0 +1,91 @@
+package com.google.firebase.cloud;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.cloud.firestore.Firestore;
+import com.google.cloud.firestore.FirestoreOptions;
+import com.google.common.base.Strings;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.ImplFirebaseTrampolines;
+import com.google.firebase.internal.FirebaseService;
+import com.google.firebase.internal.NonNull;
+
+/**
+ * FirestoreClient provides access to Google Cloud Firestore. Use this API to obtain a
+ * <code>com.google.cloud.firestore.Firestore</code> instance, which provides methods for
+ * updating and querying data in Firestore.
+ *
+ * <p>A Google Cloud project ID is required to access Firestore. FirestoreClient determines the
+ * project ID from the {@link com.google.firebase.FirebaseOptions} used to initialize the underlying
+ * {@link FirebaseApp}. If that is not available, it examines the credentials used to initialize
+ * the app. Finally it attempts to get the project ID by looking up the GCLOUD_PROJECT environment
+ * variable. If a project ID cannot be determined by any of these methods, this API will throw
+ * a runtime exception.
+ */
+public class FirestoreClient {
+
+  private final Firestore firestore;
+
+  private FirestoreClient(FirebaseApp app) {
+    checkNotNull(app, "FirebaseApp must not be null");
+    String projectId = ImplFirebaseTrampolines.getProjectId(app);
+    checkArgument(!Strings.isNullOrEmpty(projectId),
+        "Project ID is required for accessing Firestore. Use a service account credential or "
+            + "set the project ID explicitly via FirebaseOptions. Alternatively you can also "
+            + "set the project ID via the GCLOUD_PROJECT environment variable.");
+    this.firestore = FirestoreOptions.newBuilder()
+        .setCredentials(ImplFirebaseTrampolines.getCredentials(app))
+        .setProjectId(projectId)
+        .build()
+        .getService();
+  }
+
+  /**
+   * Returns the Firestore instance associated with the default Firebase app.
+   *
+   * @return A non-null <code>com.google.cloud.firestore.Firestore</code> instance.
+   */
+  @NonNull
+  public static Firestore getFirestore() {
+    return getFirestore(FirebaseApp.getInstance());
+  }
+
+  /**
+   * Returns the Firestore instance associated with the specified Firebase app.
+   *
+   * @param app A non-null {@link FirebaseApp}.
+   * @return A non-null <code>com.google.cloud.firestore.Firestore</code> instance.
+   */
+  @NonNull
+  public static Firestore getFirestore(FirebaseApp app) {
+    return getInstance(app).firestore;
+  }
+
+  private static synchronized FirestoreClient getInstance(FirebaseApp app) {
+    FirestoreClientService service = ImplFirebaseTrampolines.getService(app,
+        SERVICE_ID, FirestoreClientService.class);
+    if (service == null) {
+      service = ImplFirebaseTrampolines.addService(app, new FirestoreClientService(app));
+    }
+    return service.getInstance();
+  }
+
+  private static final String SERVICE_ID = FirestoreClient.class.getName();
+
+  private static class FirestoreClientService extends FirebaseService<FirestoreClient> {
+
+    FirestoreClientService(FirebaseApp app) {
+      super(SERVICE_ID, new FirestoreClient(app));
+    }
+
+    @Override
+    public void destroy() {
+      // NOTE: We don't explicitly tear down anything here (for now). User won't be able to call
+      // FirestoreClient.getFirestore() any more, but already created Firestore instances will
+      // continue to work. Request Firestore team to provide a cleanup/teardown method on the
+      // Firestore object.
+    }
+  }
+
+}

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;
   }
 }