Add value type parameter in StructValue

PiperOrigin-RevId: 904602834

Author: l46kok

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/CelExperimentalFactory.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);

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

@@ -78,10 +78,14 @@ cel_android_library(
 
 java_library(
     name = "combined_cel_value_provider",
-    srcs = ["CombinedCelValueProvider.java"],
+    srcs = [
+        "CombinedCelValueProvider.java",
+    ],
     tags = [
     ],
     deps = [
+        ":combined_cel_value_converter",
+        ":values",
         "//common/values:cel_value_provider",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
@@ -90,16 +94,52 @@ java_library(
 
 cel_android_library(
     name = "combined_cel_value_provider_android",
-    srcs = ["CombinedCelValueProvider.java"],
+    srcs = [
+        "CombinedCelValueProvider.java",
+    ],
     tags = [
     ],
     deps = [
+        ":combined_cel_value_converter_android",
+        ":values_android",
         "//common/values:cel_value_provider_android",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven_android//:com_google_guava_guava",
     ],
 )
 
+java_library(
+    name = "combined_cel_value_converter",
+    srcs = [
+        "CombinedCelValueConverter.java",
+    ],
+    tags = [
+    ],
+    deps = [
+        ":values",
+        "//common/annotations",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:com_google_guava_guava",
+        "@maven//:org_jspecify_jspecify",
+    ],
+)
+
+cel_android_library(
+    name = "combined_cel_value_converter_android",
+    srcs = [
+        "CombinedCelValueConverter.java",
+    ],
+    tags = [
+    ],
+    deps = [
+        ":values_android",
+        "//common/annotations",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_guava_guava",
+    ],
+)
+
 java_library(
     name = "values",
     srcs = CEL_VALUES_SOURCES,

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

@@ -21,8 +21,8 @@
 import dev.cel.common.annotations.Internal;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.function.Function;
 
 /**
  * {@code CelValueConverter} handles bidirectional conversion between native Java objects to {@link
@@ -37,6 +37,12 @@ public class CelValueConverter {
 
   private static final CelValueConverter DEFAULT_INSTANCE = new CelValueConverter();
 
+  @SuppressWarnings("Immutable") // Method reference is immutable
+  private final Function<Object, Object> maybeUnwrapFunction;
+
+  @SuppressWarnings("Immutable") // Method reference is immutable
+  private final Function<Object, Object> toRuntimeValueFunction;
+
   public static CelValueConverter getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
@@ -51,14 +57,26 @@ public Object maybeUnwrap(Object value) {
       return unwrap((CelValue) value);
     }
 
+    Object mapped = mapContainer(value, maybeUnwrapFunction);
+    if (mapped != value) {
+      return mapped;
+    }
+
+    return value;
+  }
+
+  /**
+   * Maps a container (Collection or Map) by applying the provided mapper function to its elements.
+   * Returns the original value if it's not a supported container.
+   */
+  protected Object mapContainer(Object value, Function<Object, Object> mapper) {
     if (value instanceof Collection) {
       Collection<Object> collection = (Collection<Object>) value;
       ImmutableList.Builder<Object> builder =
           ImmutableList.builderWithExpectedSize(collection.size());
       for (Object element : collection) {
-        builder.add(maybeUnwrap(element));
+        builder.add(mapper.apply(element));
       }
-
       return builder.build();
     }
 
@@ -67,34 +85,30 @@ public Object maybeUnwrap(Object value) {
       ImmutableMap.Builder<Object, Object> builder =
           ImmutableMap.builderWithExpectedSize(map.size());
       for (Map.Entry<Object, Object> entry : map.entrySet()) {
-        builder.put(maybeUnwrap(entry.getKey()), maybeUnwrap(entry.getValue()));
+        builder.put(mapper.apply(entry.getKey()), mapper.apply(entry.getValue()));
       }
-
       return builder.buildOrThrow();
     }
 
     return value;
   }
 
-  /**
-   * Canonicalizes an inbound {@code value} into a suitable Java object representation for
-   * evaluation.
-   */
   public Object toRuntimeValue(Object value) {
     Preconditions.checkNotNull(value);
 
     if (value instanceof CelValue) {
       return value;
     }
 
-    if (value instanceof Collection) {
-      return toListValue((Collection<Object>) value);
-    } else if (value instanceof Map) {
-      return toMapValue((Map<Object, Object>) value);
-    } else if (value instanceof Optional) {
+    Object mapped = mapContainer(value, toRuntimeValueFunction);
+    if (mapped != value) {
+      return mapped;
+    }
+
+    if (value instanceof Optional) {
       Optional<Object> optionalValue = (Optional<Object>) value;
       return optionalValue
-          .map(this::toRuntimeValue)
+          .map(toRuntimeValueFunction)
           .map(OptionalValue::create)
           .orElse(OptionalValue.EMPTY);
     }
@@ -136,31 +150,9 @@ private Object unwrap(CelValue celValue) {
     return celValue.value();
   }
 
-  private ImmutableList<Object> toListValue(Collection<Object> iterable) {
-    Preconditions.checkNotNull(iterable);
-
-    ImmutableList.Builder<Object> listBuilder =
-        ImmutableList.builderWithExpectedSize(iterable.size());
-    for (Object entry : iterable) {
-      listBuilder.add(toRuntimeValue(entry));
-    }
-
-    return listBuilder.build();
-  }
-
-  private ImmutableMap<Object, Object> toMapValue(Map<Object, Object> map) {
-    Preconditions.checkNotNull(map);
 
-    ImmutableMap.Builder<Object, Object> mapBuilder =
-        ImmutableMap.builderWithExpectedSize(map.size());
-    for (Entry<Object, Object> entry : map.entrySet()) {
-      Object mapKey = toRuntimeValue(entry.getKey());
-      Object mapValue = toRuntimeValue(entry.getValue());
-      mapBuilder.put(mapKey, mapValue);
-    }
-
-    return mapBuilder.buildOrThrow();
+  protected CelValueConverter() {
+    this.maybeUnwrapFunction = this::maybeUnwrap;
+    this.toRuntimeValueFunction = this::toRuntimeValue;
   }
-
-  protected CelValueConverter() {}
 }