Apply code review feedback.

Author: dconeybe

firebase-firestore/CHANGELOG.md

@@ -4,9 +4,9 @@
   Bundles contain pre-packaged data produced with the NodeJS Server SDK and
   can be used to populate Firestore's cache without reading documents from
   the backend.
-- [fixed] Fix a Firestore bug where local cache inconsistencies were
-  unnecessarily being resolved, resulting in the incompletion of `Task` objects
-  returned from `get()` invocations (#2404).
+- [fixed] Fixed a Firestore bug where local cache inconsistencies were
+  unnecessarily being resolved, causing the `Task` objects returned from `get()`
+  invocations to never complete (#2404).
 
 # (22.0.2)
 - [changed] A write to a document that contains FieldValue transforms is no

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

@@ -21,8 +21,6 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.FirebaseFirestoreException;
@@ -712,15 +710,15 @@ private void pumpEnqueuedLimboResolutions() {
   }
 
   @VisibleForTesting
-  public ImmutableMap<DocumentKey, Integer> getActiveLimboDocumentResolutions() {
+  public HashMap<DocumentKey, Integer> getActiveLimboDocumentResolutions() {
     // Make a defensive copy as the Map continues to be modified.
-    return ImmutableMap.copyOf(activeLimboTargetsByKey);
+    return new HashMap(activeLimboTargetsByKey);
   }
 
   @VisibleForTesting
-  public ImmutableSet<DocumentKey> getEnqueuedLimboDocumentResolutions() {
-    // Make a defensive copy as the LinkedHashMap continues to be modified.
-    return ImmutableSet.copyOf(enqueuedLimboResolutions);
+  public LinkedHashSet<DocumentKey> getEnqueuedLimboDocumentResolutions() {
+    // Make a defensive copy as the LinkedHashSet continues to be modified.
+    return new LinkedHashSet(enqueuedLimboResolutions);
   }
 
   public void handleCredentialChange(User user) {