Drop support for java.lang.long uint support in CelValue

l46kok · copybara-github · commit c3dcc7e4a709 · 2025-04-23T20:20:16.000-07:00
PiperOrigin-RevId: 750824161
diff --git a/common/src/main/java/dev/cel/common/values/BUILD.bazel b/common/src/main/java/dev/cel/common/values/BUILD.bazel
@@ -149,7 +149,6 @@ java_library(
         ":cel_value_provider",
         ":proto_message_value",
         "//common:error_codes",
-        "//common:options",
         "//common:runtime_exception",
         "//common/annotations",
         "//common/internal:dynamic_proto",
diff --git a/common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java b/common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java
@@ -127,9 +127,9 @@ protected CelValue fromWellKnownProtoToCelValue(
       case STRING_VALUE:
         return fromJavaPrimitiveToCelValue(((StringValue) message).getValue());
       case UINT32_VALUE:
-        return UintValue.create(((UInt32Value) message).getValue(), true);
+        return UintValue.create(((UInt32Value) message).getValue());
       case UINT64_VALUE:
-        return UintValue.create(((UInt64Value) message).getValue(), true);
+        return UintValue.create(((UInt64Value) message).getValue());
       default:
         throw new UnsupportedOperationException(
             "Unsupported message to CelValue conversion - " + message);
diff --git a/common/src/main/java/dev/cel/common/values/CelValueConverter.java b/common/src/main/java/dev/cel/common/values/CelValueConverter.java
@@ -109,7 +109,7 @@ protected CelValue fromJavaPrimitiveToCelValue(Object value) {
     } else if (value instanceof Float) {
       return DoubleValue.create(Double.valueOf((Float) value));
     } else if (value instanceof UnsignedLong) {
-      return UintValue.create(((UnsignedLong) value).longValue(), /* enableUnsignedLongs= */ true);
+      return UintValue.create((UnsignedLong) value);
     }
 
     // Fall back to an Opaque value, as a custom class was supplied in the runtime. The legacy
diff --git a/common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java b/common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java
@@ -153,9 +153,9 @@ public CelValue fromProtoMessageFieldToCelValue(
 
         return fromProtoMessageToCelValue((MessageOrBuilder) result);
       case UINT32:
-        return UintValue.create((int) result, true);
+        return UintValue.create((int) result);
       case UINT64:
-        return UintValue.create((long) result, true);
+        return UintValue.create((long) result);
       default:
         break;
     }
diff --git a/common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java b/common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java
@@ -19,7 +19,6 @@
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import com.google.protobuf.Message;
 import dev.cel.common.CelErrorCode;
-import dev.cel.common.CelOptions;
 import dev.cel.common.CelRuntimeException;
 import dev.cel.common.annotations.Internal;
 import dev.cel.common.internal.DynamicProto;
@@ -92,15 +91,14 @@ private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
                         fieldName, descriptor.getFullName())));
   }
 
