Remove primitives, list and map variants of CelValue

PiperOrigin-RevId: 833651450

Author: l46kok

common/src/main/java/dev/cel/common/values/BUILD.bazel

@@ -12,27 +12,13 @@ package(
 
 # keep sorted
 CEL_VALUES_SOURCES = [
-    "BoolValue.java",
-    "BytesValue.java",
     "CelValueConverter.java",
-    "DoubleValue.java",
-    "DurationValue.java",
-    "EnumValue.java",
     "ErrorValue.java",
-    "ImmutableListValue.java",
-    "ImmutableMapValue.java",
-    "IntValue.java",
-    "ListValue.java",
-    "MapValue.java",
     "NullValue.java",
     "OpaqueValue.java",
     "OptionalValue.java",
     "SelectableValue.java",
-    "StringValue.java",
     "StructValue.java",
-    "TimestampValue.java",
-    "TypeValue.java",
-    "UintValue.java",
 ]
 
 # keep sorted
@@ -71,7 +57,6 @@ java_library(
     tags = [
     ],
     deps = [
-        ":cel_value",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
     ],
@@ -83,7 +68,6 @@ cel_android_library(
     tags = [
     ],
     deps = [
-        ":cel_value_android",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven_android//:com_google_guava_guava",
     ],
@@ -95,7 +79,6 @@ java_library(
     tags = [
     ],
     deps = [
-        "//common/values:cel_value",
         "//common/values:cel_value_provider",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
@@ -108,7 +91,6 @@ cel_android_library(
     tags = [
     ],
     deps = [
-        ":cel_value_android",
         "//common/values:cel_value_provider_android",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven_android//:com_google_guava_guava",
@@ -124,8 +106,6 @@ java_library(
         ":cel_byte_string",
         ":cel_value",
         "//:auto_value",
-        "//common:error_codes",
-        "//common:runtime_exception",
         "//common/annotations",
         "//common/types",
         "//common/types:type_providers",
@@ -144,8 +124,6 @@ cel_android_library(
         ":cel_byte_string",
         ":cel_value_android",
         "//:auto_value",
-        "//common:error_codes",
-        "//common:runtime_exception",
         "//common/annotations",
         "//common/types:type_providers_android",
         "//common/types:types_android",
@@ -173,14 +151,15 @@ java_library(
     ],
     deps = [
         ":cel_byte_string",
-        ":cel_value",
         ":values",
         "//common/annotations",
         "//common/internal:proto_time_utils",
         "//common/internal:well_known_proto",
+        "//common/values",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -191,7 +170,6 @@ cel_android_library(
     ],
     deps = [
         ":cel_byte_string",
-        ":cel_value_android",
         ":values_android",
         "//common/annotations",
         "//common/internal:proto_time_utils_android",
@@ -209,7 +187,6 @@ java_library(
     ],
     deps = [
         ":base_proto_cel_value_converter",
-        ":cel_value",
         ":values",
         "//:auto_value",
         "//common/annotations",
@@ -222,6 +199,7 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -232,7 +210,6 @@ java_library(
     ],
     deps = [
         ":base_proto_message_value_provider",
-        ":cel_value",
         ":proto_message_value",
         "//common:options",
         "//common/annotations",
@@ -254,7 +231,6 @@ java_library(
     ],
     deps = [
         ":base_proto_cel_value_converter",
-        ":cel_value",
         ":values",
         "//:auto_value",
         "//common/annotations",
@@ -282,7 +258,6 @@ cel_android_library(
     ],
     deps = [
         ":base_proto_cel_value_converter_android",
-        ":cel_value_android",
         ":values_android",
         "//:auto_value",
         "//common/annotations",

common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

@@ -18,14 +18,19 @@
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.primitives.UnsignedLong;
 import com.google.errorprone.annotations.Immutable;
 import com.google.protobuf.BoolValue;
 import com.google.protobuf.ByteString;
+import com.google.protobuf.BytesValue;
 import com.google.protobuf.DoubleValue;
 import com.google.protobuf.Duration;
 import com.google.protobuf.FloatValue;
 import com.google.protobuf.Int32Value;
 import com.google.protobuf.Int64Value;
+import com.google.protobuf.ListValue;
 import com.google.protobuf.MessageLite;
 import com.google.protobuf.MessageLiteOrBuilder;
 import com.google.protobuf.StringValue;
@@ -37,7 +42,6 @@
 import dev.cel.common.annotations.Internal;
 import dev.cel.common.internal.ProtoTimeUtils;
 import dev.cel.common.internal.WellKnownProto;
-import java.util.Optional;
 
 /**
  * {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
@@ -51,45 +55,41 @@
 @Internal
 public abstract class BaseProtoCelValueConverter extends CelValueConverter {
 
-  public abstract CelValue fromProtoMessageToCelValue(MessageLite msg);
+  public abstract Object fromProtoMessageToCelValue(MessageLite msg);
 
   /** {@inheritDoc} Protobuf semantics take precedence for conversion. */
   @Override
-  public CelValue fromJavaObjectToCelValue(Object value) {
+  public Object fromJavaObjectToCelValue(Object value) {
     Preconditions.checkNotNull(value);
 
-    Optional<WellKnownProto> wellKnownProto = WellKnownProto.getByClass(value.getClass());
-    if (wellKnownProto.isPresent()) {
-      return fromWellKnownProtoToCelValue((MessageLiteOrBuilder) value, wellKnownProto.get());
-    }
-
-    if (value instanceof ByteString) {
-      return BytesValue.create(CelByteString.of(((ByteString) value).toByteArray()));
+    if (value instanceof MessageLite) {
+      return fromProtoMessageToCelValue((MessageLite) value);
+    } else if (value instanceof ByteString) {
+      return CelByteString.of(((ByteString) value).toByteArray());
     } else if (value instanceof com.google.protobuf.NullValue) {
       return NullValue.NULL_VALUE;
     }
 
     return super.fromJavaObjectToCelValue(value);
   }
 
-  protected CelValue fromWellKnownProtoToCelValue(
+  protected Object fromWellKnownProtoToCelValue(
       MessageLiteOrBuilder message, WellKnownProto wellKnownProto) {
     switch (wellKnownProto) {
       case JSON_VALUE:
-        return adaptJsonValueToCelValue((Value) message);
+        return adaptJsonValue((Value) message);
       case JSON_STRUCT_VALUE:
-        return adaptJsonStructToCelValue((Struct) message);
+        return adaptJsonStruct((Struct) message);
       case JSON_LIST_VALUE:
-        return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
+        return adaptJsonList((ListValue) message);
       case DURATION:
-        return DurationValue.create(ProtoTimeUtils.toJavaDuration((Duration) message));
+        return ProtoTimeUtils.toJavaDuration((Duration) message);
       case TIMESTAMP:
-        return TimestampValue.create(ProtoTimeUtils.toJavaInstant((Timestamp) message));
+        return ProtoTimeUtils.toJavaInstant((Timestamp) message);
       case BOOL_VALUE:
         return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
       case BYTES_VALUE:
-        return fromJavaPrimitiveToCelValue(
-            ((com.google.protobuf.BytesValue) message).getValue().toByteArray());
+        return fromJavaPrimitiveToCelValue(((BytesValue) message).getValue().toByteArray());
       case DOUBLE_VALUE:
         return fromJavaPrimitiveToCelValue(((DoubleValue) message).getValue());
       case FLOAT_VALUE:
@@ -101,16 +101,16 @@ protected CelValue fromWellKnownProtoToCelValue(
       case STRING_VALUE:
         return fromJavaPrimitiveToCelValue(((StringValue) message).getValue());
       case UINT32_VALUE:
-        return UintValue.create(((UInt32Value) message).getValue());
+        return UnsignedLong.valueOf(((UInt32Value) message).getValue());
       case UINT64_VALUE:
-        return UintValue.create(((UInt64Value) message).getValue());
+        return UnsignedLong.fromLongBits(((UInt64Value) message).getValue());
       default:
         throw new UnsupportedOperationException(
-            "Unsupported message to CelValue conversion - " + message);
+            "Unsupported well known proto conversion - " + wellKnownProto);
     }
   }
 
-  private CelValue adaptJsonValueToCelValue(Value value) {
+  private Object adaptJsonValue(Value value) {
     switch (value.getKindCase()) {
       case BOOL_VALUE:
         return fromJavaPrimitiveToCelValue(value.getBoolValue());
@@ -119,9 +119,9 @@ private CelValue adaptJsonValueToCelValue(Value value) {
       case STRING_VALUE:
         return fromJavaPrimitiveToCelValue(value.getStringValue());
       case LIST_VALUE:
-        return adaptJsonListToCelValue(value.getListValue());
+        return adaptJsonList(value.getListValue());
       case STRUCT_VALUE:
-        return adaptJsonStructToCelValue(value.getStructValue());
+        return adaptJsonStruct(value.getStructValue());
       case NULL_VALUE:
       case KIND_NOT_SET: // Fall-through is intended
         return NullValue.NULL_VALUE;
@@ -130,28 +130,23 @@ private CelValue adaptJsonValueToCelValue(Value value) {
         "Unsupported Json to CelValue conversion: " + value.getKindCase());
   }
 
-  private ListValue<CelValue> adaptJsonListToCelValue(com.google.protobuf.ListValue listValue) {
-    return ImmutableListValue.create(
-        listValue.getValuesList().stream()
-            .map(this::adaptJsonValueToCelValue)
-            .collect(toImmutableList()));
+  private ImmutableList<Object> adaptJsonList(ListValue listValue) {
+    return listValue.getValuesList().stream().map(this::adaptJsonValue).collect(toImmutableList());
   }
 
-  private MapValue<dev.cel.common.values.StringValue, CelValue> adaptJsonStructToCelValue(
-      Struct struct) {
-    return ImmutableMapValue.create(
-        struct.getFieldsMap().entrySet().stream()
-            .collect(
-                toImmutableMap(
-                    e -> {
-                      CelValue key = fromJavaObjectToCelValue(e.getKey());
-                      if (!(key instanceof dev.cel.common.values.StringValue)) {
-                        throw new IllegalStateException(
-                            "Expected a string type for the key, but instead got: " + key);
-                      }
-                      return (dev.cel.common.values.StringValue) key;
-                    },
-                    e -> adaptJsonValueToCelValue(e.getValue()))));
+  private ImmutableMap<String, Object> adaptJsonStruct(Struct struct) {
+    return struct.getFieldsMap().entrySet().stream()
+        .collect(
+            toImmutableMap(
+                e -> {
+                  Object key = fromJavaObjectToCelValue(e.getKey());
+                  if (!(key instanceof String)) {
+                    throw new IllegalStateException(
+                        "Expected a string type for the key, but instead got: " + key);
+                  }
+                  return (String) key;
+                },
+                e -> adaptJsonValue(e.getValue())));
   }
 
   protected BaseProtoCelValueConverter() {}