Merge branch 'master' into smokeTestFix

ashwinraghav · web-flow · commit b832f400cb3a · 2018-09-13T11:45:22.000-07:00
diff --git a/README.md b/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
diff --git a/firebase-database/README.md b/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.
diff --git a/firebase-firestore/README.md b/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.
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java b/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);
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/EventAccumulator.java b/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();
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentSnapshot.java b/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 {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/RelationFilter.java b/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);
     }
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/SyncEngine.java b/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);
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalDocumentsView.java b/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);
         }
       }
     }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalSerializer.java b/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);
     }
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/MutationBatchResult.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/MutationBatchResult.java
@@ -55,10 +55,9 @@ public static MutationBatchResult create(
       ByteString streamToken) {
     Assert.hardAssert(
         batch.getMutations().size() == mutationResults.size(),
-        "Mutations sent "
-            + batch.getMutations().size()
-            + " must equal results received "
-            + mutationResults.size());
+        "Mutations sent %d must equal results received %d",
+        batch.getMutations().size(),
+        mutationResults.size());
     ImmutableSortedMap<DocumentKey, SnapshotVersion> docVersions =
         DocumentCollections.emptyVersionMap();
     List<Mutation> mutations = batch.getMutations();
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/TransformMutation.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/TransformMutation.java
@@ -126,7 +126,7 @@ public MaybeDocument applyToLocalView(
    * method is guaranteed to be safe.
    */
   private Document requireDocument(@Nullable MaybeDocument maybeDoc) {
-    hardAssert(maybeDoc instanceof Document, "Unknown MaybeDocument type " + maybeDoc);
+    hardAssert(maybeDoc instanceof Document, "Unknown MaybeDocument type %s", maybeDoc);
     Document doc = (Document) maybeDoc;
     hardAssert(doc.getKey().equals(getKey()), "Can only transform a document with the same key");
     return doc;
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/OnlineStateTracker.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/OnlineStateTracker.java
@@ -187,10 +187,10 @@ private void logClientOfflineWarningIfNecessary(String reason) {
             reason);
 
     if (shouldWarnClientIsOffline) {
-      Logger.warn(LOG_TAG, message);
+      Logger.warn(LOG_TAG, "%s", message);
       shouldWarnClientIsOffline = false;
     } else {
-      Logger.debug(LOG_TAG, message);
+      Logger.debug(LOG_TAG, "%s", message);
     }
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteSerializer.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteSerializer.java
@@ -287,7 +287,7 @@ public com.google.firestore.v1beta1.Value encodeValue(FieldValue value) {
       DocumentKey key = (DocumentKey) encodedValue;
       builder.setReferenceValue(encodeResourceName(id, key.getPath()));
     } else {
-      throw fail("Can't serialize " + value);
+      throw fail("Can't serialize %s", value);
     }
 
     return builder.build();
@@ -330,7 +330,7 @@ public FieldValue decodeValue(com.google.firestore.v1beta1.Value proto) {
       case MAP_VALUE:
         return decodeMapValue(proto.getMapValue());
       default:
-        throw fail("Unknown value " + proto);
+        throw fail("Unknown value %s", proto);
     }
   }
 
@@ -446,7 +446,7 @@ public com.google.firestore.v1beta1.Write encodeMutation(Mutation mutation) {
     } else if (mutation instanceof DeleteMutation) {
       builder.setDelete(encodeKey(mutation.getKey()));
     } else {
-      throw fail("unknown mutation type ", mutation.getClass());
+      throw fail("unknown mutation type %s", mutation.getClass());
     }
 
     if (!mutation.getPrecondition().isNone()) {
@@ -579,7 +579,8 @@ private FieldTransform decodeFieldTransform(DocumentTransform.FieldTransform fie
         hardAssert(
             fieldTransform.getSetToServerValue()
                 == DocumentTransform.FieldTransform.ServerValue.REQUEST_TIME,
-            "Unknown transform setToServerValue: " + fieldTransform.getSetToServerValue());
+            "Unknown transform setToServerValue: %s",
+            fieldTransform.getSetToServerValue());
         return new FieldTransform(
             FieldPath.fromServerFormat(fieldTransform.getFieldPath()),
             ServerTimestampOperation.getInstance());
@@ -857,7 +858,7 @@ private StructuredQuery.Filter encodeUnaryFilter(Filter filter) {
     } else if (filter instanceof NullFilter) {
       proto.setOp(UnaryFilter.Operator.IS_NULL);
     } else {
-      throw fail("Unrecognized filter: " + filter.getCanonicalId());
+      throw fail("Unrecognized filter: %s", filter.getCanonicalId());
     }
     return StructuredQuery.Filter.newBuilder().setUnaryFilter(proto).build();
   }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TargetState.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TargetState.java
@@ -106,7 +106,7 @@ TargetChange toTargetChange() {
           removedDocuments = removedDocuments.insert(key);
           break;
         default:
-          throw fail("Encountered invalid change type: " + changeType);
+          throw fail("Encountered invalid change type: %s", changeType);
       }
     }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/WatchChangeAggregator.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/WatchChangeAggregator.java
