reduce diff from main branch, to make it easier for code review

Author: dconeybe

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

@@ -17,7 +17,6 @@
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
 import androidx.annotation.NonNull;
-import com.google.firebase.firestore.util.Utf8Compare;
 import com.google.firebase.firestore.util.Util;
 import java.util.ArrayList;
 import java.util.List;
@@ -115,7 +114,7 @@ private static int compareSegments(String lhs, String rhs) {
     } else if (isLhsNumeric && isRhsNumeric) { // both numeric
       return Long.compare(extractNumericId(lhs), extractNumericId(rhs));
     } else { // both string
-      return Utf8Compare.compareUtf8Strings(lhs, rhs);
+      return Util.compareUtf8Strings(lhs, rhs);
     }
   }
 

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

@@ -20,7 +20,6 @@
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
 import androidx.annotation.Nullable;
-import com.google.firebase.firestore.util.Utf8Compare;
 import com.google.firebase.firestore.util.Util;
 import com.google.firestore.v1.ArrayValue;
 import com.google.firestore.v1.ArrayValueOrBuilder;
@@ -231,7 +230,7 @@ public static int compare(Value left, Value right) {
       case TYPE_ORDER_SERVER_TIMESTAMP:
         return compareTimestamps(getLocalWriteTime(left), getLocalWriteTime(right));
       case TYPE_ORDER_STRING:
-        return Utf8Compare.compareUtf8Strings(left.getStringValue(), right.getStringValue());
+        return Util.compareUtf8Strings(left.getStringValue(), right.getStringValue());
       case TYPE_ORDER_BLOB:
         return Util.compareByteStrings(left.getBytesValue(), right.getBytesValue());
       case TYPE_ORDER_REFERENCE:
@@ -350,7 +349,7 @@ private static int compareMaps(MapValue left, MapValue right) {
     while (iterator1.hasNext() && iterator2.hasNext()) {
       Map.Entry<String, Value> entry1 = iterator1.next();
       Map.Entry<String, Value> entry2 = iterator2.next();
-      int keyCompare = Utf8Compare.compareUtf8Strings(entry1.getKey(), entry2.getKey());
+      int keyCompare = Util.compareUtf8Strings(entry1.getKey(), entry2.getKey());
       if (keyCompare != 0) {
         return keyCompare;
       }

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

@@ -22,7 +22,10 @@
 import com.google.firebase.firestore.BuildConfig;
 import com.google.protobuf.ByteString;
 
-public final class Utf8Compare {
+/**
+ * This class provides the implementation of {@link Util#compareUtf8Strings}.
+ */
+final class Utf8Compare {
 
   private Utf8Compare() {}
 

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

@@ -85,6 +85,11 @@ public static int compareIntegers(int i1, int i2) {
     }
   }
 
+  /** Compare strings in UTF-8 encoded byte order */
+  public static int compareUtf8Strings(String left, String right) {
+    return Utf8Compare.compareUtf8Strings(left, right);
+  }
+
   /**
    * Utility function to compare longs. Note that we can't use Long.compare because it's only
    * available after Android 19.