AggregateQuerySnapshot: Change getCount()'s return value from Long to long

Author: dconeybe

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CountTest.java

@@ -89,7 +89,7 @@ public void testCanRunCount() {
                 "c", map("k", "c")));
 
     AggregateQuerySnapshot snapshot = waitFor(collection.count().get(AggregateSource.SERVER));
-    assertEquals(Long.valueOf(3), snapshot.getCount());
+    assertEquals(3, snapshot.getCount());
   }
 
   @Test
@@ -103,7 +103,7 @@ public void testCanRunCountWithFilters() {
 
     AggregateQuerySnapshot snapshot =
         waitFor(collection.whereEqualTo("k", "b").count().get(AggregateSource.SERVER));
-    assertEquals(Long.valueOf(1), snapshot.getCount());
+    assertEquals(1, snapshot.getCount());
   }
 
   @Test
@@ -119,7 +119,7 @@ public void testCanRunCountWithOrderBy() {
     AggregateQuerySnapshot snapshot =
         waitFor(collection.orderBy("k").count().get(AggregateSource.SERVER));
     // "d" is filtered out because it is ordered by "k".
-    assertEquals(Long.valueOf(3), snapshot.getCount());
+    assertEquals(3, snapshot.getCount());
   }
 
   @Test
@@ -197,7 +197,7 @@ public void testCanRunCollectionGroupQuery() {
     AggregateQuerySnapshot snapshot =
         waitFor(db.collectionGroup(collectionGroup).count().get(AggregateSource.SERVER));
     assertEquals(
-        Long.valueOf(5), // "cg-doc1", "cg-doc2", "cg-doc3", "cg-doc4", "cg-doc5",
+        5, // "cg-doc1", "cg-doc2", "cg-doc3", "cg-doc4", "cg-doc5",
         snapshot.getCount());
   }
 
@@ -213,12 +213,12 @@ public void testCanRunCountWithFiltersAndLimits() {
 
     AggregateQuerySnapshot snapshot =
         waitFor(collection.whereEqualTo("k", "a").limit(2).count().get(AggregateSource.SERVER));
-    assertEquals(Long.valueOf(2), snapshot.getCount());
+    assertEquals(2, snapshot.getCount());
 
     snapshot =
         waitFor(
             collection.whereEqualTo("k", "a").limitToLast(2).count().get(AggregateSource.SERVER));
-    assertEquals(Long.valueOf(2), snapshot.getCount());
+    assertEquals(2, snapshot.getCount());
 
     snapshot =
         waitFor(
@@ -227,18 +227,18 @@ public void testCanRunCountWithFiltersAndLimits() {
                 .limitToLast(1000)
                 .count()
                 .get(AggregateSource.SERVER));
-    assertEquals(Long.valueOf(1), snapshot.getCount());
+    assertEquals(1, snapshot.getCount());
   }
 
   @Test
   public void testCanRunCountOnNonExistentCollection() {
     CollectionReference collection = testFirestore().collection("random-coll");
 
     AggregateQuerySnapshot snapshot = waitFor(collection.count().get(AggregateSource.SERVER));
-    assertEquals(Long.valueOf(0), snapshot.getCount());
+    assertEquals(0, snapshot.getCount());
 
     snapshot = waitFor(collection.whereEqualTo("k", 100).count().get(AggregateSource.SERVER));
-    assertEquals(Long.valueOf(0), snapshot.getCount());
+    assertEquals(0, snapshot.getCount());
   }
 
   @Test
@@ -258,6 +258,6 @@ public void testFailWithoutNetwork() {
 
     waitFor(collection.getFirestore().enableNetwork());
     AggregateQuerySnapshot snapshot = waitFor(collection.count().get(AggregateSource.SERVER));
-    assertEquals(Long.valueOf(3), snapshot.getCount());
+    assertEquals(3, snapshot.getCount());
   }
 }

firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateQuerySnapshot.java

@@ -17,7 +17,6 @@
 import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import java.util.Objects;
 
 /**
@@ -44,12 +43,8 @@ public AggregateQuery getQuery() {
     return query;
   }
 
-  /**
-   * @return The result of a document count aggregation. Returns null if no count aggregation is
-   *     available in the result.
-   */
-  @Nullable
-  public Long getCount() {
+  /** @return The result of a document count aggregation. */
+  public long getCount() {
     return count;
   }