fix(firestore): fix cross-database reference log message

firebase-firestore/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 
+- [fixed] Fixed the cross-database document reference warning log naming the referenced document rather than the document containing the reference.
 - [changed] Added support for caching documents larger than 1MB by reading them in chunks from the local SQLite database.
 - [changed] Prevent OutOfMemory errors in debug logging by truncating large protobuf payloads and strings.
 

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

@@ -152,8 +152,8 @@ private Object convertReference(Value value) {
       // TODO: Somehow support foreign references.
       Logger.warn(
           "DocumentSnapshot",
-          "Document %s contains a document reference within a different database "
-              + "(%s/%s) which is not supported. It will be treated as a reference in "
+          "A document reference to %s refers to 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(),

firebase-firestore/src/test/java/com/google/firebase/firestore/UserDataWriterTest.java

@@ -43,6 +43,7 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLog;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
@@ -211,6 +212,33 @@ public void testConvertsResourceName() {
     }
   }
 
+  @Test
+  public void testConvertsResourceNameFromDifferentDatabase() {
+    ShadowLog.clear();
+    Value value =
+        Value.newBuilder()
+            .setReferenceValue("projects/other-project/databases/other-db/documents/foo/bar")
+            .build();
+    Object convertedValue = convertValue(value);
+    assertTrue(convertedValue instanceof DocumentReference);
+    DocumentReference docRef = (DocumentReference) convertedValue;
+    assertEquals(DocumentKey.fromPathString("foo/bar"), TestAccessHelper.referenceKey(docRef));
+
+    List<ShadowLog.LogItem> logs = ShadowLog.getLogsForTag("Firestore");
+    assertThat(logs).isNotEmpty();
+    boolean found = false;
+    for (ShadowLog.LogItem log : logs) {
+      if (log.msg.contains(
+          "A document reference to foo/bar refers to a different database (other-project/other-db)"
+              + ", which is not supported. It will be treated as a reference in the current"
+              + " database (projectId/(default)) instead.")) {
+        found = true;
+        break;
+      }
+    }
+    assertTrue("Expected warning log not found in " + logs, found);
+  }
+
   @Test
   public void testConvertsGeoPointValue() {
     List<GeoPoint> testCases = asList(new GeoPoint(1.24, 4.56), new GeoPoint(-20, 100));