/gradlew :firebase-firestore:googleJavaFormat

Author: dconeybe

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

@@ -20,11 +20,7 @@
 import static org.junit.Assert.assertEquals;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.google.firebase.firestore.AggregateField;
-import com.google.firebase.firestore.AggregateQuerySnapshot;
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
-
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,5 +45,4 @@ public void count() {
     AggregateQuerySnapshot snapshot = waitFor(collection.count().get());
     assertEquals(Long.valueOf(3), snapshot.get(AggregateField.count()));
   }
-
 }

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

@@ -28,16 +28,12 @@ public static CountAggregateField count() {
 
   public static final class CountAggregateField extends AggregateField {
 
-    @Nullable
-    private Integer upTo;
+    @Nullable private Integer upTo;
 
-    CountAggregateField() {
-    }
+    CountAggregateField() {}
 
     CountAggregateField(@Nullable Integer upTo) {
       this.upTo = upTo;
     }
-
   }
-
 }

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

@@ -15,7 +15,6 @@
 package com.google.firebase.firestore;
 
 import androidx.annotation.NonNull;
-
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.firestore.remote.Datastore;
@@ -27,7 +26,7 @@ public final class AggregateQuery {
 
   AggregateQuery(@NonNull Query query, @NonNull AggregateField aggregateField) {
     this.query = query;
-    if (! (aggregateField instanceof AggregateField.CountAggregateField)) {
+    if (!(aggregateField instanceof AggregateField.CountAggregateField)) {
       throw new IllegalArgumentException("unsupported aggregateField: " + aggregateField);
     }
   }
@@ -44,16 +43,17 @@ public Task<AggregateQuerySnapshot> get() {
 
     datastore
         .runCountQuery(query.query.toTarget())
-        .continueWith(Executors.DIRECT_EXECUTOR, task -> {
-      if (task.isSuccessful()) {
-        tcs.setResult(new AggregateQuerySnapshot(task.getResult()));
-      } else {
-        tcs.setException(task.getException());
-      }
-      return null;
-    });
+        .continueWith(
+            Executors.DIRECT_EXECUTOR,
+            task -> {
+              if (task.isSuccessful()) {
+                tcs.setResult(new AggregateQuerySnapshot(task.getResult()));
+              } else {
+                tcs.setException(task.getException());
+              }
+              return null;
+            });
 
     return tcs.getTask();
   }
-
 }

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

@@ -29,5 +29,4 @@ public class AggregateQuerySnapshot {
   public Long get(@NonNull AggregateField.CountAggregateField field) {
     return count;
   }
-
 }

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

@@ -41,10 +41,8 @@
 import com.google.firestore.v1.FirestoreGrpc;
 import com.google.firestore.v1.RunAggregationQueryRequest;
 import com.google.firestore.v1.RunAggregationQueryResponse;
-import com.google.firestore.v1.RunQueryRequest;
 import com.google.firestore.v1.StructuredAggregationQuery;
 import com.google.firestore.v1.Value;
-
 import io.grpc.Status;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -225,12 +223,15 @@ public void onClose(Status status) {
   }
 
   public Task<Long> runCountQuery(Target queryTarget) {
-    com.google.firestore.v1.Target.QueryTarget encodedQueryTarget = serializer.encodeQueryTarget(queryTarget);
+    com.google.firestore.v1.Target.QueryTarget encodedQueryTarget =
+        serializer.encodeQueryTarget(queryTarget);
 
-    StructuredAggregationQuery.Builder structuredAggregationQuery = StructuredAggregationQuery.newBuilder();
+    StructuredAggregationQuery.Builder structuredAggregationQuery =
+        StructuredAggregationQuery.newBuilder();
     structuredAggregationQuery.setStructuredQuery(encodedQueryTarget.getStructuredQuery());
 
-    StructuredAggregationQuery.Aggregation.Builder aggregation = StructuredAggregationQuery.Aggregation.newBuilder();
+    StructuredAggregationQuery.Aggregation.Builder aggregation =
+        StructuredAggregationQuery.Aggregation.newBuilder();
     aggregation.setCount(StructuredAggregationQuery.Aggregation.Count.getDefaultInstance());
     aggregation.setAlias("zzyzx_agg_alias_count");
     structuredAggregationQuery.addAggregations(aggregation);
@@ -239,13 +240,14 @@ public Task<Long> runCountQuery(Target queryTarget) {
     request.setParent(encodedQueryTarget.getParent());
     request.setStructuredAggregationQuery(structuredAggregationQuery);
 
-    return channel.runRpc(FirestoreGrpc.getRunAggregationQueryMethod(), request.build())
+    return channel
+        .runRpc(FirestoreGrpc.getRunAggregationQueryMethod(), request.build())
         .continueWith(
             workerQueue.getExecutor(),
             task -> {
               if (!task.isSuccessful()) {
                 if (task.getException() instanceof FirebaseFirestoreException
-                        && ((FirebaseFirestoreException) task.getException()).getCode()
+                    && ((FirebaseFirestoreException) task.getException()).getCode()
                         == FirebaseFirestoreException.Code.UNAUTHENTICATED) {
                   channel.invalidateToken();
                 }
@@ -255,10 +257,14 @@ public Task<Long> runCountQuery(Target queryTarget) {
 
               AggregationResult aggregationResult = response.getResult();
               Map<String, Value> aggregateFieldsByAlias = aggregationResult.getAggregateFieldsMap();
-              hardAssert(aggregateFieldsByAlias.size() == 1, "aggregateFieldsByAlias.size()==" + aggregateFieldsByAlias.size());
+              hardAssert(
+                  aggregateFieldsByAlias.size() == 1,
+                  "aggregateFieldsByAlias.size()==" + aggregateFieldsByAlias.size());
               Value countValue = aggregateFieldsByAlias.get("zzyzx_agg_alias_count");
               hardAssert(countValue != null, "countValue == null");
-              hardAssert(countValue.getValueTypeCase() == Value.ValueTypeCase.INTEGER_VALUE, "countValue.getValueTypeCase() == " + countValue.getValueTypeCase());
+              hardAssert(
+                  countValue.getValueTypeCase() == Value.ValueTypeCase.INTEGER_VALUE,
+                  "countValue.getValueTypeCase() == " + countValue.getValueTypeCase());
               return countValue.getIntegerValue();
             });
   }