Promote planner runtime builders to the main factories

bundle/BUILD.bazel

@@ -13,14 +13,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "cel_experimental_factory",
-    visibility = ["//:internal"],
-    exports = [
-        "//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
-    ],
-)
-
 java_library(
     name = "environment",
     exports = ["//bundle/src/main/java/dev/cel/bundle:environment"],

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

@@ -35,7 +35,6 @@ java_library(
         "@cel_spec//proto/cel/expr:checked_java_proto",
         "@maven//:com_google_code_findbugs_annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
-        "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
@@ -54,22 +53,6 @@ java_library(
         "//compiler:compiler_builder",
         "//parser",
         "//runtime",
-    ],
-)
-
-java_library(
-    name = "cel_experimental_factory",
-    srcs = ["CelExperimentalFactory.java"],
-    tags = [
-    ],
-    deps = [
-        ":cel",
-        ":cel_impl",
-        "//checker",
-        "//common:options",
-        "//common/annotations",
-        "//compiler",
-        "//parser",
         "//runtime:runtime_planner_impl",
     ],
 )
@@ -117,7 +100,6 @@ java_library(
     tags = [
     ],
     deps = [
-        ":cel_factory",
         ":environment_exception",
         ":required_fields_checker",
         "//:auto_value",
@@ -190,7 +172,6 @@ java_library(
         "//common:options",
         "//common/internal:env_visitor",
         "//common/types:cel_proto_types",
-        "//common/types:cel_types",
         "//common/types:type_providers",
         "//compiler:compiler_builder",
         "//extensions",

bundle/src/main/java/dev/cel/bundle/CelFactory.java

@@ -20,6 +20,7 @@
 import dev.cel.compiler.CelCompilerImpl;
 import dev.cel.parser.CelParserImpl;
 import dev.cel.runtime.CelRuntime;
+import dev.cel.runtime.CelRuntimeImpl;
 import dev.cel.runtime.CelRuntimeLegacyImpl;
 
 /** Helper class to configure the entire CEL stack in a common interface. */
@@ -44,6 +45,30 @@ public static CelBuilder standardCelBuilder() {
         .setStandardEnvironmentEnabled(true);
   }
 
+  /**
+   * Creates a builder for configuring CEL for the parsing, optional type-checking, and evaluation
+   * of expressions using the Program Planner.
+   *
+   * <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
+   * #standardCelBuilder()}:
+   *
+   * <ul>
+   *   <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
+   *   <li><b>Parsed-only expression evaluation:</b> Unlike the traditional stack which required
+   *       supplying type-checked expressions, this architecture handles both parsed-only and
+   *       type-checked expressions.
+   * </ul>
+   */
+  public static CelBuilder plannerCelBuilder() {
+    return CelImpl.newBuilder(
+            CelCompilerImpl.newBuilder(
+                CelParserImpl.newBuilder(),
+                CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
+            CelRuntimeImpl.newBuilder())
+        // CEL-Internal-2
+        .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
+  }
+
   /** Combines a prebuilt {@link CelCompiler} and {@link CelRuntime} into {@link Cel}. */
   public static Cel combine(CelCompiler celCompiler, CelRuntime celRuntime) {
     return CelImpl.combine(celCompiler, celRuntime);

extensions/src/test/java/dev/cel/extensions/BUILD.bazel

@@ -10,7 +10,6 @@ java_library(
     deps = [
         "//:java_truth",
         "//bundle:cel",
-        "//bundle:cel_experimental_factory",
         "//common:cel_ast",
         "//common:cel_exception",
         "//common:compiler_common",

extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java

@@ -26,7 +26,6 @@
 import com.google.testing.junit.testparameterinjector.TestParameters;
 import dev.cel.bundle.Cel;
 import dev.cel.bundle.CelBuilder;
-import dev.cel.bundle.CelExperimentalFactory;
 import dev.cel.bundle.CelFactory;
 import dev.cel.common.CelAbstractSyntaxTree;
 import dev.cel.common.CelContainer;
@@ -113,7 +112,7 @@ private CelBuilder newCelBuilder(int version) {
     switch (testMode) {
       case PLANNER_PARSE_ONLY:
       case PLANNER_CHECKED:
-        celBuilder = CelExperimentalFactory.plannerCelBuilder();
+        celBuilder = CelFactory.plannerCelBuilder();
         break;
       case LEGACY_CHECKED:
         celBuilder = CelFactory.standardCelBuilder();

publish/BUILD.bazel

@@ -32,7 +32,6 @@ RUNTIME_TARGETS = [
     "//runtime/src/main/java/dev/cel/runtime:base",
     "//runtime/src/main/java/dev/cel/runtime:interpreter",
     "//runtime/src/main/java/dev/cel/runtime:late_function_binding",
-    "//runtime/src/main/java/dev/cel/runtime:runtime_experimental_factory",
     "//runtime/src/main/java/dev/cel/runtime:runtime_factory",
     "//runtime/src/main/java/dev/cel/runtime:runtime_helpers",
     "//runtime/src/main/java/dev/cel/runtime:runtime_legacy_impl",
@@ -125,7 +124,6 @@ EXTENSION_TARGETS = [
 # keep sorted
 BUNDLE_TARGETS = [
     "//bundle/src/main/java/dev/cel/bundle:cel",
-    "//bundle/src/main/java/dev/cel/bundle:cel_experimental_factory",
     "//bundle/src/main/java/dev/cel/bundle:environment",
     "//bundle/src/main/java/dev/cel/bundle:environment_yaml_parser",
 ]

runtime/BUILD.bazel

@@ -29,14 +29,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "runtime_experimental_factory",
-    visibility = ["//:internal"],
-    exports = [
-        "//runtime/src/main/java/dev/cel/runtime:runtime_experimental_factory",
-    ],
-)
-
 java_library(
     name = "runtime_legacy_impl",
     visibility = ["//:internal"],

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

@@ -916,20 +916,8 @@ java_library(
     deps = [
         ":runtime",
         ":runtime_legacy_impl",
-        "//common:options",
-    ],
-)
-
-java_library(
-    name = "runtime_experimental_factory",
-    srcs = ["CelRuntimeExperimentalFactory.java"],
-    tags = [
-    ],
-    deps = [
-        ":runtime",
         ":runtime_planner_impl",
         "//common:options",
-        "//common/annotations",
     ],
 )
 

runtime/src/main/java/dev/cel/runtime/CelRuntimeFactory.java

@@ -32,5 +32,24 @@ public static CelRuntimeBuilder standardCelRuntimeBuilder() {
         .setStandardEnvironmentEnabled(true);
   }
 
+  /**
+   * Create a new builder for constructing a {@code CelRuntime} instance.
+   *
+   * <p>The {@code ProgramPlanner} architecture provides key benefits over the {@link
+   * #standardCelRuntimeBuilder()}:
+   *
+   * <ul>
+   *   <li><b>Performance:</b> Programs can be cached for improving evaluation speed.
+   *   <li><b>Parsed-only expression evaluation:</b> Unlike the runtime returned by {@link
+   *       #standardCelRuntimeBuilder()}, which only supported evaluating type-checked expressions,
+   *       this architecture handles both parsed-only and type-checked expressions.
+   * </ul>
+   */
+  public static CelRuntimeBuilder plannerRuntimeBuilder() {
+    return CelRuntimeImpl.newBuilder()
+        // CEL-Internal-2
+        .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
+  }
+
   private CelRuntimeFactory() {}
 }

runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java

@@ -474,7 +474,8 @@ private static CelDescriptorPool newDescriptorPool(
 
     @Override
     public CelRuntime build() {
-      assertAllowedCelOptions(options());
+      CelOptions options = options();
+      assertAllowedCelOptions(options);
       CelDescriptors celDescriptors =
           CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptorsBuilder().build());
 

runtime/src/test/java/dev/cel/runtime/BUILD.bazel

@@ -146,7 +146,6 @@ java_library(
         "//extensions",
         "//runtime",
         "//runtime:function_binding",
-        "//runtime:runtime_experimental_factory",
         "//runtime:unknown_attributes",
         "//testing:base_interpreter_test",
         "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",

runtime/src/test/java/dev/cel/runtime/PlannerInterpreterTest.java

@@ -42,7 +42,7 @@ public class PlannerInterpreterTest extends BaseInterpreterTest {
 
   @Override
   protected CelRuntimeBuilder newBaseRuntimeBuilder(CelOptions celOptions) {
-    return CelRuntimeExperimentalFactory.plannerRuntimeBuilder()
+    return CelRuntimeFactory.plannerRuntimeBuilder()
         .addLateBoundFunctions("record")
         .setOptions(celOptions)
         .addLibraries(CelExtensions.optional())

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

@@ -102,7 +102,6 @@ java_library(
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
         "@maven//:junit_junit",
-        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -113,6 +112,5 @@ java_library(
     ],
     deps = [
         "//bundle:cel",
-        "//bundle:cel_experimental_factory",
     ],
 )

testing/src/main/java/dev/cel/testing/CelRuntimeFlavor.java

@@ -15,7 +15,6 @@
 package dev.cel.testing;
 
 import dev.cel.bundle.CelBuilder;
-import dev.cel.bundle.CelExperimentalFactory;
 import dev.cel.bundle.CelFactory;
 
 /** Enumeration of supported CEL runtime environments for testing. */
@@ -29,7 +28,7 @@ public CelBuilder builder() {
   PLANNER {
     @Override
     public CelBuilder builder() {
-      return CelExperimentalFactory.plannerCelBuilder();
+      return CelFactory.plannerCelBuilder();
     }
   };