Remove deprecated dev.cel.runtime.CelRuntime.CelFunctionBinding

l46kok · copybara-github · commit fe02b64e018e · 2025-03-09T13:20:56.000-07:00
PiperOrigin-RevId: 735162133
diff --git a/runtime/src/main/java/dev/cel/runtime/CelRuntime.java b/runtime/src/main/java/dev/cel/runtime/CelRuntime.java
@@ -16,7 +16,6 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.Immutable;
 import javax.annotation.concurrent.ThreadSafe;
@@ -227,65 +226,4 @@ static Program from(Interpretable interpretable, CelOptions options) {
       return new AutoValue_CelRuntime_Program(interpretable, options);
     }
   }
-
-  /**
-   * Deprecated. Do not use.
-   *
-   * @deprecated {@link dev.cel.runtime.CelFunctionBinding} instead.
-   *     <p>TODO: Migrate users to dev.cel.runtime.CelFunctionBinding
-   */
-  @Immutable
-  @Deprecated
-  final class CelFunctionBinding implements dev.cel.runtime.CelFunctionBinding {
-    private final dev.cel.runtime.CelFunctionBinding functionBinding;
-
-    private CelFunctionBinding(dev.cel.runtime.CelFunctionBinding functionBinding) {
-      this.functionBinding = functionBinding;
-    }
-
-    @Override
-    public String getOverloadId() {
-      return functionBinding.getOverloadId();
-    }
-
-    @Override
-    public ImmutableList<Class<?>> getArgTypes() {
-      return functionBinding.getArgTypes();
-    }
-
-    @Override
-    public CelFunctionOverload getDefinition() {
-      return functionBinding.getDefinition();
-    }
-
-    /**
-     * Create a unary function binding from the {@code overloadId}, {@code arg}, and {@code impl}.
-     */
-    public static <T> CelFunctionBinding from(
-        String overloadId, Class<T> arg, CelFunctionOverload.Unary<T> impl) {
-      return new CelFunctionBinding(dev.cel.runtime.CelFunctionBinding.from(overloadId, arg, impl));
-    }
-
-    /**
-     * Create a binary function binding from the {@code overloadId}, {@code arg1}, {@code arg2}, and
-     * {@code impl}.
-     */
-    public static <T1, T2> CelFunctionBinding from(
-        String overloadId,
-        Class<T1> arg1,
-        Class<T2> arg2,
-        CelFunctionOverload.Binary<T1, T2> impl) {
-      return new CelFunctionBinding(
-          dev.cel.runtime.CelFunctionBinding.from(overloadId, arg1, arg2, impl));
-    }
-
-    /**
-     * Create a function binding from the {@code overloadId}, {@code argTypes}, and {@code impl}.
-     */
-    public static CelFunctionBinding from(
-        String overloadId, Iterable<Class<?>> argTypes, CelFunctionOverload impl) {
-      return new CelFunctionBinding(
-          dev.cel.runtime.CelFunctionBinding.from(overloadId, argTypes, impl));
-    }
-  }
 }
diff --git a/runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java b/runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
@@ -84,7 +84,7 @@ public final class CelRuntimeLegacyImpl implements CelRuntime {
   // CEL-Internal-4
   private final ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries;
 
-  private final ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings;
+  private final ImmutableList<CelFunctionBinding> celFunctionBindings;
 
   @Override
   public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {
@@ -129,8 +129,7 @@ public static final class Builder implements CelRuntimeBuilder {
     // The following properties are for testing purposes only. Do not expose to public.
     @VisibleForTesting final ImmutableSet.Builder<FileDescriptor> fileTypes;
 
-    @VisibleForTesting
-    final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;
+    @VisibleForTesting final HashMap<String, CelFunctionBinding> customFunctionBindings;
 
     @VisibleForTesting final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;
 
@@ -151,13 +150,12 @@ public CelRuntimeBuilder setOptions(CelOptions options) {
     }
 
     @Override
-    public CelRuntimeBuilder addFunctionBindings(dev.cel.runtime.CelFunctionBinding... bindings) {
+    public CelRuntimeBuilder addFunctionBindings(CelFunctionBinding... bindings) {
       return addFunctionBindings(Arrays.asList(bindings));
     }
 
     @Override
-    public CelRuntimeBuilder addFunctionBindings(
-        Iterable<dev.cel.runtime.CelFunctionBinding> bindings) {
+    public CelRuntimeBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
       bindings.forEach(o -> customFunctionBindings.putIfAbsent(o.getOverloadId(), o));
       return this;
     }
@@ -272,9 +270,9 @@ public CelRuntimeLegacyImpl build() {
       DynamicProto dynamicProto = DynamicProto.create(runtimeTypeFactory);
       RuntimeEquality runtimeEquality = ProtoMessageRuntimeEquality.create(dynamicProto, options);
 
-      ImmutableMap.Builder<String, dev.cel.runtime.CelFunctionBinding> functionBindingsBuilder =
+      ImmutableMap.Builder<String, CelFunctionBinding> functionBindingsBuilder =
           ImmutableMap.builder();
-      for (dev.cel.runtime.CelFunctionBinding standardFunctionBinding :
+      for (CelFunctionBinding standardFunctionBinding :
           newStandardFunctionBindings(runtimeEquality)) {
         functionBindingsBuilder.put(
             standardFunctionBinding.getOverloadId(), standardFunctionBinding);
@@ -286,7 +284,7 @@ public CelRuntimeLegacyImpl build() {
       functionBindingsBuilder
           .buildOrThrow()
           .forEach(
-              (String overloadId, dev.cel.runtime.CelFunctionBinding func) ->
+              (String overloadId, CelFunctionBinding func) ->
                   dispatcher.add(
                       overloadId, func.getArgTypes(), (args) -> func.getDefinition().apply(args)));
 
@@ -327,7 +325,7 @@ public CelRuntimeLegacyImpl build() {
           ImmutableList.copyOf(customFunctionBindings.values()));
     }
 
-    private ImmutableSet<dev.cel.runtime.CelFunctionBinding> newStandardFunctionBindings(
+    private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
         RuntimeEquality runtimeEquality) {
       CelStandardFunctions celStandardFunctions;
       if (standardEnvironmentEnabled) {
@@ -424,7 +422,7 @@ private CelRuntimeLegacyImpl(
       @Nullable CelValueProvider celValueProvider,
       ImmutableSet<FileDescriptor> fileDescriptors,
       ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries,
-      ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings) {
+      ImmutableList<CelFunctionBinding> celFunctionBindings) {
     this.interpreter = interpreter;
     this.options = options;
     this.standardEnvironmentEnabled = standardEnvironmentEnabled;
