diff --git a/common/src/main/java/dev/cel/common/CelOptions.java b/common/src/main/java/dev/cel/common/CelOptions.java
index 31e05de2f..d86ed64f4 100644
--- a/common/src/main/java/dev/cel/common/CelOptions.java
+++ b/common/src/main/java/dev/cel/common/CelOptions.java
@@ -412,7 +412,8 @@ public Builder enableHeterogeneousNumericComparisons(boolean value) {
public abstract Builder enableUnsignedLongs(boolean value);
/**
- * Perform equality using {@code ProtoEquality} proto equality.
+ * Perform equality using {@code ProtoEquality} proto equality. {@code CelLiteRuntime} always
+ * applies this equality regardless of this option.
*
*
CEL's alternative implementation to the {@code Message#equals} comes with a few key
* differences:
diff --git a/common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java b/common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java
index d28da7234..d37af5729 100644
--- a/common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java
+++ b/common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java
@@ -49,6 +49,8 @@
@Immutable
@Internal
public final class DefaultLiteDescriptorPool implements CelLiteDescriptorPool {
+ private static final String STRUCT_FIELDS_ENTRY = "google.protobuf.Struct.FieldsEntry";
+
private final ImmutableMap protoFqnToMessageInfo;
private final ImmutableMap, MessageLiteDescriptor> classToMessageInfo;
@@ -163,7 +165,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
/* encodingType= */ EncodingType.MAP,
/* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
/* isPacked= */ false,
- /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
+ /* fieldProtoTypeName= */ STRUCT_FIELDS_ENTRY));
break;
case JSON_VALUE:
messageBuilder = Value::newBuilder;
@@ -268,6 +270,14 @@ private DefaultLiteDescriptorPool(ImmutableSet descriptors) {
protoFqnMapBuilder.put(wellKnownProto.typeName(), wktMessageInfo);
classMapBuilder.put(wellKnownProto.messageClass(), wktMessageInfo);
}
+ // Struct's map entry, which `google.protobuf.Struct{fields: ...}` literals are encoded with.
+ protoFqnMapBuilder.put(
+ STRUCT_FIELDS_ENTRY,
+ CelLiteDescriptor.mapEntry(
+ /* fullName= */ STRUCT_FIELDS_ENTRY,
+ /* keyType= */ FieldLiteDescriptor.Type.STRING,
+ /* valueType= */ FieldLiteDescriptor.Type.MESSAGE,
+ /* valueTypeName= */ WellKnownProto.JSON_VALUE.typeName()));
for (CelLiteDescriptor descriptor : descriptors) {
protoFqnMapBuilder.putAll(descriptor.getProtoTypeNamesToDescriptors());
diff --git a/common/src/main/java/dev/cel/common/internal/ProtoAdapter.java b/common/src/main/java/dev/cel/common/internal/ProtoAdapter.java
index b872df831..73eb3d276 100644
--- a/common/src/main/java/dev/cel/common/internal/ProtoAdapter.java
+++ b/common/src/main/java/dev/cel/common/internal/ProtoAdapter.java
@@ -308,23 +308,21 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
case SFIXED32:
case SINT32:
case INT32:
- return unwrapAndConvert(INT_CONVERTER);
+ return unwrapAndConvert(fieldDescriptor, Long.class, INT_CONVERTER);
case FIXED32:
case UINT32:
if (celOptions.enableUnsignedLongs()) {
- return unwrapAndConvert(UNSIGNED_UINT32_CONVERTER);
+ return unwrapAndConvert(fieldDescriptor, UnsignedLong.class, UNSIGNED_UINT32_CONVERTER);
}
- return unwrapAndConvert(SIGNED_UINT32_CONVERTER);
+ return unwrapAndConvert(fieldDescriptor, Long.class, SIGNED_UINT32_CONVERTER);
case FIXED64:
case UINT64:
if (celOptions.enableUnsignedLongs()) {
- return unwrapAndConvert(UNSIGNED_UINT64_CONVERTER);
+ return unwrapAndConvert(fieldDescriptor, UnsignedLong.class, UNSIGNED_UINT64_CONVERTER);
}
- return BidiConverter.of(
- BidiConverter.IDENTITY.forwardConverter(),
- value -> BidiConverter.IDENTITY.backwardConverter().convert(maybeUnwrap(value)));
+ return unwrapAndCheck(fieldDescriptor, Long.class);
case FLOAT:
- return unwrapAndConvert(DOUBLE_CONVERTER);
+ return unwrapAndConvert(fieldDescriptor, Double.class, DOUBLE_CONVERTER);
case BYTES:
if (celOptions.evaluateCanonicalTypesToNativeValues()) {
return BidiConverter.