Remove Use Long.compare() instead of Util.compareLongs() too

Author: dconeybe

firebase-firestore/CHANGELOG.md

@@ -2,8 +2,8 @@
 * [fixed] Further improved performance of UTF-8 string ordering logic,
   which had degraded in v25.1.2 and received some improvements in v25.1.3.
   [#7053](//github.com/firebase/firebase-android-sdk/issues/7053)
-* [changed] Use `Integer.compare()` (which was added in Android API 19) to compare integers instead
-  of Firestore's bespoke implementation, since minSdkVersion has been greater than 19 for some time.
+* [changed] Use `Integer.compare()` and `Long.compare()` (which were added in Android API 19)
+  instead of Firestore's bespoke implementations, since minSdkVersion is greater than 19.
   [#7109](//github.com/firebase/firebase-android-sdk/pull/7109)
 
 

firebase-firestore/src/main/java/com/google/cloud/datastore/core/number/NumberComparisonHelper.java

@@ -50,7 +50,7 @@ public static int firestoreCompareDoubleWithLong(double doubleValue, long longVa
     }
 
     long doubleAsLong = (long) doubleValue;
-    int cmp = compareLongs(doubleAsLong, longValue);
+    int cmp = Long.compare(doubleAsLong, longValue);
     if (cmp != 0) {
       return cmp;
     }
@@ -60,11 +60,6 @@ public static int firestoreCompareDoubleWithLong(double doubleValue, long longVa
     return firestoreCompareDoubles(doubleValue, longAsDouble);
   }
 
-  /** Compares longs. */
-  public static int compareLongs(long leftLong, long rightLong) {
-    return Long.compare(leftLong, rightLong);
-  }
-
   /**
    * Compares doubles with Firestore query semantics: NaN precedes all other numbers and equals
    * itself, all zeroes are equal.

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

@@ -291,7 +291,7 @@ private static int compareNumbers(Value left, Value right) {
     } else if (left.getValueTypeCase() == Value.ValueTypeCase.INTEGER_VALUE) {
       long leftLong = left.getIntegerValue();
       if (right.getValueTypeCase() == Value.ValueTypeCase.INTEGER_VALUE) {
-        return Util.compareLongs(leftLong, right.getIntegerValue());
+        return Long.compare(leftLong, right.getIntegerValue());
       } else if (right.getValueTypeCase() == Value.ValueTypeCase.DOUBLE_VALUE) {
         return -1 * Util.compareMixed(right.getDoubleValue(), leftLong);
       }
@@ -301,7 +301,7 @@ private static int compareNumbers(Value left, Value right) {
   }
 
   private static int compareTimestamps(Timestamp left, Timestamp right) {
-    int cmp = Util.compareLongs(left.getSeconds(), right.getSeconds());
+    int cmp = Long.compare(left.getSeconds(), right.getSeconds());
     if (cmp != 0) {
       return cmp;
     }

firebase-firestore/src/main/java/com/google/firebase/firestore/util/Util.java

@@ -115,14 +115,6 @@ public static int compareUtf8Strings(String left, String right) {
     return Integer.compare(left.length(), right.length());
   }
 
-  /**
-   * Utility function to compare longs. Note that we can't use Long.compare because it's only
-   * available after Android 19.
-   */
-  public static int compareLongs(long i1, long i2) {
-    return NumberComparisonHelper.compareLongs(i1, i2);
-  }
-
   /** Utility function to compare doubles (using Firestore semantics for NaN). */
   public static int compareDoubles(double i1, double i2) {
     return NumberComparisonHelper.firestoreCompareDoubles(i1, i2);