@@ -148,7 +148,7 @@ public void handleTargetChange(WatchTargetChange targetChange) {
           }
           break;
         default:
-          throw fail("Unknown target watch change state: " + targetChange.getChangeType());
+          throw fail("Unknown target watch change state: %s", targetChange.getChangeType());
       }
     }
   }
@@ -187,7 +187,7 @@ public void handleExistenceFilter(ExistenceFilterWatchChange watchChange) {
           removeDocumentFromTarget(targetId, key, new NoDocument(key, SnapshotVersion.NONE));
         } else {
           hardAssert(
-              expectedCount == 1, "Single document existence filter with count: " + expectedCount);
+              expectedCount == 1, "Single document existence filter with count: %d", expectedCount);
         }
       } else {
         long currentSize = getCurrentDocumentCountForTarget(targetId);
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java
@@ -718,7 +718,7 @@ T deserialize(
           if (throwOnUnknownProperties) {
             throw new RuntimeException(message);
           } else if (warnOnUnknownProperties) {
-            Logger.warn(CustomClassMapper.class.getSimpleName(), message);
+            Logger.warn(CustomClassMapper.class.getSimpleName(), "%s", message);
           }
         }
       }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/spec/SpecTestCase.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/spec/SpecTestCase.java
@@ -344,7 +344,7 @@ private Query parseQuery(Object querySpec) throws JSONException {
       }
       return query;
     } else {
-      throw Assert.fail("Invalid query: " + querySpec);
+      throw Assert.fail("Invalid query: %s", querySpec);
     }
   }
 
@@ -761,7 +761,7 @@ private void doStep(JSONObject step) throws Exception {
       throw Assert.fail(
           "'applyClientState' is not supported on Android and should only be used in multi-client tests");
     } else {
-      throw Assert.fail("Unknown step: " + step);
+      throw Assert.fail("Unknown step: %s", step);
     }
   }
 
diff --git a/firebase-storage/README.md b/firebase-storage/README.md
@@ -8,36 +8,6 @@ downloads for your Firebase apps, regardless of network quality. You can use our
 images, audio, video, or other user-generated content. On the server, you can use Google Cloud
 Storage, to access the same files.
 
