Refactor Values

Author: tom-andersen

firebase-firestore/src/main/java/com/google/firebase/firestore/model/ObjectValue.java

@@ -247,7 +247,7 @@ public boolean equals(Object o) {
     if (this == o) {
       return true;
     } else if (o instanceof ObjectValue) {
-      return Values.equals(buildProto(), ((ObjectValue) o).buildProto());
+      return buildProto().equals(((ObjectValue) o).buildProto());
     }
     return false;
   }

firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/ArrayTransformOperation.java

@@ -123,7 +123,7 @@ protected Value apply(@Nullable Value previousValue) {
       ArrayValue.Builder result = coercedFieldValuesArray(previousValue);
       for (Value removeElement : getElements()) {
         for (int i = 0; i < result.getValuesCount(); ) {
-          if (Values.equals(result.getValues(i), removeElement)) {
+          if (result.getValues(i).equals(removeElement)) {
             result.removeValues(i);
           } else {
             ++i;

firebase-firestore/src/test/java/com/google/firebase/firestore/UserDataWriterTest.java

@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.firestore.testutil.TestUtil.blob;
 import static com.google.firebase.firestore.testutil.TestUtil.field;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
@@ -264,7 +265,7 @@ public void testConvertsLists() {
     ArrayValue.Builder expectedArray =
         ArrayValue.newBuilder().addValues(wrap("value")).addValues(wrap(true));
     Value actual = wrap(asList("value", true));
-    assertTrue(Values.equals(Value.newBuilder().setArrayValue(expectedArray).build(), actual));
+    assertThat(actual).isEqualTo(Value.newBuilder().setArrayValue(expectedArray).build());
   }
 
   @Test

firebase-firestore/src/test/java/com/google/firebase/firestore/core/TargetTest.java

@@ -151,12 +151,12 @@ public void orderByQueryBound() {
 
     Bound lowerBound = target.getLowerBound(index);
     assertEquals(1, lowerBound.getPosition().size());
-    assertTrue(Values.equals(lowerBound.getPosition().get(0), Values.MIN_VALUE));
+    assertEquals(Values.MIN_VALUE, lowerBound.getPosition().get(0));
     assertTrue(lowerBound.isInclusive());
 
     Bound upperBound = target.getUpperBound(index);
     assertEquals(1, upperBound.getPosition().size());
-    assertTrue(Values.equals(upperBound.getPosition().get(0), Values.MAX_VALUE));
+    assertEquals(Values.MAX_VALUE, upperBound.getPosition().get(0));
     assertTrue(upperBound.isInclusive());
   }
 
@@ -183,7 +183,7 @@ public void startAtQueryBound() {
 
     Bound upperBound = target.getUpperBound(index);
     assertEquals(1, upperBound.getPosition().size());
-    assertTrue(Values.equals(upperBound.getPosition().get(0), Values.MAX_VALUE));
+    assertEquals(Values.MAX_VALUE, upperBound.getPosition().get(0));
     assertTrue(upperBound.isInclusive());
   }
 
@@ -259,7 +259,7 @@ public void endAtQueryBound() {
 
     Bound lowerBound = target.getLowerBound(index);
     assertEquals(1, lowerBound.getPosition().size());
-    assertTrue(Values.equals(lowerBound.getPosition().get(0), Values.MIN_VALUE));
+    assertEquals(Values.MIN_VALUE, lowerBound.getPosition().get(0));
     assertTrue(lowerBound.isInclusive());
 
     Bound upperBound = target.getUpperBound(index);
@@ -349,11 +349,11 @@ private void verifyBound(Bound bound, boolean inclusive, Object... values) {
     assertEquals("size", values.length, position.size());
     for (int i = 0; i < values.length; ++i) {
       Value expectedValue = wrap(values[i]);
-      assertTrue(
+      assertEquals(
           String.format(
               "Values should be equal: Expected: %s, Actual: %s",
               Values.canonicalId(expectedValue), Values.canonicalId(position.get(i))),
-          Values.equals(position.get(i), expectedValue));
+          expectedValue, position.get(i));
     }
   }
 }

firebase-firestore/src/test/java/com/google/firebase/firestore/model/ValuesTest.java

@@ -368,7 +368,7 @@ static class EqualsWrapper implements Comparable<EqualsWrapper> {
 
     @Override
     public boolean equals(Object o) {
-      return o instanceof EqualsWrapper && Values.equals(proto, ((EqualsWrapper) o).proto);
+      return o instanceof EqualsWrapper && proto.equals(((EqualsWrapper) o).proto);
     }
 
     @Override

firebase-firestore/src/test/java/com/google/firebase/firestore/model/mutation/MutationTest.java

@@ -678,7 +678,7 @@ public void testNumericIncrementBaseValue() {
                 0,
                 "nested",
                 map("double", 42.0, "long", 42, "string", 0, "map", 0, "missing", 0)));
-    assertTrue(Values.equals(expected, baseValue.get(FieldPath.EMPTY_PATH)));
+    assertEquals(expected, baseValue.get(FieldPath.EMPTY_PATH));
   }
 
   @Test

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

@@ -123,7 +123,6 @@ public void setUp() {
   private void assertRoundTrip(Value actual, Value proto, Value.ValueTypeCase typeCase) {
     assertEquals(typeCase, actual.getValueTypeCase());
     assertEquals(proto, actual);
-    assertTrue(Values.equals(actual, proto));
   }
 
   @Test