Address comments.

Author: ehsannas

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

@@ -78,7 +78,9 @@ public boolean isDisjunction() {
    * Returns true if this filter is a conjunction of field filters only. Returns false otherwise.
    */
   public boolean isFlatConjunction() {
-    if (operator != Operator.AND) return false;
+    if (operator != Operator.AND) {
+      return false;
+    }
     for (Filter filter : filters) {
       if (filter instanceof CompositeFilter) {
         return false;
@@ -161,10 +163,8 @@ public boolean equals(Object o) {
   @Override
   public int hashCode() {
     int result = 37;
-    result += 31 * operator.hashCode();
-    for (Filter filter : filters) {
-      result += 31 * filter.hashCode();
-    }
+    result = 31 * result + operator.hashCode();
+    result = 31 * result + filters.hashCode();
     return result;
   }
 }

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

@@ -642,8 +642,8 @@ private StructuredQuery.Filter encodeFilters(List<Filter> filters) {
   private List<Filter> decodeFilters(StructuredQuery.Filter proto) {
     Filter result = decodeFilter(proto);
 
-    // Instead of a singletonList containing AND(F1, F2, ...), we can return
-    // a list containing F1, F2, ...
+    // Instead of a singletonList containing AND(F1, F2, ...), we can return a list containing F1,
+    // F2, ...
     // TODO(orquery): Once proper support for composite filters has been completed, we can remove
     // this flattening from here.
     if (result instanceof com.google.firebase.firestore.core.CompositeFilter) {

firebase-firestore/src/test/java/com/google/firebase/firestore/remote/RemoteSerializerTest.java

@@ -15,7 +15,7 @@
 package com.google.firebase.firestore.remote;
 
 import static com.google.firebase.firestore.model.Values.refValue;
-import static com.google.firebase.firestore.testutil.TestUtil.andFilter;
+import static com.google.firebase.firestore.testutil.TestUtil.andFilters;
 import static com.google.firebase.firestore.testutil.TestUtil.bound;
 import static com.google.firebase.firestore.testutil.TestUtil.deleteMutation;
 import static com.google.firebase.firestore.testutil.TestUtil.deletedDoc;
@@ -25,7 +25,7 @@
 import static com.google.firebase.firestore.testutil.TestUtil.key;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
 import static com.google.firebase.firestore.testutil.TestUtil.mergeMutation;
-import static com.google.firebase.firestore.testutil.TestUtil.orFilter;
+import static com.google.firebase.firestore.testutil.TestUtil.orFilters;
 import static com.google.firebase.firestore.testutil.TestUtil.orderBy;
 import static com.google.firebase.firestore.testutil.TestUtil.patchMutation;
 import static com.google.firebase.firestore.testutil.TestUtil.query;
@@ -684,14 +684,14 @@ public void testEncodesMultipleFiltersOnDeeperCollections() {
 
   @Test
   public void testEncodesCompositeFiltersOnDeeperCollections() {
-    // (prop < 42) || (author == "dimond" && tags array-contains "pending")
+    // (prop < 42) || (author == "ehsann" && tags array-contains "pending")
     Query q =
         Query.atPath(ResourcePath.fromString("rooms/1/messages/10/attachments"))
             .filter(
-                orFilter(
+                orFilters(
                     filter("prop", "<", 42),
-                    andFilter(
-                        filter("author", "==", "dimond"),
+                    andFilters(
+                        filter("author", "==", "ehsann"),
                         filter("tags", "array-contains", "pending"))));
     Target actual = serializer.encodeTarget(wrapTargetData(q));
 
@@ -727,7 +727,7 @@ public void testEncodesCompositeFiltersOnDeeperCollections() {
                                                             .setOp(Operator.EQUAL)
                                                             .setValue(
                                                                 Value.newBuilder()
-                                                                    .setStringValue("dimond"))))
+                                                                    .setStringValue("ehsann"))))
                                             .addFilters(
                                                 Filter.newBuilder()
                                                     .setFieldFilter(
@@ -757,8 +757,9 @@ public void testEncodesCompositeFiltersOnDeeperCollections() {
             .build();
 
     assertEquals(expected, actual);
-    assertEquals(
-        serializer.decodeQueryTarget(serializer.encodeQueryTarget(q.toTarget())), q.toTarget());
+    com.google.firebase.firestore.core.Target roundTripped =
+        serializer.decodeQueryTarget(serializer.encodeQueryTarget(q.toTarget()));
+    assertEquals(roundTripped, q.toTarget());
   }
 
   @Test

firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestUtil.java

@@ -258,22 +258,22 @@ public static FieldFilter filter(String key, String operator, Object value) {
     return FieldFilter.create(field(key), operatorFromString(operator), wrap(value));
   }
 
-  public static CompositeFilter andFilter(List<Filter> filters) {
+  public static CompositeFilter andFilters(List<Filter> filters) {
     return new CompositeFilter(filters, StructuredQuery.CompositeFilter.Operator.AND);
   }
 
-  public static CompositeFilter andFilter(Filter... filters) {
+  public static CompositeFilter andFilters(Filter... filters) {
     return new CompositeFilter(
         Arrays.asList(filters), StructuredQuery.CompositeFilter.Operator.AND);
   }
 
-  public static CompositeFilter orFilter(Filter... filters) {
+  public static CompositeFilter orFilters(Filter... filters) {
     // TODO(orquery): Replace this with Operator.OR once it is available.
     return new CompositeFilter(
         Arrays.asList(filters), StructuredQuery.CompositeFilter.Operator.OPERATOR_UNSPECIFIED);
   }
 
-  public static CompositeFilter orFilter(List<Filter> filters) {
+  public static CompositeFilter orFilters(List<Filter> filters) {
     // TODO(orquery): Replace this with Operator.OR once it is available.
     return new CompositeFilter(
         filters, StructuredQuery.CompositeFilter.Operator.OPERATOR_UNSPECIFIED);