No more clone

Author: schmidt-sebastian

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

@@ -55,7 +55,7 @@ public void add(MutableDocument document, SnapshotVersion readTime) {
     hardAssert(
         !readTime.equals(SnapshotVersion.NONE),
         "Cannot add document to the RemoteDocumentCache with a read time of zero");
-    docs = docs.insert(document.getKey(), document.clone().withReadTime(readTime));
+    docs = docs.insert(document.getKey(), document.mutableCopy().withReadTime(readTime));
     latestReadTime = readTime.compareTo(latestReadTime) > 0 ? readTime : latestReadTime;
 
     indexManager.addToCollectionParentIndex(document.getKey().getCollectionPath());
@@ -69,7 +69,7 @@ public void remove(DocumentKey key) {
   @Override
   public MutableDocument get(DocumentKey key) {
     Document doc = docs.get(key);
-    return doc != null ? doc.clone() : MutableDocument.newInvalidDocument(key);
+    return doc != null ? doc.mutableCopy() : MutableDocument.newInvalidDocument(key);
   }
 
   @Override
@@ -117,7 +117,7 @@ public Map<DocumentKey, MutableDocument> getAll(ResourcePath collection, IndexOf
         continue;
       }
 
-      result.put(doc.getKey(), doc.clone());
+      result.put(doc.getKey(), doc.mutableCopy());
     }
 
     return result;

firebase-firestore/src/main/java/com/google/firebase/firestore/model/Document.java

@@ -14,7 +14,6 @@
 
 package com.google.firebase.firestore.model;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firestore.v1.Value;
 import java.util.Comparator;
@@ -23,7 +22,7 @@
  * Represents a document in Firestore with a key, version, data and whether the data has local
  * mutations applied to it.
  */
-public interface Document extends Cloneable {
+public interface Document {
   /** A document comparator that returns document by key and key only. */
   Comparator<Document> KEY_COMPARATOR = (left, right) -> left.getKey().compareTo(right.getKey());
 
@@ -75,6 +74,6 @@ public interface Document extends Cloneable {
    */
   boolean hasPendingWrites();
 
-  @NonNull
-  MutableDocument clone();
+  /** Creates a mutable copy of this document. */
+  MutableDocument mutableCopy();
 }

firebase-firestore/src/main/java/com/google/firebase/firestore/model/MutableDocument.java

@@ -229,7 +229,7 @@ public boolean isUnknownDocument() {
 
   @Override
   @NonNull
-  public MutableDocument clone() {
+  public MutableDocument mutableCopy() {
     return new MutableDocument(key, documentType, version, readTime, value.clone(), documentState);
   }