Enable UnsignedLongs by default in CelOptions

l46kok · copybara-github · commit 78dfcb527526 · 2024-08-21T11:32:19.000-07:00
PiperOrigin-RevId: 665962755
diff --git a/common/src/main/java/dev/cel/common/CelOptions.java b/common/src/main/java/dev/cel/common/CelOptions.java
@@ -211,6 +211,7 @@ public static Builder current() {
     return newBuilder()
         .enableReservedIds(true)
         .enableUnsignedComparisonAndArithmeticIsUnsigned(true)
+        .enableUnsignedLongs(true)
         .enableRegexPartialMatch(true)
         .errorOnDuplicateMapKeys(true)
         .errorOnIntWrap(true)
diff --git a/common/src/main/java/dev/cel/common/ExprFeatures.java b/common/src/main/java/dev/cel/common/ExprFeatures.java
@@ -159,7 +159,8 @@ public enum ExprFeatures {
           UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED,
           ENABLE_NAMESPACED_DECLARATIONS,
           ERROR_ON_WRAP,
-          ERROR_ON_DUPLICATE_KEYS);
+          ERROR_ON_DUPLICATE_KEYS,
+          ENABLE_UNSIGNED_LONGS);
 
   public static final ImmutableSet<ExprFeatures> LEGACY = ImmutableSet.of(LEGACY_JAVA_EQUALITY);
 }
diff --git a/common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java b/common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java
@@ -106,7 +106,7 @@ public static List<Object[]> data() {
             },
             {1L, Int64Value.of(1L), LEGACY},
             {1L, Any.pack(Int64Value.of(1L)), LEGACY},
-            {1L, UInt64Value.of(1L), LEGACY},
+            {UnsignedLong.valueOf(1L), UInt64Value.of(1L), LEGACY},
             {"hello", StringValue.of("hello"), LEGACY},
             {"hello", Any.pack(StringValue.of("hello")), LEGACY},
             {"hello", Value.newBuilder().setStringValue("hello").build(), LEGACY},
diff --git a/common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java b/common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java
@@ -106,9 +106,9 @@ public void newValue_createProtoMessage_fieldsPopulated() {
     assertThat(protoMessageValue.select(StringValue.create("single_int64")))
         .isEqualTo(IntValue.create(2L));
     assertThat(protoMessageValue.select(StringValue.create("single_uint32")))
-        .isEqualTo(UintValue.create(3L, false));
+        .isEqualTo(UintValue.create(3L, true));
     assertThat(protoMessageValue.select(StringValue.create("single_uint64")))
-        .isEqualTo(UintValue.create(4L, false));
+        .isEqualTo(UintValue.create(4L, true));
     assertThat(protoMessageValue.select(StringValue.create("single_double")))
         .isEqualTo(DoubleValue.create(5.5d));
     assertThat(protoMessageValue.select(StringValue.create("single_bool")))
@@ -178,9 +178,9 @@ public void newValue_createProtoMessage_wrappersPopulated() {
     assertThat(protoMessageValue.select(StringValue.create("single_int64_wrapper")).value())
         .isEqualTo(2L);
     assertThat(protoMessageValue.select(StringValue.create("single_uint32_wrapper")).value())
-        .isEqualTo(3L);
+        .isEqualTo(UnsignedLong.valueOf(3L));
     assertThat(protoMessageValue.select(StringValue.create("single_uint64_wrapper")).value())
-        .isEqualTo(4L);
+        .isEqualTo(UnsignedLong.valueOf(4L));
     assertThat(protoMessageValue.select(StringValue.create("single_double_wrapper")).value())
         .isEqualTo(5.5d);
     assertThat(protoMessageValue.select(StringValue.create("single_bool_wrapper")).value())
diff --git a/extensions/src/test/java/dev/cel/extensions/CelMathExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelMathExtensionsTest.java
@@ -44,10 +44,12 @@ public class CelMathExtensionsTest {
       CelOptions.current().enableUnsignedLongs(false).build();
   private static final CelCompiler CEL_COMPILER =
       CelCompilerFactory.standardCelCompilerBuilder()
+          .setOptions(CEL_OPTIONS)
           .addLibraries(CelExtensions.math(CEL_OPTIONS))
           .build();
   private static final CelRuntime CEL_RUNTIME =
       CelRuntimeFactory.standardCelRuntimeBuilder()
+          .setOptions(CEL_OPTIONS)
           .addLibraries(CelExtensions.math(CEL_OPTIONS))
           .build();
 
diff --git a/testing/src/test/java/dev/cel/testing/EvalSyncTest.java b/testing/src/test/java/dev/cel/testing/EvalSyncTest.java
@@ -17,6 +17,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.primitives.UnsignedLong;
 import com.google.protobuf.Any;
 import com.google.protobuf.BoolValue;
 import com.google.protobuf.ByteString;
@@ -80,8 +81,8 @@ public static List<Object[]> data() {
             {StringValue.of("test"), "test"},
             {Int32Value.of(1), 1L},
             {Int64Value.of(1), 1L},
-            {UInt32Value.of(1), 1L},
-            {UInt64Value.of(1), 1L},
+            {UInt32Value.of(1), UnsignedLong.valueOf(1L)},
+            {UInt64Value.of(1), UnsignedLong.valueOf(1L)},
             {BytesValue.of(ByteString.copyFromUtf8("test")), ByteString.copyFromUtf8("test")},
           });
     }

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ public enum ExprFeatures {`
`159`	`159`	`UNSIGNED_COMPARISON_AND_ARITHMETIC_IS_UNSIGNED,`
`160`	`160`	`ENABLE_NAMESPACED_DECLARATIONS,`
`161`	`161`	`ERROR_ON_WRAP,`
`162`		`- ERROR_ON_DUPLICATE_KEYS);`
	`162`	`+ ERROR_ON_DUPLICATE_KEYS,`
	`163`	`+ ENABLE_UNSIGNED_LONGS);`
`163`	`164`
`164`	`165`	`public static final ImmutableSet<ExprFeatures> LEGACY = ImmutableSet.of(LEGACY_JAVA_EQUALITY);`
`165`	`166`	`}`