---

mikelehen · JesseLovelace · commit 3458876fa2be · 2019-01-22T10:57:33.000-08:00
yaml --- r: 14055 b: refs/heads/autosynth-monitoring c: ed7bc85 h: refs/heads/master i: 14053: 29ce48a 14051: 355d37f 14047: 3b93fb7
diff --git a/[refs] b/[refs]
@@ -115,7 +115,7 @@ refs/tags/v0.67.0: 30b56f02092efc6f3c3667650ea8b8825003e0b7
 refs/heads/autosynth-compute: 8e86445e504cea6f99b9fb237bfd7f0e5ef8b3ce
 refs/heads/autosynth-container: f6384095f50b31bfc8208542a49181e158d3681c
 refs/heads/autosynth-dataproc: bc74a8841bc1693d7945d991d15979df550b1fd1
-refs/heads/autosynth-monitoring: c9f7d7bb12a08f084dd826f27ce997db658dc86b
+refs/heads/autosynth-monitoring: ed7bc857a05b34eed6be182d4798a62bf09cd394
 refs/heads/autosynth-pubsub: ed3340e32d13bb1a42ca4431cb1ad9bdaf550aa4
 refs/heads/autosynth-video-intelligence: 3e8faeeee2f803271529bd6e89b621c1ca098628
 refs/heads/autosynth-vision: d758c43ba2ef4f4f7ad07b722617cb39fe3f29db
diff --git a/branches/autosynth-monitoring/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java b/branches/autosynth-monitoring/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java
@@ -398,7 +398,7 @@ boolean areTimestampsInSnapshotsEnabled() {
 
   /** Returns the name of the Firestore project associated with this client. */
   String getDatabaseName() {
-    return databasePath.toString();
+    return databasePath.getDatabaseName().toString();
   }
 
   /** Returns the underlying RPC client. */
diff --git a/branches/autosynth-monitoring/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java b/branches/autosynth-monitoring/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java
@@ -127,9 +127,8 @@ String getPath() {
    */
   String getName() {
     String path = getPath();
-
     if (path.isEmpty()) {
-      return getDatabaseName().toString();
+      return getDatabaseName() + "/documents";
     } else {
       return getDatabaseName() + "/documents/" + getPath();
     }
diff --git a/branches/autosynth-monitoring/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java b/branches/autosynth-monitoring/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java
@@ -435,7 +435,7 @@ public static RunQueryRequest query(StructuredQuery... query) {
   public static RunQueryRequest query(
       @Nullable ByteString transactionId, StructuredQuery... query) {
     RunQueryRequest.Builder request = RunQueryRequest.newBuilder();
-    request.setParent(LocalFirestoreHelper.DATABASE_NAME);
+    request.setParent(LocalFirestoreHelper.DATABASE_NAME + "/documents");
     StructuredQuery.Builder structuredQuery = request.getStructuredQueryBuilder();
     structuredQuery.addFrom(
         StructuredQuery.CollectionSelector.newBuilder().setCollectionId("coll"));

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ boolean areTimestampsInSnapshotsEnabled() {`
`398`	`398`
`399`	`399`	`/** Returns the name of the Firestore project associated with this client. */`
`400`	`400`	`String getDatabaseName() {`
`401`		`- return databasePath.toString();`
	`401`	`+ return databasePath.getDatabaseName().toString();`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`/** Returns the underlying RPC client. */`