Remove interface

Author: tom-andersen

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/RemoteStoreTest.java

@@ -78,8 +78,7 @@ public ImmutableSortedSet<DocumentKey> getRemoteKeysForTarget(int targetId) {
     QueryEngine queryEngine = new QueryEngine();
     Persistence persistence = MemoryPersistence.createEagerGcMemoryPersistence();
     persistence.start();
-    LocalStore localStore =
-        new LocalStore(persistence, queryEngine, User.UNAUTHENTICATED);
+    LocalStore localStore = new LocalStore(persistence, queryEngine, User.UNAUTHENTICATED);
     RemoteStore remoteStore =
         new RemoteStore(callback, localStore, datastore, testQueue, connectivityMonitor);
 

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

@@ -16,6 +16,7 @@
 
 import com.google.firebase.firestore.local.IndexBackfiller;
 import com.google.firebase.firestore.local.LocalSerializer;
+import com.google.firebase.firestore.local.LocalStore;
 import com.google.firebase.firestore.local.LruDelegate;
 import com.google.firebase.firestore.local.LruGarbageCollector;
 import com.google.firebase.firestore.local.Persistence;
@@ -35,7 +36,12 @@ protected Scheduler createGarbageCollectionScheduler(Configuration configuration
 
   @Override
   protected IndexBackfiller createIndexBackfiller(Configuration configuration) {
-    return new IndexBackfiller(getPersistence(), configuration.getAsyncQueue(), getLocalStore());
+    LocalStore localStore = getLocalStore();
+    return new IndexBackfiller(
+        getPersistence(),
+        configuration.getAsyncQueue(),
+        localStore::getIndexManagerForCurrentUser,
+        localStore::getLocalDocumentsForCurrentUser);
   }
 
   @Override

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

@@ -16,6 +16,7 @@
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import com.google.common.base.Supplier;
 import com.google.firebase.firestore.model.Document;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldIndex.IndexOffset;
@@ -39,13 +40,19 @@ public class IndexBackfiller {
 
   private final Scheduler scheduler;
   private final Persistence persistence;
-  private final UserComponents components;
+  private final Supplier<IndexManager> indexManagerOfCurrentUser;
+  private final Supplier<LocalDocumentsView> localDocumentsViewOfCurrentUser;
   private int maxDocumentsToProcess = MAX_DOCUMENTS_TO_PROCESS;
 
-  public IndexBackfiller(Persistence persistence, AsyncQueue asyncQueue, UserComponents components) {
+  public IndexBackfiller(
+      Persistence persistence,
+      AsyncQueue asyncQueue,
+      Supplier<IndexManager> indexManagerOfCurrentUser,
+      Supplier<LocalDocumentsView> localDocumentsViewOfCurrentUser) {
     this.persistence = persistence;
-    this.components = components;
     this.scheduler = new Scheduler(asyncQueue);
+    this.indexManagerOfCurrentUser = indexManagerOfCurrentUser;
+    this.localDocumentsViewOfCurrentUser = localDocumentsViewOfCurrentUser;
   }
 
   public class Scheduler implements com.google.firebase.firestore.local.Scheduler {
@@ -92,7 +99,7 @@ public int backfill() {
 
   /** Writes index entries until the cap is reached. Returns the number of documents processed. */
   private int writeIndexEntries() {
-    IndexManager indexManager = components.getIndexManager();
+    IndexManager indexManager = indexManagerOfCurrentUser.get();
     Set<String> processedCollectionGroups = new HashSet<>();
     int documentsRemaining = maxDocumentsToProcess;
     while (documentsRemaining > 0) {
@@ -112,8 +119,8 @@ private int writeIndexEntries() {
    */
   private int writeEntriesForCollectionGroup(
       String collectionGroup, int documentsRemainingUnderCap) {
-    IndexManager indexManager = components.getIndexManager();
-    LocalDocumentsView localDocumentsView = components.getLocalDocuments();
+    IndexManager indexManager = indexManagerOfCurrentUser.get();
+    LocalDocumentsView localDocumentsView = localDocumentsViewOfCurrentUser.get();
     // Use the earliest offset of all field indexes to query the local cache.
     IndexOffset existingOffset = indexManager.getMinOffset(collectionGroup);
 

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

@@ -48,7 +48,7 @@
  * in remoteDocumentCache or local mutations for the document). The view is computed by applying the
  * mutations in the MutationQueue to the RemoteDocumentCache.
  */
-class LocalDocumentsView {
+public class LocalDocumentsView {
 
   private final RemoteDocumentCache remoteDocumentCache;
   private final MutationQueue mutationQueue;

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

@@ -99,7 +99,7 @@
  * <p>The LocalStore must be able to efficiently execute queries against its local cache of the
  * documents, to provide the initial set of results before any remote changes have been received.
  */
-public final class LocalStore implements BundleCallback, UserComponents {
+public final class LocalStore implements BundleCallback {
   /**
    * The maximum time to leave a resume token buffered without writing it out. This value is
    * arbitrary: it's long enough to avoid several writes (possibly indefinitely if updates come more
@@ -192,13 +192,11 @@ private void startMutationQueue() {
     persistence.runTransaction("Start MutationQueue", () -> mutationQueue.start());
   }
 
-  @Override
-  public IndexManager getIndexManager() {
+  public IndexManager getIndexManagerForCurrentUser() {
     return indexManager;
   }
 
-  @Override
-  public LocalDocumentsView getLocalDocuments() {
+  public LocalDocumentsView getLocalDocumentsForCurrentUser() {
     return localDocuments;
   }
 

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

@@ -28,8 +28,6 @@
 import static com.google.firebase.firestore.testutil.TestUtil.version;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.core.Query;
@@ -85,18 +83,9 @@ public void setUp() {
             persistence.getMutationQueue(User.UNAUTHENTICATED, indexManager),
             documentOverlayCache,
             indexManager);
-    UserComponents components = new UserComponents() {
-      @Override
-      public IndexManager getIndexManager() {
-        return indexManager;
-      }
-
-      @Override
-      public LocalDocumentsView getLocalDocuments() {
-        return localDocumentsView;
-      }
-    };
-    backfiller = new IndexBackfiller(persistence, new AsyncQueue(), components);
+    backfiller =
+        new IndexBackfiller(
+            persistence, new AsyncQueue(), () -> indexManager, () -> localDocumentsView);
   }
 
   @After

firebase-firestore/src/test/java/com/google/firebase/firestore/local/IndexBackfillerTest.java

@@ -20,7 +20,6 @@
 import static com.google.firebase.firestore.testutil.TestUtil.deleteMutation;
 import static com.google.firebase.firestore.testutil.TestUtil.deletedDoc;
 import static com.google.firebase.firestore.testutil.TestUtil.doc;
-import static com.google.firebase.firestore.testutil.TestUtil.docMap;
 import static com.google.firebase.firestore.testutil.TestUtil.existenceFilterEvent;
 import static com.google.firebase.firestore.testutil.TestUtil.filter;
 import static com.google.firebase.firestore.testutil.TestUtil.key;
@@ -127,7 +126,12 @@ public void setUp() {
     queryEngine = new CountingQueryEngine(new QueryEngine());
     localStore = new LocalStore(localStorePersistence, queryEngine, User.UNAUTHENTICATED);
     localStore.start();
-    indexBackfiller = new IndexBackfiller(localStorePersistence, new AsyncQueue(), localStore);
+    indexBackfiller =
+        new IndexBackfiller(
+            localStorePersistence,
+            new AsyncQueue(),
+            localStore::getIndexManagerForCurrentUser,
+            localStore::getLocalDocumentsForCurrentUser);
   }
 
   @After