spotless, apiTxt, use Expr types.

Author: tom-andersen

firebase-firestore/api.txt

@@ -660,10 +660,7 @@ public void testComparisonOperators() {
             .pipeline()
             .collection(randomCol)
             .where(
-                and(
-                    gt("rating", 4.2),
-                    lte(field("rating"), 4.5),
-                    neq("genre", "Science Function")))
+                and(gt("rating", 4.2), lte(field("rating"), 4.5), neq("genre", "Science Function")))
             .select("rating", "title")
             .sort(field("title").ascending())
             .execute();
@@ -771,10 +768,8 @@ public void testDistanceFunctions() {
             .collection(randomCol)
             .select(
                 cosineDistance(vector(sourceVector), targetVector).alias("cosineDistance"),
-                Expr.dotProduct(vector(sourceVector), targetVector)
-                    .alias("dotProductDistance"),
-                euclideanDistance(vector(sourceVector), targetVector)
-                    .alias("euclideanDistance"))
+                Expr.dotProduct(vector(sourceVector), targetVector).alias("dotProductDistance"),
+                euclideanDistance(vector(sourceVector), targetVector).alias("euclideanDistance"))
             .limit(1)
             .execute();
     assertThat(waitFor(execute).getResults())

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/PipelineTest.java

@@ -36,7 +36,6 @@ import com.google.firebase.firestore.pipeline.ExprWithAlias
 import com.google.firebase.firestore.pipeline.Field
 import com.google.firebase.firestore.pipeline.FindNearestStage
 import com.google.firebase.firestore.pipeline.FunctionExpr
-import com.google.firebase.firestore.pipeline.GenericArg
 import com.google.firebase.firestore.pipeline.GenericStage
 import com.google.firebase.firestore.pipeline.LimitStage
 import com.google.firebase.firestore.pipeline.OffsetStage
@@ -118,7 +117,7 @@ internal constructor(
    * @return A new [Pipeline] object with this stage appended to the stage list.
    */
   fun genericStage(name: String, vararg arguments: Any): Pipeline =
-    append(GenericStage(name, arguments.map(GenericArg::from)))
+    append(GenericStage.ofName(name).withArguments(arguments))
 
   /**
    * Adds a stage to the pipeline by specifying the stage name as an argument. This does not offer
@@ -171,7 +170,9 @@ internal constructor(
    */
   fun removeFields(field: String, vararg additionalFields: String): Pipeline =
     append(
-      RemoveFieldsStage(arrayOf(Expr.field(field), *additionalFields.map(Expr::field).toTypedArray()))
+      RemoveFieldsStage(
+        arrayOf(Expr.field(field), *additionalFields.map(Expr::field).toTypedArray())
+      )
     )
 
   /**
@@ -255,8 +256,7 @@ internal constructor(
    * You can filter documents based on their field values, using implementations of [BooleanExpr],
    * typically including but not limited to:
    *
-   * - field comparators: [Expr.eq], [Expr.lt] (less than), [Expr.gt]
-   * (greater than), etc.
+   * - field comparators: [Expr.eq], [Expr.lt] (less than), [Expr.gt] (greater than), etc.
    * - logical operators: [Expr.and], [Expr.or], [Expr.not], etc.
    * - advanced functions: [Expr.regexMatch], [Expr.arrayContains], etc.
    *

firebase-firestore/src/main/java/com/google/firebase/firestore/Pipeline.kt

@@ -567,9 +567,10 @@ public Pipeline toPipeline(FirebaseFirestore firestore, UserDataReader userDataR
         p = p.sort(orderings.get(0), orderings.stream().skip(1).toArray(Ordering[]::new));
         p = p.limit((int) limit);
       } else {
-        p = p.sort(
-            orderings.get(0).reverse(),
-            orderings.stream().skip(1).map(Ordering::reverse).toArray(Ordering[]::new));
+        p =
+            p.sort(
+                orderings.get(0).reverse(),
+                orderings.stream().skip(1).map(Ordering::reverse).toArray(Ordering[]::new));
         p = p.limit((int) limit);
         p = p.sort(orderings.get(0), orderings.stream().skip(1).toArray(Ordering[]::new));
       }