Fix docStubs task

Author: tom-andersen

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

@@ -131,6 +131,6 @@ public Task<DocumentReference> add(@NonNull Object data) {
 
   @NonNull
   public Pipeline pipeline() {
-    return new Pipeline(firestore, new CollectionSource(getPath()));
+    return new Pipeline(firestore, firestore.getUserDataReader(), new CollectionSource(getPath()));
   }
 }

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

@@ -857,8 +857,7 @@ DatabaseId getDatabaseId() {
   }
 
   @NonNull
-  @RestrictTo(RestrictTo.Scope.LIBRARY)
-  public UserDataReader getUserDataReader() {
+  UserDataReader getUserDataReader() {
     return userDataReader;
   }
 

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

@@ -49,15 +49,17 @@ import com.google.firestore.v1.Value
 class Pipeline
 internal constructor(
   internal val firestore: FirebaseFirestore,
+  internal val userDataReader: UserDataReader,
   private val stages: FluentIterable<Stage>
 ) {
   internal constructor(
     firestore: FirebaseFirestore,
+    userDataReader: UserDataReader,
     stage: Stage
-  ) : this(firestore, FluentIterable.of(stage))
+  ) : this(firestore, userDataReader, FluentIterable.of(stage))
 
   private fun append(stage: Stage): Pipeline {
-    return Pipeline(firestore, stages.append(stage))
+    return Pipeline(firestore, userDataReader, stages.append(stage))
   }
 
   fun execute(): Task<PipelineSnapshot> {
@@ -86,7 +88,7 @@ internal constructor(
 
   internal fun toPipelineProto(): com.google.firestore.v1.Pipeline =
     com.google.firestore.v1.Pipeline.newBuilder()
-      .addAllStages(stages.map { it.toProtoStage(firestore.userDataReader) })
+      .addAllStages(stages.map { it.toProtoStage(userDataReader) })
       .build()
 
   fun genericStage(name: String, vararg params: Any) =
@@ -167,18 +169,18 @@ class PipelineSource internal constructor(private val firestore: FirebaseFiresto
         "Provided collection reference is from a different Firestore instance."
       )
     }
-    return Pipeline(firestore, CollectionSource(ref.path))
+    return Pipeline(firestore, firestore.userDataReader, CollectionSource(ref.path))
   }
 
   fun collectionGroup(collectionId: String): Pipeline {
     Preconditions.checkNotNull(collectionId, "Provided collection ID must not be null.")
     require(!collectionId.contains("/")) {
       "Invalid collectionId '$collectionId'. Collection IDs must not contain '/'."
     }
-    return Pipeline(firestore, CollectionGroupSource(collectionId))
+    return Pipeline(firestore, firestore.userDataReader, CollectionGroupSource(collectionId))
   }
 
-  fun database(): Pipeline = Pipeline(firestore, DatabaseSource())
+  fun database(): Pipeline = Pipeline(firestore, firestore.userDataReader, DatabaseSource())
 
   fun documents(vararg documents: String): Pipeline {
     // Validate document path by converting to DocumentReference
@@ -196,6 +198,7 @@ class PipelineSource internal constructor(private val firestore: FirebaseFiresto
     }
     return Pipeline(
       firestore,
+      firestore.userDataReader,
       DocumentsSource(documents.map { docRef -> "/" + docRef.path }.toTypedArray())
     )
   }

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

@@ -363,6 +363,9 @@ protected constructor(private val name: String, private val params: Array<out Ex
   private constructor(name: String, param: Expr, vararg params: Any) : this(name, arrayOf(param, *toArrayOfExprOrConstant(params)))
   private constructor(name: String, fieldName: String, vararg params: Any) : this(name, arrayOf(Field.of(fieldName), *toArrayOfExprOrConstant(params)))
   companion object {
+
+    @JvmStatic fun generic(name: String, vararg expr: Expr) = Function(name, expr)
+
     @JvmStatic
     fun and(condition: BooleanExpr, vararg conditions: BooleanExpr) = BooleanExpr("and", condition, *conditions)
 
@@ -787,6 +790,12 @@ class BooleanExpr internal constructor(name: String, params: Array<out Expr>) :
     internal constructor(name: String, param: Expr, vararg params: Any) : this(name, arrayOf(param, *toArrayOfExprOrConstant(params)))
     internal constructor(name: String, fieldName: String, vararg params: Any) : this(name, arrayOf(Field.of(fieldName), *toArrayOfExprOrConstant(params)))
 
+  companion object {
+
+    @JvmStatic fun generic(name: String, vararg expr: Expr) = BooleanExpr(name, expr)
+
+  }
+
   fun not() = not(this)
 
   fun countIf(): AggregateExpr = AggregateExpr.countIf(this)

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

@@ -31,7 +31,7 @@ internal constructor(private val name: String, private val options: Map<String,
     builder.putAllOptions(options)
     return builder.build()
   }
-  protected abstract fun args(userDataReader: UserDataReader): Sequence<Value>
+  internal abstract fun args(userDataReader: UserDataReader): Sequence<Value>
 }
 
 class GenericStage internal constructor(name: String, private val params: List<GenericArg>) :