Internal Changes

PiperOrigin-RevId: 789859483

Author: l46kok

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

@@ -88,6 +88,9 @@ public interface CelBuilder {
   @Deprecated
   CelBuilder setContainer(String container);
 
+  /** Retrieves the currently configured {@link CelContainer} in the builder. */
+  CelContainer container();
+
   /**
    * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
    * functions.

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

@@ -195,6 +195,11 @@ public CelBuilder setContainer(String container) {
       return this;
     }
 
+    @Override
+    public CelContainer container() {
+      return compilerBuilder.container();
+    }
+
     @Override
     public CelBuilder setContainer(CelContainer container) {
       compilerBuilder.setContainer(container);

compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java

@@ -89,6 +89,9 @@ public interface CelCompilerBuilder {
   @CanIgnoreReturnValue
   CelCompilerBuilder setContainer(CelContainer container);
 
+  /** Retrieves the currently configured {@link CelContainer} in the builder. */
+  CelContainer container();
+
   /** Add a variable declaration with a given {@code name} and proto based {@link Type}. */
   @CanIgnoreReturnValue
   CelCompilerBuilder addVar(String name, Type type);

compiler/src/main/java/dev/cel/compiler/CelCompilerImpl.java

@@ -170,6 +170,11 @@ public CelCompilerBuilder setContainer(CelContainer container) {
       return this;
     }
 
+    @Override
+    public CelContainer container() {
+      return checkerBuilder.container();
+    }
+
     @Override
     public CelCompilerBuilder addVar(String name, Type type) {
       return addVar(name, CelProtoTypes.typeToCelType(type));

policy/src/main/java/dev/cel/policy/CelPolicy.java

@@ -23,7 +23,10 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import dev.cel.common.formats.ValueString;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -76,13 +79,23 @@ public abstract static class Builder {
 
     public abstract Builder setMetadata(ImmutableMap<String, Object> value);
 
-    abstract ImmutableList.Builder<Import> importsBuilder();
+    private final ArrayList<Import> importList = new ArrayList<>();
 
     abstract Builder setImports(ImmutableList<Import> value);
 
+    public List<Import> imports() {
+      return importList;
+    }
+
     @CanIgnoreReturnValue
     public Builder addImport(Import value) {
-      importsBuilder().add(value);
+      importList.add(value);
+      return this;
+    }
+
+    @CanIgnoreReturnValue
+    public Builder addImports(Collection<Import> values) {
+      importList.addAll(values);
       return this;
     }
 
@@ -98,7 +111,12 @@ public Builder putMetadata(Map<String, Object> map) {
       return this;
     }
 
-    public abstract CelPolicy build();
+    abstract CelPolicy autoBuild();
+
+    public CelPolicy build() {
+      setImports(ImmutableList.copyOf(importList));
+      return autoBuild();
+    }
   }
 
   /**