Add ProtoValues.contains()

Author: schmidt-sebastian

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

@@ -33,11 +33,9 @@ public boolean matches(Document doc) {
     if (!(other instanceof ArrayValue)) {
       return false;
     }
-    for (Value otherVal : other.getProto().getArrayValue().getValuesList()) {
-      for (Value thisVal : getValue().getProto().getArrayValue().getValuesList()) {
-        if (ProtoValues.equals(otherVal, thisVal)) {
-          return true;
-        }
+    for (Value val : other.getProto().getArrayValue().getValuesList()) {
+      if (ProtoValues.contains(getValue().getProto().getArrayValue().getValuesList(), val)) {
+        return true;
       }
     }
     return false;

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

@@ -19,7 +19,6 @@
 import com.google.firebase.firestore.model.value.ArrayValue;
 import com.google.firebase.firestore.model.value.FieldValue;
 import com.google.firebase.firestore.model.value.ProtoValues;
-import com.google.firestore.v1.Value;
 
 /** A Filter that implements the array-contains operator. */
 public class ArrayContainsFilter extends FieldFilter {
@@ -30,14 +29,8 @@ public class ArrayContainsFilter extends FieldFilter {
   @Override
   public boolean matches(Document doc) {
     FieldValue other = doc.getField(getField());
-    if (!(other instanceof ArrayValue)) {
-      return false;
-    }
-    for (Value otherVal : other.getProto().getArrayValue().getValuesList()) {
-      if (ProtoValues.equals(otherVal, getValue().getProto())) {
-        return true;
-      }
-    }
-    return false;
+    return other instanceof ArrayValue
+        && ProtoValues.contains(
+            other.getProto().getArrayValue().getValuesList(), getValue().getProto());
   }
 }

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

@@ -19,7 +19,6 @@
 import com.google.firebase.firestore.model.value.ArrayValue;
 import com.google.firebase.firestore.model.value.FieldValue;
 import com.google.firebase.firestore.model.value.ProtoValues;
-import com.google.firestore.v1.Value;
 
 /** A Filter that implements the IN operator. */
 public class InFilter extends FieldFilter {
@@ -30,14 +29,8 @@ public class InFilter extends FieldFilter {
   @Override
   public boolean matches(Document doc) {
     FieldValue other = doc.getField(getField());
-    if (other == null) {
-      return false;
-    }
-    for (Value otherVal : getValue().getProto().getArrayValue().getValuesList()) {
-      if (ProtoValues.equals(otherVal, other.getProto())) {
-        return true;
-      }
-    }
-    return false;
+    return other != null
+        && ProtoValues.contains(
+            getValue().getProto().getArrayValue().getValuesList(), other.getProto());
   }
 }

firebase-firestore/src/main/java/com/google/firebase/firestore/model/value/ProtoValues.java

@@ -155,6 +155,16 @@ private static boolean objectEquals(Value left, Value right) {
     return true;
   }
 
+  /** Returns true if the Value list contains the specified element. */
+  public static boolean contains(List<Value> haystack, Value needle) {
+    for (Value haystackEl : haystack) {
+      if (equals(haystackEl, needle)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   public static int compare(Value left, Value right) {
     int leftType = typeOrder(left);
     int rightType = typeOrder(right);