Remove grouped overloads from CelStandardFunctions

PiperOrigin-RevId: 850118838

Author: l46kok

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

@@ -828,6 +828,9 @@ java_library(
         "//common/types:cel_types",
         "//common/values:cel_value_provider",
         "//common/values:proto_message_value_provider",
+        "//runtime/standard:add",
+        "//runtime/standard:int",
+        "//runtime/standard:timestamp",
         "@maven//:com_google_code_findbugs_annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",

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

@@ -43,9 +43,9 @@
 import dev.cel.common.types.CelTypes;
 import dev.cel.common.values.CelValueProvider;
 import dev.cel.common.values.ProtoMessageValueProvider;
-import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Arithmetic;
-import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Comparison;
-import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
+import dev.cel.runtime.standard.AddOperator.AddOverload;
+import dev.cel.runtime.standard.IntFunction.IntOverload;
+import dev.cel.runtime.standard.TimestampFunction.TimestampOverload;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Optional;
@@ -339,7 +339,7 @@ private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
                     (standardFunction, standardOverload) -> {
                       switch (standardFunction) {
                         case INT:
-                          if (standardOverload.equals(Conversions.INT64_TO_INT64)) {
+                          if (standardOverload.equals(IntOverload.INT64_TO_INT64)) {
                             // Note that we require UnsignedLong flag here to avoid ambiguous
                             // overloads against "uint64_to_int64", because they both use the same
                             // Java Long class. We skip adding this identity function if the flag is
@@ -350,26 +350,23 @@ private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
                         case TIMESTAMP:
                           // TODO: Remove this flag guard once the feature has been
                           // auto-enabled.
-                          if (standardOverload.equals(Conversions.INT64_TO_TIMESTAMP)) {
+                          if (standardOverload.equals(TimestampOverload.INT64_TO_TIMESTAMP)) {
                             return options.enableTimestampEpoch();
                           }
                           break;
                         case STRING:
                           return options.enableStringConversion();
                         case ADD:
-                          Arithmetic arithmetic = (Arithmetic) standardOverload;
-                          if (arithmetic.equals(Arithmetic.ADD_STRING)) {
+                          if (standardOverload.equals(AddOverload.ADD_STRING)) {
                             return options.enableStringConcatenation();
                           }
-                          if (arithmetic.equals(Arithmetic.ADD_LIST)) {
+                          if (standardOverload.equals(AddOverload.ADD_LIST)) {
                             return options.enableListConcatenation();
                           }
                           break;
                         default:
-                          if (standardOverload instanceof Comparison
-                              && !options.enableHeterogeneousNumericComparisons()) {
-                            Comparison comparison = (Comparison) standardOverload;
-                            return !comparison.isHeterogeneousComparison();
+                          if (!options.enableHeterogeneousNumericComparisons()) {
+                            return !CelStandardFunctions.isHeterogeneousComparison(standardOverload);
                           }
                           break;
                       }