Use UnaryFilter.

Author: ehsannas

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

@@ -25,12 +25,12 @@
 /** @hide */
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class Filter {
-  static class FieldFilter extends Filter {
+  static class UnaryFilter extends Filter {
     private final FieldPath field;
     private final Operator operator;
     private final Object value;
 
-    public FieldFilter(FieldPath field, Operator operator, @Nullable Object value) {
+    public UnaryFilter(FieldPath field, Operator operator, @Nullable Object value) {
       this.field = field;
       this.operator = operator;
       this.value = value;
@@ -76,7 +76,7 @@ public static Filter equalTo(@NonNull String field, @Nullable Object value) {
 
   @NonNull
   public static Filter equalTo(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new FieldFilter(fieldPath, Operator.EQUAL, value);
+    return new UnaryFilter(fieldPath, Operator.EQUAL, value);
   }
 
   @NonNull
@@ -86,7 +86,7 @@ public static Filter notEqualTo(@NonNull String field, @Nullable Object value) {
 
   @NonNull
   public static Filter notEqualTo(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new FieldFilter(fieldPath, Operator.NOT_EQUAL, value);
+    return new UnaryFilter(fieldPath, Operator.NOT_EQUAL, value);
   }
 
   @NonNull
@@ -96,7 +96,7 @@ public static Filter greaterThan(@NonNull String field, @Nullable Object value)
 
   @NonNull
   public static Filter greaterThan(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new FieldFilter(fieldPath, Operator.GREATER_THAN, value);
+    return new UnaryFilter(fieldPath, Operator.GREATER_THAN, value);
   }
 
   @NonNull
@@ -106,7 +106,7 @@ public static Filter greaterThanOrEqualTo(@NonNull String field, @Nullable Objec
 
   @NonNull
   public static Filter greaterThanOrEqualTo(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new FieldFilter(fieldPath, Operator.GREATER_THAN_OR_EQUAL, value);
+    return new UnaryFilter(fieldPath, Operator.GREATER_THAN_OR_EQUAL, value);
   }
 
   @NonNull
@@ -116,7 +116,7 @@ public static Filter lessThan(@NonNull String field, @Nullable Object value) {
 
   @NonNull
   public static Filter lessThan(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new FieldFilter(fieldPath, Operator.LESS_THAN, value);
+    return new UnaryFilter(fieldPath, Operator.LESS_THAN, value);
   }
 
   @NonNull
@@ -126,7 +126,7 @@ public static Filter lessThanOrEqualTo(@NonNull String field, @Nullable Object v
 
   @NonNull
   public static Filter lessThanOrEqualTo(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new FieldFilter(fieldPath, Operator.LESS_THAN_OR_EQUAL, value);
+    return new UnaryFilter(fieldPath, Operator.LESS_THAN_OR_EQUAL, value);
   }
 
   @NonNull
@@ -136,7 +136,7 @@ public static Filter arrayContains(@NonNull String field, @Nullable Object value
 
   @NonNull
   public static Filter arrayContains(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new FieldFilter(fieldPath, Operator.ARRAY_CONTAINS, value);
+    return new UnaryFilter(fieldPath, Operator.ARRAY_CONTAINS, value);
   }
 
   @NonNull
@@ -146,7 +146,7 @@ public static Filter arrayContainsAny(@NonNull String field, @Nullable Object va
 
   @NonNull
   public static Filter arrayContainsAny(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new FieldFilter(fieldPath, Operator.ARRAY_CONTAINS_ANY, value);
+    return new UnaryFilter(fieldPath, Operator.ARRAY_CONTAINS_ANY, value);
   }
 
   @NonNull
@@ -156,7 +156,7 @@ public static Filter inArray(@NonNull String field, @Nullable Object value) {
 
   @NonNull
   public static Filter inArray(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new FieldFilter(fieldPath, Operator.IN, value);
+    return new UnaryFilter(fieldPath, Operator.IN, value);
   }
 
   @NonNull
@@ -166,7 +166,7 @@ public static Filter notInArray(@NonNull String field, @Nullable Object value) {
 
   @NonNull
   public static Filter notInArray(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new FieldFilter(fieldPath, Operator.NOT_IN, value);
+    return new UnaryFilter(fieldPath, Operator.NOT_IN, value);
   }
 
   @NonNull

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

@@ -388,13 +388,13 @@ public Query whereNotIn(@NonNull FieldPath fieldPath, @NonNull List<? extends Ob
   }
 
   /**
-   * Takes a {@link Filter.FieldFilter} object, parses the value object and returns a new {@link
+   * Takes a {@link Filter.UnaryFilter} object, parses the value object and returns a new {@link
    * FieldFilter} for the field, operator, and parsed value.
    *
-   * @param fieldFilterData The Filter.FieldFilter object to parse.
+   * @param fieldFilterData The Filter.UnaryFilter object to parse.
    * @return The created {@link FieldFilter}.
    */
-  private FieldFilter parseFieldFilter(Filter.FieldFilter fieldFilterData) {
+  private FieldFilter parseFieldFilter(Filter.UnaryFilter fieldFilterData) {
     FieldPath fieldPath = fieldFilterData.getField();
     Operator op = fieldFilterData.getOperator();
     Object value = fieldFilterData.getValue();
@@ -459,10 +459,10 @@ private com.google.firebase.firestore.core.Filter parseCompositeFilter(
    */
   private com.google.firebase.firestore.core.Filter parseFilter(Filter filter) {
     hardAssert(
-        filter instanceof Filter.FieldFilter || filter instanceof Filter.CompositeFilter,
-        "Parsing is only supported for Filter.FieldFilter and Filter.CompositeFilter.");
-    if (filter instanceof Filter.FieldFilter) {
-      return parseFieldFilter((Filter.FieldFilter) filter);
+        filter instanceof Filter.UnaryFilter || filter instanceof Filter.CompositeFilter,
+        "Parsing is only supported for Filter.UnaryFilter and Filter.CompositeFilter.");
+    if (filter instanceof Filter.UnaryFilter) {
+      return parseFieldFilter((Filter.UnaryFilter) filter);
     }
     return parseCompositeFilter((Filter.CompositeFilter) filter);
   }