fixups

Author: tom-andersen

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

@@ -569,7 +569,7 @@ public static void checkOnlineAndOfflineResultsMatch(Query query, String... expe
   public static void checkQueryAndPipelineResultsMatch(Query query, String... expectedDocs) {
     QuerySnapshot docsFromQuery = waitFor(query.get(Source.SERVER));
     PipelineSnapshot docsFromPipeline =
-        waitFor(query.getFirestore().pipeline().createFrom(query).execute());
+        waitFor(query.getFirestore().pipeline().convertFrom(query).execute());
 
     assertEquals(querySnapshotToIds(docsFromQuery), pipelineSnapshotToIds(docsFromPipeline));
     List<String> expected = asList(expectedDocs);

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java

@@ -14,12 +14,13 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.firebase.firestore.pipeline.Expr.field;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import com.google.firebase.firestore.pipeline.AggregateFunction;
 import com.google.firebase.firestore.pipeline.AggregateWithAlias;
-import com.google.firebase.firestore.pipeline.Field;
 import java.util.Objects;
 
 /** Represents an aggregation that can be performed by Firestore. */
@@ -218,7 +219,7 @@ private SumAggregateField(@NonNull FieldPath fieldPath) {
     @NonNull
     @Override
     AggregateWithAlias toPipeline() {
-      return Field.of(getFieldPath()).sum().alias(getAlias());
+      return field(getFieldPath()).sum().alias(getAlias());
     }
   }
 
@@ -231,7 +232,7 @@ private AverageAggregateField(@NonNull FieldPath fieldPath) {
     @NonNull
     @Override
     AggregateWithAlias toPipeline() {
-      return Field.of(getFieldPath()).avg().alias(getAlias());
+      return field(getFieldPath()).avg().alias(getAlias());
     }
   }
 }

firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateField.java

@@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableList
 import com.google.firebase.Timestamp
 import com.google.firebase.firestore.model.DocumentKey
 import com.google.firebase.firestore.model.Values
+import com.google.firebase.firestore.pipeline.AbstractOptions
 import com.google.firebase.firestore.pipeline.AddFieldsStage
 import com.google.firebase.firestore.pipeline.AggregateFunction
 import com.google.firebase.firestore.pipeline.AggregateStage
@@ -38,9 +39,11 @@ 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.InternalOptions
 import com.google.firebase.firestore.pipeline.LimitStage
 import com.google.firebase.firestore.pipeline.OffsetStage
 import com.google.firebase.firestore.pipeline.Ordering
+import com.google.firebase.firestore.pipeline.PipelineOptions
 import com.google.firebase.firestore.pipeline.RemoveFieldsStage
 import com.google.firebase.firestore.pipeline.ReplaceStage
 import com.google.firebase.firestore.pipeline.SampleStage
@@ -72,17 +75,19 @@ internal constructor(
     return Pipeline(firestore, userDataReader, stages.append(stage))
   }
 
-  fun execute(): Task<PipelineSnapshot> {
+  fun execute(): Task<PipelineSnapshot> = execute(PipelineOptions.DEFAULT)
+
+  fun execute(options: PipelineOptions): Task<PipelineSnapshot> {
     val observerTask = ObserverSnapshotTask()
-    firestore.callClient { call -> call!!.executePipeline(toProto(), observerTask) }
+    firestore.callClient { call -> call!!.executePipeline(toProto(options), observerTask) }
     return observerTask.task
   }
 
   internal fun documentReference(key: DocumentKey): DocumentReference {
     return DocumentReference(key, firestore)
   }
 
-  private fun toProto(): ExecutePipelineRequest {
+  private fun toProto(options: PipelineOptions): ExecutePipelineRequest {
     val database = firestore.databaseId
     val builder = ExecutePipelineRequest.newBuilder()
     builder.database = "projects/${database.projectId}/databases/${database.databaseId}"
@@ -169,7 +174,7 @@ internal constructor(
    */
   fun removeFields(field: String, vararg additionalFields: String): Pipeline =
     append(
-      RemoveFieldsStage(arrayOf(Field.of(field), *additionalFields.map(Field::of).toTypedArray()))
+      RemoveFieldsStage(arrayOf(Expr.field(field), *additionalFields.map(Expr::field).toTypedArray()))
     )
 
   /**
@@ -221,7 +226,7 @@ internal constructor(
     append(
       SelectStage(
         arrayOf(
-          Field.of(fieldName),
+          Expr.field(fieldName),
           *additionalSelections.map(Selectable::toSelectable).toTypedArray()
         )
       )
@@ -253,10 +258,10 @@ internal constructor(
    * You can filter documents based on their field values, using implementations of [BooleanExpr],
    * typically including but not limited to:
    *
-   * - field comparators: [FunctionExpr.eq], [FunctionExpr.lt] (less than), [FunctionExpr.gt]
+   * - field comparators: [Expr.eq], [Expr.lt] (less than), [Expr.gt]
    * (greater than), etc.
-   * - logical operators: [FunctionExpr.and], [FunctionExpr.or], [FunctionExpr.not], etc.
-   * - advanced functions: [FunctionExpr.regexMatch], [FunctionExpr.arrayContains[], etc.
+   * - logical operators: [Expr.and], [Expr.or], [Expr.not], etc.
+   * - advanced functions: [Expr.regexMatch], [Expr.arrayContains], etc.
    *
    * @param condition The [BooleanExpr] to apply.
    * @return A new [Pipeline] object with this stage appended to the stage list.
@@ -336,7 +341,7 @@ internal constructor(
     append(
       DistinctStage(
         arrayOf(
-          Field.of(groupField),
+          Expr.field(groupField),
           *additionalGroups.map(Selectable::toSelectable).toTypedArray()
         )
       )
@@ -468,7 +473,7 @@ internal constructor(
    * @param field The [String] specifying the field name containing the nested map.
    * @return A new [Pipeline] object with this stage appended to the stage list.
    */
-  fun replace(field: String): Pipeline = replace(Field.of(field))
+  fun replace(field: String): Pipeline = replace(Expr.field(field))
 
   /**
    * Fully overwrites all fields in a document with those coming from a nested map.
@@ -530,7 +535,7 @@ internal constructor(
    * @return A new [Pipeline] object with this stage appended to the stage list.
    */
   fun unnest(arrayField: String, alias: String): Pipeline =
-    unnest(Field.of(arrayField).alias(alias))
+    unnest(Expr.field(arrayField).alias(alias))
 
   /**
    * Takes a specified array from the input documents and outputs a document for each element with

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

@@ -14,7 +14,7 @@
 
 package com.google.firebase.firestore.core;
 
-import static com.google.firebase.firestore.pipeline.FunctionExpr.and;
+import static com.google.firebase.firestore.pipeline.Expr.and;
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 import static java.lang.Double.isNaN;
 

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

@@ -14,8 +14,8 @@
 
 package com.google.firebase.firestore.core;
 
-import static com.google.firebase.firestore.pipeline.FunctionExpr.and;
-import static com.google.firebase.firestore.pipeline.FunctionExpr.or;
+import static com.google.firebase.firestore.pipeline.Expr.and;
+import static com.google.firebase.firestore.pipeline.Expr.or;
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
 import androidx.annotation.NonNull;
@@ -547,7 +547,7 @@ public Pipeline toPipeline(FirebaseFirestore firestore, UserDataReader userDataR
       p = p.where(fields.get(0).exists());
     } else {
       BooleanExpr[] conditions =
-          fields.stream().skip(1).map(Expr::exists).toArray(BooleanExpr[]::new);
+          fields.stream().skip(1).map(Expr.Companion::exists).toArray(BooleanExpr[]::new);
       p = p.where(and(fields.get(0).exists(), conditions));
     }
 
@@ -587,7 +587,7 @@ private static BooleanExpr whereConditionsFromCursor(
     int last = size - 1;
     BooleanExpr condition = cmp.apply(fields.get(last), boundPosition.get(last));
     if (bound.isInclusive()) {
-      condition = or(condition, FunctionExpr.eq(fields.get(last), boundPosition.get(last)));
+      condition = or(condition, Expr.eq(fields.get(last), boundPosition.get(last)));
     }
     for (int i = size - 2; i >= 0; i--) {
       final Field field = fields.get(i);

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

@@ -25,7 +25,7 @@ class AggregateFunction
 private constructor(private val name: String, private val params: Array<out Expr>) {
   private constructor(name: String) : this(name, emptyArray())
   private constructor(name: String, expr: Expr) : this(name, arrayOf(expr))
-  private constructor(name: String, fieldName: String) : this(name, Field.of(fieldName))
+  private constructor(name: String, fieldName: String) : this(name, Expr.field(fieldName))
 
   companion object {