Support evaluation of dynamic messages constructed via dynamic descri…

…ptors Closes #350 PiperOrigin-RevId: 636755364
google · May 24, 2024 · 29828eb · 29828eb
1 parent 28de306
commit 29828eb
Show file tree

Hide file tree

Showing 9 changed files with 1,302 additions and 11 deletions.
diff --git a/common/resources/testdata/proto3/BUILD.bazel b/common/resources/testdata/proto3/BUILD.bazel
@@ -4,6 +4,11 @@ package(
     default_visibility = ["//visibility:public"],
 )
 
+alias(
+    name = "test_all_types_file_descriptor_set",
+    actual = "//common/src/main/resources/testdata/proto3:test_all_types_file_descriptor_set",
+)
+
 alias(
     name = "test_all_types_java_proto",
     actual = "//common/src/main/resources/testdata/proto3:test_all_types_java_proto",

diff --git a/common/src/main/java/dev/cel/common/internal/ProtoAdapter.java b/common/src/main/java/dev/cel/common/internal/ProtoAdapter.java
@@ -210,14 +210,32 @@ public Optional<Object> adaptFieldToValue(FieldDescriptor fieldDescriptor, Objec
     }
     if (fieldDescriptor.isMapField()) {
       Descriptor entryDescriptor = fieldDescriptor.getMessageType();
-      BidiConverter keyConverter = fieldToValueConverter(entryDescriptor.findFieldByNumber(1));
-      BidiConverter valueConverter = fieldToValueConverter(entryDescriptor.findFieldByNumber(2));
+      FieldDescriptor keyFieldDescriptor = entryDescriptor.findFieldByNumber(1);
+      FieldDescriptor valueFieldDescriptor = entryDescriptor.findFieldByNumber(2);
+      BidiConverter keyConverter = fieldToValueConverter(keyFieldDescriptor);
+      BidiConverter valueConverter = fieldToValueConverter(valueFieldDescriptor);
+
       Map<Object, Object> map = new HashMap<>();
-      for (MapEntry entry : ((List<MapEntry>) fieldValue)) {
+      Object mapKey;
+      Object mapValue;
+      for (Object entry : ((List<Object>) fieldValue)) {
+        if (entry instanceof MapEntry) {
+          MapEntry mapEntry = (MapEntry) entry;
+          mapKey = mapEntry.getKey();
+          mapValue = mapEntry.getValue();
+        } else if (entry instanceof DynamicMessage) {
+          DynamicMessage dynamicMessage = (DynamicMessage) entry;
+          mapKey = dynamicMessage.getField(keyFieldDescriptor);
+          mapValue = dynamicMessage.getField(valueFieldDescriptor);
+        } else {
+          throw new IllegalStateException("Unexpected map field type: " + entry);
+        }
+
         map.put(
-            keyConverter.forwardConverter().convert(entry.getKey()),
-            valueConverter.forwardConverter().convert(entry.getValue()));
+            keyConverter.forwardConverter().convert(mapKey),
+            valueConverter.forwardConverter().convert(mapValue));
       }
+
       return Optional.of(map);
     }
     if (fieldDescriptor.isRepeated()) {

diff --git a/common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java b/common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java
@@ -186,7 +186,7 @@ public CelValue fromJavaObjectToCelValue(Object value) {
   }
 
   /** Adapts the protobuf message field into {@link CelValue}. */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public CelValue fromProtoMessageFieldToCelValue(
       Message message, FieldDescriptor fieldDescriptor) {
     Preconditions.checkNotNull(message);
@@ -202,8 +202,26 @@ public CelValue fromProtoMessageFieldToCelValue(
           return NullValue.NULL_VALUE;
         } else if (fieldDescriptor.isMapField()) {
           Map<Object, Object> map = new HashMap<>();
-          for (MapEntry<Object, Object> entry : ((List<MapEntry<Object, Object>>) result)) {
-            map.put(entry.getKey(), entry.getValue());
+          Object mapKey;
+          Object mapValue;
+          for (Object entry : ((List<Object>) result)) {
+            if (entry instanceof MapEntry) {
+              MapEntry mapEntry = (MapEntry) entry;
+              mapKey = mapEntry.getKey();
+              mapValue = mapEntry.getValue();
+            } else if (entry instanceof DynamicMessage) {
+              DynamicMessage dynamicMessage = (DynamicMessage) entry;
+              FieldDescriptor keyFieldDescriptor =
+                  fieldDescriptor.getMessageType().findFieldByNumber(1);
+              FieldDescriptor valueFieldDescriptor =
+                  fieldDescriptor.getMessageType().findFieldByNumber(2);
+              mapKey = dynamicMessage.getField(keyFieldDescriptor);
+              mapValue = dynamicMessage.getField(valueFieldDescriptor);
+            } else {
+              throw new IllegalStateException("Unexpected map field type: " + entry);
+            }
+
+            map.put(mapKey, mapValue);
           }
           return fromJavaObjectToCelValue(map);
         }

diff --git a/common/src/main/resources/testdata/proto3/BUILD.bazel b/common/src/main/resources/testdata/proto3/BUILD.bazel
@@ -8,6 +8,11 @@ package(
     ],
 )
 
+filegroup(
+    name = "test_all_types_file_descriptor_set",
+    srcs = ["test_all_types.fds"],
+)
+
 proto_library(
     name = "test_all_types_proto",
     srcs = [