diff --git a/common/BUILD.bazel b/common/BUILD.bazel index 815d8a1da..7b5c7af4c 100644 --- a/common/BUILD.bazel +++ b/common/BUILD.bazel @@ -126,3 +126,8 @@ java_library( name = "operator", exports = ["//common/src/main/java/dev/cel/common:operator"], ) + +cel_android_library( + name = "operator_android", + exports = ["//common/src/main/java/dev/cel/common:operator_android"], +) diff --git a/common/src/main/java/dev/cel/common/BUILD.bazel b/common/src/main/java/dev/cel/common/BUILD.bazel index a5fffe049..333ec4b78 100644 --- a/common/src/main/java/dev/cel/common/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/BUILD.bazel @@ -360,3 +360,11 @@ java_library( ], deps = ["@maven//:com_google_guava_guava"], ) + +cel_android_library( + name = "operator_android", + srcs = ["Operator.java"], + tags = [ + ], + deps = ["@maven_android//:com_google_guava_guava"], +) diff --git a/runtime/src/main/java/dev/cel/runtime/standard/AddOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/AddOperator.java index 783ddd81a..82bb308d1 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/AddOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/AddOperator.java @@ -14,6 +14,7 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.ADD; import static dev.cel.runtime.standard.ArithmeticHelpers.getArithmeticErrorCode; import com.google.common.collect.ImmutableSet; @@ -170,6 +171,6 @@ public CelFunctionBinding newFunctionBinding( } private AddOperator(ImmutableSet overloads) { - super(overloads); + super(ADD.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/BUILD.bazel b/runtime/src/main/java/dev/cel/runtime/standard/BUILD.bazel index 041d07dea..ed189014f 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/BUILD.bazel +++ b/runtime/src/main/java/dev/cel/runtime/standard/BUILD.bazel @@ -48,6 +48,7 @@ java_library( ":arithmetic_helpers", ":standard_function", ":standard_overload", + "//common:operator", "//common:options", "//common:runtime_exception", "//common/internal:date_time_helpers", @@ -70,6 +71,7 @@ cel_android_library( ":arithmetic_helpers", ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//common:runtime_exception", "//common/internal:date_time_helpers_android", @@ -92,6 +94,7 @@ java_library( ":arithmetic_helpers", ":standard_function", ":standard_overload", + "//common:operator", "//common:options", "//common:runtime_exception", "//common/internal:date_time_helpers", @@ -113,6 +116,7 @@ cel_android_library( ":arithmetic_helpers", ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//common:runtime_exception", "//common/internal:date_time_helpers_android", @@ -364,6 +368,7 @@ java_library( ], deps = [ ":standard_overload", + "//common:operator", "//common:options", "//runtime:function_binding", "//runtime:runtime_equality", @@ -380,6 +385,7 @@ cel_android_library( deps = [ ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//runtime:function_binding_android", "//runtime:runtime_equality_android", @@ -742,6 +748,7 @@ java_library( ], deps = [ ":standard_overload", + "//common:operator", "//common:options", "//common/internal:comparison_functions", "//common/internal:proto_time_utils", @@ -763,6 +770,7 @@ cel_android_library( deps = [ ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//common/internal:comparison_functions_android", "//common/internal:proto_time_utils_android", @@ -782,6 +790,7 @@ java_library( ], deps = [ ":standard_overload", + "//common:operator", "//common:options", "//common/internal:comparison_functions", "//common/internal:proto_time_utils", @@ -803,6 +812,7 @@ cel_android_library( deps = [ ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//common/internal:comparison_functions_android", "//common/internal:proto_time_utils_android", @@ -822,6 +832,7 @@ java_library( ], deps = [ ":standard_overload", + "//common:operator", "//common:options", "//runtime:function_binding", "//runtime:runtime_equality", @@ -838,6 +849,7 @@ cel_android_library( deps = [ ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//runtime:function_binding_android", "//runtime:runtime_equality_android", @@ -852,6 +864,7 @@ java_library( ], deps = [ ":standard_overload", + "//common:operator", "//common:options", "//runtime:function_binding", "//runtime:runtime_equality", @@ -869,6 +882,7 @@ cel_android_library( deps = [ ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//runtime:function_binding_android", "//runtime:runtime_equality_android", @@ -924,6 +938,7 @@ java_library( ], deps = [ ":standard_overload", + "//common:operator", "//common:options", "//common/internal:comparison_functions", "//common/internal:proto_time_utils", @@ -945,6 +960,7 @@ cel_android_library( deps = [ ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//common/internal:comparison_functions_android", "//common/internal:proto_time_utils_android", @@ -964,6 +980,7 @@ java_library( ], deps = [ ":standard_overload", + "//common:operator", "//common:options", "//common/internal:comparison_functions", "//common/internal:proto_time_utils", @@ -985,6 +1002,7 @@ cel_android_library( deps = [ ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//common/internal:comparison_functions_android", "//common/internal:proto_time_utils_android", @@ -1004,6 +1022,7 @@ java_library( ], deps = [ ":standard_overload", + "//common:operator", "//common:options", "//runtime:function_binding", "//runtime:runtime_equality", @@ -1020,6 +1039,7 @@ cel_android_library( deps = [ ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//runtime:function_binding_android", "//runtime:runtime_equality_android", @@ -1071,6 +1091,7 @@ java_library( deps = [ ":arithmetic_helpers", ":standard_overload", + "//common:operator", "//common:options", "//common:runtime_exception", "//runtime:function_binding", @@ -1090,6 +1111,7 @@ cel_android_library( ":arithmetic_helpers", ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//common:runtime_exception", "//runtime:function_binding_android", @@ -1107,6 +1129,7 @@ java_library( deps = [ ":arithmetic_helpers", ":standard_overload", + "//common:operator", "//common:options", "//common:runtime_exception", "//runtime:function_binding", @@ -1126,6 +1149,7 @@ cel_android_library( ":arithmetic_helpers", ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//common:runtime_exception", "//runtime:function_binding_android", @@ -1143,6 +1167,7 @@ java_library( deps = [ ":arithmetic_helpers", ":standard_overload", + "//common:operator", "//common:options", "//common:runtime_exception", "//runtime:function_binding", @@ -1162,6 +1187,7 @@ cel_android_library( ":arithmetic_helpers", ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//common:runtime_exception", "//runtime:function_binding_android", @@ -1179,6 +1205,7 @@ java_library( deps = [ ":arithmetic_helpers", ":standard_overload", + "//common:operator", "//common:options", "//common:runtime_exception", "//runtime:function_binding", @@ -1198,6 +1225,7 @@ cel_android_library( ":arithmetic_helpers", ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//common:runtime_exception", "//runtime:function_binding_android", @@ -1214,6 +1242,7 @@ java_library( ], deps = [ ":standard_overload", + "//common:operator", "//common:options", "//runtime:function_binding", "//runtime:runtime_equality", @@ -1230,6 +1259,7 @@ cel_android_library( deps = [ ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//runtime:function_binding_android", "//runtime:runtime_equality_android", @@ -1426,6 +1456,7 @@ java_library( ], deps = [ ":standard_overload", + "//common:operator", "//common:options", "//runtime:function_binding", "//runtime:internal_function_binder", @@ -1443,6 +1474,7 @@ cel_android_library( deps = [ ":standard_function_android", ":standard_overload_android", + "//common:operator_android", "//common:options", "//runtime:function_binding_android", "//runtime:internal_function_binder_android", diff --git a/runtime/src/main/java/dev/cel/runtime/standard/BoolFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/BoolFunction.java index 5d9d3919c..60cc8b156 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/BoolFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/BoolFunction.java @@ -87,6 +87,6 @@ public CelFunctionBinding newFunctionBinding( } private BoolFunction(ImmutableSet overloads) { - super(overloads); + super("bool", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/BytesFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/BytesFunction.java index e2a5230ce..7e3ab2b2f 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/BytesFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/BytesFunction.java @@ -76,6 +76,6 @@ public CelFunctionBinding newFunctionBinding( } private BytesFunction(ImmutableSet overloads) { - super(overloads); + super("bytes", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/CelStandardFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/CelStandardFunction.java index bde6fa6b5..73d53287c 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/CelStandardFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/CelStandardFunction.java @@ -14,8 +14,9 @@ package dev.cel.runtime.standard; -import static com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkArgument; +import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.errorprone.annotations.Immutable; import dev.cel.common.CelOptions; @@ -28,6 +29,7 @@ */ @Immutable public abstract class CelStandardFunction { + private final String name; private final ImmutableSet overloads; public ImmutableSet newFunctionBindings( @@ -40,8 +42,10 @@ public ImmutableSet newFunctionBindings( return builder.build(); } - CelStandardFunction(ImmutableSet overloads) { - checkState(!overloads.isEmpty(), "At least 1 overload must be provided."); + CelStandardFunction(String name, ImmutableSet overloads) { + checkArgument(!Strings.isNullOrEmpty(name), "Function name must be provided."); + checkArgument(!overloads.isEmpty(), "At least 1 overload must be provided."); this.overloads = overloads; + this.name = name; } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/ContainsFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/ContainsFunction.java index 21f8390b9..bf3f9f7a7 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/ContainsFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/ContainsFunction.java @@ -58,6 +58,6 @@ public CelFunctionBinding newFunctionBinding( } private ContainsFunction(ImmutableSet overloads) { - super(overloads); + super("contains", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/DivideOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/DivideOperator.java index b9fdad33c..a9c36b0ff 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/DivideOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/DivideOperator.java @@ -14,6 +14,7 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.DIVIDE; import static dev.cel.runtime.standard.ArithmeticHelpers.getArithmeticErrorCode; import com.google.common.collect.ImmutableSet; @@ -90,6 +91,6 @@ public CelFunctionBinding newFunctionBinding( } private DivideOperator(ImmutableSet overloads) { - super(overloads); + super(DIVIDE.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/DoubleFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/DoubleFunction.java index 508df1983..b541bd379 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/DoubleFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/DoubleFunction.java @@ -87,6 +87,6 @@ public CelFunctionBinding newFunctionBinding( } private DoubleFunction(ImmutableSet overloads) { - super(overloads); + super("double", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/DurationFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/DurationFunction.java index 72f96f785..436ffd1d4 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/DurationFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/DurationFunction.java @@ -88,6 +88,6 @@ public CelFunctionBinding newFunctionBinding( } private DurationFunction(ImmutableSet overloads) { - super(overloads); + super("duration", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/DynFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/DynFunction.java index d3cb34de9..da855de82 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/DynFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/DynFunction.java @@ -57,6 +57,6 @@ public CelFunctionBinding newFunctionBinding( } private DynFunction(ImmutableSet overloads) { - super(overloads); + super("dyn", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/EndsWithFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/EndsWithFunction.java index eeda546fe..7f4e8c035 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/EndsWithFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/EndsWithFunction.java @@ -59,6 +59,6 @@ public CelFunctionBinding newFunctionBinding( } private EndsWithFunction(ImmutableSet overloads) { - super(overloads); + super("endsWith", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/EqualsOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/EqualsOperator.java index ae78decbd..c505e069e 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/EqualsOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/EqualsOperator.java @@ -14,6 +14,8 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.EQUALS; + import com.google.common.collect.ImmutableSet; import dev.cel.common.CelOptions; import dev.cel.runtime.CelFunctionBinding; @@ -58,6 +60,6 @@ public CelFunctionBinding newFunctionBinding( } private EqualsOperator(ImmutableSet overloads) { - super(overloads); + super(EQUALS.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GetDateFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/GetDateFunction.java index 04e046062..bb0fb0d79 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GetDateFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GetDateFunction.java @@ -89,6 +89,6 @@ public CelFunctionBinding newFunctionBinding( } private GetDateFunction(ImmutableSet overloads) { - super(overloads); + super("getDate", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfMonthFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfMonthFunction.java index b6f146aa9..e35888fb5 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfMonthFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfMonthFunction.java @@ -90,6 +90,6 @@ public CelFunctionBinding newFunctionBinding( } private GetDayOfMonthFunction(ImmutableSet overloads) { - super(overloads); + super("getDayOfMonth", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfWeekFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfWeekFunction.java index cede6c1e1..e2fa02961 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfWeekFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfWeekFunction.java @@ -106,6 +106,6 @@ public CelFunctionBinding newFunctionBinding( } private GetDayOfWeekFunction(ImmutableSet overloads) { - super(overloads); + super("getDayOfWeek", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfYearFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfYearFunction.java index 966c70bc6..4c0e62637 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfYearFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GetDayOfYearFunction.java @@ -91,6 +91,6 @@ public CelFunctionBinding newFunctionBinding( } private GetDayOfYearFunction(ImmutableSet overloads) { - super(overloads); + super("getDayOfYear", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GetFullYearFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/GetFullYearFunction.java index a91fffb72..925f61307 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GetFullYearFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GetFullYearFunction.java @@ -90,6 +90,6 @@ public CelFunctionBinding newFunctionBinding( } private GetFullYearFunction(ImmutableSet overloads) { - super(overloads); + super("getFullYear", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GetHoursFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/GetHoursFunction.java index 94fb6391e..afe16556f 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GetHoursFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GetHoursFunction.java @@ -101,6 +101,6 @@ public CelFunctionBinding newFunctionBinding( } private GetHoursFunction(ImmutableSet overloads) { - super(overloads); + super("getHours", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GetMillisecondsFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/GetMillisecondsFunction.java index 672226eaf..32b17cc88 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GetMillisecondsFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GetMillisecondsFunction.java @@ -112,6 +112,6 @@ public CelFunctionBinding newFunctionBinding( } private GetMillisecondsFunction(ImmutableSet overloads) { - super(overloads); + super("getMilliseconds", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GetMinutesFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/GetMinutesFunction.java index 5f75d14ef..5f701f1e1 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GetMinutesFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GetMinutesFunction.java @@ -102,6 +102,6 @@ public CelFunctionBinding newFunctionBinding( } private GetMinutesFunction(ImmutableSet overloads) { - super(overloads); + super("getMinutes", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GetMonthFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/GetMonthFunction.java index dc4e66889..a8a9ded68 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GetMonthFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GetMonthFunction.java @@ -89,6 +89,6 @@ public CelFunctionBinding newFunctionBinding( } private GetMonthFunction(ImmutableSet overloads) { - super(overloads); + super("getMonth", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GetSecondsFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/GetSecondsFunction.java index 70fe96ec4..80030f50f 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GetSecondsFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GetSecondsFunction.java @@ -114,6 +114,6 @@ public CelFunctionBinding newFunctionBinding( } private GetSecondsFunction(ImmutableSet overloads) { - super(overloads); + super("getSeconds", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GreaterEqualsOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/GreaterEqualsOperator.java index be41e0f5f..c04b4398f 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GreaterEqualsOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GreaterEqualsOperator.java @@ -14,6 +14,8 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.GREATER_EQUALS; + import com.google.common.collect.ImmutableSet; import com.google.common.primitives.UnsignedLong; import com.google.protobuf.ByteString; @@ -197,6 +199,6 @@ public CelFunctionBinding newFunctionBinding( } private GreaterEqualsOperator(ImmutableSet overloads) { - super(overloads); + super(GREATER_EQUALS.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/GreaterOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/GreaterOperator.java index 21b59eebb..80edb8a9b 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/GreaterOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/GreaterOperator.java @@ -14,6 +14,8 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.GREATER; + import com.google.common.collect.ImmutableSet; import com.google.common.primitives.UnsignedLong; import com.google.protobuf.ByteString; @@ -190,6 +192,6 @@ public CelFunctionBinding newFunctionBinding( } private GreaterOperator(ImmutableSet overloads) { - super(overloads); + super(GREATER.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/InOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/InOperator.java index 9a2c99f43..bf80cc6ff 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/InOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/InOperator.java @@ -14,6 +14,8 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.IN; + import com.google.common.collect.ImmutableSet; import dev.cel.common.CelOptions; import dev.cel.runtime.CelFunctionBinding; @@ -70,6 +72,6 @@ public CelFunctionBinding newFunctionBinding( } private InOperator(ImmutableSet overloads) { - super(overloads); + super(IN.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/IndexOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/IndexOperator.java index d1b88a88f..f48e8fbf5 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/IndexOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/IndexOperator.java @@ -14,6 +14,8 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.INDEX; + import com.google.common.collect.ImmutableSet; import dev.cel.common.CelOptions; import dev.cel.runtime.CelFunctionBinding; @@ -65,6 +67,6 @@ public CelFunctionBinding newFunctionBinding( } private IndexOperator(ImmutableSet overloads) { - super(overloads); + super(INDEX.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java index fda307a9d..248131865 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/IntFunction.java @@ -130,6 +130,6 @@ public CelFunctionBinding newFunctionBinding( } private IntFunction(ImmutableSet overloads) { - super(overloads); + super("int", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/LessEqualsOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/LessEqualsOperator.java index e09fcce5e..7688acbc1 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/LessEqualsOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/LessEqualsOperator.java @@ -14,6 +14,8 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.LESS_EQUALS; + import com.google.common.collect.ImmutableSet; import com.google.common.primitives.UnsignedLong; import com.google.protobuf.ByteString; @@ -194,6 +196,6 @@ public CelFunctionBinding newFunctionBinding( } private LessEqualsOperator(ImmutableSet overloads) { - super(overloads); + super(LESS_EQUALS.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/LessOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/LessOperator.java index 4afbc20a2..a53a13a92 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/LessOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/LessOperator.java @@ -14,6 +14,8 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.LESS; + import com.google.common.collect.ImmutableSet; import com.google.common.primitives.UnsignedLong; import com.google.protobuf.ByteString; @@ -190,6 +192,6 @@ public CelFunctionBinding newFunctionBinding( } private LessOperator(ImmutableSet overloads) { - super(overloads); + super(LESS.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/LogicalNotOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/LogicalNotOperator.java index a4be6385b..6c2ec8efd 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/LogicalNotOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/LogicalNotOperator.java @@ -14,6 +14,8 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.LOGICAL_NOT; + import com.google.common.collect.ImmutableSet; import dev.cel.common.CelOptions; import dev.cel.runtime.CelFunctionBinding; @@ -57,6 +59,6 @@ public CelFunctionBinding newFunctionBinding( } private LogicalNotOperator(ImmutableSet overloads) { - super(overloads); + super(LOGICAL_NOT.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/MatchesFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/MatchesFunction.java index 7c24f65a2..62df04110 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/MatchesFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/MatchesFunction.java @@ -84,6 +84,6 @@ public CelFunctionBinding newFunctionBinding( } private MatchesFunction(ImmutableSet overloads) { - super(overloads); + super("matches", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/ModuloOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/ModuloOperator.java index e7246851c..01e02764d 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/ModuloOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/ModuloOperator.java @@ -14,6 +14,7 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.MODULO; import static dev.cel.runtime.standard.ArithmeticHelpers.getArithmeticErrorCode; import com.google.common.collect.ImmutableSet; @@ -85,6 +86,6 @@ public CelFunctionBinding newFunctionBinding( } private ModuloOperator(ImmutableSet overloads) { - super(overloads); + super(MODULO.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/MultiplyOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/MultiplyOperator.java index 7e9e2f352..c55a4c968 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/MultiplyOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/MultiplyOperator.java @@ -14,6 +14,7 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.MULTIPLY; import static dev.cel.runtime.standard.ArithmeticHelpers.getArithmeticErrorCode; import com.google.common.collect.ImmutableSet; @@ -103,6 +104,6 @@ public CelFunctionBinding newFunctionBinding( } private MultiplyOperator(ImmutableSet overloads) { - super(overloads); + super(MULTIPLY.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/NegateOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/NegateOperator.java index 2e3f094f5..cc072fdec 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/NegateOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/NegateOperator.java @@ -14,6 +14,7 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.NEGATE; import static dev.cel.runtime.standard.ArithmeticHelpers.getArithmeticErrorCode; import com.google.common.collect.ImmutableSet; @@ -72,6 +73,6 @@ public CelFunctionBinding newFunctionBinding( } private NegateOperator(ImmutableSet overloads) { - super(overloads); + super(NEGATE.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/NotEqualsOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/NotEqualsOperator.java index 5a0475f29..27b17676e 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/NotEqualsOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/NotEqualsOperator.java @@ -14,6 +14,8 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.NOT_EQUALS; + import com.google.common.collect.ImmutableSet; import dev.cel.common.CelOptions; import dev.cel.runtime.CelFunctionBinding; @@ -60,6 +62,6 @@ public CelFunctionBinding newFunctionBinding( } private NotEqualsOperator(ImmutableSet overloads) { - super(overloads); + super(NOT_EQUALS.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/NotStrictlyFalseFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/NotStrictlyFalseFunction.java index af7d1a3c2..8e0ceead4 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/NotStrictlyFalseFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/NotStrictlyFalseFunction.java @@ -14,6 +14,8 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.NOT_STRICTLY_FALSE; + import com.google.common.collect.ImmutableSet; import dev.cel.common.CelOptions; import dev.cel.runtime.CelFunctionBinding; @@ -63,6 +65,6 @@ public CelFunctionBinding newFunctionBinding( } private NotStrictlyFalseFunction(ImmutableSet overloads) { - super(overloads); + super(NOT_STRICTLY_FALSE.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/SizeFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/SizeFunction.java index 9f79605ed..a8f787665 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/SizeFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/SizeFunction.java @@ -98,6 +98,6 @@ public CelFunctionBinding newFunctionBinding( } private SizeFunction(ImmutableSet overloads) { - super(overloads); + super("size", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/StartsWithFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/StartsWithFunction.java index 6626d6912..457dd3cf1 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/StartsWithFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/StartsWithFunction.java @@ -58,6 +58,6 @@ public CelFunctionBinding newFunctionBinding( } private StartsWithFunction(ImmutableSet overloads) { - super(overloads); + super("startsWith", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/StringFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/StringFunction.java index c491bfe76..9311962ca 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/StringFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/StringFunction.java @@ -134,6 +134,6 @@ public CelFunctionBinding newFunctionBinding( } private StringFunction(ImmutableSet overloads) { - super(overloads); + super("string", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java b/runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java index 4b0ecd3ae..8a7595f92 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/SubtractOperator.java @@ -14,6 +14,7 @@ package dev.cel.runtime.standard; +import static dev.cel.common.Operator.SUBTRACT; import static dev.cel.runtime.standard.ArithmeticHelpers.getArithmeticErrorCode; import com.google.common.collect.ImmutableSet; @@ -157,6 +158,6 @@ public CelFunctionBinding newFunctionBinding( } private SubtractOperator(ImmutableSet overloads) { - super(overloads); + super(SUBTRACT.getFunction(), overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/TimestampFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/TimestampFunction.java index 34fb15768..27c495034 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/TimestampFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/TimestampFunction.java @@ -107,6 +107,6 @@ public CelFunctionBinding newFunctionBinding( } private TimestampFunction(ImmutableSet overloads) { - super(overloads); + super("timestamp", overloads); } } diff --git a/runtime/src/main/java/dev/cel/runtime/standard/UintFunction.java b/runtime/src/main/java/dev/cel/runtime/standard/UintFunction.java index 89424e7fc..d120c6b75 100644 --- a/runtime/src/main/java/dev/cel/runtime/standard/UintFunction.java +++ b/runtime/src/main/java/dev/cel/runtime/standard/UintFunction.java @@ -158,6 +158,6 @@ public CelFunctionBinding newFunctionBinding( } private UintFunction(ImmutableSet overloads) { - super(overloads); + super("uint", overloads); } }