Tweaks

Author: wu-hui

google-cloud-firestore/src/main/java/com/google/cloud/firestore/Pipeline.java

@@ -82,35 +82,25 @@
  */
 public final class Pipeline {
   private final ImmutableList<Stage> stages;
-  private final String name;
 
-  private Pipeline(List<Stage> stages, String name) {
+  private Pipeline(List<Stage> stages) {
     this.stages = ImmutableList.copyOf(stages);
-    this.name = name;
   }
 
   private Pipeline(Collection collection) {
-    this(Lists.newArrayList(collection), collection.getPath());
+    this(Lists.newArrayList(collection));
   }
 
   private Pipeline(CollectionGroup group) {
-    this(Lists.newArrayList(group), group.getCollectionId());
+    this(Lists.newArrayList(group));
   }
 
   private Pipeline(Database db) {
-    this(Lists.newArrayList(db), db.getName());
+    this(Lists.newArrayList(db));
   }
 
   private Pipeline(Documents docs) {
-    this(Lists.newArrayList(docs), docs.getName());
-  }
-
-  public static Pipeline from(CollectionReference source) {
-    return new Pipeline(new Collection(source.getPath()));
-  }
-
-  public static Pipeline from(com.google.cloud.firestore.CollectionGroup source) {
-    return new Pipeline(new CollectionGroup(source.options.getCollectionId()));
+    this(Lists.newArrayList(docs));
   }
 
   public static Pipeline fromCollection(String collectionName) {
@@ -165,51 +155,46 @@ public Pipeline addFields(Selectable... fields) {
         ImmutableList.<Stage>builder()
             .addAll(stages)
             .add(new AddFields(projectablesToMap(fields)))
-            .build(),
-        name);
+            .build());
   }
 
   public Pipeline select(Selectable... projections) {
     return new Pipeline(
         ImmutableList.<Stage>builder()
             .addAll(stages)
             .add(new Select(projectablesToMap(projections)))
-            .build(),
-        name);
+            .build());
   }
 
   public Pipeline select(String... fields) {
     return new Pipeline(
         ImmutableList.<Stage>builder()
             .addAll(stages)
             .add(new Select(fieldNamesToMap(fields)))
-            .build(),
-        name);
+            .build());
   }
 
   public Pipeline filter(FilterCondition condition) {
     return new Pipeline(
         ImmutableList.<Stage>builder()
             .addAll(stages)
             .add(new com.google.cloud.firestore.pipeline.stages.Filter(condition))
-            .build(),
-        name);
+            .build());
   }
 
   public Pipeline offset(int offset) {
     return new Pipeline(
-        ImmutableList.<Stage>builder().addAll(stages).add(new Offset(offset)).build(), name);
+        ImmutableList.<Stage>builder().addAll(stages).add(new Offset(offset)).build());
   }
 
   public Pipeline limit(int limit) {
     return new Pipeline(
-        ImmutableList.<Stage>builder().addAll(stages).add(new Limit(limit)).build(), name);
+        ImmutableList.<Stage>builder().addAll(stages).add(new Limit(limit)).build());
   }
 
   public Pipeline aggregate(AggregatorTarget... aggregators) {
     return new Pipeline(
-        ImmutableList.<Stage>builder().addAll(stages).add(new Aggregate(aggregators)).build(),
-        name);
+        ImmutableList.<Stage>builder().addAll(stages).add(new Aggregate(aggregators)).build());
   }
 
   public Pipeline findNearest(
@@ -226,17 +211,15 @@ public Pipeline findNearest(
             .add(
                 new FindNearest(
                     property, vector, options)) // Assuming FindNearest takes these arguments
-            .build(),
-        name);
+            .build());
   }
 
   public Pipeline sort(List<Ordering> orders, Sort.Density density, Sort.Truncation truncation) {
     return new Pipeline(
         ImmutableList.<Stage>builder()
             .addAll(stages)
             .add(new Sort(orders, density, truncation))
-            .build(),
-        name);
+            .build());
   }
 
   // Sugar
@@ -258,8 +241,7 @@ public Pipeline genericStage(String name, Map<String, Object> params) {
                     name,
                     Lists.newArrayList(
                         params.values()))) // Assuming GenericStage takes a list of params
-            .build(),
-        name);
+            .build());
   }
 
   public ApiFuture<List<PipelineResult>> execute(Firestore db) {

google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java

@@ -2122,8 +2122,10 @@ public AggregateQuery aggregate(
   @Nonnull
   public Pipeline toPipeline() {
     // From
-    Pipeline ppl =
-        Pipeline.fromCollection(
+    Pipeline ppl = this.options.getAllDescendants() ?
+        Pipeline.fromCollectionGroup(
+            this.options.getCollectionId())
+        : Pipeline.fromCollection(
             this.options.getParentPath().append(this.options.getCollectionId()).getPath());
 
     // Filters

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/expressions/AggregatorTarget.java

@@ -1,6 +1,6 @@
 package com.google.cloud.firestore.pipeline.expressions;
 
-public final class AggregatorTarget implements Selectable, Accumulator {
+public final class AggregatorTarget implements Selectable{
   private final Accumulator accumulator;
   private final String fieldName;
 
@@ -17,9 +17,4 @@ public Accumulator getAccumulator() {
   public String getFieldName() {
     return fieldName;
   }
-
-  @Override
-  public AggregatorTarget toField(String fieldName) {
-    return null;
-  }
 }

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/expressions/Function.java

@@ -164,10 +164,6 @@ public static Or or(FilterCondition left, FilterCondition... other) {
     return new Or(conditions);
   }
 
-  // File: FunctionUtils.java (or similar)
-
-  // ... other static methods ...
-
   public static ArrayContains arrayContains(Expr expr, Expr element) {
     return new ArrayContains(expr, element);
   }
@@ -218,7 +214,7 @@ public static IsNull isNull(String field) {
     return new IsNull(Field.of(field));
   }
 
-  public static Not not(Expr expr) {
+  public static Not not(FilterCondition expr) {
     return new Not(expr);
   }
 
@@ -238,8 +234,6 @@ public static Avg avg(String field) {
     return new Avg(Field.of(field), false);
   }
 
-  // Note: There seems to be a typo in the Kotlin code.
-  //       `min` and `max` are calling `Sum` and `Avg` constructors respectively
   public static Min min(Expr expr) {
     return new Min(expr, false); // Corrected constructor call
   }