Merge branch 'master' into smokeTestFix

Author: ashwinraghav

README.md

@@ -87,6 +87,11 @@ If you don't have a suitable testing project already:
   * Download the resulting `google-services.json` file and put it in the root of
     your checkout.
 
+For now, you have to disable security rule enforcement for the Realtime
+Database, Cloud Firestore, and Cloud Storage in your test project (if running
+the integration tests for any of those). Re-enable your security rules after
+your test run.
+
 #### Running Integration Tests
 
 Integration tests can be executed on the command line by running
@@ -204,6 +209,9 @@ projects may be published as follows.
     publishProjectsToMavenLocal
 ```
 
+To generate the Maven dependency tree under `build/` instead, you can replace
+`publishProjectsToMavenLocal` in the above command with `firebasePublish`.
+
 ### Code Formatting
 
 Code in this repo is formatted with the google-java-format tool. You can enable

firebase-database/README.md

@@ -7,35 +7,6 @@ in realtime to every connected client. When you build cross-platform apps with o
 and JavaScript SDKs, all of your clients share one Realtime Database instance and automatically
 receive updates with the newest data.
 
-All Gradle commands should be run from the source root (which is one level up from this folder).
-
-Building
-========
-You can build the SDK by invoking `./gradlew :firebase-database:assemble`.
-
-If you want to test changes locally, you may also run
-`./gradlew -PprojectsToPublish="firebase-database" firebasePublish`. This generates the Maven 
-dependency tree (under `build/`) that you can use during app development.
-
-Testing
-=======
-
-To run the unit tests:
-
-- Invoke `./gradlew :firebase-database:check`.
-
-To run the integration tests:
-
-- Make sure that you have configured a `google-service.json` from your Firebase test project in the
-  source root.
-- For now, you have to disable security rule enforcement for the Realtime Databse in your test
-  project.
-- Start an Android Emulator.
-- Invoke `./gradlew :firebase-database:connectedCheck`.
-- Re-enable your security rules after your test run.
-
-
-Formatting
-==========
-Format your source files via `./gradlew :firebase-database:googleJavaFormat`
-
+All Gradle commands should be run from the source root (which is one level up
+from this folder). See the README.md in the source root for instructions on
+publishing/testing the Realtime Database.

firebase-firestore/README.md

@@ -1 +1,15 @@
-Prior to submitting please run `./gradlew :firebase-firestore:googleJavaFormat` to format your code.
+# firebase-firestore
+
+This is the Cloud Firestore component of the Firebase Android SDK.
+
+Cloud Firestore is a flexible, scalable database for mobile, web, and server
+development from Firebase and Google Cloud Platform. Like Firebase Realtime
+Database, it keeps your data in sync across client apps through realtime
+listeners and offers offline support for mobile and web so you can build
+responsive apps that work regardless of network latency or Internet
+connectivity. Cloud Firestore also offers seamless integration with other
+Firebase and Google Cloud Platform products, including Cloud Functions.
+
+All Gradle commands should be run from the source root (which is one level up
+from this folder). See the README.md in the source root for instructions on
+publishing/testing Cloud Firestore.

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java

@@ -636,7 +636,7 @@ public void testQuerySnapshotEventsForAdd() {
                   assertFalse(doc2.getMetadata().hasPendingWrites());
                   break;
                 default:
-                  fail("unexpected call to onSnapshot:" + snapshot);
+                  fail("unexpected call to onSnapshot: " + snapshot);
               }
             });
     waitFor(emptyLatch);

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/EventAccumulator.java

@@ -39,7 +39,7 @@ public EventAccumulator() {
   public EventListener<T> listener() {
     return (value, error) -> {
       synchronized (EventAccumulator.this) {
-        hardAssert(error == null, "Unexpected error: " + error);
+        hardAssert(error == null, "Unexpected error: %s", error);
         Log.i("EventAccumulator", "Received new event: " + value);
         events.add(value);
         checkFulfilled();

firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentSnapshot.java

@@ -505,15 +505,14 @@ private Object convertValue(FieldValue value, FieldValueOptions options) {
         // TODO: Somehow support foreign references.
         Logger.warn(
             "DocumentSnapshot",
-            String.format(
-                "Document %s contains a document reference within a different database "
-                    + "(%s/%s) which is not supported. It will be treated as a reference in "
-                    + "the current database (%s/%s) instead.",
-                key.getPath(),
-                refDatabase.getProjectId(),
-                refDatabase.getDatabaseId(),
-                database.getProjectId(),
-                database.getDatabaseId()));
+            "Document %s contains a document reference within a different database "
+                + "(%s/%s) which is not supported. It will be treated as a reference in "
+                + "the current database (%s/%s) instead.",
+            key.getPath(),
+            refDatabase.getProjectId(),
+            refDatabase.getDatabaseId(),
+            database.getProjectId(),
+            database.getDatabaseId());
       }
       return new DocumentReference(key, firestore);
     } else {

firebase-firestore/src/main/java/com/google/firebase/firestore/core/RelationFilter.java

@@ -94,7 +94,7 @@ private boolean matchesComparison(int comp) {
       case GREATER_THAN_OR_EQUAL:
         return comp >= 0;
       default:
-        throw Assert.fail("Unknown operator: ", operator);
+        throw Assert.fail("Unknown operator: %s", operator);
     }
   }
 

firebase-firestore/src/main/java/com/google/firebase/firestore/core/SyncEngine.java

@@ -376,7 +376,7 @@ public void handleRejectedListen(int targetId, Status error) {
       handleRemoteEvent(event);
     } else {
       QueryView queryView = queryViewsByTarget.get(targetId);
-      hardAssert(queryView != null, "Unknown target: " + targetId);
+      hardAssert(queryView != null, "Unknown target: %s", targetId);
       localStore.releaseQuery(queryView.getQuery());
       removeAndCleanup(queryView);
       callback.onError(queryView.getQuery(), error);

firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalDocumentsView.java

@@ -143,7 +143,7 @@ private ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingCollection
         } else if (mutatedDoc instanceof Document) {
           results = results.insert(key, (Document) mutatedDoc);
         } else {
-          throw fail("Unknown document type: " + mutatedDoc);
+          throw fail("Unknown document type: %s", mutatedDoc);
         }
       }
     }

firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalSerializer.java

@@ -68,7 +68,7 @@ MaybeDocument decodeMaybeDocument(com.google.firebase.firestore.proto.MaybeDocum
         return decodeNoDocument(proto.getNoDocument());
 
       default:
-        throw fail("Unknown MaybeDocument " + proto);
+        throw fail("Unknown MaybeDocument %s", proto);
     }
   }