Cleanup and sync with server function updates

Author: wu-hui

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

@@ -44,7 +44,6 @@
 import io.opencensus.trace.AttributeValue;
 import io.opencensus.trace.Tracing;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -538,47 +537,6 @@ public Pipeline findNearest(
             .build());
   }
 
-  /**
-   * Sorts the documents from previous stages based on one or more {@link Ordering} criteria.
-   *
-   * <p>This stage allows you to order the results of your pipeline. You can specify multiple {@link
-   * Ordering} instances to sort by multiple fields in ascending or descending order. If documents
-   * have the same value for a field used for sorting, the next specified ordering will be used. If
-   * all orderings result in equal comparison, the documents are considered equal, and the order is
-   * unspecified.
-   *
-   * <p>Example:
-   *
-   * <pre>{@code
-   * // Sort books by rating in descending order, and then by title in ascending order for books
-   * // with the same rating, with density required and truncation disabled.
-   * firestore.pipeline().collection("books")
-   *     .sort(
-   *         Arrays.asList(Ordering.of("rating").descending(), Ordering.of("title")),
-   *         Sort.Density.REQUIRED,
-   *         Sort.Truncation.DISABLED,
-   *         10);
-   * }</pre>
-   *
-   * @param orders One or more {@link Ordering} instances specifying the sorting criteria.
-   * @param density Specifies the index density semantics. See {@link
-   *     com.google.cloud.firestore.pipeline.stages.Sort.Density} for more information on density
-   *     sorting.
-   * @param truncation Specifies the index truncation semantics. See {@link
-   *     com.google.cloud.firestore.pipeline.stages.Sort.Truncation} for more information on
-   *     truncation options.
-   * @return A new {@code Pipeline} object with this stage appended to the stage list.
-   */
-  @BetaApi
-  public Pipeline sort(List<Ordering> orders, Sort.Density density, Sort.Truncation truncation) {
-    return new Pipeline(
-        this.db,
-        ImmutableList.<Stage>builder()
-            .addAll(stages)
-            .add(new Sort(orders, density, truncation))
-            .build());
-  }
-
   /**
    * Sorts the documents from previous stages based on one or more {@link Ordering} criteria.
    *
@@ -604,7 +562,8 @@ public Pipeline sort(List<Ordering> orders, Sort.Density density, Sort.Truncatio
    */
   @BetaApi
   public Pipeline sort(Ordering... orders) {
-    return sort(Arrays.asList(orders), Sort.Density.UNSPECIFIED, Sort.Truncation.UNSPECIFIED);
+    return new Pipeline(
+        this.db, ImmutableList.<Stage>builder().addAll(stages).add(new Sort(orders)).build());
   }
 
   /**

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

@@ -101,11 +101,11 @@ static FilterCondition toPipelineFilterCondition(FilterInternal f) {
         case IS_NAN:
           return and(field.exists(), field.isNaN());
         case IS_NULL:
-          return and(field.exists(), field.isNull());
+          return and(field.exists(), field.eq(null));
         case IS_NOT_NAN:
           return and(field.exists(), not(field.isNaN()));
         case IS_NOT_NULL:
-          return and(field.exists(), not(field.isNull()));
+          return and(field.exists(), not(field.eq(null)));
         default:
           // Handle OPERATOR_UNSPECIFIED and UNRECOGNIZED cases as needed
           throw new IllegalArgumentException("Unsupported operator: " + unaryFilter.getOperator());

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

@@ -46,8 +46,6 @@
 import com.google.cloud.firestore.pipeline.expressions.Field;
 import com.google.cloud.firestore.pipeline.expressions.Ordering;
 import com.google.cloud.firestore.pipeline.expressions.Selectable;
-import com.google.cloud.firestore.pipeline.stages.Sort.Density;
-import com.google.cloud.firestore.pipeline.stages.Sort.Truncation;
 import com.google.cloud.firestore.v1.FirestoreSettings;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -2174,7 +2172,7 @@ public Pipeline pipeline() {
                           ? Field.of(fieldOrder.fieldReference.getFieldPath()).ascending()
                           : Field.of(fieldOrder.fieldReference.getFieldPath()).descending())
               .collect(Collectors.toList());
-      ppl = ppl.sort(orders, Density.REQUIRED, Truncation.UNSPECIFIED);
+      ppl = ppl.sort(orders.toArray(new Ordering[] {}));
     }
 
     // Cursors, Limit and Offset

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

@@ -18,7 +18,7 @@
 public final class Constant implements Expr {
   private final Object value;
 
-  private Constant(Object value) {
+  Constant(Object value) {
     this.value = value;
   }
 

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

@@ -671,23 +671,6 @@ default Exists exists() {
     return new Exists(this);
   }
 
-  /**
-   * Creates an expression that checks if this expression evaluates to null.
-   *
-   * <p>Example:
-   *
-   * <pre>{@code
-   * // Check if the 'optionalField' is null
-   * Field.of("optionalField").isNull();
-   * }</pre>
-   *
-   * @return A new {@code Expr} representing the null check.
-   */
-  @BetaApi
-  default IsNull isNull() {
-    return new IsNull(this);
-  }
-
   // Aggregate Functions
 
   /**

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

@@ -2000,42 +2000,6 @@ public static IsNaN isNaN(String field) {
     return new IsNaN(Field.of(field));
   }
 
-  /**
-   * Creates an expression that checks if an expression evaluates to null.
-   *
-   * <p>Example:
-   *
-   * <pre>{@code
-   * // Check if the 'optionalField' is null
-   * Function.isNull(Field.of("optionalField"));
-   * }</pre>
-   *
-   * @param expr The expression to check.
-   * @return A new {@code Expr} representing the null check.
-   */
-  @BetaApi
-  public static IsNull isNull(Expr expr) {
-    return new IsNull(expr);
-  }
-
-  /**
-   * Creates an expression that checks if a field's value is null.
-   *
-   * <p>Example:
-   *
-   * <pre>{@code
-   * // Check if the 'optionalField' is null
-   * Function.isNull("optionalField");
-   * }</pre>
-   *
-   * @param field The name of the field to check.
-   * @return A new {@code Expr} representing the null check.
-   */
-  @BetaApi
-  public static IsNull isNull(String field) {
-    return new IsNull(Field.of(field));
-  }
-
   /**
    * Creates an expression that negates a filter condition.
    *

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

@@ -11,7 +11,9 @@
 public final class FunctionUtils {
   @InternalApi
   public static Value exprToValue(Expr expr) {
-    if (expr instanceof Constant) {
+    if (expr == null) {
+      return Constant.of((String) null).toProto();
+    } else if (expr instanceof Constant) {
       return ((Constant) expr).toProto();
     } else if (expr instanceof Field) {
       return ((Field) expr).toProto();

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

@@ -2,21 +2,17 @@
 
 import com.google.api.core.InternalApi;
 import com.google.cloud.firestore.pipeline.expressions.Ordering;
+import com.google.common.collect.Lists;
 import java.util.List;
-import java.util.Locale;
 
 public final class Sort implements Stage {
 
   private static final String name = "sort";
   private final List<Ordering> orders;
-  private final Sort.Density density;
-  private final Sort.Truncation truncation;
 
   @InternalApi
-  public Sort(List<Ordering> orders, Sort.Density density, Sort.Truncation truncation) {
-    this.orders = orders;
-    this.density = density;
-    this.truncation = truncation;
+  public Sort(Ordering... orders) {
+    this.orders = Lists.newArrayList(orders);
   }
 
   @InternalApi
@@ -28,40 +24,4 @@ public String getName() {
   public List<Ordering> getOrders() {
     return orders;
   }
-
-  @InternalApi
-  public Sort.Density getDensity() {
-    if (density != null) {
-      return density;
-    }
-    return Density.UNSPECIFIED;
-  }
-
-  @InternalApi
-  public Sort.Truncation getTruncation() {
-    if (truncation != null) {
-      return truncation;
-    }
-    return Truncation.UNSPECIFIED;
-  }
-
-  public enum Density {
-    UNSPECIFIED,
-    REQUIRED;
-
-    @Override
-    public String toString() {
-      return name().toLowerCase(Locale.getDefault());
-    }
-  }
-
-  public enum Truncation {
-    UNSPECIFIED,
-    DISABLED;
-
-    @Override
-    public String toString() {
-      return name().toLowerCase(Locale.getDefault());
-    }
-  }
 }

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/stages/Sort.java

@@ -64,8 +64,6 @@ public static com.google.firestore.v1.Pipeline.Stage toStageProto(Stage stage) {
           .setName(sortStage.getName())
           .addAllArgs(
               sortStage.getOrders().stream().map(Ordering::toProto).collect(Collectors.toList()))
-          .putOptions("density", encodeValue(sortStage.getDensity().toString()))
-          .putOptions("truncation", encodeValue(sortStage.getTruncation().toString()))
           .build();
     } else if (stage instanceof Offset) {
       Offset offsetStage = (Offset) stage;