Remove deprecated ExprFeatures

PiperOrigin-RevId: 716771447

Author: l46kok

checker/src/main/java/dev/cel/checker/BUILD.bazel

@@ -173,7 +173,6 @@ java_library(
         "//:auto_value",
         "//common",
         "//common:compiler_common",
-        "//common:features",
         "//common:options",
         "//common:proto_ast",
         "//common/annotations",

checker/src/main/java/dev/cel/checker/Env.java

@@ -19,6 +19,7 @@
 import dev.cel.expr.Decl.FunctionDecl.Overload;
 import dev.cel.expr.Expr;
 import dev.cel.expr.Type;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -32,7 +33,6 @@
 import dev.cel.common.CelFunctionDecl;
 import dev.cel.common.CelOptions;
 import dev.cel.common.CelOverloadDecl;
-import dev.cel.common.ExprFeatures;
 import dev.cel.common.annotations.Internal;
 import dev.cel.common.ast.CelConstant;
 import dev.cel.common.ast.CelExpr;
@@ -97,6 +97,12 @@ public class Env {
   /** CEL Feature flags. */
   private final CelOptions celOptions;
 
+  private static final CelOptions LEGACY_TYPE_CHECKER_OPTIONS =
+      CelOptions.newBuilder()
+          .disableCelStandardEquality(false)
+          .enableNamespacedDeclarations(false)
+          .build();
+
   private Env(
       Errors errors, TypeProvider typeProvider, DeclGroup declGroup, CelOptions celOptions) {
     this.celOptions = celOptions;
@@ -106,111 +112,51 @@ private Env(
   }
 
   /**
-   * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
-   * operators with a reference to the feature flags enabled in the environment.
-   *
-   * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
-   */
-  @Deprecated
-  public static Env unconfigured(Errors errors, ExprFeatures... exprFeatures) {
-    return unconfigured(errors, new DescriptorTypeProvider(), ImmutableSet.copyOf(exprFeatures));
-  }
-
-  /**
-   * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
-   * operators using a custom {@code typeProvider}.
-   *
-   * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
-   */
-  @Deprecated
-  public static Env unconfigured(
-      Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
-    return unconfigured(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
-  }
-
-  /**
-   * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
-   * operators using a custom {@code typeProvider}. The set of enabled {@code exprFeatures} is also
-   * provided.
-   *
-   * @deprecated use {@code unconfigured} with {@code CelOptions} instead.
+   * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
+   *     See {@code CelCompilerFactory}.
    */
   @Deprecated
-  public static Env unconfigured(
-      Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
-    return unconfigured(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
+  public static Env unconfigured(Errors errors) {
+    return unconfigured(errors, LEGACY_TYPE_CHECKER_OPTIONS);
   }
 
   /**
    * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
    * operators with a reference to the configured {@code celOptions}.
    */
-  public static Env unconfigured(Errors errors, CelOptions celOptions) {
+  @VisibleForTesting
+  static Env unconfigured(Errors errors, CelOptions celOptions) {
     return unconfigured(errors, new DescriptorTypeProvider(), celOptions);
   }
 
   /**
    * Creates an unconfigured {@code Env} value without the standard CEL types, functions, and
-   * operators using a custom {@code typeProvider}. The {@code CelOptions} are provided as well.
-   */
-  public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
-    return new Env(errors, typeProvider, new DeclGroup(), celOptions);
-  }
-
-  /**
-   * Creates an {@code Env} value configured with the standard types, functions, and operators with
-   * a reference to the set of {@code exprFeatures} enabled in the environment.
-   *
-   * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
-   * subsequent declarations.
+   * operators using a custom {@code typeProvider}.
    *
-   * @deprecated use {@code standard} with {@code CelOptions} instead.
+   * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
+   *     See {@code CelCompilerFactory}.
    */
   @Deprecated
-  public static Env standard(Errors errors, ExprFeatures... exprFeatures) {
-    return standard(errors, new DescriptorTypeProvider(), exprFeatures);
+  public static Env unconfigured(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
+    return new Env(errors, typeProvider, new DeclGroup(), celOptions);
   }
 
   /**
-   * Creates an {@code Env} value configured with the standard types, functions, and operators,
-   * configured with a custom {@code typeProvider}.
-   *
-   * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
-   * subsequent declarations with the same signature.
-   *
-   * @deprecated use {@code standard} with {@code CelOptions} instead.
+   * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
+   *     See {@code CelCompilerFactory}.
    */
   @Deprecated
-  public static Env standard(
-      Errors errors, TypeProvider typeProvider, ExprFeatures... exprFeatures) {
-    return standard(errors, typeProvider, ImmutableSet.copyOf(exprFeatures));
+  public static Env standard(Errors errors) {
+    return standard(errors, new DescriptorTypeProvider());
   }
 
   /**
-   * Creates an {@code Env} value configured with the standard types, functions, and operators,
-   * configured with a custom {@code typeProvider} and a reference to the set of {@code
-   * exprFeatures} enabled in the environment.
-   *
-   * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
-   * subsequent declarations with the same signature.
-   *
-   * @deprecated use {@code standard} with {@code CelOptions} instead.
+   * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
+   *     See {@code CelCompilerFactory}.
    */
   @Deprecated
-  public static Env standard(
-      Errors errors, TypeProvider typeProvider, ImmutableSet<ExprFeatures> exprFeatures) {
-    return standard(errors, typeProvider, CelOptions.fromExprFeatures(exprFeatures));
-  }
-
-  /**
-   * Creates an {@code Env} value configured with the standard types, functions, and operators and a
-   * reference to the configured {@code celOptions}.
-   *
-   * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
-   * subsequent declarations with the same signature.
-   */
-  public static Env standard(Errors errors, CelOptions celOptions) {
-    return standard(errors, new DescriptorTypeProvider(), celOptions);
+  public static Env standard(Errors errors, TypeProvider typeProvider) {
+    return standard(errors, typeProvider, LEGACY_TYPE_CHECKER_OPTIONS);
   }
 
   /**
@@ -220,7 +166,11 @@ public static Env standard(Errors errors, CelOptions celOptions) {
    *
    * <p>Note: standard declarations are configured in an isolated scope, and may be shadowed by
    * subsequent declarations with the same signature.
+   *
+   * @deprecated Do not use. This exists for compatibility reasons. Migrate to CEL-Java fluent APIs.
+   *     See {@code CelCompilerFactory}.
    */
+  @Deprecated
   public static Env standard(Errors errors, TypeProvider typeProvider, CelOptions celOptions) {
     CelStandardDeclarations celStandardDeclaration =
         CelStandardDeclarations.newBuilder()

common/BUILD.bazel

@@ -25,11 +25,6 @@ java_library(
     exports = ["//common/src/main/java/dev/cel/common:options"],
 )
 
-java_library(
-    name = "features",
-    exports = ["//common/src/main/java/dev/cel/common:features"],
-)
-
 java_library(
     name = "proto_ast",
     exports = ["//common/src/main/java/dev/cel/common:proto_ast"],

common/src/main/java/dev/cel/common/BUILD.bazel

@@ -95,23 +95,12 @@ java_library(
     tags = [
     ],
     deps = [
-        ":features",
         "//:auto_value",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
     ],
 )
 
-java_library(
-    name = "features",
-    srcs = ["ExprFeatures.java"],
-    tags = [
-    ],
-    deps = [
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
 java_library(
     name = "proto_ast",
     srcs = PROTO_AST_SOURCE,

common/src/main/java/dev/cel/common/CelOptions.java

@@ -15,7 +15,6 @@
 package dev.cel.common;
 
 import com.google.auto.value.AutoValue;
-import com.google.common.collect.ImmutableSet;
 import com.google.errorprone.annotations.CheckReturnValue;
 import com.google.errorprone.annotations.Immutable;
 
@@ -125,60 +124,6 @@ public enum ProtoUnsetFieldOptions {
 
   public abstract Builder toBuilder();
 
-  public ImmutableSet<ExprFeatures> toExprFeatures() {
-    ImmutableSet.Builder<ExprFeatures> features = ImmutableSet.builder();
-    if (enableCompileTimeOverloadResolution()) {
-      features.add(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION);
-    }
-    if (disableCelStandardEquality()) {
-      features.add(ExprFeatures.LEGACY_JAVA_EQUALITY);
-    }
-    if (enableHomogeneousLiterals()) {
-      features.add(ExprFeatures.HOMOGENEOUS_LITERALS);
-    }
-    if (enableRegexPartialMatch()) {
-      features.add(ExprFeatures.REGEX_PARTIAL_MATCH);
-    }
-    if (enableReservedIds()) {
-      features.add(ExprFeatures.RESERVED_IDS);
-    }
-    if (enableUnsignedComparisonAndArithmeticIsUnsigned()) {
-      features.add(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED);
-    }
-    if (retainRepeatedUnaryOperators()) {
-      features.add(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS);
-    }
-    if (retainUnbalancedLogicalExpressions()) {
-      features.add(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS);
-    }
-    if (errorOnIntWrap()) {
-      features.add(ExprFeatures.ERROR_ON_WRAP);
-    }
-    if (errorOnDuplicateMapKeys()) {
-      features.add(ExprFeatures.ERROR_ON_DUPLICATE_KEYS);
-    }
-    if (populateMacroCalls()) {
-      features.add(ExprFeatures.POPULATE_MACRO_CALLS);
-    }
-    if (enableTimestampEpoch()) {
-      features.add(ExprFeatures.ENABLE_TIMESTAMP_EPOCH);
-    }
-    if (enableHeterogeneousNumericComparisons()) {
-      features.add(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS);
-    }
-    if (enableNamespacedDeclarations()) {
-      features.add(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS);
-    }
-    if (enableUnsignedLongs()) {
-      features.add(ExprFeatures.ENABLE_UNSIGNED_LONGS);
-    }
-    if (enableProtoDifferencerEquality()) {
-      features.add(ExprFeatures.PROTO_DIFFERENCER_EQUALITY);
-    }
-
-    return features.build();
-  }
-
   /**
    * Return an unconfigured {@code Builder}. This is equivalent to preserving all legacy behaviors,
    * both good and bad, of the original CEL implementation.
@@ -240,33 +185,6 @@ public static Builder current() {
         .disableCelStandardEquality(false);
   }
 
-  public static CelOptions fromExprFeatures(ImmutableSet<ExprFeatures> features) {
-    return newBuilder()
-        .enableCompileTimeOverloadResolution(
-            features.contains(ExprFeatures.COMPILE_TIME_OVERLOAD_RESOLUTION))
-        .disableCelStandardEquality(features.contains(ExprFeatures.LEGACY_JAVA_EQUALITY))
-        .enableHomogeneousLiterals(features.contains(ExprFeatures.HOMOGENEOUS_LITERALS))
-        .enableRegexPartialMatch(features.contains(ExprFeatures.REGEX_PARTIAL_MATCH))
-        .enableReservedIds(features.contains(ExprFeatures.RESERVED_IDS))
-        .enableUnsignedComparisonAndArithmeticIsUnsigned(
-            features.contains(ExprFeatures.UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED))
-        .retainRepeatedUnaryOperators(
-            features.contains(ExprFeatures.RETAIN_REPEATED_UNARY_OPERATORS))
-        .retainUnbalancedLogicalExpressions(
-            features.contains(ExprFeatures.RETAIN_UNBALANCED_LOGICAL_EXPRESSIONS))
-        .errorOnIntWrap(features.contains(ExprFeatures.ERROR_ON_WRAP))
-        .errorOnDuplicateMapKeys(features.contains(ExprFeatures.ERROR_ON_DUPLICATE_KEYS))
-        .populateMacroCalls(features.contains(ExprFeatures.POPULATE_MACRO_CALLS))
-        .enableTimestampEpoch(features.contains(ExprFeatures.ENABLE_TIMESTAMP_EPOCH))
-        .enableHeterogeneousNumericComparisons(
-            features.contains(ExprFeatures.ENABLE_HETEROGENEOUS_NUMERIC_COMPARISONS))
-        .enableNamespacedDeclarations(
-            features.contains(ExprFeatures.ENABLE_NAMESPACED_DECLARATIONS))
-        .enableUnsignedLongs(features.contains(ExprFeatures.ENABLE_UNSIGNED_LONGS))
-        .enableProtoDifferencerEquality(features.contains(ExprFeatures.PROTO_DIFFERENCER_EQUALITY))
-        .build();
-  }
-
   /** Builder for configuring the {@code CelOptions}. */
   @AutoValue.Builder
   public abstract static class Builder {