Wrap FieldMask via shared message-to-struct hook on the base converter

andrewparmet · andrewparmet · commit 984193b7ee46 · 2026-06-02T16:13:23.000-04:00
Move the FieldMask case into BaseProtoCelValueConverter, delegating to a new
fromProtoMessageToStructValue hook that both the full and lite converters
implement. This reuses the existing non-well-known message wrapping path
(removing the duplicated ProtoMessageValue.create call) and extends the fix to
the lite runtime. Adds a lite-converter test.
diff --git a/common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java b/common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java
@@ -17,8 +17,6 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -29,7 +27,6 @@
 import com.google.protobuf.BytesValue;
 import com.google.protobuf.DoubleValue;
 import com.google.protobuf.Duration;
-import com.google.protobuf.FieldMask;
 import com.google.protobuf.FloatValue;
 import com.google.protobuf.Int32Value;
 import com.google.protobuf.Int64Value;
@@ -44,8 +41,6 @@
 import dev.cel.common.annotations.Internal;
 import dev.cel.common.internal.ProtoTimeUtils;
 import dev.cel.common.internal.WellKnownProto;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
@@ -73,6 +68,12 @@ public Object toRuntimeValue(Object value) {
     return super.toRuntimeValue(value);
   }
 
+  /** Wraps a protobuf message as a navigable struct value. */
+  protected StructValue<String, ?> fromProtoMessageToStructValue(MessageLiteOrBuilder message) {
+    throw new UnsupportedOperationException(
+        "This converter does not support wrapping protobuf messages as struct values.");
+  }
+
   protected Object fromWellKnownProto(MessageLiteOrBuilder message, WellKnownProto wellKnownProto) {
     switch (wellKnownProto) {
       case JSON_VALUE:
@@ -104,14 +105,7 @@ protected Object fromWellKnownProto(MessageLiteOrBuilder message, WellKnownProto
       case UINT64_VALUE:
         return UnsignedLong.fromLongBits(((UInt64Value) message).getValue());
       case FIELD_MASK:
-        FieldMask fieldMask = (FieldMask) message;
-        List<String> paths = new ArrayList<>(fieldMask.getPathsCount());
-        for (String path : fieldMask.getPathsList()) {
-          if (!path.isEmpty()) {
-            paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
-          }
-        }
-        return normalizePrimitive(Joiner.on(",").join(paths));
+        return fromProtoMessageToStructValue(message);
       case EMPTY:
         return ImmutableMap.of();
       default:
diff --git a/common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java b/common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java
@@ -71,14 +71,17 @@ protected Object fromWellKnownProto(MessageLiteOrBuilder msg, WellKnownProto wel
               "Unpacking failed for message: " + message.getDescriptorForType().getFullName(), e);
         }
         return toRuntimeValue(unpackedMessage);
-      case FIELD_MASK:
-        return ProtoMessageValue.create(
-            (Message) message, celDescriptorPool, this, celOptions.enableJsonFieldNames());
       default:
         return super.fromWellKnownProto(message, wellKnownProto);
     }
   }
 
+  @Override
+  protected ProtoMessageValue fromProtoMessageToStructValue(MessageLiteOrBuilder message) {
+    return ProtoMessageValue.create(
+        (Message) message, celDescriptorPool, this, celOptions.enableJsonFieldNames());
+  }
+
   @Override
   public Object toRuntimeValue(Object value) {
     if (value instanceof EnumValueDescriptor) {
@@ -102,8 +105,7 @@ public Object toRuntimeValue(Object value) {
       WellKnownProto wellKnownProto =
           WellKnownProto.getByTypeName(message.getDescriptorForType().getFullName()).orElse(null);
       if (wellKnownProto == null) {
-        return ProtoMessageValue.create(
-            message, celDescriptorPool, this, celOptions.enableJsonFieldNames());
+        return fromProtoMessageToStructValue(message);
       }
 
       return fromWellKnownProto(message, wellKnownProto);
diff --git a/common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java b/common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java
@@ -28,6 +28,7 @@
 import com.google.protobuf.CodedInputStream;
 import com.google.protobuf.ExtensionRegistryLite;
 import com.google.protobuf.MessageLite;
+import com.google.protobuf.MessageLiteOrBuilder;
 import com.google.protobuf.WireFormat;
 import dev.cel.common.annotations.Internal;
 import dev.cel.common.internal.CelLiteDescriptorPool;
@@ -184,6 +185,17 @@ public Object toRuntimeValue(Object value) {
     return super.toRuntimeValue(value);
   }
 
+  @Override
+  protected ProtoMessageLiteValue fromProtoMessageToStructValue(MessageLiteOrBuilder message) {
+    MessageLite msg = (MessageLite) message;
+    MessageLiteDescriptor descriptor =
+        descriptorPool
+            .findDescriptor(msg)
+            .orElseThrow(
+                () -> new NoSuchElementException("Could not find a descriptor for: " + msg));
+    return ProtoMessageLiteValue.create(msg, descriptor.getProtoTypeName(), this);
+  }
+
   private Object getDefaultValue(FieldLiteDescriptor fieldDescriptor) {
     EncodingType encodingType = fieldDescriptor.getEncodingType();
     switch (encodingType) {
diff --git a/common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java b/common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java
@@ -27,6 +27,7 @@
 import com.google.protobuf.DoubleValue;
 import com.google.protobuf.Duration;
 import com.google.protobuf.ExtensionRegistryLite;
+import com.google.protobuf.FieldMask;
 import com.google.protobuf.FloatValue;
 import com.google.protobuf.Int32Value;
 import com.google.protobuf.Int64Value;
@@ -104,6 +105,17 @@ public void fromProtoMessageToCelValue_withWellKnownProto_convertsToPrimitivesFr
     assertThat(adaptedValue).isEqualTo(testCase.value);
   }
 
+  @Test
+  public void fromProtoMessageToCelValue_fieldMask_returnsProtoMessageLiteValue() {
+    FieldMask fieldMask = FieldMask.newBuilder().addPaths("foo").addPaths("bar").build();
+
+    Object adaptedValue = PROTO_LITE_CEL_VALUE_CONVERTER.toRuntimeValue(fieldMask);
+
+    assertThat(adaptedValue).isInstanceOf(ProtoMessageLiteValue.class);
+    assertThat(((ProtoMessageLiteValue) adaptedValue).select("paths"))
+        .isEqualTo(ImmutableList.of("foo", "bar"));
+  }
+
   /** Test cases for repeated_int64: 1L,2L,3L */
   @SuppressWarnings("ImmutableEnumChecker") // Test only
   private enum RepeatedFieldBytesTestCase {
