Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP#626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Mar 11, 2025
Merged

Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ java_library(
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
],
)

Expand Down
49 changes: 44 additions & 5 deletions common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,26 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.CelDescriptors;
import dev.cel.common.annotations.Internal;
import java.util.HashMap;
Expand All@@ -40,14 +57,36 @@
@Immutable
@Internal
public final class DefaultDescriptorPool implements CelDescriptorPool {
private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_DESCRIPTORS =

private static final ImmutableMap<WellKnownProto, Descriptor> WELL_KNOWN_PROTO_TO_DESCRIPTORS =
ImmutableMap.<WellKnownProto, Descriptor>builder()
.put(WellKnownProto.ANY_VALUE, Any.getDescriptor())
.put(WellKnownProto.BOOL_VALUE, BoolValue.getDescriptor())
.put(WellKnownProto.BYTES_VALUE, BytesValue.getDescriptor())
.put(WellKnownProto.DOUBLE_VALUE, DoubleValue.getDescriptor())
.put(WellKnownProto.DURATION, Duration.getDescriptor())
.put(WellKnownProto.FLOAT_VALUE, FloatValue.getDescriptor())
.put(WellKnownProto.INT32_VALUE, Int32Value.getDescriptor())
.put(WellKnownProto.INT64_VALUE, Int64Value.getDescriptor())
.put(WellKnownProto.STRING_VALUE, StringValue.getDescriptor())
.put(WellKnownProto.TIMESTAMP, Timestamp.getDescriptor())
.put(WellKnownProto.UINT32_VALUE, UInt32Value.getDescriptor())
.put(WellKnownProto.UINT64_VALUE, UInt64Value.getDescriptor())
.put(WellKnownProto.JSON_LIST_VALUE, ListValue.getDescriptor())
.put(WellKnownProto.JSON_STRUCT_VALUE, Struct.getDescriptor())
.put(WellKnownProto.JSON_VALUE, Value.getDescriptor())
.put(WellKnownProto.EMPTY, Empty.getDescriptor())
.put(WellKnownProto.FIELD_MASK, FieldMask.getDescriptor())
.buildOrThrow();

private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS =
stream(WellKnownProto.values())
.collect(toImmutableMap(WellKnownProto::typeName, WellKnownProto::descriptor));
.collect(toImmutableMap(WellKnownProto::typeName, WELL_KNOWN_PROTO_TO_DESCRIPTORS::get));

/** A DefaultDescriptorPool instance with just well known types loaded. */
public static final DefaultDescriptorPool INSTANCE =
new DefaultDescriptorPool(
WELL_KNOWN_TYPE_DESCRIPTORS,
WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS,
ImmutableMultimap.of(),
ExtensionRegistry.getEmptyRegistry());

Expand All@@ -67,8 +106,8 @@ public static DefaultDescriptorPool create(CelDescriptors celDescriptors) {

public static DefaultDescriptorPool create(
CelDescriptors celDescriptors, ExtensionRegistry extensionRegistry) {
Map<String, Descriptor> descriptorMap = new HashMap<>(); // Using a hashmap to allow deduping
stream(WellKnownProto.values()).forEach(d -> descriptorMap.put(d.typeName(), d.descriptor()));
Map<String, Descriptor> descriptorMap =
new HashMap<>(WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS); // Using a hashmap to allow deduping

for (Descriptor descriptor : celDescriptors.messageTypeDescriptors()) {
descriptorMap.putIfAbsent(descriptor.getFullName(), descriptor);
Expand Down
12 changes: 7 additions & 5 deletions common/src/main/java/dev/cel/common/internal/ProtoAdapter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,7 +157,7 @@ public Object adaptProtoToValue(MessageOrBuilder proto) {
// If the proto is not a well-known type, then the input Message is what's expected as the
// output return value.
WellKnownProto wellKnownProto =
WellKnownProto.getByDescriptorName(typeName(proto.getDescriptorForType()));
WellKnownProto.getByTypeName(typeName(proto.getDescriptorForType()));
if (wellKnownProto == null) {
return proto;
}
Expand DownExpand Up@@ -335,7 +335,7 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
*/
@SuppressWarnings("unchecked")
public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(protoTypeName);
WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(protoTypeName);
if (wellKnownProto == null) {
if (value instanceof Message) {
return Optional.of((Message) value);
Expand DownExpand Up@@ -376,7 +376,7 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
break;
case DOUBLE_VALUE:
return Optional.ofNullable(adaptValueToDouble(value));
case DURATION_VALUE:
case DURATION:
return Optional.of((Duration) value);
case FLOAT_VALUE:
return Optional.ofNullable(adaptValueToFloat(value));
Expand All@@ -389,12 +389,14 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
return Optional.of(StringValue.of((String) value));
}
break;
case TIMESTAMP_VALUE:
case TIMESTAMP:
return Optional.of((Timestamp) value);
case UINT32_VALUE:
return Optional.ofNullable(adaptValueToUint32(value));
case UINT64_VALUE:
return Optional.ofNullable(adaptValueToUint64(value));
default:
throw new IllegalArgumentException("Unsupported conversion: " + wellKnownProto);
}
return Optional.empty();
}
Expand DownExpand Up@@ -579,7 +581,7 @@ private static boolean isWrapperType(FieldDescriptor fieldDescriptor) {
return false;
}
String fieldTypeName = fieldDescriptor.getMessageType().getFullName();
WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(fieldTypeName);
WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(fieldTypeName);
return wellKnownProto != null && wellKnownProto.isWrapperType();
}

Expand Down
84 changes: 54 additions & 30 deletions common/src/main/java/dev/cel/common/internal/WellKnownProto.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
Expand All@@ -36,6 +37,7 @@
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

/**
* WellKnownProto types used throughout CEL. These types are specially handled to ensure that
Expand All@@ -44,24 +46,32 @@
*/
@Internal
public enum WellKnownProto {
JSON_VALUE(Value.getDescriptor()),
JSON_STRUCT_VALUE(Struct.getDescriptor()),
JSON_LIST_VALUE(ListValue.getDescriptor()),
ANY_VALUE(Any.getDescriptor()),
BOOL_VALUE(BoolValue.getDescriptor(), true),
BYTES_VALUE(BytesValue.getDescriptor(), true),
DOUBLE_VALUE(DoubleValue.getDescriptor(), true),
FLOAT_VALUE(FloatValue.getDescriptor(), true),
INT32_VALUE(Int32Value.getDescriptor(), true),
INT64_VALUE(Int64Value.getDescriptor(), true),
STRING_VALUE(StringValue.getDescriptor(), true),
UINT32_VALUE(UInt32Value.getDescriptor(), true),
UINT64_VALUE(UInt64Value.getDescriptor(), true),
DURATION_VALUE(Duration.getDescriptor()),
TIMESTAMP_VALUE(Timestamp.getDescriptor());

private final Descriptor descriptor;
private final boolean isWrapperType;
ANY_VALUE("google.protobuf.Any", Any.class.getName()),
DURATION("google.protobuf.Duration", Duration.class.getName()),
JSON_LIST_VALUE("google.protobuf.ListValue", ListValue.class.getName()),
JSON_STRUCT_VALUE("google.protobuf.Struct", Struct.class.getName()),
JSON_VALUE("google.protobuf.Value", Value.class.getName()),
TIMESTAMP("google.protobuf.Timestamp", Timestamp.class.getName()),
// Wrapper types
FLOAT_VALUE("google.protobuf.FloatValue", FloatValue.class.getName(), /* isWrapperType= */ true),
INT32_VALUE("google.protobuf.Int32Value", Int32Value.class.getName(), /* isWrapperType= */ true),
INT64_VALUE("google.protobuf.Int64Value", Int64Value.class.getName(), /* isWrapperType= */ true),
STRING_VALUE(
"google.protobuf.StringValue", StringValue.class.getName(), /* isWrapperType= */ true),
BOOL_VALUE("google.protobuf.BoolValue", BoolValue.class.getName(), /* isWrapperType= */ true),
BYTES_VALUE("google.protobuf.BytesValue", BytesValue.class.getName(), /* isWrapperType= */ true),
DOUBLE_VALUE(
"google.protobuf.DoubleValue", DoubleValue.class.getName(), /* isWrapperType= */ true),
UINT32_VALUE(
"google.protobuf.UInt32Value", UInt32Value.class.getName(), /* isWrapperType= */ true),
UINT64_VALUE(
"google.protobuf.UInt64Value", UInt64Value.class.getName(), /* isWrapperType= */ true),
// These aren't explicitly called out as wrapper types in the spec, but behave like one, because
// they are still converted into an equivalent primitive type.

EMPTY("google.protobuf.Empty", Empty.class.getName(), /* isWrapperType= */ true),
FIELD_MASK("google.protobuf.FieldMask", FieldMask.class.getName(), /* isWrapperType= */ true),
;

private static final ImmutableMap<String, WellKnownProto> WELL_KNOWN_PROTO_MAP;

Expand All@@ -71,28 +81,42 @@ public enum WellKnownProto {
.collect(toImmutableMap(WellKnownProto::typeName, Function.identity()));
}

WellKnownProto(Descriptor descriptor) {
this(descriptor, /* isWrapperType= */ false);
private final String wellKnownProtoFullName;
private final String javaClassName;
private final boolean isWrapperType;

public String typeName() {
return wellKnownProtoFullName;
}

WellKnownProto(Descriptor descriptor, boolean isWrapperType) {
this.descriptor = descriptor;
this.isWrapperType = isWrapperType;
public String javaClassName() {
return this.javaClassName;
}

public Descriptor descriptor() {
return descriptor;
public static @Nullable WellKnownProto getByTypeName(String typeName) {
return WELL_KNOWN_PROTO_MAP.get(typeName);
}

public String typeName() {
return descriptor.getFullName();
public static boolean isWrapperType(String typeName) {
WellKnownProto wellKnownProto = getByTypeName(typeName);
if (wellKnownProto == null) {
return false;
}

return wellKnownProto.isWrapperType();
}

public boolean isWrapperType() {
return isWrapperType;
}

public static WellKnownProto getByDescriptorName(String name) {
return WELL_KNOWN_PROTO_MAP.get(name);
WellKnownProto(String wellKnownProtoFullName, String javaClassName) {
this(wellKnownProtoFullName, javaClassName, /* isWrapperType= */ false);
}

WellKnownProto(String wellKnownProtoFullName, String javaClassName, boolean isWrapperType) {
this.wellKnownProtoFullName = wellKnownProtoFullName;
this.javaClassName = javaClassName;
this.isWrapperType = isWrapperType;
}
}
12 changes: 6 additions & 6 deletions common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
}

WellKnownProto wellKnownProto =
WellKnownProto.getByDescriptorName(message.getDescriptorForType().getFullName());
WellKnownProto.getByTypeName(message.getDescriptorForType().getFullName());
if (wellKnownProto == null) {
return ProtoMessageValue.create((Message) message, celDescriptorPool, this);
}
Expand All@@ -128,10 +128,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
return adaptJsonStructToCelValue((Struct) message);
case JSON_LIST_VALUE:
return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
case DURATION_VALUE:
case DURATION:
return DurationValue.create(
TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
case TIMESTAMP_VALUE:
case TIMESTAMP:
return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
case BOOL_VALUE:
return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
Expand All@@ -154,10 +154,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
case UINT64_VALUE:
return UintValue.create(
((UInt64Value) message).getValue(), celOptions.enableUnsignedLongs());
default:
throw new UnsupportedOperationException(
"Unsupported message to CelValue conversion - " + message);
}

throw new UnsupportedOperationException(
"Unsupported message to CelValue conversion - " + message);
}

/**
Expand Down
1 change: 1 addition & 0 deletions common/src/test/java/dev/cel/common/internal/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ java_library(
"//common/internal:errors",
"//common/internal:proto_equality",
"//common/internal:proto_message_factory",
"//common/internal:well_known_proto",
"//common/src/test/resources:default_instance_message_test_protos_java_proto",
"//common/src/test/resources:multi_file_java_proto",
"//common/src/test/resources:service_conflicting_name_java_proto",
Expand Down
59 changes: 59 additions & 0 deletions common/src/test/java/dev/cel/common/internal/WellKnownProtoTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import static com.google.common.truth.Truth.assertThat;

import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class WellKnownProtoTest {

@Test
@TestParameters("{typeName: 'google.protobuf.FloatValue'}")
@TestParameters("{typeName: 'google.protobuf.Int32Value'}")
@TestParameters("{typeName: 'google.protobuf.Int64Value'}")
@TestParameters("{typeName: 'google.protobuf.StringValue'}")
@TestParameters("{typeName: 'google.protobuf.BoolValue'}")
@TestParameters("{typeName: 'google.protobuf.BytesValue'}")
@TestParameters("{typeName: 'google.protobuf.DoubleValue'}")
@TestParameters("{typeName: 'google.protobuf.UInt32Value'}")
@TestParameters("{typeName: 'google.protobuf.UInt64Value'}")
@TestParameters("{typeName: 'google.protobuf.Empty'}")
@TestParameters("{typeName: 'google.protobuf.FieldMask'}")
public void isWrapperType_withTypeName_true(String typeName) {
assertThat(WellKnownProto.isWrapperType(typeName)).isTrue();
}

@Test
@TestParameters("{typeName: 'not.wellknown.type'}")
@TestParameters("{typeName: 'google.protobuf.Any'}")
@TestParameters("{typeName: 'google.protobuf.Duration'}")
@TestParameters("{typeName: 'google.protobuf.ListValue'}")
@TestParameters("{typeName: 'google.protobuf.Struct'}")
@TestParameters("{typeName: 'google.protobuf.Value'}")
@TestParameters("{typeName: 'google.protobuf.Timestamp'}")
public void isWrapperType_withTypeName_false(String typeName) {
assertThat(WellKnownProto.isWrapperType(typeName)).isFalse();
}

@Test
public void getJavaClassName() {
assertThat(WellKnownProto.ANY_VALUE.javaClassName()).isEqualTo("com.google.protobuf.Any");
}
}
3 changes: 2 additions & 1 deletion runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,8 @@ public void createMessage_wellKnownType_withCustomMessageProvider(
return;
}

Descriptor wellKnownDescriptor = wellKnownProto.descriptor();
Descriptor wellKnownDescriptor =
DefaultDescriptorPool.INSTANCE.findDescriptor(wellKnownProto.typeName()).get();
DescriptorMessageProvider messageProvider =
new DescriptorMessageProvider(
msgName ->
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP#626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 11, 2025
 Merged


Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP
#626
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand Down

49 changes: 44 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,26 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.CelDescriptors;
import dev.cel.common.annotations.Internal;
import java.util.HashMap;
Expand All@@ -40,14 +57,36 @@
@Immutable
@Internal
public final class DefaultDescriptorPool implements CelDescriptorPool {
 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_DESCRIPTORS =

 private static final ImmutableMap<WellKnownProto, Descriptor> WELL_KNOWN_PROTO_TO_DESCRIPTORS =
 ImmutableMap.<WellKnownProto, Descriptor>builder()
 .put(WellKnownProto.ANY_VALUE, Any.getDescriptor())
 .put(WellKnownProto.BOOL_VALUE, BoolValue.getDescriptor())
 .put(WellKnownProto.BYTES_VALUE, BytesValue.getDescriptor())
 .put(WellKnownProto.DOUBLE_VALUE, DoubleValue.getDescriptor())
 .put(WellKnownProto.DURATION, Duration.getDescriptor())
 .put(WellKnownProto.FLOAT_VALUE, FloatValue.getDescriptor())
 .put(WellKnownProto.INT32_VALUE, Int32Value.getDescriptor())
 .put(WellKnownProto.INT64_VALUE, Int64Value.getDescriptor())
 .put(WellKnownProto.STRING_VALUE, StringValue.getDescriptor())
 .put(WellKnownProto.TIMESTAMP, Timestamp.getDescriptor())
 .put(WellKnownProto.UINT32_VALUE, UInt32Value.getDescriptor())
 .put(WellKnownProto.UINT64_VALUE, UInt64Value.getDescriptor())
 .put(WellKnownProto.JSON_LIST_VALUE, ListValue.getDescriptor())
 .put(WellKnownProto.JSON_STRUCT_VALUE, Struct.getDescriptor())
 .put(WellKnownProto.JSON_VALUE, Value.getDescriptor())
 .put(WellKnownProto.EMPTY, Empty.getDescriptor())
 .put(WellKnownProto.FIELD_MASK, FieldMask.getDescriptor())
 .buildOrThrow();

 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS =
 stream(WellKnownProto.values())
 .collect(toImmutableMap(WellKnownProto::typeName, WellKnownProto::descriptor));
 .collect(toImmutableMap(WellKnownProto::typeName, WELL_KNOWN_PROTO_TO_DESCRIPTORS::get));

 /** A DefaultDescriptorPool instance with just well known types loaded. */
 public static final DefaultDescriptorPool INSTANCE =
 new DefaultDescriptorPool(
WELL_KNOWN_TYPE_DESCRIPTORS,
WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS,
 ImmutableMultimap.of(),
 ExtensionRegistry.getEmptyRegistry());

Expand All@@ -67,8 +106,8 @@ public static DefaultDescriptorPool create(CelDescriptors celDescriptors) {

 public static DefaultDescriptorPool create(
 CelDescriptors celDescriptors, ExtensionRegistry extensionRegistry) {
 Map<String, Descriptor> descriptorMap = new HashMap<>(); // Using a hashmap to allow deduping
stream(WellKnownProto.values()).forEach(d -> descriptorMap.put(d.typeName(), d.descriptor()));
 Map<String, Descriptor> descriptorMap =
 new HashMap<>(WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS); // Using a hashmap to allow deduping

 for (Descriptor descriptor : celDescriptors.messageTypeDescriptors()) {
 descriptorMap.putIfAbsent(descriptor.getFullName(), descriptor);
Expand Down

12 changes: 7 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,7 +157,7 @@ public Object adaptProtoToValue(MessageOrBuilder proto) {
 // If the proto is not a well-known type, then the input Message is what's expected as the
 // output return value.
 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(typeName(proto.getDescriptorForType()));
 WellKnownProto.getByTypeName(typeName(proto.getDescriptorForType()));
 if (wellKnownProto == null) {
 return proto;
 }
Expand DownExpand Up@@ -335,7 +335,7 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 */
 @SuppressWarnings("unchecked")
 public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(protoTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(protoTypeName);
 if (wellKnownProto == null) {
 if (value instanceof Message) {
 return Optional.of((Message) value);
Expand DownExpand Up@@ -376,7 +376,7 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 break;
 case DOUBLE_VALUE:
 return Optional.ofNullable(adaptValueToDouble(value));
 case DURATION_VALUE:
 case DURATION:
 return Optional.of((Duration) value);
 case FLOAT_VALUE:
 return Optional.ofNullable(adaptValueToFloat(value));
Expand All@@ -389,12 +389,14 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 return Optional.of(StringValue.of((String) value));
 }
 break;
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return Optional.of((Timestamp) value);
 case UINT32_VALUE:
 return Optional.ofNullable(adaptValueToUint32(value));
 case UINT64_VALUE:
 return Optional.ofNullable(adaptValueToUint64(value));
 default:
 throw new IllegalArgumentException("Unsupported conversion: " + wellKnownProto);
 }
 return Optional.empty();
 }
Expand DownExpand Up@@ -579,7 +581,7 @@ private static boolean isWrapperType(FieldDescriptor fieldDescriptor) {
 return false;
 }
 String fieldTypeName = fieldDescriptor.getMessageType().getFullName();
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(fieldTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(fieldTypeName);
 return wellKnownProto != null && wellKnownProto.isWrapperType();
 }

Expand Down

84 changes: 54 additions & 30 deletions
common/src/main/java/dev/cel/common/internal/WellKnownProto.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
Expand All@@ -36,6 +37,7 @@
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

/**
 * WellKnownProto types used throughout CEL. These types are specially handled to ensure that
Expand All@@ -44,24 +46,32 @@
 */
@Internal
public enum WellKnownProto {
 JSON_VALUE(Value.getDescriptor()),
 JSON_STRUCT_VALUE(Struct.getDescriptor()),
 JSON_LIST_VALUE(ListValue.getDescriptor()),
 ANY_VALUE(Any.getDescriptor()),
 BOOL_VALUE(BoolValue.getDescriptor(), true),
 BYTES_VALUE(BytesValue.getDescriptor(), true),
 DOUBLE_VALUE(DoubleValue.getDescriptor(), true),
 FLOAT_VALUE(FloatValue.getDescriptor(), true),
 INT32_VALUE(Int32Value.getDescriptor(), true),
 INT64_VALUE(Int64Value.getDescriptor(), true),
 STRING_VALUE(StringValue.getDescriptor(), true),
 UINT32_VALUE(UInt32Value.getDescriptor(), true),
 UINT64_VALUE(UInt64Value.getDescriptor(), true),
 DURATION_VALUE(Duration.getDescriptor()),
 TIMESTAMP_VALUE(Timestamp.getDescriptor());

 private final Descriptor descriptor;
 private final boolean isWrapperType;
 ANY_VALUE("google.protobuf.Any", Any.class.getName()),
 DURATION("google.protobuf.Duration", Duration.class.getName()),
 JSON_LIST_VALUE("google.protobuf.ListValue", ListValue.class.getName()),
 JSON_STRUCT_VALUE("google.protobuf.Struct", Struct.class.getName()),
 JSON_VALUE("google.protobuf.Value", Value.class.getName()),
 TIMESTAMP("google.protobuf.Timestamp", Timestamp.class.getName()),
 // Wrapper types
 FLOAT_VALUE("google.protobuf.FloatValue", FloatValue.class.getName(), /* isWrapperType= */ true),
 INT32_VALUE("google.protobuf.Int32Value", Int32Value.class.getName(), /* isWrapperType= */ true),
 INT64_VALUE("google.protobuf.Int64Value", Int64Value.class.getName(), /* isWrapperType= */ true),
 STRING_VALUE(
 "google.protobuf.StringValue", StringValue.class.getName(), /* isWrapperType= */ true),
 BOOL_VALUE("google.protobuf.BoolValue", BoolValue.class.getName(), /* isWrapperType= */ true),
 BYTES_VALUE("google.protobuf.BytesValue", BytesValue.class.getName(), /* isWrapperType= */ true),
 DOUBLE_VALUE(
 "google.protobuf.DoubleValue", DoubleValue.class.getName(), /* isWrapperType= */ true),
 UINT32_VALUE(
 "google.protobuf.UInt32Value", UInt32Value.class.getName(), /* isWrapperType= */ true),
 UINT64_VALUE(
 "google.protobuf.UInt64Value", UInt64Value.class.getName(), /* isWrapperType= */ true),
 // These aren't explicitly called out as wrapper types in the spec, but behave like one, because
 // they are still converted into an equivalent primitive type.

 EMPTY("google.protobuf.Empty", Empty.class.getName(), /* isWrapperType= */ true),
 FIELD_MASK("google.protobuf.FieldMask", FieldMask.class.getName(), /* isWrapperType= */ true),
 ;

 private static final ImmutableMap<String, WellKnownProto> WELL_KNOWN_PROTO_MAP;

Expand All@@ -71,28 +81,42 @@ public enum WellKnownProto {
 .collect(toImmutableMap(WellKnownProto::typeName, Function.identity()));
 }

 WellKnownProto(Descriptor descriptor) {
 this(descriptor, /* isWrapperType= */ false);
 private final String wellKnownProtoFullName;
 private final String javaClassName;
 private final boolean isWrapperType;

 public String typeName() {
 return wellKnownProtoFullName;
 }

 WellKnownProto(Descriptor descriptor, boolean isWrapperType) {
 this.descriptor = descriptor;
 this.isWrapperType = isWrapperType;
 public String javaClassName() {
 return this.javaClassName;
 }

 public Descriptor descriptor() {
 return descriptor;
 public static @Nullable WellKnownProto getByTypeName(String typeName) {
 return WELL_KNOWN_PROTO_MAP.get(typeName);
 }

 public String typeName() {
 return descriptor.getFullName();
 public static boolean isWrapperType(String typeName) {
 WellKnownProto wellKnownProto = getByTypeName(typeName);
 if (wellKnownProto == null) {
 return false;
 }

 return wellKnownProto.isWrapperType();
 }

 public boolean isWrapperType() {
 return isWrapperType;
 }

 public static WellKnownProto getByDescriptorName(String name) {
 return WELL_KNOWN_PROTO_MAP.get(name);
 WellKnownProto(String wellKnownProtoFullName, String javaClassName) {
 this(wellKnownProtoFullName, javaClassName, /* isWrapperType= */ false);
 }

 WellKnownProto(String wellKnownProtoFullName, String javaClassName, boolean isWrapperType) {
 this.wellKnownProtoFullName = wellKnownProtoFullName;
 this.javaClassName = javaClassName;
 this.isWrapperType = isWrapperType;
 }
}

12 changes: 6 additions & 6 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 }

 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(message.getDescriptorForType().getFullName());
 WellKnownProto.getByTypeName(message.getDescriptorForType().getFullName());
 if (wellKnownProto == null) {
 return ProtoMessageValue.create((Message) message, celDescriptorPool, this);
 }
Expand All@@ -128,10 +128,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION_VALUE:
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
Expand All@@ -154,10 +154,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 case UINT64_VALUE:
 return UintValue.create(
 ((UInt64Value) message).getValue(), celOptions.enableUnsignedLongs());
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 /**
Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:proto_equality",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
Expand Down

59 changes: 59 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/WellKnownProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import static com.google.common.truth.Truth.assertThat;

import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class WellKnownProtoTest {

 @Test
 @TestParameters("{typeName: 'google.protobuf.FloatValue'}")
 @TestParameters("{typeName: 'google.protobuf.Int32Value'}")
 @TestParameters("{typeName: 'google.protobuf.Int64Value'}")
 @TestParameters("{typeName: 'google.protobuf.StringValue'}")
 @TestParameters("{typeName: 'google.protobuf.BoolValue'}")
 @TestParameters("{typeName: 'google.protobuf.BytesValue'}")
 @TestParameters("{typeName: 'google.protobuf.DoubleValue'}")
 @TestParameters("{typeName: 'google.protobuf.UInt32Value'}")
 @TestParameters("{typeName: 'google.protobuf.UInt64Value'}")
 @TestParameters("{typeName: 'google.protobuf.Empty'}")
 @TestParameters("{typeName: 'google.protobuf.FieldMask'}")
 public void isWrapperType_withTypeName_true(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isTrue();
 }

 @Test
 @TestParameters("{typeName: 'not.wellknown.type'}")
 @TestParameters("{typeName: 'google.protobuf.Any'}")
 @TestParameters("{typeName: 'google.protobuf.Duration'}")
 @TestParameters("{typeName: 'google.protobuf.ListValue'}")
 @TestParameters("{typeName: 'google.protobuf.Struct'}")
 @TestParameters("{typeName: 'google.protobuf.Value'}")
 @TestParameters("{typeName: 'google.protobuf.Timestamp'}")
 public void isWrapperType_withTypeName_false(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isFalse();
 }

 @Test
 public void getJavaClassName() {
 assertThat(WellKnownProto.ANY_VALUE.javaClassName()).isEqualTo("com.google.protobuf.Any");
 }
}

3 changes: 2 additions & 1 deletion
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,8 @@ public void createMessage_wellKnownType_withCustomMessageProvider(
 return;
 }

 Descriptor wellKnownDescriptor = wellKnownProto.descriptor();
 Descriptor wellKnownDescriptor =
 DefaultDescriptorPool.INSTANCE.findDescriptor(wellKnownProto.typeName()).get();
 DescriptorMessageProvider messageProvider =
 new DescriptorMessageProvider(
 msgName ->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP#626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 11, 2025
 Merged


Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP
#626
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand Down

49 changes: 44 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,26 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.CelDescriptors;
import dev.cel.common.annotations.Internal;
import java.util.HashMap;
Expand All@@ -40,14 +57,36 @@
@Immutable
@Internal
public final class DefaultDescriptorPool implements CelDescriptorPool {
 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_DESCRIPTORS =

 private static final ImmutableMap<WellKnownProto, Descriptor> WELL_KNOWN_PROTO_TO_DESCRIPTORS =
 ImmutableMap.<WellKnownProto, Descriptor>builder()
 .put(WellKnownProto.ANY_VALUE, Any.getDescriptor())
 .put(WellKnownProto.BOOL_VALUE, BoolValue.getDescriptor())
 .put(WellKnownProto.BYTES_VALUE, BytesValue.getDescriptor())
 .put(WellKnownProto.DOUBLE_VALUE, DoubleValue.getDescriptor())
 .put(WellKnownProto.DURATION, Duration.getDescriptor())
 .put(WellKnownProto.FLOAT_VALUE, FloatValue.getDescriptor())
 .put(WellKnownProto.INT32_VALUE, Int32Value.getDescriptor())
 .put(WellKnownProto.INT64_VALUE, Int64Value.getDescriptor())
 .put(WellKnownProto.STRING_VALUE, StringValue.getDescriptor())
 .put(WellKnownProto.TIMESTAMP, Timestamp.getDescriptor())
 .put(WellKnownProto.UINT32_VALUE, UInt32Value.getDescriptor())
 .put(WellKnownProto.UINT64_VALUE, UInt64Value.getDescriptor())
 .put(WellKnownProto.JSON_LIST_VALUE, ListValue.getDescriptor())
 .put(WellKnownProto.JSON_STRUCT_VALUE, Struct.getDescriptor())
 .put(WellKnownProto.JSON_VALUE, Value.getDescriptor())
 .put(WellKnownProto.EMPTY, Empty.getDescriptor())
 .put(WellKnownProto.FIELD_MASK, FieldMask.getDescriptor())
 .buildOrThrow();

 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS =
 stream(WellKnownProto.values())
 .collect(toImmutableMap(WellKnownProto::typeName, WellKnownProto::descriptor));
 .collect(toImmutableMap(WellKnownProto::typeName, WELL_KNOWN_PROTO_TO_DESCRIPTORS::get));

 /** A DefaultDescriptorPool instance with just well known types loaded. */
 public static final DefaultDescriptorPool INSTANCE =
 new DefaultDescriptorPool(
WELL_KNOWN_TYPE_DESCRIPTORS,
WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS,
 ImmutableMultimap.of(),
 ExtensionRegistry.getEmptyRegistry());

Expand All@@ -67,8 +106,8 @@ public static DefaultDescriptorPool create(CelDescriptors celDescriptors) {

 public static DefaultDescriptorPool create(
 CelDescriptors celDescriptors, ExtensionRegistry extensionRegistry) {
 Map<String, Descriptor> descriptorMap = new HashMap<>(); // Using a hashmap to allow deduping
stream(WellKnownProto.values()).forEach(d -> descriptorMap.put(d.typeName(), d.descriptor()));
 Map<String, Descriptor> descriptorMap =
 new HashMap<>(WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS); // Using a hashmap to allow deduping

 for (Descriptor descriptor : celDescriptors.messageTypeDescriptors()) {
 descriptorMap.putIfAbsent(descriptor.getFullName(), descriptor);
Expand Down

12 changes: 7 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,7 +157,7 @@ public Object adaptProtoToValue(MessageOrBuilder proto) {
 // If the proto is not a well-known type, then the input Message is what's expected as the
 // output return value.
 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(typeName(proto.getDescriptorForType()));
 WellKnownProto.getByTypeName(typeName(proto.getDescriptorForType()));
 if (wellKnownProto == null) {
 return proto;
 }
Expand DownExpand Up@@ -335,7 +335,7 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 */
 @SuppressWarnings("unchecked")
 public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(protoTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(protoTypeName);
 if (wellKnownProto == null) {
 if (value instanceof Message) {
 return Optional.of((Message) value);
Expand DownExpand Up@@ -376,7 +376,7 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 break;
 case DOUBLE_VALUE:
 return Optional.ofNullable(adaptValueToDouble(value));
 case DURATION_VALUE:
 case DURATION:
 return Optional.of((Duration) value);
 case FLOAT_VALUE:
 return Optional.ofNullable(adaptValueToFloat(value));
Expand All@@ -389,12 +389,14 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 return Optional.of(StringValue.of((String) value));
 }
 break;
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return Optional.of((Timestamp) value);
 case UINT32_VALUE:
 return Optional.ofNullable(adaptValueToUint32(value));
 case UINT64_VALUE:
 return Optional.ofNullable(adaptValueToUint64(value));
 default:
 throw new IllegalArgumentException("Unsupported conversion: " + wellKnownProto);
 }
 return Optional.empty();
 }
Expand DownExpand Up@@ -579,7 +581,7 @@ private static boolean isWrapperType(FieldDescriptor fieldDescriptor) {
 return false;
 }
 String fieldTypeName = fieldDescriptor.getMessageType().getFullName();
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(fieldTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(fieldTypeName);
 return wellKnownProto != null && wellKnownProto.isWrapperType();
 }

Expand Down

84 changes: 54 additions & 30 deletions
common/src/main/java/dev/cel/common/internal/WellKnownProto.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
Expand All@@ -36,6 +37,7 @@
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

/**
 * WellKnownProto types used throughout CEL. These types are specially handled to ensure that
Expand All@@ -44,24 +46,32 @@
 */
@Internal
public enum WellKnownProto {
 JSON_VALUE(Value.getDescriptor()),
 JSON_STRUCT_VALUE(Struct.getDescriptor()),
 JSON_LIST_VALUE(ListValue.getDescriptor()),
 ANY_VALUE(Any.getDescriptor()),
 BOOL_VALUE(BoolValue.getDescriptor(), true),
 BYTES_VALUE(BytesValue.getDescriptor(), true),
 DOUBLE_VALUE(DoubleValue.getDescriptor(), true),
 FLOAT_VALUE(FloatValue.getDescriptor(), true),
 INT32_VALUE(Int32Value.getDescriptor(), true),
 INT64_VALUE(Int64Value.getDescriptor(), true),
 STRING_VALUE(StringValue.getDescriptor(), true),
 UINT32_VALUE(UInt32Value.getDescriptor(), true),
 UINT64_VALUE(UInt64Value.getDescriptor(), true),
 DURATION_VALUE(Duration.getDescriptor()),
 TIMESTAMP_VALUE(Timestamp.getDescriptor());

 private final Descriptor descriptor;
 private final boolean isWrapperType;
 ANY_VALUE("google.protobuf.Any", Any.class.getName()),
 DURATION("google.protobuf.Duration", Duration.class.getName()),
 JSON_LIST_VALUE("google.protobuf.ListValue", ListValue.class.getName()),
 JSON_STRUCT_VALUE("google.protobuf.Struct", Struct.class.getName()),
 JSON_VALUE("google.protobuf.Value", Value.class.getName()),
 TIMESTAMP("google.protobuf.Timestamp", Timestamp.class.getName()),
 // Wrapper types
 FLOAT_VALUE("google.protobuf.FloatValue", FloatValue.class.getName(), /* isWrapperType= */ true),
 INT32_VALUE("google.protobuf.Int32Value", Int32Value.class.getName(), /* isWrapperType= */ true),
 INT64_VALUE("google.protobuf.Int64Value", Int64Value.class.getName(), /* isWrapperType= */ true),
 STRING_VALUE(
 "google.protobuf.StringValue", StringValue.class.getName(), /* isWrapperType= */ true),
 BOOL_VALUE("google.protobuf.BoolValue", BoolValue.class.getName(), /* isWrapperType= */ true),
 BYTES_VALUE("google.protobuf.BytesValue", BytesValue.class.getName(), /* isWrapperType= */ true),
 DOUBLE_VALUE(
 "google.protobuf.DoubleValue", DoubleValue.class.getName(), /* isWrapperType= */ true),
 UINT32_VALUE(
 "google.protobuf.UInt32Value", UInt32Value.class.getName(), /* isWrapperType= */ true),
 UINT64_VALUE(
 "google.protobuf.UInt64Value", UInt64Value.class.getName(), /* isWrapperType= */ true),
 // These aren't explicitly called out as wrapper types in the spec, but behave like one, because
 // they are still converted into an equivalent primitive type.

 EMPTY("google.protobuf.Empty", Empty.class.getName(), /* isWrapperType= */ true),
 FIELD_MASK("google.protobuf.FieldMask", FieldMask.class.getName(), /* isWrapperType= */ true),
 ;

 private static final ImmutableMap<String, WellKnownProto> WELL_KNOWN_PROTO_MAP;

Expand All@@ -71,28 +81,42 @@ public enum WellKnownProto {
 .collect(toImmutableMap(WellKnownProto::typeName, Function.identity()));
 }

 WellKnownProto(Descriptor descriptor) {
 this(descriptor, /* isWrapperType= */ false);
 private final String wellKnownProtoFullName;
 private final String javaClassName;
 private final boolean isWrapperType;

 public String typeName() {
 return wellKnownProtoFullName;
 }

 WellKnownProto(Descriptor descriptor, boolean isWrapperType) {
 this.descriptor = descriptor;
 this.isWrapperType = isWrapperType;
 public String javaClassName() {
 return this.javaClassName;
 }

 public Descriptor descriptor() {
 return descriptor;
 public static @Nullable WellKnownProto getByTypeName(String typeName) {
 return WELL_KNOWN_PROTO_MAP.get(typeName);
 }

 public String typeName() {
 return descriptor.getFullName();
 public static boolean isWrapperType(String typeName) {
 WellKnownProto wellKnownProto = getByTypeName(typeName);
 if (wellKnownProto == null) {
 return false;
 }

 return wellKnownProto.isWrapperType();
 }

 public boolean isWrapperType() {
 return isWrapperType;
 }

 public static WellKnownProto getByDescriptorName(String name) {
 return WELL_KNOWN_PROTO_MAP.get(name);
 WellKnownProto(String wellKnownProtoFullName, String javaClassName) {
 this(wellKnownProtoFullName, javaClassName, /* isWrapperType= */ false);
 }

 WellKnownProto(String wellKnownProtoFullName, String javaClassName, boolean isWrapperType) {
 this.wellKnownProtoFullName = wellKnownProtoFullName;
 this.javaClassName = javaClassName;
 this.isWrapperType = isWrapperType;
 }
}

12 changes: 6 additions & 6 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 }

 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(message.getDescriptorForType().getFullName());
 WellKnownProto.getByTypeName(message.getDescriptorForType().getFullName());
 if (wellKnownProto == null) {
 return ProtoMessageValue.create((Message) message, celDescriptorPool, this);
 }
Expand All@@ -128,10 +128,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION_VALUE:
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
Expand All@@ -154,10 +154,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 case UINT64_VALUE:
 return UintValue.create(
 ((UInt64Value) message).getValue(), celOptions.enableUnsignedLongs());
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 /**
Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:proto_equality",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
Expand Down

59 changes: 59 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/WellKnownProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import static com.google.common.truth.Truth.assertThat;

import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class WellKnownProtoTest {

 @Test
 @TestParameters("{typeName: 'google.protobuf.FloatValue'}")
 @TestParameters("{typeName: 'google.protobuf.Int32Value'}")
 @TestParameters("{typeName: 'google.protobuf.Int64Value'}")
 @TestParameters("{typeName: 'google.protobuf.StringValue'}")
 @TestParameters("{typeName: 'google.protobuf.BoolValue'}")
 @TestParameters("{typeName: 'google.protobuf.BytesValue'}")
 @TestParameters("{typeName: 'google.protobuf.DoubleValue'}")
 @TestParameters("{typeName: 'google.protobuf.UInt32Value'}")
 @TestParameters("{typeName: 'google.protobuf.UInt64Value'}")
 @TestParameters("{typeName: 'google.protobuf.Empty'}")
 @TestParameters("{typeName: 'google.protobuf.FieldMask'}")
 public void isWrapperType_withTypeName_true(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isTrue();
 }

 @Test
 @TestParameters("{typeName: 'not.wellknown.type'}")
 @TestParameters("{typeName: 'google.protobuf.Any'}")
 @TestParameters("{typeName: 'google.protobuf.Duration'}")
 @TestParameters("{typeName: 'google.protobuf.ListValue'}")
 @TestParameters("{typeName: 'google.protobuf.Struct'}")
 @TestParameters("{typeName: 'google.protobuf.Value'}")
 @TestParameters("{typeName: 'google.protobuf.Timestamp'}")
 public void isWrapperType_withTypeName_false(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isFalse();
 }

 @Test
 public void getJavaClassName() {
 assertThat(WellKnownProto.ANY_VALUE.javaClassName()).isEqualTo("com.google.protobuf.Any");
 }
}

3 changes: 2 additions & 1 deletion
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,8 @@ public void createMessage_wellKnownType_withCustomMessageProvider(
 return;
 }

 Descriptor wellKnownDescriptor = wellKnownProto.descriptor();
 Descriptor wellKnownDescriptor =
 DefaultDescriptorPool.INSTANCE.findDescriptor(wellKnownProto.typeName()).get();
 DescriptorMessageProvider messageProvider =
 new DescriptorMessageProvider(
 msgName ->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP#626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 11, 2025
 Merged


Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP
#626
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand Down

49 changes: 44 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,26 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.CelDescriptors;
import dev.cel.common.annotations.Internal;
import java.util.HashMap;
Expand All@@ -40,14 +57,36 @@
@Immutable
@Internal
public final class DefaultDescriptorPool implements CelDescriptorPool {
 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_DESCRIPTORS =

 private static final ImmutableMap<WellKnownProto, Descriptor> WELL_KNOWN_PROTO_TO_DESCRIPTORS =
 ImmutableMap.<WellKnownProto, Descriptor>builder()
 .put(WellKnownProto.ANY_VALUE, Any.getDescriptor())
 .put(WellKnownProto.BOOL_VALUE, BoolValue.getDescriptor())
 .put(WellKnownProto.BYTES_VALUE, BytesValue.getDescriptor())
 .put(WellKnownProto.DOUBLE_VALUE, DoubleValue.getDescriptor())
 .put(WellKnownProto.DURATION, Duration.getDescriptor())
 .put(WellKnownProto.FLOAT_VALUE, FloatValue.getDescriptor())
 .put(WellKnownProto.INT32_VALUE, Int32Value.getDescriptor())
 .put(WellKnownProto.INT64_VALUE, Int64Value.getDescriptor())
 .put(WellKnownProto.STRING_VALUE, StringValue.getDescriptor())
 .put(WellKnownProto.TIMESTAMP, Timestamp.getDescriptor())
 .put(WellKnownProto.UINT32_VALUE, UInt32Value.getDescriptor())
 .put(WellKnownProto.UINT64_VALUE, UInt64Value.getDescriptor())
 .put(WellKnownProto.JSON_LIST_VALUE, ListValue.getDescriptor())
 .put(WellKnownProto.JSON_STRUCT_VALUE, Struct.getDescriptor())
 .put(WellKnownProto.JSON_VALUE, Value.getDescriptor())
 .put(WellKnownProto.EMPTY, Empty.getDescriptor())
 .put(WellKnownProto.FIELD_MASK, FieldMask.getDescriptor())
 .buildOrThrow();

 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS =
 stream(WellKnownProto.values())
 .collect(toImmutableMap(WellKnownProto::typeName, WellKnownProto::descriptor));
 .collect(toImmutableMap(WellKnownProto::typeName, WELL_KNOWN_PROTO_TO_DESCRIPTORS::get));

 /** A DefaultDescriptorPool instance with just well known types loaded. */
 public static final DefaultDescriptorPool INSTANCE =
 new DefaultDescriptorPool(
WELL_KNOWN_TYPE_DESCRIPTORS,
WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS,
 ImmutableMultimap.of(),
 ExtensionRegistry.getEmptyRegistry());

Expand All@@ -67,8 +106,8 @@ public static DefaultDescriptorPool create(CelDescriptors celDescriptors) {

 public static DefaultDescriptorPool create(
 CelDescriptors celDescriptors, ExtensionRegistry extensionRegistry) {
 Map<String, Descriptor> descriptorMap = new HashMap<>(); // Using a hashmap to allow deduping
stream(WellKnownProto.values()).forEach(d -> descriptorMap.put(d.typeName(), d.descriptor()));
 Map<String, Descriptor> descriptorMap =
 new HashMap<>(WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS); // Using a hashmap to allow deduping

 for (Descriptor descriptor : celDescriptors.messageTypeDescriptors()) {
 descriptorMap.putIfAbsent(descriptor.getFullName(), descriptor);
Expand Down

12 changes: 7 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,7 +157,7 @@ public Object adaptProtoToValue(MessageOrBuilder proto) {
 // If the proto is not a well-known type, then the input Message is what's expected as the
 // output return value.
 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(typeName(proto.getDescriptorForType()));
 WellKnownProto.getByTypeName(typeName(proto.getDescriptorForType()));
 if (wellKnownProto == null) {
 return proto;
 }
Expand DownExpand Up@@ -335,7 +335,7 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 */
 @SuppressWarnings("unchecked")
 public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(protoTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(protoTypeName);
 if (wellKnownProto == null) {
 if (value instanceof Message) {
 return Optional.of((Message) value);
Expand DownExpand Up@@ -376,7 +376,7 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 break;
 case DOUBLE_VALUE:
 return Optional.ofNullable(adaptValueToDouble(value));
 case DURATION_VALUE:
 case DURATION:
 return Optional.of((Duration) value);
 case FLOAT_VALUE:
 return Optional.ofNullable(adaptValueToFloat(value));
Expand All@@ -389,12 +389,14 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 return Optional.of(StringValue.of((String) value));
 }
 break;
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return Optional.of((Timestamp) value);
 case UINT32_VALUE:
 return Optional.ofNullable(adaptValueToUint32(value));
 case UINT64_VALUE:
 return Optional.ofNullable(adaptValueToUint64(value));
 default:
 throw new IllegalArgumentException("Unsupported conversion: " + wellKnownProto);
 }
 return Optional.empty();
 }
Expand DownExpand Up@@ -579,7 +581,7 @@ private static boolean isWrapperType(FieldDescriptor fieldDescriptor) {
 return false;
 }
 String fieldTypeName = fieldDescriptor.getMessageType().getFullName();
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(fieldTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(fieldTypeName);
 return wellKnownProto != null && wellKnownProto.isWrapperType();
 }

Expand Down

84 changes: 54 additions & 30 deletions
common/src/main/java/dev/cel/common/internal/WellKnownProto.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
Expand All@@ -36,6 +37,7 @@
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

/**
 * WellKnownProto types used throughout CEL. These types are specially handled to ensure that
Expand All@@ -44,24 +46,32 @@
 */
@Internal
public enum WellKnownProto {
 JSON_VALUE(Value.getDescriptor()),
 JSON_STRUCT_VALUE(Struct.getDescriptor()),
 JSON_LIST_VALUE(ListValue.getDescriptor()),
 ANY_VALUE(Any.getDescriptor()),
 BOOL_VALUE(BoolValue.getDescriptor(), true),
 BYTES_VALUE(BytesValue.getDescriptor(), true),
 DOUBLE_VALUE(DoubleValue.getDescriptor(), true),
 FLOAT_VALUE(FloatValue.getDescriptor(), true),
 INT32_VALUE(Int32Value.getDescriptor(), true),
 INT64_VALUE(Int64Value.getDescriptor(), true),
 STRING_VALUE(StringValue.getDescriptor(), true),
 UINT32_VALUE(UInt32Value.getDescriptor(), true),
 UINT64_VALUE(UInt64Value.getDescriptor(), true),
 DURATION_VALUE(Duration.getDescriptor()),
 TIMESTAMP_VALUE(Timestamp.getDescriptor());

 private final Descriptor descriptor;
 private final boolean isWrapperType;
 ANY_VALUE("google.protobuf.Any", Any.class.getName()),
 DURATION("google.protobuf.Duration", Duration.class.getName()),
 JSON_LIST_VALUE("google.protobuf.ListValue", ListValue.class.getName()),
 JSON_STRUCT_VALUE("google.protobuf.Struct", Struct.class.getName()),
 JSON_VALUE("google.protobuf.Value", Value.class.getName()),
 TIMESTAMP("google.protobuf.Timestamp", Timestamp.class.getName()),
 // Wrapper types
 FLOAT_VALUE("google.protobuf.FloatValue", FloatValue.class.getName(), /* isWrapperType= */ true),
 INT32_VALUE("google.protobuf.Int32Value", Int32Value.class.getName(), /* isWrapperType= */ true),
 INT64_VALUE("google.protobuf.Int64Value", Int64Value.class.getName(), /* isWrapperType= */ true),
 STRING_VALUE(
 "google.protobuf.StringValue", StringValue.class.getName(), /* isWrapperType= */ true),
 BOOL_VALUE("google.protobuf.BoolValue", BoolValue.class.getName(), /* isWrapperType= */ true),
 BYTES_VALUE("google.protobuf.BytesValue", BytesValue.class.getName(), /* isWrapperType= */ true),
 DOUBLE_VALUE(
 "google.protobuf.DoubleValue", DoubleValue.class.getName(), /* isWrapperType= */ true),
 UINT32_VALUE(
 "google.protobuf.UInt32Value", UInt32Value.class.getName(), /* isWrapperType= */ true),
 UINT64_VALUE(
 "google.protobuf.UInt64Value", UInt64Value.class.getName(), /* isWrapperType= */ true),
 // These aren't explicitly called out as wrapper types in the spec, but behave like one, because
 // they are still converted into an equivalent primitive type.

 EMPTY("google.protobuf.Empty", Empty.class.getName(), /* isWrapperType= */ true),
 FIELD_MASK("google.protobuf.FieldMask", FieldMask.class.getName(), /* isWrapperType= */ true),
 ;

 private static final ImmutableMap<String, WellKnownProto> WELL_KNOWN_PROTO_MAP;

Expand All@@ -71,28 +81,42 @@ public enum WellKnownProto {
 .collect(toImmutableMap(WellKnownProto::typeName, Function.identity()));
 }

 WellKnownProto(Descriptor descriptor) {
 this(descriptor, /* isWrapperType= */ false);
 private final String wellKnownProtoFullName;
 private final String javaClassName;
 private final boolean isWrapperType;

 public String typeName() {
 return wellKnownProtoFullName;
 }

 WellKnownProto(Descriptor descriptor, boolean isWrapperType) {
 this.descriptor = descriptor;
 this.isWrapperType = isWrapperType;
 public String javaClassName() {
 return this.javaClassName;
 }

 public Descriptor descriptor() {
 return descriptor;
 public static @Nullable WellKnownProto getByTypeName(String typeName) {
 return WELL_KNOWN_PROTO_MAP.get(typeName);
 }

 public String typeName() {
 return descriptor.getFullName();
 public static boolean isWrapperType(String typeName) {
 WellKnownProto wellKnownProto = getByTypeName(typeName);
 if (wellKnownProto == null) {
 return false;
 }

 return wellKnownProto.isWrapperType();
 }

 public boolean isWrapperType() {
 return isWrapperType;
 }

 public static WellKnownProto getByDescriptorName(String name) {
 return WELL_KNOWN_PROTO_MAP.get(name);
 WellKnownProto(String wellKnownProtoFullName, String javaClassName) {
 this(wellKnownProtoFullName, javaClassName, /* isWrapperType= */ false);
 }

 WellKnownProto(String wellKnownProtoFullName, String javaClassName, boolean isWrapperType) {
 this.wellKnownProtoFullName = wellKnownProtoFullName;
 this.javaClassName = javaClassName;
 this.isWrapperType = isWrapperType;
 }
}

12 changes: 6 additions & 6 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 }

 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(message.getDescriptorForType().getFullName());
 WellKnownProto.getByTypeName(message.getDescriptorForType().getFullName());
 if (wellKnownProto == null) {
 return ProtoMessageValue.create((Message) message, celDescriptorPool, this);
 }
Expand All@@ -128,10 +128,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION_VALUE:
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
Expand All@@ -154,10 +154,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 case UINT64_VALUE:
 return UintValue.create(
 ((UInt64Value) message).getValue(), celOptions.enableUnsignedLongs());
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 /**
Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:proto_equality",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
Expand Down

59 changes: 59 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/WellKnownProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import static com.google.common.truth.Truth.assertThat;

import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class WellKnownProtoTest {

 @Test
 @TestParameters("{typeName: 'google.protobuf.FloatValue'}")
 @TestParameters("{typeName: 'google.protobuf.Int32Value'}")
 @TestParameters("{typeName: 'google.protobuf.Int64Value'}")
 @TestParameters("{typeName: 'google.protobuf.StringValue'}")
 @TestParameters("{typeName: 'google.protobuf.BoolValue'}")
 @TestParameters("{typeName: 'google.protobuf.BytesValue'}")
 @TestParameters("{typeName: 'google.protobuf.DoubleValue'}")
 @TestParameters("{typeName: 'google.protobuf.UInt32Value'}")
 @TestParameters("{typeName: 'google.protobuf.UInt64Value'}")
 @TestParameters("{typeName: 'google.protobuf.Empty'}")
 @TestParameters("{typeName: 'google.protobuf.FieldMask'}")
 public void isWrapperType_withTypeName_true(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isTrue();
 }

 @Test
 @TestParameters("{typeName: 'not.wellknown.type'}")
 @TestParameters("{typeName: 'google.protobuf.Any'}")
 @TestParameters("{typeName: 'google.protobuf.Duration'}")
 @TestParameters("{typeName: 'google.protobuf.ListValue'}")
 @TestParameters("{typeName: 'google.protobuf.Struct'}")
 @TestParameters("{typeName: 'google.protobuf.Value'}")
 @TestParameters("{typeName: 'google.protobuf.Timestamp'}")
 public void isWrapperType_withTypeName_false(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isFalse();
 }

 @Test
 public void getJavaClassName() {
 assertThat(WellKnownProto.ANY_VALUE.javaClassName()).isEqualTo("com.google.protobuf.Any");
 }
}

3 changes: 2 additions & 1 deletion
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,8 @@ public void createMessage_wellKnownType_withCustomMessageProvider(
 return;
 }

 Descriptor wellKnownDescriptor = wellKnownProto.descriptor();
 Descriptor wellKnownDescriptor =
 DefaultDescriptorPool.INSTANCE.findDescriptor(wellKnownProto.typeName()).get();
 DescriptorMessageProvider messageProvider =
 new DescriptorMessageProvider(
 msgName ->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP#626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 11, 2025
 Merged


Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP
#626
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand Down

49 changes: 44 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,26 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.CelDescriptors;
import dev.cel.common.annotations.Internal;
import java.util.HashMap;
Expand All@@ -40,14 +57,36 @@
@Immutable
@Internal
public final class DefaultDescriptorPool implements CelDescriptorPool {
 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_DESCRIPTORS =

 private static final ImmutableMap<WellKnownProto, Descriptor> WELL_KNOWN_PROTO_TO_DESCRIPTORS =
 ImmutableMap.<WellKnownProto, Descriptor>builder()
 .put(WellKnownProto.ANY_VALUE, Any.getDescriptor())
 .put(WellKnownProto.BOOL_VALUE, BoolValue.getDescriptor())
 .put(WellKnownProto.BYTES_VALUE, BytesValue.getDescriptor())
 .put(WellKnownProto.DOUBLE_VALUE, DoubleValue.getDescriptor())
 .put(WellKnownProto.DURATION, Duration.getDescriptor())
 .put(WellKnownProto.FLOAT_VALUE, FloatValue.getDescriptor())
 .put(WellKnownProto.INT32_VALUE, Int32Value.getDescriptor())
 .put(WellKnownProto.INT64_VALUE, Int64Value.getDescriptor())
 .put(WellKnownProto.STRING_VALUE, StringValue.getDescriptor())
 .put(WellKnownProto.TIMESTAMP, Timestamp.getDescriptor())
 .put(WellKnownProto.UINT32_VALUE, UInt32Value.getDescriptor())
 .put(WellKnownProto.UINT64_VALUE, UInt64Value.getDescriptor())
 .put(WellKnownProto.JSON_LIST_VALUE, ListValue.getDescriptor())
 .put(WellKnownProto.JSON_STRUCT_VALUE, Struct.getDescriptor())
 .put(WellKnownProto.JSON_VALUE, Value.getDescriptor())
 .put(WellKnownProto.EMPTY, Empty.getDescriptor())
 .put(WellKnownProto.FIELD_MASK, FieldMask.getDescriptor())
 .buildOrThrow();

 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS =
 stream(WellKnownProto.values())
 .collect(toImmutableMap(WellKnownProto::typeName, WellKnownProto::descriptor));
 .collect(toImmutableMap(WellKnownProto::typeName, WELL_KNOWN_PROTO_TO_DESCRIPTORS::get));

 /** A DefaultDescriptorPool instance with just well known types loaded. */
 public static final DefaultDescriptorPool INSTANCE =
 new DefaultDescriptorPool(
WELL_KNOWN_TYPE_DESCRIPTORS,
WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS,
 ImmutableMultimap.of(),
 ExtensionRegistry.getEmptyRegistry());

Expand All@@ -67,8 +106,8 @@ public static DefaultDescriptorPool create(CelDescriptors celDescriptors) {

 public static DefaultDescriptorPool create(
 CelDescriptors celDescriptors, ExtensionRegistry extensionRegistry) {
 Map<String, Descriptor> descriptorMap = new HashMap<>(); // Using a hashmap to allow deduping
stream(WellKnownProto.values()).forEach(d -> descriptorMap.put(d.typeName(), d.descriptor()));
 Map<String, Descriptor> descriptorMap =
 new HashMap<>(WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS); // Using a hashmap to allow deduping

 for (Descriptor descriptor : celDescriptors.messageTypeDescriptors()) {
 descriptorMap.putIfAbsent(descriptor.getFullName(), descriptor);
Expand Down

12 changes: 7 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,7 +157,7 @@ public Object adaptProtoToValue(MessageOrBuilder proto) {
 // If the proto is not a well-known type, then the input Message is what's expected as the
 // output return value.
 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(typeName(proto.getDescriptorForType()));
 WellKnownProto.getByTypeName(typeName(proto.getDescriptorForType()));
 if (wellKnownProto == null) {
 return proto;
 }
Expand DownExpand Up@@ -335,7 +335,7 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 */
 @SuppressWarnings("unchecked")
 public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(protoTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(protoTypeName);
 if (wellKnownProto == null) {
 if (value instanceof Message) {
 return Optional.of((Message) value);
Expand DownExpand Up@@ -376,7 +376,7 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 break;
 case DOUBLE_VALUE:
 return Optional.ofNullable(adaptValueToDouble(value));
 case DURATION_VALUE:
 case DURATION:
 return Optional.of((Duration) value);
 case FLOAT_VALUE:
 return Optional.ofNullable(adaptValueToFloat(value));
Expand All@@ -389,12 +389,14 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 return Optional.of(StringValue.of((String) value));
 }
 break;
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return Optional.of((Timestamp) value);
 case UINT32_VALUE:
 return Optional.ofNullable(adaptValueToUint32(value));
 case UINT64_VALUE:
 return Optional.ofNullable(adaptValueToUint64(value));
 default:
 throw new IllegalArgumentException("Unsupported conversion: " + wellKnownProto);
 }
 return Optional.empty();
 }
Expand DownExpand Up@@ -579,7 +581,7 @@ private static boolean isWrapperType(FieldDescriptor fieldDescriptor) {
 return false;
 }
 String fieldTypeName = fieldDescriptor.getMessageType().getFullName();
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(fieldTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(fieldTypeName);
 return wellKnownProto != null && wellKnownProto.isWrapperType();
 }

Expand Down

84 changes: 54 additions & 30 deletions
common/src/main/java/dev/cel/common/internal/WellKnownProto.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
Expand All@@ -36,6 +37,7 @@
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

/**
 * WellKnownProto types used throughout CEL. These types are specially handled to ensure that
Expand All@@ -44,24 +46,32 @@
 */
@Internal
public enum WellKnownProto {
 JSON_VALUE(Value.getDescriptor()),
 JSON_STRUCT_VALUE(Struct.getDescriptor()),
 JSON_LIST_VALUE(ListValue.getDescriptor()),
 ANY_VALUE(Any.getDescriptor()),
 BOOL_VALUE(BoolValue.getDescriptor(), true),
 BYTES_VALUE(BytesValue.getDescriptor(), true),
 DOUBLE_VALUE(DoubleValue.getDescriptor(), true),
 FLOAT_VALUE(FloatValue.getDescriptor(), true),
 INT32_VALUE(Int32Value.getDescriptor(), true),
 INT64_VALUE(Int64Value.getDescriptor(), true),
 STRING_VALUE(StringValue.getDescriptor(), true),
 UINT32_VALUE(UInt32Value.getDescriptor(), true),
 UINT64_VALUE(UInt64Value.getDescriptor(), true),
 DURATION_VALUE(Duration.getDescriptor()),
 TIMESTAMP_VALUE(Timestamp.getDescriptor());

 private final Descriptor descriptor;
 private final boolean isWrapperType;
 ANY_VALUE("google.protobuf.Any", Any.class.getName()),
 DURATION("google.protobuf.Duration", Duration.class.getName()),
 JSON_LIST_VALUE("google.protobuf.ListValue", ListValue.class.getName()),
 JSON_STRUCT_VALUE("google.protobuf.Struct", Struct.class.getName()),
 JSON_VALUE("google.protobuf.Value", Value.class.getName()),
 TIMESTAMP("google.protobuf.Timestamp", Timestamp.class.getName()),
 // Wrapper types
 FLOAT_VALUE("google.protobuf.FloatValue", FloatValue.class.getName(), /* isWrapperType= */ true),
 INT32_VALUE("google.protobuf.Int32Value", Int32Value.class.getName(), /* isWrapperType= */ true),
 INT64_VALUE("google.protobuf.Int64Value", Int64Value.class.getName(), /* isWrapperType= */ true),
 STRING_VALUE(
 "google.protobuf.StringValue", StringValue.class.getName(), /* isWrapperType= */ true),
 BOOL_VALUE("google.protobuf.BoolValue", BoolValue.class.getName(), /* isWrapperType= */ true),
 BYTES_VALUE("google.protobuf.BytesValue", BytesValue.class.getName(), /* isWrapperType= */ true),
 DOUBLE_VALUE(
 "google.protobuf.DoubleValue", DoubleValue.class.getName(), /* isWrapperType= */ true),
 UINT32_VALUE(
 "google.protobuf.UInt32Value", UInt32Value.class.getName(), /* isWrapperType= */ true),
 UINT64_VALUE(
 "google.protobuf.UInt64Value", UInt64Value.class.getName(), /* isWrapperType= */ true),
 // These aren't explicitly called out as wrapper types in the spec, but behave like one, because
 // they are still converted into an equivalent primitive type.

 EMPTY("google.protobuf.Empty", Empty.class.getName(), /* isWrapperType= */ true),
 FIELD_MASK("google.protobuf.FieldMask", FieldMask.class.getName(), /* isWrapperType= */ true),
 ;

 private static final ImmutableMap<String, WellKnownProto> WELL_KNOWN_PROTO_MAP;

Expand All@@ -71,28 +81,42 @@ public enum WellKnownProto {
 .collect(toImmutableMap(WellKnownProto::typeName, Function.identity()));
 }

 WellKnownProto(Descriptor descriptor) {
 this(descriptor, /* isWrapperType= */ false);
 private final String wellKnownProtoFullName;
 private final String javaClassName;
 private final boolean isWrapperType;

 public String typeName() {
 return wellKnownProtoFullName;
 }

 WellKnownProto(Descriptor descriptor, boolean isWrapperType) {
 this.descriptor = descriptor;
 this.isWrapperType = isWrapperType;
 public String javaClassName() {
 return this.javaClassName;
 }

 public Descriptor descriptor() {
 return descriptor;
 public static @Nullable WellKnownProto getByTypeName(String typeName) {
 return WELL_KNOWN_PROTO_MAP.get(typeName);
 }

 public String typeName() {
 return descriptor.getFullName();
 public static boolean isWrapperType(String typeName) {
 WellKnownProto wellKnownProto = getByTypeName(typeName);
 if (wellKnownProto == null) {
 return false;
 }

 return wellKnownProto.isWrapperType();
 }

 public boolean isWrapperType() {
 return isWrapperType;
 }

 public static WellKnownProto getByDescriptorName(String name) {
 return WELL_KNOWN_PROTO_MAP.get(name);
 WellKnownProto(String wellKnownProtoFullName, String javaClassName) {
 this(wellKnownProtoFullName, javaClassName, /* isWrapperType= */ false);
 }

 WellKnownProto(String wellKnownProtoFullName, String javaClassName, boolean isWrapperType) {
 this.wellKnownProtoFullName = wellKnownProtoFullName;
 this.javaClassName = javaClassName;
 this.isWrapperType = isWrapperType;
 }
}

12 changes: 6 additions & 6 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 }

 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(message.getDescriptorForType().getFullName());
 WellKnownProto.getByTypeName(message.getDescriptorForType().getFullName());
 if (wellKnownProto == null) {
 return ProtoMessageValue.create((Message) message, celDescriptorPool, this);
 }
Expand All@@ -128,10 +128,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION_VALUE:
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
Expand All@@ -154,10 +154,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 case UINT64_VALUE:
 return UintValue.create(
 ((UInt64Value) message).getValue(), celOptions.enableUnsignedLongs());
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 /**
Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:proto_equality",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
Expand Down

59 changes: 59 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/WellKnownProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import static com.google.common.truth.Truth.assertThat;

import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class WellKnownProtoTest {

 @Test
 @TestParameters("{typeName: 'google.protobuf.FloatValue'}")
 @TestParameters("{typeName: 'google.protobuf.Int32Value'}")
 @TestParameters("{typeName: 'google.protobuf.Int64Value'}")
 @TestParameters("{typeName: 'google.protobuf.StringValue'}")
 @TestParameters("{typeName: 'google.protobuf.BoolValue'}")
 @TestParameters("{typeName: 'google.protobuf.BytesValue'}")
 @TestParameters("{typeName: 'google.protobuf.DoubleValue'}")
 @TestParameters("{typeName: 'google.protobuf.UInt32Value'}")
 @TestParameters("{typeName: 'google.protobuf.UInt64Value'}")
 @TestParameters("{typeName: 'google.protobuf.Empty'}")
 @TestParameters("{typeName: 'google.protobuf.FieldMask'}")
 public void isWrapperType_withTypeName_true(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isTrue();
 }

 @Test
 @TestParameters("{typeName: 'not.wellknown.type'}")
 @TestParameters("{typeName: 'google.protobuf.Any'}")
 @TestParameters("{typeName: 'google.protobuf.Duration'}")
 @TestParameters("{typeName: 'google.protobuf.ListValue'}")
 @TestParameters("{typeName: 'google.protobuf.Struct'}")
 @TestParameters("{typeName: 'google.protobuf.Value'}")
 @TestParameters("{typeName: 'google.protobuf.Timestamp'}")
 public void isWrapperType_withTypeName_false(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isFalse();
 }

 @Test
 public void getJavaClassName() {
 assertThat(WellKnownProto.ANY_VALUE.javaClassName()).isEqualTo("com.google.protobuf.Any");
 }
}

3 changes: 2 additions & 1 deletion
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,8 @@ public void createMessage_wellKnownType_withCustomMessageProvider(
 return;
 }

 Descriptor wellKnownDescriptor = wellKnownProto.descriptor();
 Descriptor wellKnownDescriptor =
 DefaultDescriptorPool.INSTANCE.findDescriptor(wellKnownProto.typeName()).get();
 DescriptorMessageProvider messageProvider =
 new DescriptorMessageProvider(
 msgName ->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP#626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 11, 2025
 Merged


Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP
#626
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand Down

49 changes: 44 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,26 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.CelDescriptors;
import dev.cel.common.annotations.Internal;
import java.util.HashMap;
Expand All@@ -40,14 +57,36 @@
@Immutable
@Internal
public final class DefaultDescriptorPool implements CelDescriptorPool {
 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_DESCRIPTORS =

 private static final ImmutableMap<WellKnownProto, Descriptor> WELL_KNOWN_PROTO_TO_DESCRIPTORS =
 ImmutableMap.<WellKnownProto, Descriptor>builder()
 .put(WellKnownProto.ANY_VALUE, Any.getDescriptor())
 .put(WellKnownProto.BOOL_VALUE, BoolValue.getDescriptor())
 .put(WellKnownProto.BYTES_VALUE, BytesValue.getDescriptor())
 .put(WellKnownProto.DOUBLE_VALUE, DoubleValue.getDescriptor())
 .put(WellKnownProto.DURATION, Duration.getDescriptor())
 .put(WellKnownProto.FLOAT_VALUE, FloatValue.getDescriptor())
 .put(WellKnownProto.INT32_VALUE, Int32Value.getDescriptor())
 .put(WellKnownProto.INT64_VALUE, Int64Value.getDescriptor())
 .put(WellKnownProto.STRING_VALUE, StringValue.getDescriptor())
 .put(WellKnownProto.TIMESTAMP, Timestamp.getDescriptor())
 .put(WellKnownProto.UINT32_VALUE, UInt32Value.getDescriptor())
 .put(WellKnownProto.UINT64_VALUE, UInt64Value.getDescriptor())
 .put(WellKnownProto.JSON_LIST_VALUE, ListValue.getDescriptor())
 .put(WellKnownProto.JSON_STRUCT_VALUE, Struct.getDescriptor())
 .put(WellKnownProto.JSON_VALUE, Value.getDescriptor())
 .put(WellKnownProto.EMPTY, Empty.getDescriptor())
 .put(WellKnownProto.FIELD_MASK, FieldMask.getDescriptor())
 .buildOrThrow();

 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS =
 stream(WellKnownProto.values())
 .collect(toImmutableMap(WellKnownProto::typeName, WellKnownProto::descriptor));
 .collect(toImmutableMap(WellKnownProto::typeName, WELL_KNOWN_PROTO_TO_DESCRIPTORS::get));

 /** A DefaultDescriptorPool instance with just well known types loaded. */
 public static final DefaultDescriptorPool INSTANCE =
 new DefaultDescriptorPool(
WELL_KNOWN_TYPE_DESCRIPTORS,
WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS,
 ImmutableMultimap.of(),
 ExtensionRegistry.getEmptyRegistry());

Expand All@@ -67,8 +106,8 @@ public static DefaultDescriptorPool create(CelDescriptors celDescriptors) {

 public static DefaultDescriptorPool create(
 CelDescriptors celDescriptors, ExtensionRegistry extensionRegistry) {
 Map<String, Descriptor> descriptorMap = new HashMap<>(); // Using a hashmap to allow deduping
stream(WellKnownProto.values()).forEach(d -> descriptorMap.put(d.typeName(), d.descriptor()));
 Map<String, Descriptor> descriptorMap =
 new HashMap<>(WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS); // Using a hashmap to allow deduping

 for (Descriptor descriptor : celDescriptors.messageTypeDescriptors()) {
 descriptorMap.putIfAbsent(descriptor.getFullName(), descriptor);
Expand Down

12 changes: 7 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,7 +157,7 @@ public Object adaptProtoToValue(MessageOrBuilder proto) {
 // If the proto is not a well-known type, then the input Message is what's expected as the
 // output return value.
 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(typeName(proto.getDescriptorForType()));
 WellKnownProto.getByTypeName(typeName(proto.getDescriptorForType()));
 if (wellKnownProto == null) {
 return proto;
 }
Expand DownExpand Up@@ -335,7 +335,7 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 */
 @SuppressWarnings("unchecked")
 public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(protoTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(protoTypeName);
 if (wellKnownProto == null) {
 if (value instanceof Message) {
 return Optional.of((Message) value);
Expand DownExpand Up@@ -376,7 +376,7 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 break;
 case DOUBLE_VALUE:
 return Optional.ofNullable(adaptValueToDouble(value));
 case DURATION_VALUE:
 case DURATION:
 return Optional.of((Duration) value);
 case FLOAT_VALUE:
 return Optional.ofNullable(adaptValueToFloat(value));
Expand All@@ -389,12 +389,14 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 return Optional.of(StringValue.of((String) value));
 }
 break;
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return Optional.of((Timestamp) value);
 case UINT32_VALUE:
 return Optional.ofNullable(adaptValueToUint32(value));
 case UINT64_VALUE:
 return Optional.ofNullable(adaptValueToUint64(value));
 default:
 throw new IllegalArgumentException("Unsupported conversion: " + wellKnownProto);
 }
 return Optional.empty();
 }
Expand DownExpand Up@@ -579,7 +581,7 @@ private static boolean isWrapperType(FieldDescriptor fieldDescriptor) {
 return false;
 }
 String fieldTypeName = fieldDescriptor.getMessageType().getFullName();
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(fieldTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(fieldTypeName);
 return wellKnownProto != null && wellKnownProto.isWrapperType();
 }

Expand Down

84 changes: 54 additions & 30 deletions
common/src/main/java/dev/cel/common/internal/WellKnownProto.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
Expand All@@ -36,6 +37,7 @@
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

/**
 * WellKnownProto types used throughout CEL. These types are specially handled to ensure that
Expand All@@ -44,24 +46,32 @@
 */
@Internal
public enum WellKnownProto {
 JSON_VALUE(Value.getDescriptor()),
 JSON_STRUCT_VALUE(Struct.getDescriptor()),
 JSON_LIST_VALUE(ListValue.getDescriptor()),
 ANY_VALUE(Any.getDescriptor()),
 BOOL_VALUE(BoolValue.getDescriptor(), true),
 BYTES_VALUE(BytesValue.getDescriptor(), true),
 DOUBLE_VALUE(DoubleValue.getDescriptor(), true),
 FLOAT_VALUE(FloatValue.getDescriptor(), true),
 INT32_VALUE(Int32Value.getDescriptor(), true),
 INT64_VALUE(Int64Value.getDescriptor(), true),
 STRING_VALUE(StringValue.getDescriptor(), true),
 UINT32_VALUE(UInt32Value.getDescriptor(), true),
 UINT64_VALUE(UInt64Value.getDescriptor(), true),
 DURATION_VALUE(Duration.getDescriptor()),
 TIMESTAMP_VALUE(Timestamp.getDescriptor());

 private final Descriptor descriptor;
 private final boolean isWrapperType;
 ANY_VALUE("google.protobuf.Any", Any.class.getName()),
 DURATION("google.protobuf.Duration", Duration.class.getName()),
 JSON_LIST_VALUE("google.protobuf.ListValue", ListValue.class.getName()),
 JSON_STRUCT_VALUE("google.protobuf.Struct", Struct.class.getName()),
 JSON_VALUE("google.protobuf.Value", Value.class.getName()),
 TIMESTAMP("google.protobuf.Timestamp", Timestamp.class.getName()),
 // Wrapper types
 FLOAT_VALUE("google.protobuf.FloatValue", FloatValue.class.getName(), /* isWrapperType= */ true),
 INT32_VALUE("google.protobuf.Int32Value", Int32Value.class.getName(), /* isWrapperType= */ true),
 INT64_VALUE("google.protobuf.Int64Value", Int64Value.class.getName(), /* isWrapperType= */ true),
 STRING_VALUE(
 "google.protobuf.StringValue", StringValue.class.getName(), /* isWrapperType= */ true),
 BOOL_VALUE("google.protobuf.BoolValue", BoolValue.class.getName(), /* isWrapperType= */ true),
 BYTES_VALUE("google.protobuf.BytesValue", BytesValue.class.getName(), /* isWrapperType= */ true),
 DOUBLE_VALUE(
 "google.protobuf.DoubleValue", DoubleValue.class.getName(), /* isWrapperType= */ true),
 UINT32_VALUE(
 "google.protobuf.UInt32Value", UInt32Value.class.getName(), /* isWrapperType= */ true),
 UINT64_VALUE(
 "google.protobuf.UInt64Value", UInt64Value.class.getName(), /* isWrapperType= */ true),
 // These aren't explicitly called out as wrapper types in the spec, but behave like one, because
 // they are still converted into an equivalent primitive type.

 EMPTY("google.protobuf.Empty", Empty.class.getName(), /* isWrapperType= */ true),
 FIELD_MASK("google.protobuf.FieldMask", FieldMask.class.getName(), /* isWrapperType= */ true),
 ;

 private static final ImmutableMap<String, WellKnownProto> WELL_KNOWN_PROTO_MAP;

Expand All@@ -71,28 +81,42 @@ public enum WellKnownProto {
 .collect(toImmutableMap(WellKnownProto::typeName, Function.identity()));
 }

 WellKnownProto(Descriptor descriptor) {
 this(descriptor, /* isWrapperType= */ false);
 private final String wellKnownProtoFullName;
 private final String javaClassName;
 private final boolean isWrapperType;

 public String typeName() {
 return wellKnownProtoFullName;
 }

 WellKnownProto(Descriptor descriptor, boolean isWrapperType) {
 this.descriptor = descriptor;
 this.isWrapperType = isWrapperType;
 public String javaClassName() {
 return this.javaClassName;
 }

 public Descriptor descriptor() {
 return descriptor;
 public static @Nullable WellKnownProto getByTypeName(String typeName) {
 return WELL_KNOWN_PROTO_MAP.get(typeName);
 }

 public String typeName() {
 return descriptor.getFullName();
 public static boolean isWrapperType(String typeName) {
 WellKnownProto wellKnownProto = getByTypeName(typeName);
 if (wellKnownProto == null) {
 return false;
 }

 return wellKnownProto.isWrapperType();
 }

 public boolean isWrapperType() {
 return isWrapperType;
 }

 public static WellKnownProto getByDescriptorName(String name) {
 return WELL_KNOWN_PROTO_MAP.get(name);
 WellKnownProto(String wellKnownProtoFullName, String javaClassName) {
 this(wellKnownProtoFullName, javaClassName, /* isWrapperType= */ false);
 }

 WellKnownProto(String wellKnownProtoFullName, String javaClassName, boolean isWrapperType) {
 this.wellKnownProtoFullName = wellKnownProtoFullName;
 this.javaClassName = javaClassName;
 this.isWrapperType = isWrapperType;
 }
}

12 changes: 6 additions & 6 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 }

 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(message.getDescriptorForType().getFullName());
 WellKnownProto.getByTypeName(message.getDescriptorForType().getFullName());
 if (wellKnownProto == null) {
 return ProtoMessageValue.create((Message) message, celDescriptorPool, this);
 }
Expand All@@ -128,10 +128,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION_VALUE:
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
Expand All@@ -154,10 +154,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 case UINT64_VALUE:
 return UintValue.create(
 ((UInt64Value) message).getValue(), celOptions.enableUnsignedLongs());
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 /**
Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:proto_equality",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
Expand Down

59 changes: 59 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/WellKnownProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import static com.google.common.truth.Truth.assertThat;

import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class WellKnownProtoTest {

 @Test
 @TestParameters("{typeName: 'google.protobuf.FloatValue'}")
 @TestParameters("{typeName: 'google.protobuf.Int32Value'}")
 @TestParameters("{typeName: 'google.protobuf.Int64Value'}")
 @TestParameters("{typeName: 'google.protobuf.StringValue'}")
 @TestParameters("{typeName: 'google.protobuf.BoolValue'}")
 @TestParameters("{typeName: 'google.protobuf.BytesValue'}")
 @TestParameters("{typeName: 'google.protobuf.DoubleValue'}")
 @TestParameters("{typeName: 'google.protobuf.UInt32Value'}")
 @TestParameters("{typeName: 'google.protobuf.UInt64Value'}")
 @TestParameters("{typeName: 'google.protobuf.Empty'}")
 @TestParameters("{typeName: 'google.protobuf.FieldMask'}")
 public void isWrapperType_withTypeName_true(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isTrue();
 }

 @Test
 @TestParameters("{typeName: 'not.wellknown.type'}")
 @TestParameters("{typeName: 'google.protobuf.Any'}")
 @TestParameters("{typeName: 'google.protobuf.Duration'}")
 @TestParameters("{typeName: 'google.protobuf.ListValue'}")
 @TestParameters("{typeName: 'google.protobuf.Struct'}")
 @TestParameters("{typeName: 'google.protobuf.Value'}")
 @TestParameters("{typeName: 'google.protobuf.Timestamp'}")
 public void isWrapperType_withTypeName_false(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isFalse();
 }

 @Test
 public void getJavaClassName() {
 assertThat(WellKnownProto.ANY_VALUE.javaClassName()).isEqualTo("com.google.protobuf.Any");
 }
}

3 changes: 2 additions & 1 deletion
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,8 @@ public void createMessage_wellKnownType_withCustomMessageProvider(
 return;
 }

 Descriptor wellKnownDescriptor = wellKnownProto.descriptor();
 Descriptor wellKnownDescriptor =
 DefaultDescriptorPool.INSTANCE.findDescriptor(wellKnownProto.typeName()).get();
 DescriptorMessageProvider messageProvider =
 new DescriptorMessageProvider(
 msgName ->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP#626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 11, 2025
 Merged


Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP
#626
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand Down

49 changes: 44 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,26 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.CelDescriptors;
import dev.cel.common.annotations.Internal;
import java.util.HashMap;
Expand All@@ -40,14 +57,36 @@
@Immutable
@Internal
public final class DefaultDescriptorPool implements CelDescriptorPool {
 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_DESCRIPTORS =

 private static final ImmutableMap<WellKnownProto, Descriptor> WELL_KNOWN_PROTO_TO_DESCRIPTORS =
 ImmutableMap.<WellKnownProto, Descriptor>builder()
 .put(WellKnownProto.ANY_VALUE, Any.getDescriptor())
 .put(WellKnownProto.BOOL_VALUE, BoolValue.getDescriptor())
 .put(WellKnownProto.BYTES_VALUE, BytesValue.getDescriptor())
 .put(WellKnownProto.DOUBLE_VALUE, DoubleValue.getDescriptor())
 .put(WellKnownProto.DURATION, Duration.getDescriptor())
 .put(WellKnownProto.FLOAT_VALUE, FloatValue.getDescriptor())
 .put(WellKnownProto.INT32_VALUE, Int32Value.getDescriptor())
 .put(WellKnownProto.INT64_VALUE, Int64Value.getDescriptor())
 .put(WellKnownProto.STRING_VALUE, StringValue.getDescriptor())
 .put(WellKnownProto.TIMESTAMP, Timestamp.getDescriptor())
 .put(WellKnownProto.UINT32_VALUE, UInt32Value.getDescriptor())
 .put(WellKnownProto.UINT64_VALUE, UInt64Value.getDescriptor())
 .put(WellKnownProto.JSON_LIST_VALUE, ListValue.getDescriptor())
 .put(WellKnownProto.JSON_STRUCT_VALUE, Struct.getDescriptor())
 .put(WellKnownProto.JSON_VALUE, Value.getDescriptor())
 .put(WellKnownProto.EMPTY, Empty.getDescriptor())
 .put(WellKnownProto.FIELD_MASK, FieldMask.getDescriptor())
 .buildOrThrow();

 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS =
 stream(WellKnownProto.values())
 .collect(toImmutableMap(WellKnownProto::typeName, WellKnownProto::descriptor));
 .collect(toImmutableMap(WellKnownProto::typeName, WELL_KNOWN_PROTO_TO_DESCRIPTORS::get));

 /** A DefaultDescriptorPool instance with just well known types loaded. */
 public static final DefaultDescriptorPool INSTANCE =
 new DefaultDescriptorPool(
WELL_KNOWN_TYPE_DESCRIPTORS,
WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS,
 ImmutableMultimap.of(),
 ExtensionRegistry.getEmptyRegistry());

Expand All@@ -67,8 +106,8 @@ public static DefaultDescriptorPool create(CelDescriptors celDescriptors) {

 public static DefaultDescriptorPool create(
 CelDescriptors celDescriptors, ExtensionRegistry extensionRegistry) {
 Map<String, Descriptor> descriptorMap = new HashMap<>(); // Using a hashmap to allow deduping
stream(WellKnownProto.values()).forEach(d -> descriptorMap.put(d.typeName(), d.descriptor()));
 Map<String, Descriptor> descriptorMap =
 new HashMap<>(WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS); // Using a hashmap to allow deduping

 for (Descriptor descriptor : celDescriptors.messageTypeDescriptors()) {
 descriptorMap.putIfAbsent(descriptor.getFullName(), descriptor);
Expand Down

12 changes: 7 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,7 +157,7 @@ public Object adaptProtoToValue(MessageOrBuilder proto) {
 // If the proto is not a well-known type, then the input Message is what's expected as the
 // output return value.
 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(typeName(proto.getDescriptorForType()));
 WellKnownProto.getByTypeName(typeName(proto.getDescriptorForType()));
 if (wellKnownProto == null) {
 return proto;
 }
Expand DownExpand Up@@ -335,7 +335,7 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 */
 @SuppressWarnings("unchecked")
 public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(protoTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(protoTypeName);
 if (wellKnownProto == null) {
 if (value instanceof Message) {
 return Optional.of((Message) value);
Expand DownExpand Up@@ -376,7 +376,7 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 break;
 case DOUBLE_VALUE:
 return Optional.ofNullable(adaptValueToDouble(value));
 case DURATION_VALUE:
 case DURATION:
 return Optional.of((Duration) value);
 case FLOAT_VALUE:
 return Optional.ofNullable(adaptValueToFloat(value));
Expand All@@ -389,12 +389,14 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 return Optional.of(StringValue.of((String) value));
 }
 break;
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return Optional.of((Timestamp) value);
 case UINT32_VALUE:
 return Optional.ofNullable(adaptValueToUint32(value));
 case UINT64_VALUE:
 return Optional.ofNullable(adaptValueToUint64(value));
 default:
 throw new IllegalArgumentException("Unsupported conversion: " + wellKnownProto);
 }
 return Optional.empty();
 }
Expand DownExpand Up@@ -579,7 +581,7 @@ private static boolean isWrapperType(FieldDescriptor fieldDescriptor) {
 return false;
 }
 String fieldTypeName = fieldDescriptor.getMessageType().getFullName();
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(fieldTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(fieldTypeName);
 return wellKnownProto != null && wellKnownProto.isWrapperType();
 }

Expand Down

84 changes: 54 additions & 30 deletions
common/src/main/java/dev/cel/common/internal/WellKnownProto.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
Expand All@@ -36,6 +37,7 @@
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

/**
 * WellKnownProto types used throughout CEL. These types are specially handled to ensure that
Expand All@@ -44,24 +46,32 @@
 */
@Internal
public enum WellKnownProto {
 JSON_VALUE(Value.getDescriptor()),
 JSON_STRUCT_VALUE(Struct.getDescriptor()),
 JSON_LIST_VALUE(ListValue.getDescriptor()),
 ANY_VALUE(Any.getDescriptor()),
 BOOL_VALUE(BoolValue.getDescriptor(), true),
 BYTES_VALUE(BytesValue.getDescriptor(), true),
 DOUBLE_VALUE(DoubleValue.getDescriptor(), true),
 FLOAT_VALUE(FloatValue.getDescriptor(), true),
 INT32_VALUE(Int32Value.getDescriptor(), true),
 INT64_VALUE(Int64Value.getDescriptor(), true),
 STRING_VALUE(StringValue.getDescriptor(), true),
 UINT32_VALUE(UInt32Value.getDescriptor(), true),
 UINT64_VALUE(UInt64Value.getDescriptor(), true),
 DURATION_VALUE(Duration.getDescriptor()),
 TIMESTAMP_VALUE(Timestamp.getDescriptor());

 private final Descriptor descriptor;
 private final boolean isWrapperType;
 ANY_VALUE("google.protobuf.Any", Any.class.getName()),
 DURATION("google.protobuf.Duration", Duration.class.getName()),
 JSON_LIST_VALUE("google.protobuf.ListValue", ListValue.class.getName()),
 JSON_STRUCT_VALUE("google.protobuf.Struct", Struct.class.getName()),
 JSON_VALUE("google.protobuf.Value", Value.class.getName()),
 TIMESTAMP("google.protobuf.Timestamp", Timestamp.class.getName()),
 // Wrapper types
 FLOAT_VALUE("google.protobuf.FloatValue", FloatValue.class.getName(), /* isWrapperType= */ true),
 INT32_VALUE("google.protobuf.Int32Value", Int32Value.class.getName(), /* isWrapperType= */ true),
 INT64_VALUE("google.protobuf.Int64Value", Int64Value.class.getName(), /* isWrapperType= */ true),
 STRING_VALUE(
 "google.protobuf.StringValue", StringValue.class.getName(), /* isWrapperType= */ true),
 BOOL_VALUE("google.protobuf.BoolValue", BoolValue.class.getName(), /* isWrapperType= */ true),
 BYTES_VALUE("google.protobuf.BytesValue", BytesValue.class.getName(), /* isWrapperType= */ true),
 DOUBLE_VALUE(
 "google.protobuf.DoubleValue", DoubleValue.class.getName(), /* isWrapperType= */ true),
 UINT32_VALUE(
 "google.protobuf.UInt32Value", UInt32Value.class.getName(), /* isWrapperType= */ true),
 UINT64_VALUE(
 "google.protobuf.UInt64Value", UInt64Value.class.getName(), /* isWrapperType= */ true),
 // These aren't explicitly called out as wrapper types in the spec, but behave like one, because
 // they are still converted into an equivalent primitive type.

 EMPTY("google.protobuf.Empty", Empty.class.getName(), /* isWrapperType= */ true),
 FIELD_MASK("google.protobuf.FieldMask", FieldMask.class.getName(), /* isWrapperType= */ true),
 ;

 private static final ImmutableMap<String, WellKnownProto> WELL_KNOWN_PROTO_MAP;

Expand All@@ -71,28 +81,42 @@ public enum WellKnownProto {
 .collect(toImmutableMap(WellKnownProto::typeName, Function.identity()));
 }

 WellKnownProto(Descriptor descriptor) {
 this(descriptor, /* isWrapperType= */ false);
 private final String wellKnownProtoFullName;
 private final String javaClassName;
 private final boolean isWrapperType;

 public String typeName() {
 return wellKnownProtoFullName;
 }

 WellKnownProto(Descriptor descriptor, boolean isWrapperType) {
 this.descriptor = descriptor;
 this.isWrapperType = isWrapperType;
 public String javaClassName() {
 return this.javaClassName;
 }

 public Descriptor descriptor() {
 return descriptor;
 public static @Nullable WellKnownProto getByTypeName(String typeName) {
 return WELL_KNOWN_PROTO_MAP.get(typeName);
 }

 public String typeName() {
 return descriptor.getFullName();
 public static boolean isWrapperType(String typeName) {
 WellKnownProto wellKnownProto = getByTypeName(typeName);
 if (wellKnownProto == null) {
 return false;
 }

 return wellKnownProto.isWrapperType();
 }

 public boolean isWrapperType() {
 return isWrapperType;
 }

 public static WellKnownProto getByDescriptorName(String name) {
 return WELL_KNOWN_PROTO_MAP.get(name);
 WellKnownProto(String wellKnownProtoFullName, String javaClassName) {
 this(wellKnownProtoFullName, javaClassName, /* isWrapperType= */ false);
 }

 WellKnownProto(String wellKnownProtoFullName, String javaClassName, boolean isWrapperType) {
 this.wellKnownProtoFullName = wellKnownProtoFullName;
 this.javaClassName = javaClassName;
 this.isWrapperType = isWrapperType;
 }
}

12 changes: 6 additions & 6 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 }

 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(message.getDescriptorForType().getFullName());
 WellKnownProto.getByTypeName(message.getDescriptorForType().getFullName());
 if (wellKnownProto == null) {
 return ProtoMessageValue.create((Message) message, celDescriptorPool, this);
 }
Expand All@@ -128,10 +128,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION_VALUE:
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
Expand All@@ -154,10 +154,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 case UINT64_VALUE:
 return UintValue.create(
 ((UInt64Value) message).getValue(), celOptions.enableUnsignedLongs());
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 /**
Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:proto_equality",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
Expand Down

59 changes: 59 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/WellKnownProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import static com.google.common.truth.Truth.assertThat;

import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class WellKnownProtoTest {

 @Test
 @TestParameters("{typeName: 'google.protobuf.FloatValue'}")
 @TestParameters("{typeName: 'google.protobuf.Int32Value'}")
 @TestParameters("{typeName: 'google.protobuf.Int64Value'}")
 @TestParameters("{typeName: 'google.protobuf.StringValue'}")
 @TestParameters("{typeName: 'google.protobuf.BoolValue'}")
 @TestParameters("{typeName: 'google.protobuf.BytesValue'}")
 @TestParameters("{typeName: 'google.protobuf.DoubleValue'}")
 @TestParameters("{typeName: 'google.protobuf.UInt32Value'}")
 @TestParameters("{typeName: 'google.protobuf.UInt64Value'}")
 @TestParameters("{typeName: 'google.protobuf.Empty'}")
 @TestParameters("{typeName: 'google.protobuf.FieldMask'}")
 public void isWrapperType_withTypeName_true(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isTrue();
 }

 @Test
 @TestParameters("{typeName: 'not.wellknown.type'}")
 @TestParameters("{typeName: 'google.protobuf.Any'}")
 @TestParameters("{typeName: 'google.protobuf.Duration'}")
 @TestParameters("{typeName: 'google.protobuf.ListValue'}")
 @TestParameters("{typeName: 'google.protobuf.Struct'}")
 @TestParameters("{typeName: 'google.protobuf.Value'}")
 @TestParameters("{typeName: 'google.protobuf.Timestamp'}")
 public void isWrapperType_withTypeName_false(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isFalse();
 }

 @Test
 public void getJavaClassName() {
 assertThat(WellKnownProto.ANY_VALUE.javaClassName()).isEqualTo("com.google.protobuf.Any");
 }
}

3 changes: 2 additions & 1 deletion
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,8 @@ public void createMessage_wellKnownType_withCustomMessageProvider(
 return;
 }

 Descriptor wellKnownDescriptor = wellKnownProto.descriptor();
 Descriptor wellKnownDescriptor =
 DefaultDescriptorPool.INSTANCE.findDescriptor(wellKnownProto.typeName()).get();
 DescriptorMessageProvider messageProvider =
 new DescriptorMessageProvider(
 msgName ->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP#626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Mar 11, 2025
 Merged


Change WellKnownProto to lookup a descriptor by its type name. Add google.protobuf.Empty and google.protobuf.FieldMask to WKP
#626
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ java_library(
 "//common/annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand Down

49 changes: 44 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,26 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.CelDescriptors;
import dev.cel.common.annotations.Internal;
import java.util.HashMap;
Expand All@@ -40,14 +57,36 @@
@Immutable
@Internal
public final class DefaultDescriptorPool implements CelDescriptorPool {
 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_DESCRIPTORS =

 private static final ImmutableMap<WellKnownProto, Descriptor> WELL_KNOWN_PROTO_TO_DESCRIPTORS =
 ImmutableMap.<WellKnownProto, Descriptor>builder()
 .put(WellKnownProto.ANY_VALUE, Any.getDescriptor())
 .put(WellKnownProto.BOOL_VALUE, BoolValue.getDescriptor())
 .put(WellKnownProto.BYTES_VALUE, BytesValue.getDescriptor())
 .put(WellKnownProto.DOUBLE_VALUE, DoubleValue.getDescriptor())
 .put(WellKnownProto.DURATION, Duration.getDescriptor())
 .put(WellKnownProto.FLOAT_VALUE, FloatValue.getDescriptor())
 .put(WellKnownProto.INT32_VALUE, Int32Value.getDescriptor())
 .put(WellKnownProto.INT64_VALUE, Int64Value.getDescriptor())
 .put(WellKnownProto.STRING_VALUE, StringValue.getDescriptor())
 .put(WellKnownProto.TIMESTAMP, Timestamp.getDescriptor())
 .put(WellKnownProto.UINT32_VALUE, UInt32Value.getDescriptor())
 .put(WellKnownProto.UINT64_VALUE, UInt64Value.getDescriptor())
 .put(WellKnownProto.JSON_LIST_VALUE, ListValue.getDescriptor())
 .put(WellKnownProto.JSON_STRUCT_VALUE, Struct.getDescriptor())
 .put(WellKnownProto.JSON_VALUE, Value.getDescriptor())
 .put(WellKnownProto.EMPTY, Empty.getDescriptor())
 .put(WellKnownProto.FIELD_MASK, FieldMask.getDescriptor())
 .buildOrThrow();

 private static final ImmutableMap<String, Descriptor> WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS =
 stream(WellKnownProto.values())
 .collect(toImmutableMap(WellKnownProto::typeName, WellKnownProto::descriptor));
 .collect(toImmutableMap(WellKnownProto::typeName, WELL_KNOWN_PROTO_TO_DESCRIPTORS::get));

 /** A DefaultDescriptorPool instance with just well known types loaded. */
 public static final DefaultDescriptorPool INSTANCE =
 new DefaultDescriptorPool(
WELL_KNOWN_TYPE_DESCRIPTORS,
WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS,
 ImmutableMultimap.of(),
 ExtensionRegistry.getEmptyRegistry());

Expand All@@ -67,8 +106,8 @@ public static DefaultDescriptorPool create(CelDescriptors celDescriptors) {

 public static DefaultDescriptorPool create(
 CelDescriptors celDescriptors, ExtensionRegistry extensionRegistry) {
 Map<String, Descriptor> descriptorMap = new HashMap<>(); // Using a hashmap to allow deduping
stream(WellKnownProto.values()).forEach(d -> descriptorMap.put(d.typeName(), d.descriptor()));
 Map<String, Descriptor> descriptorMap =
 new HashMap<>(WELL_KNOWN_TYPE_NAME_TO_DESCRIPTORS); // Using a hashmap to allow deduping

 for (Descriptor descriptor : celDescriptors.messageTypeDescriptors()) {
 descriptorMap.putIfAbsent(descriptor.getFullName(), descriptor);
Expand Down

12 changes: 7 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,7 +157,7 @@ public Object adaptProtoToValue(MessageOrBuilder proto) {
 // If the proto is not a well-known type, then the input Message is what's expected as the
 // output return value.
 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(typeName(proto.getDescriptorForType()));
 WellKnownProto.getByTypeName(typeName(proto.getDescriptorForType()));
 if (wellKnownProto == null) {
 return proto;
 }
Expand DownExpand Up@@ -335,7 +335,7 @@ private BidiConverter fieldToValueConverter(FieldDescriptor fieldDescriptor) {
 */
 @SuppressWarnings("unchecked")
 public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(protoTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(protoTypeName);
 if (wellKnownProto == null) {
 if (value instanceof Message) {
 return Optional.of((Message) value);
Expand DownExpand Up@@ -376,7 +376,7 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 break;
 case DOUBLE_VALUE:
 return Optional.ofNullable(adaptValueToDouble(value));
 case DURATION_VALUE:
 case DURATION:
 return Optional.of((Duration) value);
 case FLOAT_VALUE:
 return Optional.ofNullable(adaptValueToFloat(value));
Expand All@@ -389,12 +389,14 @@ public Optional<Message> adaptValueToProto(Object value, String protoTypeName) {
 return Optional.of(StringValue.of((String) value));
 }
 break;
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return Optional.of((Timestamp) value);
 case UINT32_VALUE:
 return Optional.ofNullable(adaptValueToUint32(value));
 case UINT64_VALUE:
 return Optional.ofNullable(adaptValueToUint64(value));
 default:
 throw new IllegalArgumentException("Unsupported conversion: " + wellKnownProto);
 }
 return Optional.empty();
 }
Expand DownExpand Up@@ -579,7 +581,7 @@ private static boolean isWrapperType(FieldDescriptor fieldDescriptor) {
 return false;
 }
 String fieldTypeName = fieldDescriptor.getMessageType().getFullName();
 WellKnownProto wellKnownProto = WellKnownProto.getByDescriptorName(fieldTypeName);
 WellKnownProto wellKnownProto = WellKnownProto.getByTypeName(fieldTypeName);
 return wellKnownProto != null && wellKnownProto.isWrapperType();
 }

Expand Down

84 changes: 54 additions & 30 deletions
common/src/main/java/dev/cel/common/internal/WellKnownProto.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
Expand All@@ -36,6 +37,7 @@
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

/**
 * WellKnownProto types used throughout CEL. These types are specially handled to ensure that
Expand All@@ -44,24 +46,32 @@
 */
@Internal
public enum WellKnownProto {
 JSON_VALUE(Value.getDescriptor()),
 JSON_STRUCT_VALUE(Struct.getDescriptor()),
 JSON_LIST_VALUE(ListValue.getDescriptor()),
 ANY_VALUE(Any.getDescriptor()),
 BOOL_VALUE(BoolValue.getDescriptor(), true),
 BYTES_VALUE(BytesValue.getDescriptor(), true),
 DOUBLE_VALUE(DoubleValue.getDescriptor(), true),
 FLOAT_VALUE(FloatValue.getDescriptor(), true),
 INT32_VALUE(Int32Value.getDescriptor(), true),
 INT64_VALUE(Int64Value.getDescriptor(), true),
 STRING_VALUE(StringValue.getDescriptor(), true),
 UINT32_VALUE(UInt32Value.getDescriptor(), true),
 UINT64_VALUE(UInt64Value.getDescriptor(), true),
 DURATION_VALUE(Duration.getDescriptor()),
 TIMESTAMP_VALUE(Timestamp.getDescriptor());

 private final Descriptor descriptor;
 private final boolean isWrapperType;
 ANY_VALUE("google.protobuf.Any", Any.class.getName()),
 DURATION("google.protobuf.Duration", Duration.class.getName()),
 JSON_LIST_VALUE("google.protobuf.ListValue", ListValue.class.getName()),
 JSON_STRUCT_VALUE("google.protobuf.Struct", Struct.class.getName()),
 JSON_VALUE("google.protobuf.Value", Value.class.getName()),
 TIMESTAMP("google.protobuf.Timestamp", Timestamp.class.getName()),
 // Wrapper types
 FLOAT_VALUE("google.protobuf.FloatValue", FloatValue.class.getName(), /* isWrapperType= */ true),
 INT32_VALUE("google.protobuf.Int32Value", Int32Value.class.getName(), /* isWrapperType= */ true),
 INT64_VALUE("google.protobuf.Int64Value", Int64Value.class.getName(), /* isWrapperType= */ true),
 STRING_VALUE(
 "google.protobuf.StringValue", StringValue.class.getName(), /* isWrapperType= */ true),
 BOOL_VALUE("google.protobuf.BoolValue", BoolValue.class.getName(), /* isWrapperType= */ true),
 BYTES_VALUE("google.protobuf.BytesValue", BytesValue.class.getName(), /* isWrapperType= */ true),
 DOUBLE_VALUE(
 "google.protobuf.DoubleValue", DoubleValue.class.getName(), /* isWrapperType= */ true),
 UINT32_VALUE(
 "google.protobuf.UInt32Value", UInt32Value.class.getName(), /* isWrapperType= */ true),
 UINT64_VALUE(
 "google.protobuf.UInt64Value", UInt64Value.class.getName(), /* isWrapperType= */ true),
 // These aren't explicitly called out as wrapper types in the spec, but behave like one, because
 // they are still converted into an equivalent primitive type.

 EMPTY("google.protobuf.Empty", Empty.class.getName(), /* isWrapperType= */ true),
 FIELD_MASK("google.protobuf.FieldMask", FieldMask.class.getName(), /* isWrapperType= */ true),
 ;

 private static final ImmutableMap<String, WellKnownProto> WELL_KNOWN_PROTO_MAP;

Expand All@@ -71,28 +81,42 @@ public enum WellKnownProto {
 .collect(toImmutableMap(WellKnownProto::typeName, Function.identity()));
 }

 WellKnownProto(Descriptor descriptor) {
 this(descriptor, /* isWrapperType= */ false);
 private final String wellKnownProtoFullName;
 private final String javaClassName;
 private final boolean isWrapperType;

 public String typeName() {
 return wellKnownProtoFullName;
 }

 WellKnownProto(Descriptor descriptor, boolean isWrapperType) {
 this.descriptor = descriptor;
 this.isWrapperType = isWrapperType;
 public String javaClassName() {
 return this.javaClassName;
 }

 public Descriptor descriptor() {
 return descriptor;
 public static @Nullable WellKnownProto getByTypeName(String typeName) {
 return WELL_KNOWN_PROTO_MAP.get(typeName);
 }

 public String typeName() {
 return descriptor.getFullName();
 public static boolean isWrapperType(String typeName) {
 WellKnownProto wellKnownProto = getByTypeName(typeName);
 if (wellKnownProto == null) {
 return false;
 }

 return wellKnownProto.isWrapperType();
 }

 public boolean isWrapperType() {
 return isWrapperType;
 }

 public static WellKnownProto getByDescriptorName(String name) {
 return WELL_KNOWN_PROTO_MAP.get(name);
 WellKnownProto(String wellKnownProtoFullName, String javaClassName) {
 this(wellKnownProtoFullName, javaClassName, /* isWrapperType= */ false);
 }

 WellKnownProto(String wellKnownProtoFullName, String javaClassName, boolean isWrapperType) {
 this.wellKnownProtoFullName = wellKnownProtoFullName;
 this.javaClassName = javaClassName;
 this.isWrapperType = isWrapperType;
 }
}

12 changes: 6 additions & 6 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 }

 WellKnownProto wellKnownProto =
 WellKnownProto.getByDescriptorName(message.getDescriptorForType().getFullName());
 WellKnownProto.getByTypeName(message.getDescriptorForType().getFullName());
 if (wellKnownProto == null) {
 return ProtoMessageValue.create((Message) message, celDescriptorPool, this);
 }
Expand All@@ -128,10 +128,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION_VALUE:
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP_VALUE:
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
Expand All@@ -154,10 +154,10 @@ public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 case UINT64_VALUE:
 return UintValue.create(
 ((UInt64Value) message).getValue(), celOptions.enableUnsignedLongs());
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }

 /**
Expand Down

1 change: 1 addition & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:proto_equality",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/src/test/resources:default_instance_message_test_protos_java_proto",
 "//common/src/test/resources:multi_file_java_proto",
 "//common/src/test/resources:service_conflicting_name_java_proto",
Expand Down

59 changes: 59 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/WellKnownProtoTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import static com.google.common.truth.Truth.assertThat;

import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import com.google.testing.junit.testparameterinjector.TestParameters;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class WellKnownProtoTest {

 @Test
 @TestParameters("{typeName: 'google.protobuf.FloatValue'}")
 @TestParameters("{typeName: 'google.protobuf.Int32Value'}")
 @TestParameters("{typeName: 'google.protobuf.Int64Value'}")
 @TestParameters("{typeName: 'google.protobuf.StringValue'}")
 @TestParameters("{typeName: 'google.protobuf.BoolValue'}")
 @TestParameters("{typeName: 'google.protobuf.BytesValue'}")
 @TestParameters("{typeName: 'google.protobuf.DoubleValue'}")
 @TestParameters("{typeName: 'google.protobuf.UInt32Value'}")
 @TestParameters("{typeName: 'google.protobuf.UInt64Value'}")
 @TestParameters("{typeName: 'google.protobuf.Empty'}")
 @TestParameters("{typeName: 'google.protobuf.FieldMask'}")
 public void isWrapperType_withTypeName_true(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isTrue();
 }

 @Test
 @TestParameters("{typeName: 'not.wellknown.type'}")
 @TestParameters("{typeName: 'google.protobuf.Any'}")
 @TestParameters("{typeName: 'google.protobuf.Duration'}")
 @TestParameters("{typeName: 'google.protobuf.ListValue'}")
 @TestParameters("{typeName: 'google.protobuf.Struct'}")
 @TestParameters("{typeName: 'google.protobuf.Value'}")
 @TestParameters("{typeName: 'google.protobuf.Timestamp'}")
 public void isWrapperType_withTypeName_false(String typeName) {
 assertThat(WellKnownProto.isWrapperType(typeName)).isFalse();
 }

 @Test
 public void getJavaClassName() {
 assertThat(WellKnownProto.ANY_VALUE.javaClassName()).isEqualTo("com.google.protobuf.Any");
 }
}

3 changes: 2 additions & 1 deletion
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,8 @@ public void createMessage_wellKnownType_withCustomMessageProvider(
 return;
 }

 Descriptor wellKnownDescriptor = wellKnownProto.descriptor();
 Descriptor wellKnownDescriptor =
 DefaultDescriptorPool.INSTANCE.findDescriptor(wellKnownProto.typeName()).get();
 DescriptorMessageProvider messageProvider =
 new DescriptorMessageProvider(
 msgName ->
Expand Down