-  public static ProtoMessageValueProvider newInstance(
-      DynamicProto dynamicProto, CelOptions celOptions) {
-    return new ProtoMessageValueProvider(dynamicProto, celOptions);
+  public static ProtoMessageValueProvider newInstance(DynamicProto dynamicProto) {
+    return new ProtoMessageValueProvider(dynamicProto);
   }
 
-  private ProtoMessageValueProvider(DynamicProto dynamicProto, CelOptions celOptions) {
+  private ProtoMessageValueProvider(DynamicProto dynamicProto) {
     this.protoMessageFactory = dynamicProto.getProtoMessageFactory();
     this.protoCelValueConverter =
         ProtoCelValueConverter.newInstance(protoMessageFactory.getDescriptorPool(), dynamicProto);
-    this.protoAdapter = new ProtoAdapter(dynamicProto, celOptions.enableUnsignedLongs());
+    this.protoAdapter = new ProtoAdapter(dynamicProto, true);
   }
 }
diff --git a/common/src/main/java/dev/cel/common/values/UintValue.java b/common/src/main/java/dev/cel/common/values/UintValue.java
@@ -27,11 +27,10 @@
 @Immutable
 @AutoValue
 @AutoValue.CopyAnnotations
-@SuppressWarnings("Immutable") // value is either a boxed long or an immutable UnsignedLong.
 public abstract class UintValue extends CelValue {
 
   @Override
-  public abstract Number value();
+  public abstract UnsignedLong value();
 
   @Override
   public boolean isZeroValue() {
@@ -47,8 +46,7 @@ public static UintValue create(UnsignedLong value) {
     return new AutoValue_UintValue(value);
   }
 
-  public static UintValue create(long value, boolean enableUnsignedLongs) {
-    Number unsignedLong = enableUnsignedLongs ? UnsignedLong.fromLongBits(value) : value;
-    return new AutoValue_UintValue(unsignedLong);
+  public static UintValue create(long value) {
+    return new AutoValue_UintValue(UnsignedLong.fromLongBits(value));
   }
 }
diff --git a/common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java b/common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java
@@ -24,7 +24,6 @@
 import com.google.protobuf.util.Timestamps;
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import dev.cel.common.CelDescriptorUtil;
-import dev.cel.common.CelOptions;
 import dev.cel.common.CelRuntimeException;
 import dev.cel.common.internal.CelDescriptorPool;
 import dev.cel.common.internal.DefaultDescriptorPool;
@@ -56,7 +55,7 @@ public class ProtoMessageValueProviderTest {
   @Test
   public void newValue_createEmptyProtoMessage() {
     ProtoMessageValueProvider protoMessageValueProvider =
-        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO, CelOptions.DEFAULT);
+        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 
     ProtoMessageValue protoMessageValue =
         (ProtoMessageValue)
@@ -70,7 +69,7 @@ public void newValue_createEmptyProtoMessage() {
   @Test
   public void newValue_createProtoMessage_fieldsPopulated() {
     ProtoMessageValueProvider protoMessageValueProvider =
-        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO, CelOptions.DEFAULT);
+        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 
     ProtoMessageValue protoMessageValue =
         (ProtoMessageValue)
@@ -104,9 +103,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, true));
+        .isEqualTo(UintValue.create(3L));
     assertThat(protoMessageValue.select(StringValue.create("single_uint64")))
-        .isEqualTo(UintValue.create(4L, true));
+        .isEqualTo(UintValue.create(4L));
     assertThat(protoMessageValue.select(StringValue.create("single_double")))
         .isEqualTo(DoubleValue.create(5.5d));
     assertThat(protoMessageValue.select(StringValue.create("single_bool")))
@@ -122,7 +121,7 @@ public void newValue_createProtoMessage_fieldsPopulated() {
   @Test
   public void newValue_createProtoMessage_unsignedLongFieldsPopulated() {
     ProtoMessageValueProvider protoMessageValueProvider =
-        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO, CelOptions.current().build());
+        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 
     ProtoMessageValue protoMessageValue =
         (ProtoMessageValue)
@@ -143,7 +142,7 @@ public void newValue_createProtoMessage_unsignedLongFieldsPopulated() {
   @Test
   public void newValue_createProtoMessage_wrappersPopulated() {
     ProtoMessageValueProvider protoMessageValueProvider =
-        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO, CelOptions.DEFAULT);
+        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 
     ProtoMessageValue protoMessageValue =
         (ProtoMessageValue)
@@ -189,7 +188,7 @@ public void newValue_createProtoMessage_wrappersPopulated() {
   @Test
   public void newValue_createProtoMessage_extensionFieldsPopulated() {
     ProtoMessageValueProvider protoMessageValueProvider =
-        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO, CelOptions.DEFAULT);
+        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 
     ProtoMessageValue protoMessageValue =
         (ProtoMessageValue)
@@ -210,7 +209,7 @@ public void newValue_createProtoMessage_extensionFieldsPopulated() {
   @Test
   public void newValue_invalidMessageName_throws() {
     ProtoMessageValueProvider protoMessageValueProvider =
-        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO, CelOptions.DEFAULT);
+        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 
     CelRuntimeException e =
         assertThrows(
@@ -225,7 +224,7 @@ public void newValue_invalidMessageName_throws() {
   @Test
   public void newValue_invalidField_throws() {
     ProtoMessageValueProvider protoMessageValueProvider =
-        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO, CelOptions.DEFAULT);
+        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 
     IllegalArgumentException e =
         assertThrows(
@@ -245,7 +244,7 @@ public void newValue_invalidField_throws() {
   public void newValue_onCombinedProvider() {
     CelValueProvider celValueProvider = (structType, fields) -> Optional.empty();
     ProtoMessageValueProvider protoMessageValueProvider =
-        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO, CelOptions.DEFAULT);
+        ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
     CelValueProvider combinedProvider =
         new CombinedCelValueProvider(celValueProvider, protoMessageValueProvider);
 
diff --git a/runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java b/runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
@@ -292,7 +292,7 @@ public CelRuntimeLegacyImpl build() {
 
       if (options.enableCelValue()) {
         ProtoMessageValueProvider messageValueProvider =
-            ProtoMessageValueProvider.newInstance(dynamicProto, options);
+            ProtoMessageValueProvider.newInstance(dynamicProto);
         if (celValueProvider != null) {
           celValueProvider =
               new CelValueProvider.CombinedCelValueProvider(celValueProvider, messageValueProvider);

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ protected CelValue fromJavaPrimitiveToCelValue(Object value) {`
`109`	`109`	`} else if (value instanceof Float) {`
`110`	`110`	`return DoubleValue.create(Double.valueOf((Float) value));`
`111`	`111`	`} else if (value instanceof UnsignedLong) {`
`112`		`- return UintValue.create(((UnsignedLong) value).longValue(), /* enableUnsignedLongs= */ true);`
	`112`	`+ return UintValue.create((UnsignedLong) value);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`// Fall back to an Opaque value, as a custom class was supplied in the runtime. The legacy`