Split Program into its own interface

l46kok · copybara-github · commit 473246ad5610 · 2025-11-04T17:46:04.000-08:00
PiperOrigin-RevId: 825748112
diff --git a/runtime/BUILD.bazel b/runtime/BUILD.bazel
@@ -244,3 +244,14 @@ cel_android_library(
     visibility = ["//:internal"],
     exports = ["//runtime/src/main/java/dev/cel/runtime:internal_function_binder_andriod"],
 )
+
+java_library(
+    name = "program",
+    visibility = ["//:internal"],
+    exports = ["//runtime/src/main/java/dev/cel/runtime:program"],
+)
+
+cel_android_library(
+    name = "program_android",
+    exports = ["//runtime/src/main/java/dev/cel/runtime:program_android"],
+)
diff --git a/runtime/src/main/java/dev/cel/runtime/BUILD.bazel b/runtime/src/main/java/dev/cel/runtime/BUILD.bazel
@@ -41,10 +41,14 @@ LITE_RUNTIME_SOURCES = [
 
 # keep sorted
 LITE_RUNTIME_IMPL_SOURCES = [
-    "LiteProgramImpl.java",
     "LiteRuntimeImpl.java",
 ]
 
+# keep sorted
+LITE_PROGRAM_IMPL_SOURCES = [
+    "LiteProgramImpl.java",
+]
+
 # keep sorted
 FUNCTION_BINDING_SOURCES = [
     "CelFunctionBinding.java",
@@ -833,7 +837,6 @@ java_library(
         ":function_resolver",
         ":interpretable",
         ":interpreter",
-        ":lite_runtime",
         ":proto_message_activation_factory",
         ":proto_message_runtime_equality",
         ":runtime_equality",
@@ -853,6 +856,7 @@ java_library(
         "//common/types:cel_types",
         "//common/values:cel_value_provider",
         "//common/values:proto_message_value_provider",
+        "//runtime:program",
         "@maven//:com_google_code_findbugs_annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
@@ -869,12 +873,12 @@ java_library(
     deps = [
         ":evaluation_exception",
         ":function_binding",
-        ":function_resolver",
         "//:auto_value",
         "//common:cel_ast",
         "//common:options",
         "//common/annotations",
         "//common/values:cel_value_provider",
+        "//runtime:program",
         "//runtime/standard:standard_function",
         "@maven//:com_google_code_findbugs_annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
@@ -888,14 +892,11 @@ java_library(
     tags = [
     ],
     deps = [
-        ":activation",
         ":cel_value_runtime_type_provider",
         ":dispatcher",
-        ":evaluation_exception",
         ":function_binding",
-        ":function_resolver",
-        ":interpretable",
         ":interpreter",
+        ":lite_program_impl",
         ":lite_runtime",
         ":runtime_equality",
         ":runtime_helpers",
@@ -904,28 +905,53 @@ java_library(
         "//common:cel_ast",
         "//common:options",
         "//common/values:cel_value_provider",
+        "//runtime:program",
         "//runtime/standard:standard_function",
-        "@maven//:com_google_code_findbugs_annotations",
-        "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
     ],
 )
 
+java_library(
+    name = "lite_program_impl",
+    srcs = LITE_PROGRAM_IMPL_SOURCES,
+    deps = [
+        ":activation",
+        ":evaluation_exception",
+        ":function_resolver",
+        ":interpretable",
+        ":program",
+        "//:auto_value",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+    ],
+)
+
+cel_android_library(
+    name = "lite_program_impl_android",
+    srcs = LITE_PROGRAM_IMPL_SOURCES,
+    deps = [
+        ":activation_android",
+        ":evaluation_exception",
+        ":function_resolver_android",
+        ":interpretable_android",
+        ":program_android",
+        "//:auto_value",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+    ],
+)
+
 cel_android_library(
     name = "lite_runtime_impl_android",
     srcs = LITE_RUNTIME_IMPL_SOURCES,
     tags = [
     ],
     deps = [
-        ":activation_android",
         ":cel_value_runtime_type_provider_android",
         ":dispatcher_android",
-        ":evaluation_exception",
         ":function_binding_android",
-        ":function_resolver_android",
-        ":interpretable_android",
         ":interpreter_android",
+        ":lite_program_impl_android",
         ":lite_runtime_android",
+        ":program_android",
         ":runtime_equality_android",
         ":runtime_helpers_android",
         ":type_resolver_android",
@@ -934,7 +960,6 @@ cel_android_library(
         "//common:options",
         "//common/values:cel_value_provider_android",
         "//runtime/standard:standard_function_android",
-        "@maven//:com_google_code_findbugs_annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven_android//:com_google_guava_guava",
@@ -1127,7 +1152,7 @@ cel_android_library(
     deps = [
         ":evaluation_exception",
         ":function_binding_android",
-        ":function_resolver_android",
+        ":program_android",
         "//:auto_value",
         "//common:cel_ast_android",
         "//common:options",
@@ -1195,6 +1220,31 @@ cel_android_library(
     ],
 )
 
+java_library(
+    name = "program",
+    srcs = ["Program.java"],
+    tags = [
+    ],
+    deps = [
+        ":evaluation_exception",
+        ":function_resolver",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+    ],
+)
+
+cel_android_library(
+    name = "program_android",
+    srcs = ["Program.java"],
+    tags = [
+    ],
+    deps = [
+        ":evaluation_exception",
+        ":function_resolver_android",
+        "//:auto_value",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+    ],
+)
+
 java_library(
     name = "internal_function_binder",
     srcs = ["InternalFunctionBinder.java"],
diff --git a/runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java b/runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java
@@ -14,11 +14,9 @@
 
 package dev.cel.runtime;
 
-import com.google.errorprone.annotations.Immutable;
 import javax.annotation.concurrent.ThreadSafe;
 import dev.cel.common.CelAbstractSyntaxTree;
 import dev.cel.common.annotations.Beta;
-import java.util.Map;
 
 /**
  * CelLiteRuntime creates executable {@link Program} instances from {@link CelAbstractSyntaxTree}
@@ -34,22 +32,4 @@ public interface CelLiteRuntime {
   Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationException;
 
   CelLiteRuntimeBuilder toRuntimeBuilder();
-
-  /** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
-  @Immutable
-  interface Program {
-
-    /** Evaluate the expression without any variables. */
-    Object eval() throws CelEvaluationException;
-
-    /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
-    Object eval(Map<String, ?> mapValue) throws CelEvaluationException;
-
-    /**
-     * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
-     * lateBoundFunctionResolver}.
-     */
-    Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
-        throws CelEvaluationException;
-  }
 }
diff --git a/runtime/src/main/java/dev/cel/runtime/CelRuntime.java b/runtime/src/main/java/dev/cel/runtime/CelRuntime.java
@@ -37,7 +37,7 @@ public interface CelRuntime {
 
   /** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
   @Immutable
-  interface Program extends CelLiteRuntime.Program {
+  interface Program extends dev.cel.runtime.Program {
 
     /** Evaluate the expression using {@code message} fields as the source of input variables. */
     Object eval(Message message) throws CelEvaluationException;
diff --git a/runtime/src/main/java/dev/cel/runtime/LiteProgramImpl.java b/runtime/src/main/java/dev/cel/runtime/LiteProgramImpl.java
@@ -20,7 +20,7 @@
 
 @Immutable
 @AutoValue
-abstract class LiteProgramImpl implements CelLiteRuntime.Program {
+abstract class LiteProgramImpl implements Program {
 
   abstract Interpretable interpretable();
 
@@ -40,7 +40,7 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio
     return interpretable().eval(Activation.copyOf(mapValue), lateBoundFunctionResolver);
   }
 
-  static CelLiteRuntime.Program plan(Interpretable interpretable) {
+  static Program plan(Interpretable interpretable) {
     return new AutoValue_LiteProgramImpl(interpretable);
   }
 }
diff --git a/runtime/src/main/java/dev/cel/runtime/Program.java b/runtime/src/main/java/dev/cel/runtime/Program.java
@@ -0,0 +1,36 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package dev.cel.runtime;
+
+import com.google.errorprone.annotations.Immutable;
+import java.util.Map;
+
+/** Creates an evaluable {@code Program} instance which is thread-safe and immutable. */
+@Immutable
+public interface Program {
+
+  /** Evaluate the expression without any variables. */
+  Object eval() throws CelEvaluationException;
+
+  /** Evaluate the expression using a {@code mapValue} as the source of input variables. */
+  Object eval(Map<String, ?> mapValue) throws CelEvaluationException;
+
+  /**
+   * Evaluate a compiled program with {@code mapValue} and late-bound functions {@code
+   * lateBoundFunctionResolver}.
+   */
+  Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctionResolver)
+      throws CelEvaluationException;
+}
diff --git a/runtime/src/test/java/dev/cel/runtime/BUILD.bazel b/runtime/src/test/java/dev/cel/runtime/BUILD.bazel
@@ -156,6 +156,7 @@ cel_android_local_test(
         "//runtime:lite_runtime_impl_android",
         "//runtime:standard_functions_android",
         "//runtime:unknown_attributes_android",
+        "//runtime/src/main/java/dev/cel/runtime:program_android",
         "//runtime/standard:equals_android",
         "//runtime/standard:int_android",
         "//testing/protos:test_all_types_cel_java_proto2_lite",
diff --git a/runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java b/runtime/src/test/java/dev/cel/runtime/CelLiteRuntimeAndroidTest.java
@@ -47,7 +47,6 @@
 import dev.cel.expr.conformance.proto3.TestAllTypesCelLiteDescriptor;
 import dev.cel.extensions.CelLiteExtensions;
 import dev.cel.extensions.SetsFunction;
-import dev.cel.runtime.CelLiteRuntime.Program;
 import dev.cel.runtime.standard.EqualsOperator;
 import dev.cel.runtime.standard.IntFunction;
 import dev.cel.runtime.standard.IntFunction.IntOverload;

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`@Immutable`
`22`	`22`	`@AutoValue`
`23`		`-abstract class LiteProgramImpl implements CelLiteRuntime.Program {`
	`23`	`+abstract class LiteProgramImpl implements Program {`
`24`	`24`
`25`	`25`	`abstract Interpretable interpretable();`
`26`	`26`
`@@ -40,7 +40,7 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio`
`40`	`40`	`return interpretable().eval(Activation.copyOf(mapValue), lateBoundFunctionResolver);`
`41`	`41`	`}`
`42`	`42`
`43`		`- static CelLiteRuntime.Program plan(Interpretable interpretable) {`
	`43`	`+ static Program plan(Interpretable interpretable) {`
`44`	`44`	`return new AutoValue_LiteProgramImpl(interpretable);`
`45`	`45`	`}`
`46`	`46`	`}`