-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-storage:assemble`.
-
-If you want to test changes locally, you may also run
-`./gradlew -PprojectsToPublish="firebase-storage" 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-storage: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. 
-- Enable Firebase Storage in your project. Firebase Storage can be implicitly enabled by visiting
-  the Storage tab in the [Firebase Console](https://console.firebase.google.com/).
-- For now, you have to disable security rule enforcement for Cloud Storage in your test project.
-- Start an Android Emulator.
-- Invoke `./gradlew :firebase-storage:connectedCheck`.
-- Re-enable your security rules after your test run.
-
-
-Formatting
-==========
-Format your source files via `./gradlew :firebase-storage: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 Firebase Storage.

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ public void testQuerySnapshotEventsForAdd() {`
`636`	`636`	`assertFalse(doc2.getMetadata().hasPendingWrites());`
`637`	`637`	`break;`
`638`	`638`	`default:`
`639`		`- fail("unexpected call to onSnapshot:" + snapshot);`
	`639`	`+ fail("unexpected call to onSnapshot: " + snapshot);`
`640`	`640`	`}`
`641`	`641`	`});`
`642`	`642`	`waitFor(emptyLatch);`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private boolean matchesComparison(int comp) {`
`94`	`94`	`case GREATER_THAN_OR_EQUAL:`
`95`	`95`	`return comp >= 0;`
`96`	`96`	`default:`
`97`		`- throw Assert.fail("Unknown operator: ", operator);`
	`97`	`+ throw Assert.fail("Unknown operator: %s", operator);`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingCollection`
`143`	`143`	`} else if (mutatedDoc instanceof Document) {`
`144`	`144`	`results = results.insert(key, (Document) mutatedDoc);`
`145`	`145`	`} else {`
`146`		`- throw fail("Unknown document type: " + mutatedDoc);`
	`146`	`+ throw fail("Unknown document type: %s", mutatedDoc);`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ MaybeDocument decodeMaybeDocument(com.google.firebase.firestore.proto.MaybeDocum`
`68`	`68`	`return decodeNoDocument(proto.getNoDocument());`
`69`	`69`
`70`	`70`	`default:`
`71`		`- throw fail("Unknown MaybeDocument " + proto);`
	`71`	`+ throw fail("Unknown MaybeDocument %s", proto);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -187,10 +187,10 @@ private void logClientOfflineWarningIfNecessary(String reason) {`
`187`	`187`	`reason);`
`188`	`188`
`189`	`189`	`if (shouldWarnClientIsOffline) {`
`190`		`- Logger.warn(LOG_TAG, message);`
	`190`	`+ Logger.warn(LOG_TAG, "%s", message);`
`191`	`191`	`shouldWarnClientIsOffline = false;`
`192`	`192`	`} else {`
`193`		`- Logger.debug(LOG_TAG, message);`
	`193`	`+ Logger.debug(LOG_TAG, "%s", message);`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ TargetChange toTargetChange() {`
`106`	`106`	`removedDocuments = removedDocuments.insert(key);`
`107`	`107`	`break;`
`108`	`108`	`default:`
`109`		`- throw fail("Encountered invalid change type: " + changeType);`
	`109`	`+ throw fail("Encountered invalid change type: %s", changeType);`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public void handleTargetChange(WatchTargetChange targetChange) {`
`148`	`148`	`}`
`149`	`149`	`break;`
`150`	`150`	`default:`
`151`		`- throw fail("Unknown target watch change state: " + targetChange.getChangeType());`
	`151`	`+ throw fail("Unknown target watch change state: %s", targetChange.getChangeType());`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`}`
`@@ -187,7 +187,7 @@ public void handleExistenceFilter(ExistenceFilterWatchChange watchChange) {`
`187`	`187`	`removeDocumentFromTarget(targetId, key, new NoDocument(key, SnapshotVersion.NONE));`
`188`	`188`	`} else {`
`189`	`189`	`hardAssert(`
`190`		`- expectedCount == 1, "Single document existence filter with count: " + expectedCount);`
	`190`	`+ expectedCount == 1, "Single document existence filter with count: %d", expectedCount);`
`191`	`191`	`}`
`192`	`192`	`} else {`
`193`	`193`	`long currentSize = getCurrentDocumentCountForTarget(targetId);`
Original file line number	Diff line number	Diff line change
`@@ -718,7 +718,7 @@ T deserialize(`
`718`	`718`	`if (throwOnUnknownProperties) {`
`719`	`719`	`throw new RuntimeException(message);`
`720`	`720`	`} else if (warnOnUnknownProperties) {`
`721`		`- Logger.warn(CustomClassMapper.class.getSimpleName(), message);`
	`721`	`+ Logger.warn(CustomClassMapper.class.getSimpleName(), "%s", message);`
`722`	`722`	`}`
`723`	`723`	`}`
`724`	`724`	`}`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ private Query parseQuery(Object querySpec) throws JSONException {`
`344`	`344`	`}`
`345`	`345`	`return query;`
`346`	`346`	`} else {`
`347`		`- throw Assert.fail("Invalid query: " + querySpec);`
	`347`	`+ throw Assert.fail("Invalid query: %s", querySpec);`
`348`	`348`	`}`
`349`	`349`	`}`
`350`	`350`
`@@ -761,7 +761,7 @@ private void doStep(JSONObject step) throws Exception {`
`761`	`761`	`throw Assert.fail(`
`762`	`762`	`"'applyClientState' is not supported on Android and should only be used in multi-client tests");`
`763`	`763`	`} else {`
`764`		`- throw Assert.fail("Unknown step: " + step);`
	`764`	`+ throw Assert.fail("Unknown step: %s", step);`
`765`	`765`	`}`
`766`	`766`	`}`
`767`	`767`