Port some small code changes from firebase/firebase-js-sdk#7474 to be consistent with the web sdk (#5177)

Author: dconeybe

firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TestingHooks.java

@@ -23,6 +23,7 @@
 import com.google.auto.value.AutoValue;
 import com.google.firebase.firestore.ListenerRegistration;
 import com.google.firebase.firestore.model.DatabaseId;
+import com.google.firebase.firestore.remote.WatchChangeAggregator.BloomFilterApplicationStatus;
 import com.google.firestore.v1.BloomFilter;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicReference;
@@ -168,13 +169,13 @@ static ExistenceFilterMismatchInfo from(
         ExistenceFilter existenceFilter,
         DatabaseId databaseId,
         @Nullable com.google.firebase.firestore.remote.BloomFilter bloomFilter,
-        boolean bloomFilterApplied) {
+        BloomFilterApplicationStatus bloomFilterStatus) {
       return create(
           localCacheCount,
           existenceFilter.getCount(),
           databaseId.getProjectId(),
           databaseId.getDatabaseId(),
-          ExistenceFilterBloomFilterInfo.from(bloomFilter, bloomFilterApplied, existenceFilter));
+          ExistenceFilterBloomFilterInfo.from(bloomFilter, bloomFilterStatus, existenceFilter));
     }
   }
 
@@ -214,15 +215,15 @@ static ExistenceFilterBloomFilterInfo create(
     @Nullable
     static ExistenceFilterBloomFilterInfo from(
         @Nullable com.google.firebase.firestore.remote.BloomFilter bloomFilter,
-        boolean bloomFilterApplied,
+        BloomFilterApplicationStatus bloomFilterStatus,
         ExistenceFilter existenceFilter) {
       BloomFilter unchangedNames = existenceFilter.getUnchangedNames();
       if (unchangedNames == null) {
         return null;
       }
       return create(
           bloomFilter,
-          bloomFilterApplied,
+          /*bloomFilterApplied=*/ bloomFilterStatus == BloomFilterApplicationStatus.SUCCESS,
           unchangedNames.getHashCount(),
           unchangedNames.getBits().getBitmap().size(),
           unchangedNames.getBits().getPadding());

firebase-firestore/src/main/java/com/google/firebase/firestore/remote/WatchChangeAggregator.java

@@ -85,7 +85,7 @@ public interface TargetMetadataProvider {
   private static final String LOG_TAG = "WatchChangeAggregator";
 
   /** The bloom filter application status while handling existence filter mismatch. */
-  private enum BloomFilterApplicationStatus {
+  enum BloomFilterApplicationStatus {
     SUCCESS,
     SKIPPED,
     FALSE_POSITIVE
@@ -218,9 +218,9 @@ public void handleExistenceFilter(ExistenceFilterWatchChange watchChange) {
           // Apply bloom filter to identify and mark removed documents.
           BloomFilter bloomFilter = this.parseBloomFilter(watchChange);
           BloomFilterApplicationStatus status =
-              bloomFilter == null
-                  ? BloomFilterApplicationStatus.SKIPPED
-                  : this.applyBloomFilter(bloomFilter, watchChange, currentSize);
+              bloomFilter != null
+                  ? this.applyBloomFilter(bloomFilter, watchChange, currentSize)
+                  : BloomFilterApplicationStatus.SKIPPED;
 
           if (status != BloomFilterApplicationStatus.SUCCESS) {
             // If bloom filter application fails, we reset the mapping and
@@ -242,7 +242,7 @@ public void handleExistenceFilter(ExistenceFilterWatchChange watchChange) {
                       watchChange.getExistenceFilter(),
                       targetMetadataProvider.getDatabaseId(),
                       bloomFilter,
-                      /*bloomFilterApplied=*/ status == BloomFilterApplicationStatus.SUCCESS));
+                      status));
         }
       }
     }