Fix after merge

Author: tom-andersen

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

@@ -25,7 +25,6 @@ import com.google.firebase.firestore.pipeline.AddFieldsStage
 import com.google.firebase.firestore.pipeline.AggregateFunction
 import com.google.firebase.firestore.pipeline.AggregateStage
 import com.google.firebase.firestore.pipeline.AggregateWithAlias
-import com.google.firebase.firestore.pipeline.BaseStage
 import com.google.firebase.firestore.pipeline.BooleanExpr
 import com.google.firebase.firestore.pipeline.CollectionGroupSource
 import com.google.firebase.firestore.pipeline.CollectionSource
@@ -132,7 +131,7 @@ class Pipeline
 private constructor(
   firestore: FirebaseFirestore,
   userDataReader: UserDataReader,
-  stages: FluentIterable<BaseStage<*>>
+  stages: FluentIterable<Stage<*>>
 ) : AbstractPipeline(firestore, userDataReader, stages) {
   internal constructor(
     firestore: FirebaseFirestore,
@@ -761,15 +760,15 @@ class RealtimePipeline
 internal constructor(
   firestore: FirebaseFirestore,
   userDataReader: UserDataReader,
-  stages: FluentIterable<BaseStage<*>>
+  stages: FluentIterable<Stage<*>>
 ) : AbstractPipeline(firestore, userDataReader, stages) {
   internal constructor(
     firestore: FirebaseFirestore,
     userDataReader: UserDataReader,
-    stage: BaseStage<*>
+    stage: Stage<*>
   ) : this(firestore, userDataReader, FluentIterable.of(stage))
 
-  private fun append(stage: BaseStage<*>): RealtimePipeline {
+  private fun append(stage: Stage<*>): RealtimePipeline {
     return RealtimePipeline(firestore, userDataReader, stages.append(stage))
   }
 

firebase-firestore/src/main/java/com/google/firebase/firestore/pipeline/expressions.kt

@@ -1854,28 +1854,6 @@ abstract class Expr internal constructor() {
     fun mapGet(fieldName: String, keyExpression: Expr): Expr =
       FunctionExpr("map_get", evaluateMapGet, fieldName, keyExpression)
 
-    /**
-     * Accesses a value from a map (object) field using the provided [keyExpression].
-     *
-     * @param mapExpression The expression representing the map.
-     * @param keyExpression The key to access in the map.
-     * @return A new [Expr] representing the value associated with the given key in the map.
-     */
-    @JvmStatic
-    fun mapGet(mapExpression: Expr, keyExpression: Expr): Expr =
-      FunctionExpr("map_get", mapExpression, keyExpression)
-
-    /**
-     * Accesses a value from a map (object) field using the provided [keyExpression].
-     *
-     * @param fieldName The field name of the map field.
-     * @param keyExpression The key to access in the map.
-     * @return A new [Expr] representing the value associated with the given key in the map.
-     */
-    @JvmStatic
-    fun mapGet(fieldName: String, keyExpression: Expr): Expr =
-      FunctionExpr("map_get", fieldName, keyExpression)
-
     /**
      * Creates an expression that merges multiple maps into a single map. If multiple maps have the
      * same key, the later value is used.
@@ -2677,25 +2655,6 @@ abstract class Expr internal constructor() {
     fun array(elements: List<Any?>): Expr =
       FunctionExpr("array", evaluateArray, elements.map(::toExprOrConstant).toTypedArray())
 
-    /**
-     * Creates an expression that creates a Firestore array value from an input array.
-     *
-     * @param elements The input array to evaluate in the expression.
-     * @return A new [Expr] representing the array function.
-     */
-    @JvmStatic
-    fun array(vararg elements: Any?): Expr =
-      FunctionExpr("array", elements.map(::toExprOrConstant).toTypedArray<Expr>())
-
-    /**
-     * Creates an expression that creates a Firestore array value from an input array.
-     *
-     * @param elements The input array to evaluate in the expression.
-     * @return A new [Expr] representing the array function.
-     */
-    @JvmStatic
-    fun array(elements: List<Any?>): Expr =
-      FunctionExpr("array", elements.map(::toExprOrConstant).toTypedArray())
     /**
      * Creates an expression that concatenates an array with other arrays.
      *