Use androidX Nullable

Author: schmidt-sebastian

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

@@ -16,6 +16,7 @@
 
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
+import androidx.annotation.Nullable;
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.core.Query;
@@ -25,7 +26,6 @@
 import com.google.firebase.firestore.model.MaybeDocument;
 import com.google.firebase.firestore.model.SnapshotVersion;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * A query engine that takes advantage of the target document mapping in the QueryCache. The

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

@@ -14,13 +14,13 @@
 
 package com.google.firebase.firestore.local;
 
+import androidx.annotation.Nullable;
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.model.Document;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.MaybeDocument;
-import javax.annotation.Nullable;
 
 /**
  * Represents a query engine capable of performing queries over the local document cache. You must

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

@@ -16,14 +16,14 @@
 
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
+import androidx.annotation.Nullable;
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.model.Document;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.MaybeDocument;
 import com.google.firebase.firestore.model.SnapshotVersion;
-import javax.annotation.Nullable;
 
 /**
  * A naive implementation of QueryEngine that just loads all the documents in the queried collection

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

@@ -148,11 +148,11 @@ private void addUpdatedResult(Document doc) {
   }
 
   private ImmutableSortedMap<DocumentKey, Document> runQuery(
-          Query query, QueryData queryData, boolean expectIndexFree) {
+      Query query, QueryData queryData, boolean expectIndexFree) {
     expectIndexFreeExecution = expectIndexFree;
     ImmutableSortedSet<DocumentKey> remoteKeys =
-            new ImmutableSortedSet<>(
-                    new ArrayList<>(existingQueryResults.keySet()), DocumentKey.comparator());
+        new ImmutableSortedSet<>(
+            new ArrayList<>(existingQueryResults.keySet()), DocumentKey.comparator());
     return queryEngine.getDocumentsMatchingQuery(query, queryData, remoteKeys);
   }
 

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

@@ -1201,7 +1201,8 @@ public void testQueriesIncludeDocumentsFromOtherQueries() {
 
   @Test
   public void testQueriesFilterDocumentsThatNoLongerMatch() {
-    // This test verifies that documents that once matched a query are post-filtered if they no longer match the query filter.
+    // This test verifies that documents that once matched a query are post-filtered if they no
+    // longer match the query filter.
     if (garbageCollectorIsEager()) {
       return;
     }

firebase-firestore/src/test/java/com/google/firebase/firestore/spec/QueryEvent.java

@@ -14,10 +14,10 @@
 
 package com.google.firebase.firestore.spec;
 
+import androidx.annotation.Nullable;
 import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.core.ViewSnapshot;
-import javax.annotation.Nullable;
 
 /** Object that contains exactly one of either a view snapshot or an error for the given query. */
 public class QueryEvent {