Internal Changes

PiperOrigin-RevId: 834975953

Author: l46kok

common/src/main/java/dev/cel/common/values/CelValueConverter.java

@@ -33,7 +33,7 @@
 @SuppressWarnings("unchecked") // Unchecked cast of generics due to type-erasure (ex: MapValue).
 @Internal
 @Immutable
-abstract class CelValueConverter {
+public abstract class CelValueConverter {
 
   /** Adapts a {@link CelValue} to a plain old Java Object. */
   public Object unwrap(CelValue celValue) {

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

@@ -128,6 +128,7 @@ java_library(
         ":resolved_overload",
         "//:auto_value",
         "//common:error_codes",
+        "//common/annotations",
         "@maven//:com_google_code_findbugs_annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
@@ -146,6 +147,7 @@ cel_android_library(
         ":resolved_overload_android",
         "//:auto_value",
         "//common:error_codes",
+        "//common/annotations",
         "@maven//:com_google_code_findbugs_annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven_android//:com_google_guava_guava",
@@ -577,11 +579,13 @@ java_library(
 java_library(
     name = "interpretable",
     srcs = INTERPRABLE_SOURCES,
+    tags = [
+    ],
     deps = [
         ":evaluation_exception",
-        ":evaluation_listener",
         ":function_resolver",
         "//common/annotations",
+        "//runtime:evaluation_listener",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:org_jspecify_jspecify",
     ],
@@ -877,6 +881,7 @@ java_library(
         "//common/values:cel_value_provider",
         "//runtime/standard:standard_function",
         "@maven//:com_google_code_findbugs_annotations",
+        "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
     ],
 )
@@ -1172,6 +1177,7 @@ java_library(
         ":function_overload",
         ":unknown_attributes",
         "//:auto_value",
+        "//common/annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
     ],
@@ -1186,6 +1192,7 @@ cel_android_library(
         ":function_overload_android",
         ":unknown_attributes_android",
         "//:auto_value",
+        "//common/annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven_android//:com_google_guava_guava",
     ],

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

@@ -17,6 +17,7 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.annotations.Internal;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,8 @@
  */
 @AutoValue
 @Immutable
-abstract class CelResolvedOverload {
+@Internal
+public abstract class CelResolvedOverload {
 
   /** The overload id of the function. */
   public abstract String getOverloadId();
@@ -78,7 +80,14 @@ public static CelResolvedOverload of(
    * Returns true if the overload's expected argument types match the types of the given arguments.
    */
   boolean canHandle(Object[] arguments) {
-    ImmutableList<Class<?>> parameterTypes = getParameterTypes();
+    return canHandle(arguments, getParameterTypes(), isStrict());
+  }
+
+  /**
+   * Returns true if the overload's expected argument types match the types of the given arguments.
+   */
+  public static boolean canHandle(
+      Object[] arguments, ImmutableList<Class<?>> parameterTypes, boolean isStrict) {
     if (parameterTypes.size() != arguments.length) {
       return false;
     }
@@ -96,7 +105,7 @@ boolean canHandle(Object[] arguments) {
 
       if (arg instanceof Exception || arg instanceof CelUnknownSet) {
         // Only non-strict functions can accept errors/unknowns as arguments to a function
-        if (!isStrict()) {
+        if (!isStrict) {
           // Skip assignability check below, but continue to validate remaining args
           continue;
         }

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

@@ -14,6 +14,7 @@
 
 package dev.cel.runtime;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.auto.value.AutoBuilder;
@@ -22,17 +23,27 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.Immutable;
 import dev.cel.common.CelErrorCode;
+import dev.cel.common.annotations.Internal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-/** Default implementation of dispatcher. */
+/**
+ * Default implementation of dispatcher.
+ *
+ * <p>CEL Library Internals. Do Not Use.
+ */
 @Immutable
-final class DefaultDispatcher implements CelFunctionResolver {
+@Internal
+public final class DefaultDispatcher implements CelFunctionResolver {
 
   private final ImmutableMap<String, CelResolvedOverload> overloads;
 
+  public Optional<CelResolvedOverload> findOverload(String functionName) {
+    return Optional.ofNullable(overloads.get(functionName));
+  }
+
   @Override
   public Optional<CelResolvedOverload> findOverloadMatchingArgs(
       String functionName, List<String> overloadIds, Object[] args) throws CelEvaluationException {
@@ -101,24 +112,26 @@ Optional<CelResolvedOverload> findSingleNonStrictOverload(List<String> overloadI
     return Optional.empty();
   }
 
-  static Builder newBuilder() {
+  public static Builder newBuilder() {
     return new AutoBuilder_DefaultDispatcher_Builder();
   }
 
+  /** Builder for {@link DefaultDispatcher}. */
   @AutoBuilder(ofClass = DefaultDispatcher.class)
-  abstract static class Builder {
+  public abstract static class Builder {
 
     abstract ImmutableMap<String, CelResolvedOverload> overloads();
 
     abstract ImmutableMap.Builder<String, CelResolvedOverload> overloadsBuilder();
 
     @CanIgnoreReturnValue
-    Builder addOverload(
+    public Builder addOverload(
         String overloadId,
         List<Class<?>> argTypes,
         boolean isStrict,
         CelFunctionOverload overload) {
       checkNotNull(overloadId);
+      checkArgument(!overloadId.isEmpty(), "Overload ID cannot be empty.");
       checkNotNull(argTypes);
       checkNotNull(overload);
 
@@ -127,7 +140,7 @@ Builder addOverload(
       return this;
     }
 
-    abstract DefaultDispatcher build();
+    public abstract DefaultDispatcher build();
   }
 
   DefaultDispatcher(ImmutableMap<String, CelResolvedOverload> overloads) {