Remove extraneous protoTypeName argument from RuntimeTypeProvider interface#706

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
May 29, 2025
Merged

Remove extraneous protoTypeName argument from RuntimeTypeProvider interface #706

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
2 changes: 1 addition & 1 deletion common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);
public abstract CelValue fromProtoMessageToCelValue(MessageLite msg);

/**
* Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
Expand Down
8 changes: 4 additions & 4 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@@ -57,12 +57,12 @@ public static ProtoCelValueConverter newInstance(
}

@Override
public CelValue fromProtoMessageToCelValue(String unusedProtoTypeName, MessageLite msg) {
return fromProtoMessageToCelValue((MessageOrBuilder) msg);
public CelValue fromProtoMessageToCelValue(MessageLite msg) {
return fromDescriptorMessageToCelValue((MessageOrBuilder) msg);
}

/** Adapts a Protobuf message into a {@link CelValue}. */
public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
public CelValue fromDescriptorMessageToCelValue(MessageOrBuilder message) {
Preconditions.checkNotNull(message);

// Attempt to convert the proto from a dynamic message into a concrete message if possible.
Expand DownExpand Up@@ -151,7 +151,7 @@ public CelValue fromProtoMessageFieldToCelValue(
return fromJavaObjectToCelValue(map);
}

return fromProtoMessageToCelValue((MessageOrBuilder) result);
return fromDescriptorMessageToCelValue((MessageOrBuilder) result);
case UINT32:
return UintValue.create((int) result);
case UINT64:
Expand Down
11 changes: 4 additions & 7 deletions common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,8 +157,7 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {

Object defaultValue = getDefaultValue(fieldDescriptor);
if (defaultValue instanceof MessageLite) {
return fromProtoMessageToCelValue(
fieldDescriptor.getFieldProtoTypeName(), (MessageLite) defaultValue);
return fromProtoMessageToCelValue((MessageLite) defaultValue);
}

return fromJavaObjectToCelValue(defaultValue);
Expand DownExpand Up@@ -357,17 +356,15 @@ private static Object readUnknownField(int tagWireType, CodedInputStream inputSt
}

@Override
public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
@SuppressWarnings("LiteProtoToString") // No alternative identifier to use. Debug only info is OK.
public CelValue fromProtoMessageToCelValue(MessageLite msg) {
checkNotNull(msg);
checkNotNull(protoTypeName);

MessageLiteDescriptor descriptor =
descriptorPool
.findDescriptor(msg)
.orElseThrow(
() ->
new NoSuchElementException(
"Could not find a descriptor for: " + protoTypeName));
() -> new NoSuchElementException("Could not find a descriptor for: " + msg));
WellKnownProto wellKnownProto =
WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
}

MessageLite message = descriptor.newMessageBuilder().build();
return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(structType, message));
return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(message));
}

public static ProtoMessageLiteValueProvider newInstance(CelLiteDescriptor... descriptors) {
Expand Down
35 changes: 11 additions & 24 deletions common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
Expand All@@ -59,47 +58,36 @@ public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLit
ProtoMessageLiteValue protoMessageLiteValue =
(ProtoMessageLiteValue)
PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
"cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());
TestAllTypes.getDefaultInstance());

assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
}

private enum WellKnownProtoTestCase {
BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
BOOL(com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
BYTES(
WellKnownProto.BYTES_VALUE,
com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
DOUBLE(
WellKnownProto.DOUBLE_VALUE,
com.google.protobuf.DoubleValue.of(1.0),
DoubleValue.create(1.0)),
INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
STRING(
WellKnownProto.STRING_VALUE,
com.google.protobuf.StringValue.of("test"),
StringValue.create("test")),
FLOAT(FloatValue.of(1.0f), DoubleValue.create(1.0f)),
DOUBLE(com.google.protobuf.DoubleValue.of(1.0), DoubleValue.create(1.0)),
INT32(Int32Value.of(1), IntValue.create(1)),
INT64(Int64Value.of(1L), IntValue.create(1L)),
STRING(com.google.protobuf.StringValue.of("test"), StringValue.create("test")),

DURATION(
WellKnownProto.DURATION,
Duration.newBuilder().setSeconds(10).setNanos(50).build(),
DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
TIMESTAMP(
WellKnownProto.TIMESTAMP,
Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
UINT32(UInt32Value.of(1), UintValue.create(1)),
UINT64(UInt64Value.of(1L), UintValue.create(1L)),
;

private final WellKnownProto wellKnownProto;
private final MessageLite msg;
private final CelValue celValue;

WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
this.wellKnownProto = wellKnownProto;
WellKnownProtoTestCase(MessageLite msg, CelValue celValue) {
this.msg = msg;
this.celValue = celValue;
}
Expand All@@ -109,8 +97,7 @@ private enum WellKnownProtoTestCase {
public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
@TestParameter WellKnownProtoTestCase testCase) {
CelValue convertedCelValue =
PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
testCase.wellKnownProto.typeName(), testCase.msg);
PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(testCase.msg);

assertThat(convertedCelValue).isEqualTo(testCase.celValue);
}
Expand Down
20 changes: 8 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/CelValueRuntimeTypeProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ final class CelValueRuntimeTypeProvider implements RuntimeTypeProvider {
private static final BaseProtoCelValueConverter DEFAULT_CEL_VALUE_CONVERTER =
new BaseProtoCelValueConverter() {
@Override
public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
public CelValue fromProtoMessageToCelValue(MessageLite msg) {
throw new UnsupportedOperationException(
"A value provider must be provided in the runtime to handle protobuf messages");
}
Expand DownExpand Up@@ -82,28 +82,24 @@ public Object createMessage(String messageName, Map<String, Object> values) {
}

@Override
public Object selectField(String typeName, Object message, String fieldName) {
SelectableValue<CelValue> selectableValue =
getSelectableValueOrThrow(typeName, message, fieldName);
public Object selectField(Object message, String fieldName) {
SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

return unwrapCelValue(selectableValue.select(StringValue.create(fieldName)));
}

@Override
public Object hasField(String messageName, Object message, String fieldName) {
SelectableValue<CelValue> selectableValue =
getSelectableValueOrThrow(messageName, message, fieldName);
public Object hasField(Object message, String fieldName) {
SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

return selectableValue.find(StringValue.create(fieldName)).isPresent();
}

@SuppressWarnings("unchecked")
private SelectableValue<CelValue> getSelectableValueOrThrow(
String typeName, Object obj, String fieldName) {
private SelectableValue<CelValue> getSelectableValueOrThrow(Object obj, String fieldName) {
CelValue convertedCelValue;
if ((obj instanceof MessageLite)) {
convertedCelValue =
protoCelValueConverter.fromProtoMessageToCelValue(typeName, (MessageLite) obj);
convertedCelValue = protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) obj);
} else {
convertedCelValue = protoCelValueConverter.fromJavaObjectToCelValue(obj);
}
Expand All@@ -128,7 +124,7 @@ public Object adapt(String messageName, Object message) {

if (message instanceof MessageLite) {
return unwrapCelValue(
protoCelValueConverter.fromProtoMessageToCelValue(messageName, (MessageLite) message));
protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) message));
} else {
return unwrapCelValue(protoCelValueConverter.fromJavaObjectToCelValue(message));
}
Expand Down
14 changes: 4 additions & 10 deletions runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,7 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
@Override
public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
throws CelEvaluationException {
return eval(resolver,
lateBoundFunctionResolver,
CelEvaluationListener.noOpListener());
return eval(resolver, lateBoundFunctionResolver, CelEvaluationListener.noOpListener());
}

@Override
Expand DownExpand Up@@ -365,12 +363,10 @@ private IntermediateResult evalFieldSelect(
return IntermediateResult.create(attribute, operand);
}

CelType operandCheckedType = getCheckedTypeOrThrow(operandExpr);
if (isTestOnly) {
return IntermediateResult.create(
attribute, typeProvider.hasField(operandCheckedType.name(), operand, field));
return IntermediateResult.create(attribute, typeProvider.hasField(operand, field));
}
Object fieldValue = typeProvider.selectField(operandCheckedType.name(), operand, field);
Object fieldValue = typeProvider.selectField(operand, field);

return IntermediateResult.create(
attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
Expand DownExpand Up@@ -736,9 +732,7 @@ private Optional<IntermediateResult> maybeEvalOptionalSelectField(
}

String field = callExpr.args().get(1).constant().stringValue();
CelType checkedType = getCheckedTypeOrThrow(expr);
boolean hasField =
(boolean) typeProvider.hasField(checkedType.name(), lhsResult.value(), field);
boolean hasField = (boolean) typeProvider.hasField(lhsResult.value(), field);
if (!hasField) {
// Protobuf sets default (zero) values to uninitialized fields.
// In case of CEL's optional values, we want to explicitly return Optional.none()
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ public DescriptorMessageProvider(ProtoMessageFactory protoMessageFactory, CelOpt

@Override
@SuppressWarnings("unchecked")
public @Nullable Object selectField(String unusedTypeName, Object message, String fieldName) {
public @Nullable Object selectField(Object message, String fieldName) {
boolean isOptionalMessage = false;
if (message instanceof Optional) {
isOptionalMessage = true;
Expand DownExpand Up@@ -148,7 +148,7 @@ public Object adapt(String messageName, Object message) {
}

@Override
public Object hasField(String messageName, Object message, String fieldName) {
public Object hasField(Object message, String fieldName) {
if (message instanceof Optional<?>) {
Optional<?> optionalMessage = (Optional<?>) message;
if (!optionalMessage.isPresent()) {
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/MessageProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,10 +29,10 @@ public interface MessageProvider {
Object createMessage(String messageName, Map<String, Object> values);

/** Select field from message. */
Object selectField(String messageName, Object message, String fieldName);
Object selectField(Object message, String fieldName);

/** Check whether a field is set on message. */
Object hasField(String messageName, Object message, String fieldName);
Object hasField(Object message, String fieldName);

/** Adapt object to its message value with source location metadata on failure. */
Object adapt(String messageName, Object message);
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,12 +58,12 @@ public Object createMessage(String messageName, Map<String, Object> values) {
}

@Override
public Object selectField(String typeName, Object message, String fieldName) {
public Object selectField(Object message, String fieldName) {
return null;
}

@Override
public Object hasField(String messageName, Object message, String fieldName) {
public Object hasField(Object message, String fieldName) {
return null;
}

Expand Down
31 changes: 5 additions & 26 deletions runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,40 +140,24 @@ public void createMessage_badFieldError() {

@Test
public void hasField_mapKeyFound() {
assertThat(
provider.hasField(
TestAllTypes.getDescriptor().getFullName(),
ImmutableMap.of("hello", "world"),
"hello"))
.isEqualTo(true);
assertThat(provider.hasField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo(true);
}

@Test
public void hasField_mapKeyNotFound() {
assertThat(
provider.hasField(
TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"))
.isEqualTo(false);
assertThat(provider.hasField(ImmutableMap.of(), "hello")).isEqualTo(false);
}

@Test
public void selectField_mapKeyFound() {
assertThat(
provider.selectField(
TestAllTypes.getDescriptor().getFullName(),
ImmutableMap.of("hello", "world"),
"hello"))
.isEqualTo("world");
assertThat(provider.selectField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo("world");
}

@Test
public void selectField_mapKeyNotFound() {
CelRuntimeException e =
Assert.assertThrows(
CelRuntimeException.class,
() ->
provider.selectField(
TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"));
CelRuntimeException.class, () -> provider.selectField(ImmutableMap.of(), "hello"));
assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
}
Expand All@@ -182,7 +166,6 @@ public void selectField_mapKeyNotFound() {
public void selectField_unsetWrapperField() {
assertThat(
provider.selectField(
TestAllTypes.getDescriptor().getFullName(),
dev.cel.expr.conformance.proto3.TestAllTypes.getDefaultInstance(),
"single_int64_wrapper"))
.isEqualTo(NullValue.NULL_VALUE);
Expand All@@ -192,10 +175,7 @@ public void selectField_unsetWrapperField() {
public void selectField_nonProtoObjectError() {
CelRuntimeException e =
Assert.assertThrows(
CelRuntimeException.class,
() ->
provider.selectField(
TestAllTypes.getDescriptor().getFullName(), "hello", "not_a_field"));
CelRuntimeException.class, () -> provider.selectField("hello", "not_a_field"));
assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
}
Expand All@@ -214,7 +194,6 @@ public void selectField_extensionUsingDynamicTypes() {
long result =
(long)
provider.selectField(
TestAllTypes.getDescriptor().getFullName(),
TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 10).build(),
TestAllTypesProto.getDescriptor().getPackage() + ".int32_ext");

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
Remove extraneous protoTypeName argument from RuntimeTypeProvider interface#706

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

May 29, 2025
 Merged


Remove extraneous protoTypeName argument from RuntimeTypeProvider interface
#706
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


2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);
 public abstract CelValue fromProtoMessageToCelValue(MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
Expand Down

8 changes: 4 additions & 4 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@@ -57,12 +57,12 @@ public static ProtoCelValueConverter newInstance(
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String unusedProtoTypeName, MessageLite msg) {
 return fromProtoMessageToCelValue((MessageOrBuilder) msg);
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 return fromDescriptorMessageToCelValue((MessageOrBuilder) msg);
 }

 /** Adapts a Protobuf message into a {@link CelValue}. */
 public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 public CelValue fromDescriptorMessageToCelValue(MessageOrBuilder message) {
 Preconditions.checkNotNull(message);

 // Attempt to convert the proto from a dynamic message into a concrete message if possible.
Expand DownExpand Up@@ -151,7 +151,7 @@ public CelValue fromProtoMessageFieldToCelValue(
 return fromJavaObjectToCelValue(map);
 }

 return fromProtoMessageToCelValue((MessageOrBuilder) result);
 return fromDescriptorMessageToCelValue((MessageOrBuilder) result);
 case UINT32:
 return UintValue.create((int) result);
 case UINT64:
Expand Down

11 changes: 4 additions & 7 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,8 +157,7 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {

 Object defaultValue = getDefaultValue(fieldDescriptor);
 if (defaultValue instanceof MessageLite) {
 return fromProtoMessageToCelValue(
 fieldDescriptor.getFieldProtoTypeName(), (MessageLite) defaultValue);
 return fromProtoMessageToCelValue((MessageLite) defaultValue);
 }

 return fromJavaObjectToCelValue(defaultValue);
Expand DownExpand Up@@ -357,17 +356,15 @@ private static Object readUnknownField(int tagWireType, CodedInputStream inputSt
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 @SuppressWarnings("LiteProtoToString") // No alternative identifier to use. Debug only info is OK.
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor =
 descriptorPool
 .findDescriptor(msg)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Could not find a descriptor for: " + protoTypeName));
 () -> new NoSuchElementException("Could not find a descriptor for: " + msg));
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }

 MessageLite message = descriptor.newMessageBuilder().build();
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(structType, message));
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(message));
 }

 public static ProtoMessageLiteValueProvider newInstance(CelLiteDescriptor... descriptors) {
Expand Down

35 changes: 11 additions & 24 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
Expand All@@ -59,47 +58,36 @@ public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLit
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
"cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());
 TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BOOL(com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),
 FLOAT(FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(com.google.protobuf.DoubleValue.of(1.0), DoubleValue.create(1.0)),
 INT32(Int32Value.of(1), IntValue.create(1)),
 INT64(Int64Value.of(1L), IntValue.create(1L)),
 STRING(com.google.protobuf.StringValue.of("test"), StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 UINT32(UInt32Value.of(1), UintValue.create(1)),
 UINT64(UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 WellKnownProtoTestCase(MessageLite msg, CelValue celValue) {
 this.msg = msg;
 this.celValue = celValue;
 }
Expand All@@ -109,8 +97,7 @@ private enum WellKnownProtoTestCase {
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
Expand Down

20 changes: 8 additions & 12 deletions
runtime/src/main/java/dev/cel/runtime/CelValueRuntimeTypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ final class CelValueRuntimeTypeProvider implements RuntimeTypeProvider {
 private static final BaseProtoCelValueConverter DEFAULT_CEL_VALUE_CONVERTER =
 new BaseProtoCelValueConverter() {
 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 throw new UnsupportedOperationException(
 "A value provider must be provided in the runtime to handle protobuf messages");
 }
Expand DownExpand Up@@ -82,28 +82,24 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(typeName, message, fieldName);
 public Object selectField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return unwrapCelValue(selectableValue.select(StringValue.create(fieldName)));
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(messageName, message, fieldName);
 public Object hasField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return selectableValue.find(StringValue.create(fieldName)).isPresent();
 }

 @SuppressWarnings("unchecked")
 private SelectableValue<CelValue> getSelectableValueOrThrow(
 String typeName, Object obj, String fieldName) {
 private SelectableValue<CelValue> getSelectableValueOrThrow(Object obj, String fieldName) {
 CelValue convertedCelValue;
 if ((obj instanceof MessageLite)) {
 convertedCelValue =
 protoCelValueConverter.fromProtoMessageToCelValue(typeName, (MessageLite) obj);
 convertedCelValue = protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) obj);
 } else {
 convertedCelValue = protoCelValueConverter.fromJavaObjectToCelValue(obj);
 }
Expand All@@ -128,7 +124,7 @@ public Object adapt(String messageName, Object message) {

 if (message instanceof MessageLite) {
 return unwrapCelValue(
 protoCelValueConverter.fromProtoMessageToCelValue(messageName, (MessageLite) message));
 protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) message));
 } else {
 return unwrapCelValue(protoCelValueConverter.fromJavaObjectToCelValue(message));
 }
Expand Down

14 changes: 4 additions & 10 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,7 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 return eval(resolver, lateBoundFunctionResolver, CelEvaluationListener.noOpListener());
 }

 @Override
Expand DownExpand Up@@ -365,12 +363,10 @@ private IntermediateResult evalFieldSelect(
 return IntermediateResult.create(attribute, operand);
 }

 CelType operandCheckedType = getCheckedTypeOrThrow(operandExpr);
 if (isTestOnly) {
 return IntermediateResult.create(
 attribute, typeProvider.hasField(operandCheckedType.name(), operand, field));
 return IntermediateResult.create(attribute, typeProvider.hasField(operand, field));
 }
 Object fieldValue = typeProvider.selectField(operandCheckedType.name(), operand, field);
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
Expand DownExpand Up@@ -736,9 +732,7 @@ private Optional<IntermediateResult> maybeEvalOptionalSelectField(
 }

 String field = callExpr.args().get(1).constant().stringValue();
 CelType checkedType = getCheckedTypeOrThrow(expr);
 boolean hasField =
 (boolean) typeProvider.hasField(checkedType.name(), lhsResult.value(), field);
 boolean hasField = (boolean) typeProvider.hasField(lhsResult.value(), field);
 if (!hasField) {
 // Protobuf sets default (zero) values to uninitialized fields.
 // In case of CEL's optional values, we want to explicitly return Optional.none()
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ public DescriptorMessageProvider(ProtoMessageFactory protoMessageFactory, CelOpt

 @Override
 @SuppressWarnings("unchecked")
 public @Nullable Object selectField(String unusedTypeName, Object message, String fieldName) {
 public @Nullable Object selectField(Object message, String fieldName) {
 boolean isOptionalMessage = false;
 if (message instanceof Optional) {
 isOptionalMessage = true;
Expand DownExpand Up@@ -148,7 +148,7 @@ public Object adapt(String messageName, Object message) {
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 if (message instanceof Optional<?>) {
 Optional<?> optionalMessage = (Optional<?>) message;
 if (!optionalMessage.isPresent()) {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/MessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,10 +29,10 @@ public interface MessageProvider {
 Object createMessage(String messageName, Map<String, Object> values);

 /** Select field from message. */
 Object selectField(String messageName, Object message, String fieldName);
 Object selectField(Object message, String fieldName);

 /** Check whether a field is set on message. */
 Object hasField(String messageName, Object message, String fieldName);
 Object hasField(Object message, String fieldName);

 /** Adapt object to its message value with source location metadata on failure. */
 Object adapt(String messageName, Object message);
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,12 +58,12 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 public Object selectField(Object message, String fieldName) {
 return null;
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 return null;
 }

Expand Down

31 changes: 5 additions & 26 deletions
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,40 +140,24 @@ public void createMessage_badFieldError() {

 @Test
 public void hasField_mapKeyFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo(true);
 assertThat(provider.hasField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo(true);
 }

 @Test
 public void hasField_mapKeyNotFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"))
 .isEqualTo(false);
 assertThat(provider.hasField(ImmutableMap.of(), "hello")).isEqualTo(false);
 }

 @Test
 public void selectField_mapKeyFound() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo("world");
 assertThat(provider.selectField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo("world");
 }

 @Test
 public void selectField_mapKeyNotFound() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"));
 CelRuntimeException.class, () -> provider.selectField(ImmutableMap.of(), "hello"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -182,7 +166,6 @@ public void selectField_mapKeyNotFound() {
 public void selectField_unsetWrapperField() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 dev.cel.expr.conformance.proto3.TestAllTypes.getDefaultInstance(),
 "single_int64_wrapper"))
 .isEqualTo(NullValue.NULL_VALUE);
Expand All@@ -192,10 +175,7 @@ public void selectField_unsetWrapperField() {
 public void selectField_nonProtoObjectError() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), "hello", "not_a_field"));
 CelRuntimeException.class, () -> provider.selectField("hello", "not_a_field"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -214,7 +194,6 @@ public void selectField_extensionUsingDynamicTypes() {
 long result =
 (long)
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 10).build(),
 TestAllTypesProto.getDescriptor().getPackage() + ".int32_ext");

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
Remove extraneous protoTypeName argument from RuntimeTypeProvider interface#706

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

May 29, 2025
 Merged


Remove extraneous protoTypeName argument from RuntimeTypeProvider interface
#706
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


2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);
 public abstract CelValue fromProtoMessageToCelValue(MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
Expand Down

8 changes: 4 additions & 4 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@@ -57,12 +57,12 @@ public static ProtoCelValueConverter newInstance(
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String unusedProtoTypeName, MessageLite msg) {
 return fromProtoMessageToCelValue((MessageOrBuilder) msg);
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 return fromDescriptorMessageToCelValue((MessageOrBuilder) msg);
 }

 /** Adapts a Protobuf message into a {@link CelValue}. */
 public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 public CelValue fromDescriptorMessageToCelValue(MessageOrBuilder message) {
 Preconditions.checkNotNull(message);

 // Attempt to convert the proto from a dynamic message into a concrete message if possible.
Expand DownExpand Up@@ -151,7 +151,7 @@ public CelValue fromProtoMessageFieldToCelValue(
 return fromJavaObjectToCelValue(map);
 }

 return fromProtoMessageToCelValue((MessageOrBuilder) result);
 return fromDescriptorMessageToCelValue((MessageOrBuilder) result);
 case UINT32:
 return UintValue.create((int) result);
 case UINT64:
Expand Down

11 changes: 4 additions & 7 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,8 +157,7 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {

 Object defaultValue = getDefaultValue(fieldDescriptor);
 if (defaultValue instanceof MessageLite) {
 return fromProtoMessageToCelValue(
 fieldDescriptor.getFieldProtoTypeName(), (MessageLite) defaultValue);
 return fromProtoMessageToCelValue((MessageLite) defaultValue);
 }

 return fromJavaObjectToCelValue(defaultValue);
Expand DownExpand Up@@ -357,17 +356,15 @@ private static Object readUnknownField(int tagWireType, CodedInputStream inputSt
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 @SuppressWarnings("LiteProtoToString") // No alternative identifier to use. Debug only info is OK.
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor =
 descriptorPool
 .findDescriptor(msg)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Could not find a descriptor for: " + protoTypeName));
 () -> new NoSuchElementException("Could not find a descriptor for: " + msg));
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }

 MessageLite message = descriptor.newMessageBuilder().build();
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(structType, message));
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(message));
 }

 public static ProtoMessageLiteValueProvider newInstance(CelLiteDescriptor... descriptors) {
Expand Down

35 changes: 11 additions & 24 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
Expand All@@ -59,47 +58,36 @@ public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLit
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
"cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());
 TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BOOL(com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),
 FLOAT(FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(com.google.protobuf.DoubleValue.of(1.0), DoubleValue.create(1.0)),
 INT32(Int32Value.of(1), IntValue.create(1)),
 INT64(Int64Value.of(1L), IntValue.create(1L)),
 STRING(com.google.protobuf.StringValue.of("test"), StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 UINT32(UInt32Value.of(1), UintValue.create(1)),
 UINT64(UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 WellKnownProtoTestCase(MessageLite msg, CelValue celValue) {
 this.msg = msg;
 this.celValue = celValue;
 }
Expand All@@ -109,8 +97,7 @@ private enum WellKnownProtoTestCase {
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
Expand Down

20 changes: 8 additions & 12 deletions
runtime/src/main/java/dev/cel/runtime/CelValueRuntimeTypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ final class CelValueRuntimeTypeProvider implements RuntimeTypeProvider {
 private static final BaseProtoCelValueConverter DEFAULT_CEL_VALUE_CONVERTER =
 new BaseProtoCelValueConverter() {
 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 throw new UnsupportedOperationException(
 "A value provider must be provided in the runtime to handle protobuf messages");
 }
Expand DownExpand Up@@ -82,28 +82,24 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(typeName, message, fieldName);
 public Object selectField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return unwrapCelValue(selectableValue.select(StringValue.create(fieldName)));
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(messageName, message, fieldName);
 public Object hasField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return selectableValue.find(StringValue.create(fieldName)).isPresent();
 }

 @SuppressWarnings("unchecked")
 private SelectableValue<CelValue> getSelectableValueOrThrow(
 String typeName, Object obj, String fieldName) {
 private SelectableValue<CelValue> getSelectableValueOrThrow(Object obj, String fieldName) {
 CelValue convertedCelValue;
 if ((obj instanceof MessageLite)) {
 convertedCelValue =
 protoCelValueConverter.fromProtoMessageToCelValue(typeName, (MessageLite) obj);
 convertedCelValue = protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) obj);
 } else {
 convertedCelValue = protoCelValueConverter.fromJavaObjectToCelValue(obj);
 }
Expand All@@ -128,7 +124,7 @@ public Object adapt(String messageName, Object message) {

 if (message instanceof MessageLite) {
 return unwrapCelValue(
 protoCelValueConverter.fromProtoMessageToCelValue(messageName, (MessageLite) message));
 protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) message));
 } else {
 return unwrapCelValue(protoCelValueConverter.fromJavaObjectToCelValue(message));
 }
Expand Down

14 changes: 4 additions & 10 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,7 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 return eval(resolver, lateBoundFunctionResolver, CelEvaluationListener.noOpListener());
 }

 @Override
Expand DownExpand Up@@ -365,12 +363,10 @@ private IntermediateResult evalFieldSelect(
 return IntermediateResult.create(attribute, operand);
 }

 CelType operandCheckedType = getCheckedTypeOrThrow(operandExpr);
 if (isTestOnly) {
 return IntermediateResult.create(
 attribute, typeProvider.hasField(operandCheckedType.name(), operand, field));
 return IntermediateResult.create(attribute, typeProvider.hasField(operand, field));
 }
 Object fieldValue = typeProvider.selectField(operandCheckedType.name(), operand, field);
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
Expand DownExpand Up@@ -736,9 +732,7 @@ private Optional<IntermediateResult> maybeEvalOptionalSelectField(
 }

 String field = callExpr.args().get(1).constant().stringValue();
 CelType checkedType = getCheckedTypeOrThrow(expr);
 boolean hasField =
 (boolean) typeProvider.hasField(checkedType.name(), lhsResult.value(), field);
 boolean hasField = (boolean) typeProvider.hasField(lhsResult.value(), field);
 if (!hasField) {
 // Protobuf sets default (zero) values to uninitialized fields.
 // In case of CEL's optional values, we want to explicitly return Optional.none()
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ public DescriptorMessageProvider(ProtoMessageFactory protoMessageFactory, CelOpt

 @Override
 @SuppressWarnings("unchecked")
 public @Nullable Object selectField(String unusedTypeName, Object message, String fieldName) {
 public @Nullable Object selectField(Object message, String fieldName) {
 boolean isOptionalMessage = false;
 if (message instanceof Optional) {
 isOptionalMessage = true;
Expand DownExpand Up@@ -148,7 +148,7 @@ public Object adapt(String messageName, Object message) {
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 if (message instanceof Optional<?>) {
 Optional<?> optionalMessage = (Optional<?>) message;
 if (!optionalMessage.isPresent()) {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/MessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,10 +29,10 @@ public interface MessageProvider {
 Object createMessage(String messageName, Map<String, Object> values);

 /** Select field from message. */
 Object selectField(String messageName, Object message, String fieldName);
 Object selectField(Object message, String fieldName);

 /** Check whether a field is set on message. */
 Object hasField(String messageName, Object message, String fieldName);
 Object hasField(Object message, String fieldName);

 /** Adapt object to its message value with source location metadata on failure. */
 Object adapt(String messageName, Object message);
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,12 +58,12 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 public Object selectField(Object message, String fieldName) {
 return null;
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 return null;
 }

Expand Down

31 changes: 5 additions & 26 deletions
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,40 +140,24 @@ public void createMessage_badFieldError() {

 @Test
 public void hasField_mapKeyFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo(true);
 assertThat(provider.hasField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo(true);
 }

 @Test
 public void hasField_mapKeyNotFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"))
 .isEqualTo(false);
 assertThat(provider.hasField(ImmutableMap.of(), "hello")).isEqualTo(false);
 }

 @Test
 public void selectField_mapKeyFound() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo("world");
 assertThat(provider.selectField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo("world");
 }

 @Test
 public void selectField_mapKeyNotFound() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"));
 CelRuntimeException.class, () -> provider.selectField(ImmutableMap.of(), "hello"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -182,7 +166,6 @@ public void selectField_mapKeyNotFound() {
 public void selectField_unsetWrapperField() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 dev.cel.expr.conformance.proto3.TestAllTypes.getDefaultInstance(),
 "single_int64_wrapper"))
 .isEqualTo(NullValue.NULL_VALUE);
Expand All@@ -192,10 +175,7 @@ public void selectField_unsetWrapperField() {
 public void selectField_nonProtoObjectError() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), "hello", "not_a_field"));
 CelRuntimeException.class, () -> provider.selectField("hello", "not_a_field"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -214,7 +194,6 @@ public void selectField_extensionUsingDynamicTypes() {
 long result =
 (long)
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 10).build(),
 TestAllTypesProto.getDescriptor().getPackage() + ".int32_ext");

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
Remove extraneous protoTypeName argument from RuntimeTypeProvider interface#706

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

May 29, 2025
 Merged


Remove extraneous protoTypeName argument from RuntimeTypeProvider interface
#706
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


2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);
 public abstract CelValue fromProtoMessageToCelValue(MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
Expand Down

8 changes: 4 additions & 4 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@@ -57,12 +57,12 @@ public static ProtoCelValueConverter newInstance(
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String unusedProtoTypeName, MessageLite msg) {
 return fromProtoMessageToCelValue((MessageOrBuilder) msg);
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 return fromDescriptorMessageToCelValue((MessageOrBuilder) msg);
 }

 /** Adapts a Protobuf message into a {@link CelValue}. */
 public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 public CelValue fromDescriptorMessageToCelValue(MessageOrBuilder message) {
 Preconditions.checkNotNull(message);

 // Attempt to convert the proto from a dynamic message into a concrete message if possible.
Expand DownExpand Up@@ -151,7 +151,7 @@ public CelValue fromProtoMessageFieldToCelValue(
 return fromJavaObjectToCelValue(map);
 }

 return fromProtoMessageToCelValue((MessageOrBuilder) result);
 return fromDescriptorMessageToCelValue((MessageOrBuilder) result);
 case UINT32:
 return UintValue.create((int) result);
 case UINT64:
Expand Down

11 changes: 4 additions & 7 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,8 +157,7 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {

 Object defaultValue = getDefaultValue(fieldDescriptor);
 if (defaultValue instanceof MessageLite) {
 return fromProtoMessageToCelValue(
 fieldDescriptor.getFieldProtoTypeName(), (MessageLite) defaultValue);
 return fromProtoMessageToCelValue((MessageLite) defaultValue);
 }

 return fromJavaObjectToCelValue(defaultValue);
Expand DownExpand Up@@ -357,17 +356,15 @@ private static Object readUnknownField(int tagWireType, CodedInputStream inputSt
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 @SuppressWarnings("LiteProtoToString") // No alternative identifier to use. Debug only info is OK.
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor =
 descriptorPool
 .findDescriptor(msg)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Could not find a descriptor for: " + protoTypeName));
 () -> new NoSuchElementException("Could not find a descriptor for: " + msg));
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }

 MessageLite message = descriptor.newMessageBuilder().build();
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(structType, message));
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(message));
 }

 public static ProtoMessageLiteValueProvider newInstance(CelLiteDescriptor... descriptors) {
Expand Down

35 changes: 11 additions & 24 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
Expand All@@ -59,47 +58,36 @@ public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLit
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
"cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());
 TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BOOL(com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),
 FLOAT(FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(com.google.protobuf.DoubleValue.of(1.0), DoubleValue.create(1.0)),
 INT32(Int32Value.of(1), IntValue.create(1)),
 INT64(Int64Value.of(1L), IntValue.create(1L)),
 STRING(com.google.protobuf.StringValue.of("test"), StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 UINT32(UInt32Value.of(1), UintValue.create(1)),
 UINT64(UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 WellKnownProtoTestCase(MessageLite msg, CelValue celValue) {
 this.msg = msg;
 this.celValue = celValue;
 }
Expand All@@ -109,8 +97,7 @@ private enum WellKnownProtoTestCase {
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
Expand Down

20 changes: 8 additions & 12 deletions
runtime/src/main/java/dev/cel/runtime/CelValueRuntimeTypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ final class CelValueRuntimeTypeProvider implements RuntimeTypeProvider {
 private static final BaseProtoCelValueConverter DEFAULT_CEL_VALUE_CONVERTER =
 new BaseProtoCelValueConverter() {
 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 throw new UnsupportedOperationException(
 "A value provider must be provided in the runtime to handle protobuf messages");
 }
Expand DownExpand Up@@ -82,28 +82,24 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(typeName, message, fieldName);
 public Object selectField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return unwrapCelValue(selectableValue.select(StringValue.create(fieldName)));
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(messageName, message, fieldName);
 public Object hasField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return selectableValue.find(StringValue.create(fieldName)).isPresent();
 }

 @SuppressWarnings("unchecked")
 private SelectableValue<CelValue> getSelectableValueOrThrow(
 String typeName, Object obj, String fieldName) {
 private SelectableValue<CelValue> getSelectableValueOrThrow(Object obj, String fieldName) {
 CelValue convertedCelValue;
 if ((obj instanceof MessageLite)) {
 convertedCelValue =
 protoCelValueConverter.fromProtoMessageToCelValue(typeName, (MessageLite) obj);
 convertedCelValue = protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) obj);
 } else {
 convertedCelValue = protoCelValueConverter.fromJavaObjectToCelValue(obj);
 }
Expand All@@ -128,7 +124,7 @@ public Object adapt(String messageName, Object message) {

 if (message instanceof MessageLite) {
 return unwrapCelValue(
 protoCelValueConverter.fromProtoMessageToCelValue(messageName, (MessageLite) message));
 protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) message));
 } else {
 return unwrapCelValue(protoCelValueConverter.fromJavaObjectToCelValue(message));
 }
Expand Down

14 changes: 4 additions & 10 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,7 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 return eval(resolver, lateBoundFunctionResolver, CelEvaluationListener.noOpListener());
 }

 @Override
Expand DownExpand Up@@ -365,12 +363,10 @@ private IntermediateResult evalFieldSelect(
 return IntermediateResult.create(attribute, operand);
 }

 CelType operandCheckedType = getCheckedTypeOrThrow(operandExpr);
 if (isTestOnly) {
 return IntermediateResult.create(
 attribute, typeProvider.hasField(operandCheckedType.name(), operand, field));
 return IntermediateResult.create(attribute, typeProvider.hasField(operand, field));
 }
 Object fieldValue = typeProvider.selectField(operandCheckedType.name(), operand, field);
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
Expand DownExpand Up@@ -736,9 +732,7 @@ private Optional<IntermediateResult> maybeEvalOptionalSelectField(
 }

 String field = callExpr.args().get(1).constant().stringValue();
 CelType checkedType = getCheckedTypeOrThrow(expr);
 boolean hasField =
 (boolean) typeProvider.hasField(checkedType.name(), lhsResult.value(), field);
 boolean hasField = (boolean) typeProvider.hasField(lhsResult.value(), field);
 if (!hasField) {
 // Protobuf sets default (zero) values to uninitialized fields.
 // In case of CEL's optional values, we want to explicitly return Optional.none()
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ public DescriptorMessageProvider(ProtoMessageFactory protoMessageFactory, CelOpt

 @Override
 @SuppressWarnings("unchecked")
 public @Nullable Object selectField(String unusedTypeName, Object message, String fieldName) {
 public @Nullable Object selectField(Object message, String fieldName) {
 boolean isOptionalMessage = false;
 if (message instanceof Optional) {
 isOptionalMessage = true;
Expand DownExpand Up@@ -148,7 +148,7 @@ public Object adapt(String messageName, Object message) {
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 if (message instanceof Optional<?>) {
 Optional<?> optionalMessage = (Optional<?>) message;
 if (!optionalMessage.isPresent()) {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/MessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,10 +29,10 @@ public interface MessageProvider {
 Object createMessage(String messageName, Map<String, Object> values);

 /** Select field from message. */
 Object selectField(String messageName, Object message, String fieldName);
 Object selectField(Object message, String fieldName);

 /** Check whether a field is set on message. */
 Object hasField(String messageName, Object message, String fieldName);
 Object hasField(Object message, String fieldName);

 /** Adapt object to its message value with source location metadata on failure. */
 Object adapt(String messageName, Object message);
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,12 +58,12 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 public Object selectField(Object message, String fieldName) {
 return null;
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 return null;
 }

Expand Down

31 changes: 5 additions & 26 deletions
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,40 +140,24 @@ public void createMessage_badFieldError() {

 @Test
 public void hasField_mapKeyFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo(true);
 assertThat(provider.hasField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo(true);
 }

 @Test
 public void hasField_mapKeyNotFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"))
 .isEqualTo(false);
 assertThat(provider.hasField(ImmutableMap.of(), "hello")).isEqualTo(false);
 }

 @Test
 public void selectField_mapKeyFound() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo("world");
 assertThat(provider.selectField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo("world");
 }

 @Test
 public void selectField_mapKeyNotFound() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"));
 CelRuntimeException.class, () -> provider.selectField(ImmutableMap.of(), "hello"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -182,7 +166,6 @@ public void selectField_mapKeyNotFound() {
 public void selectField_unsetWrapperField() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 dev.cel.expr.conformance.proto3.TestAllTypes.getDefaultInstance(),
 "single_int64_wrapper"))
 .isEqualTo(NullValue.NULL_VALUE);
Expand All@@ -192,10 +175,7 @@ public void selectField_unsetWrapperField() {
 public void selectField_nonProtoObjectError() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), "hello", "not_a_field"));
 CelRuntimeException.class, () -> provider.selectField("hello", "not_a_field"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -214,7 +194,6 @@ public void selectField_extensionUsingDynamicTypes() {
 long result =
 (long)
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 10).build(),
 TestAllTypesProto.getDescriptor().getPackage() + ".int32_ext");

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
Remove extraneous protoTypeName argument from RuntimeTypeProvider interface#706

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

May 29, 2025
 Merged


Remove extraneous protoTypeName argument from RuntimeTypeProvider interface
#706
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


2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);
 public abstract CelValue fromProtoMessageToCelValue(MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
Expand Down

8 changes: 4 additions & 4 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@@ -57,12 +57,12 @@ public static ProtoCelValueConverter newInstance(
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String unusedProtoTypeName, MessageLite msg) {
 return fromProtoMessageToCelValue((MessageOrBuilder) msg);
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 return fromDescriptorMessageToCelValue((MessageOrBuilder) msg);
 }

 /** Adapts a Protobuf message into a {@link CelValue}. */
 public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 public CelValue fromDescriptorMessageToCelValue(MessageOrBuilder message) {
 Preconditions.checkNotNull(message);

 // Attempt to convert the proto from a dynamic message into a concrete message if possible.
Expand DownExpand Up@@ -151,7 +151,7 @@ public CelValue fromProtoMessageFieldToCelValue(
 return fromJavaObjectToCelValue(map);
 }

 return fromProtoMessageToCelValue((MessageOrBuilder) result);
 return fromDescriptorMessageToCelValue((MessageOrBuilder) result);
 case UINT32:
 return UintValue.create((int) result);
 case UINT64:
Expand Down

11 changes: 4 additions & 7 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,8 +157,7 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {

 Object defaultValue = getDefaultValue(fieldDescriptor);
 if (defaultValue instanceof MessageLite) {
 return fromProtoMessageToCelValue(
 fieldDescriptor.getFieldProtoTypeName(), (MessageLite) defaultValue);
 return fromProtoMessageToCelValue((MessageLite) defaultValue);
 }

 return fromJavaObjectToCelValue(defaultValue);
Expand DownExpand Up@@ -357,17 +356,15 @@ private static Object readUnknownField(int tagWireType, CodedInputStream inputSt
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 @SuppressWarnings("LiteProtoToString") // No alternative identifier to use. Debug only info is OK.
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor =
 descriptorPool
 .findDescriptor(msg)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Could not find a descriptor for: " + protoTypeName));
 () -> new NoSuchElementException("Could not find a descriptor for: " + msg));
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }

 MessageLite message = descriptor.newMessageBuilder().build();
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(structType, message));
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(message));
 }

 public static ProtoMessageLiteValueProvider newInstance(CelLiteDescriptor... descriptors) {
Expand Down

35 changes: 11 additions & 24 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
Expand All@@ -59,47 +58,36 @@ public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLit
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
"cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());
 TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BOOL(com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),
 FLOAT(FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(com.google.protobuf.DoubleValue.of(1.0), DoubleValue.create(1.0)),
 INT32(Int32Value.of(1), IntValue.create(1)),
 INT64(Int64Value.of(1L), IntValue.create(1L)),
 STRING(com.google.protobuf.StringValue.of("test"), StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 UINT32(UInt32Value.of(1), UintValue.create(1)),
 UINT64(UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 WellKnownProtoTestCase(MessageLite msg, CelValue celValue) {
 this.msg = msg;
 this.celValue = celValue;
 }
Expand All@@ -109,8 +97,7 @@ private enum WellKnownProtoTestCase {
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
Expand Down

20 changes: 8 additions & 12 deletions
runtime/src/main/java/dev/cel/runtime/CelValueRuntimeTypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ final class CelValueRuntimeTypeProvider implements RuntimeTypeProvider {
 private static final BaseProtoCelValueConverter DEFAULT_CEL_VALUE_CONVERTER =
 new BaseProtoCelValueConverter() {
 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 throw new UnsupportedOperationException(
 "A value provider must be provided in the runtime to handle protobuf messages");
 }
Expand DownExpand Up@@ -82,28 +82,24 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(typeName, message, fieldName);
 public Object selectField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return unwrapCelValue(selectableValue.select(StringValue.create(fieldName)));
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(messageName, message, fieldName);
 public Object hasField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return selectableValue.find(StringValue.create(fieldName)).isPresent();
 }

 @SuppressWarnings("unchecked")
 private SelectableValue<CelValue> getSelectableValueOrThrow(
 String typeName, Object obj, String fieldName) {
 private SelectableValue<CelValue> getSelectableValueOrThrow(Object obj, String fieldName) {
 CelValue convertedCelValue;
 if ((obj instanceof MessageLite)) {
 convertedCelValue =
 protoCelValueConverter.fromProtoMessageToCelValue(typeName, (MessageLite) obj);
 convertedCelValue = protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) obj);
 } else {
 convertedCelValue = protoCelValueConverter.fromJavaObjectToCelValue(obj);
 }
Expand All@@ -128,7 +124,7 @@ public Object adapt(String messageName, Object message) {

 if (message instanceof MessageLite) {
 return unwrapCelValue(
 protoCelValueConverter.fromProtoMessageToCelValue(messageName, (MessageLite) message));
 protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) message));
 } else {
 return unwrapCelValue(protoCelValueConverter.fromJavaObjectToCelValue(message));
 }
Expand Down

14 changes: 4 additions & 10 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,7 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 return eval(resolver, lateBoundFunctionResolver, CelEvaluationListener.noOpListener());
 }

 @Override
Expand DownExpand Up@@ -365,12 +363,10 @@ private IntermediateResult evalFieldSelect(
 return IntermediateResult.create(attribute, operand);
 }

 CelType operandCheckedType = getCheckedTypeOrThrow(operandExpr);
 if (isTestOnly) {
 return IntermediateResult.create(
 attribute, typeProvider.hasField(operandCheckedType.name(), operand, field));
 return IntermediateResult.create(attribute, typeProvider.hasField(operand, field));
 }
 Object fieldValue = typeProvider.selectField(operandCheckedType.name(), operand, field);
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
Expand DownExpand Up@@ -736,9 +732,7 @@ private Optional<IntermediateResult> maybeEvalOptionalSelectField(
 }

 String field = callExpr.args().get(1).constant().stringValue();
 CelType checkedType = getCheckedTypeOrThrow(expr);
 boolean hasField =
 (boolean) typeProvider.hasField(checkedType.name(), lhsResult.value(), field);
 boolean hasField = (boolean) typeProvider.hasField(lhsResult.value(), field);
 if (!hasField) {
 // Protobuf sets default (zero) values to uninitialized fields.
 // In case of CEL's optional values, we want to explicitly return Optional.none()
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ public DescriptorMessageProvider(ProtoMessageFactory protoMessageFactory, CelOpt

 @Override
 @SuppressWarnings("unchecked")
 public @Nullable Object selectField(String unusedTypeName, Object message, String fieldName) {
 public @Nullable Object selectField(Object message, String fieldName) {
 boolean isOptionalMessage = false;
 if (message instanceof Optional) {
 isOptionalMessage = true;
Expand DownExpand Up@@ -148,7 +148,7 @@ public Object adapt(String messageName, Object message) {
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 if (message instanceof Optional<?>) {
 Optional<?> optionalMessage = (Optional<?>) message;
 if (!optionalMessage.isPresent()) {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/MessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,10 +29,10 @@ public interface MessageProvider {
 Object createMessage(String messageName, Map<String, Object> values);

 /** Select field from message. */
 Object selectField(String messageName, Object message, String fieldName);
 Object selectField(Object message, String fieldName);

 /** Check whether a field is set on message. */
 Object hasField(String messageName, Object message, String fieldName);
 Object hasField(Object message, String fieldName);

 /** Adapt object to its message value with source location metadata on failure. */
 Object adapt(String messageName, Object message);
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,12 +58,12 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 public Object selectField(Object message, String fieldName) {
 return null;
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 return null;
 }

Expand Down

31 changes: 5 additions & 26 deletions
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,40 +140,24 @@ public void createMessage_badFieldError() {

 @Test
 public void hasField_mapKeyFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo(true);
 assertThat(provider.hasField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo(true);
 }

 @Test
 public void hasField_mapKeyNotFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"))
 .isEqualTo(false);
 assertThat(provider.hasField(ImmutableMap.of(), "hello")).isEqualTo(false);
 }

 @Test
 public void selectField_mapKeyFound() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo("world");
 assertThat(provider.selectField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo("world");
 }

 @Test
 public void selectField_mapKeyNotFound() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"));
 CelRuntimeException.class, () -> provider.selectField(ImmutableMap.of(), "hello"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -182,7 +166,6 @@ public void selectField_mapKeyNotFound() {
 public void selectField_unsetWrapperField() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 dev.cel.expr.conformance.proto3.TestAllTypes.getDefaultInstance(),
 "single_int64_wrapper"))
 .isEqualTo(NullValue.NULL_VALUE);
Expand All@@ -192,10 +175,7 @@ public void selectField_unsetWrapperField() {
 public void selectField_nonProtoObjectError() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), "hello", "not_a_field"));
 CelRuntimeException.class, () -> provider.selectField("hello", "not_a_field"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -214,7 +194,6 @@ public void selectField_extensionUsingDynamicTypes() {
 long result =
 (long)
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 10).build(),
 TestAllTypesProto.getDescriptor().getPackage() + ".int32_ext");

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
Remove extraneous protoTypeName argument from RuntimeTypeProvider interface#706

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

May 29, 2025
 Merged


Remove extraneous protoTypeName argument from RuntimeTypeProvider interface
#706
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


2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);
 public abstract CelValue fromProtoMessageToCelValue(MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
Expand Down

8 changes: 4 additions & 4 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@@ -57,12 +57,12 @@ public static ProtoCelValueConverter newInstance(
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String unusedProtoTypeName, MessageLite msg) {
 return fromProtoMessageToCelValue((MessageOrBuilder) msg);
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 return fromDescriptorMessageToCelValue((MessageOrBuilder) msg);
 }

 /** Adapts a Protobuf message into a {@link CelValue}. */
 public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 public CelValue fromDescriptorMessageToCelValue(MessageOrBuilder message) {
 Preconditions.checkNotNull(message);

 // Attempt to convert the proto from a dynamic message into a concrete message if possible.
Expand DownExpand Up@@ -151,7 +151,7 @@ public CelValue fromProtoMessageFieldToCelValue(
 return fromJavaObjectToCelValue(map);
 }

 return fromProtoMessageToCelValue((MessageOrBuilder) result);
 return fromDescriptorMessageToCelValue((MessageOrBuilder) result);
 case UINT32:
 return UintValue.create((int) result);
 case UINT64:
Expand Down

11 changes: 4 additions & 7 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,8 +157,7 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {

 Object defaultValue = getDefaultValue(fieldDescriptor);
 if (defaultValue instanceof MessageLite) {
 return fromProtoMessageToCelValue(
 fieldDescriptor.getFieldProtoTypeName(), (MessageLite) defaultValue);
 return fromProtoMessageToCelValue((MessageLite) defaultValue);
 }

 return fromJavaObjectToCelValue(defaultValue);
Expand DownExpand Up@@ -357,17 +356,15 @@ private static Object readUnknownField(int tagWireType, CodedInputStream inputSt
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 @SuppressWarnings("LiteProtoToString") // No alternative identifier to use. Debug only info is OK.
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor =
 descriptorPool
 .findDescriptor(msg)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Could not find a descriptor for: " + protoTypeName));
 () -> new NoSuchElementException("Could not find a descriptor for: " + msg));
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }

 MessageLite message = descriptor.newMessageBuilder().build();
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(structType, message));
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(message));
 }

 public static ProtoMessageLiteValueProvider newInstance(CelLiteDescriptor... descriptors) {
Expand Down

35 changes: 11 additions & 24 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
Expand All@@ -59,47 +58,36 @@ public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLit
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
"cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());
 TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BOOL(com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),
 FLOAT(FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(com.google.protobuf.DoubleValue.of(1.0), DoubleValue.create(1.0)),
 INT32(Int32Value.of(1), IntValue.create(1)),
 INT64(Int64Value.of(1L), IntValue.create(1L)),
 STRING(com.google.protobuf.StringValue.of("test"), StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 UINT32(UInt32Value.of(1), UintValue.create(1)),
 UINT64(UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 WellKnownProtoTestCase(MessageLite msg, CelValue celValue) {
 this.msg = msg;
 this.celValue = celValue;
 }
Expand All@@ -109,8 +97,7 @@ private enum WellKnownProtoTestCase {
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
Expand Down

20 changes: 8 additions & 12 deletions
runtime/src/main/java/dev/cel/runtime/CelValueRuntimeTypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ final class CelValueRuntimeTypeProvider implements RuntimeTypeProvider {
 private static final BaseProtoCelValueConverter DEFAULT_CEL_VALUE_CONVERTER =
 new BaseProtoCelValueConverter() {
 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 throw new UnsupportedOperationException(
 "A value provider must be provided in the runtime to handle protobuf messages");
 }
Expand DownExpand Up@@ -82,28 +82,24 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(typeName, message, fieldName);
 public Object selectField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return unwrapCelValue(selectableValue.select(StringValue.create(fieldName)));
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(messageName, message, fieldName);
 public Object hasField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return selectableValue.find(StringValue.create(fieldName)).isPresent();
 }

 @SuppressWarnings("unchecked")
 private SelectableValue<CelValue> getSelectableValueOrThrow(
 String typeName, Object obj, String fieldName) {
 private SelectableValue<CelValue> getSelectableValueOrThrow(Object obj, String fieldName) {
 CelValue convertedCelValue;
 if ((obj instanceof MessageLite)) {
 convertedCelValue =
 protoCelValueConverter.fromProtoMessageToCelValue(typeName, (MessageLite) obj);
 convertedCelValue = protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) obj);
 } else {
 convertedCelValue = protoCelValueConverter.fromJavaObjectToCelValue(obj);
 }
Expand All@@ -128,7 +124,7 @@ public Object adapt(String messageName, Object message) {

 if (message instanceof MessageLite) {
 return unwrapCelValue(
 protoCelValueConverter.fromProtoMessageToCelValue(messageName, (MessageLite) message));
 protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) message));
 } else {
 return unwrapCelValue(protoCelValueConverter.fromJavaObjectToCelValue(message));
 }
Expand Down

14 changes: 4 additions & 10 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,7 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 return eval(resolver, lateBoundFunctionResolver, CelEvaluationListener.noOpListener());
 }

 @Override
Expand DownExpand Up@@ -365,12 +363,10 @@ private IntermediateResult evalFieldSelect(
 return IntermediateResult.create(attribute, operand);
 }

 CelType operandCheckedType = getCheckedTypeOrThrow(operandExpr);
 if (isTestOnly) {
 return IntermediateResult.create(
 attribute, typeProvider.hasField(operandCheckedType.name(), operand, field));
 return IntermediateResult.create(attribute, typeProvider.hasField(operand, field));
 }
 Object fieldValue = typeProvider.selectField(operandCheckedType.name(), operand, field);
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
Expand DownExpand Up@@ -736,9 +732,7 @@ private Optional<IntermediateResult> maybeEvalOptionalSelectField(
 }

 String field = callExpr.args().get(1).constant().stringValue();
 CelType checkedType = getCheckedTypeOrThrow(expr);
 boolean hasField =
 (boolean) typeProvider.hasField(checkedType.name(), lhsResult.value(), field);
 boolean hasField = (boolean) typeProvider.hasField(lhsResult.value(), field);
 if (!hasField) {
 // Protobuf sets default (zero) values to uninitialized fields.
 // In case of CEL's optional values, we want to explicitly return Optional.none()
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ public DescriptorMessageProvider(ProtoMessageFactory protoMessageFactory, CelOpt

 @Override
 @SuppressWarnings("unchecked")
 public @Nullable Object selectField(String unusedTypeName, Object message, String fieldName) {
 public @Nullable Object selectField(Object message, String fieldName) {
 boolean isOptionalMessage = false;
 if (message instanceof Optional) {
 isOptionalMessage = true;
Expand DownExpand Up@@ -148,7 +148,7 @@ public Object adapt(String messageName, Object message) {
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 if (message instanceof Optional<?>) {
 Optional<?> optionalMessage = (Optional<?>) message;
 if (!optionalMessage.isPresent()) {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/MessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,10 +29,10 @@ public interface MessageProvider {
 Object createMessage(String messageName, Map<String, Object> values);

 /** Select field from message. */
 Object selectField(String messageName, Object message, String fieldName);
 Object selectField(Object message, String fieldName);

 /** Check whether a field is set on message. */
 Object hasField(String messageName, Object message, String fieldName);
 Object hasField(Object message, String fieldName);

 /** Adapt object to its message value with source location metadata on failure. */
 Object adapt(String messageName, Object message);
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,12 +58,12 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 public Object selectField(Object message, String fieldName) {
 return null;
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 return null;
 }

Expand Down

31 changes: 5 additions & 26 deletions
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,40 +140,24 @@ public void createMessage_badFieldError() {

 @Test
 public void hasField_mapKeyFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo(true);
 assertThat(provider.hasField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo(true);
 }

 @Test
 public void hasField_mapKeyNotFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"))
 .isEqualTo(false);
 assertThat(provider.hasField(ImmutableMap.of(), "hello")).isEqualTo(false);
 }

 @Test
 public void selectField_mapKeyFound() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo("world");
 assertThat(provider.selectField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo("world");
 }

 @Test
 public void selectField_mapKeyNotFound() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"));
 CelRuntimeException.class, () -> provider.selectField(ImmutableMap.of(), "hello"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -182,7 +166,6 @@ public void selectField_mapKeyNotFound() {
 public void selectField_unsetWrapperField() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 dev.cel.expr.conformance.proto3.TestAllTypes.getDefaultInstance(),
 "single_int64_wrapper"))
 .isEqualTo(NullValue.NULL_VALUE);
Expand All@@ -192,10 +175,7 @@ public void selectField_unsetWrapperField() {
 public void selectField_nonProtoObjectError() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), "hello", "not_a_field"));
 CelRuntimeException.class, () -> provider.selectField("hello", "not_a_field"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -214,7 +194,6 @@ public void selectField_extensionUsingDynamicTypes() {
 long result =
 (long)
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 10).build(),
 TestAllTypesProto.getDescriptor().getPackage() + ".int32_ext");

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
Remove extraneous protoTypeName argument from RuntimeTypeProvider interface#706

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

May 29, 2025
 Merged


Remove extraneous protoTypeName argument from RuntimeTypeProvider interface
#706
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


2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);
 public abstract CelValue fromProtoMessageToCelValue(MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
Expand Down

8 changes: 4 additions & 4 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@@ -57,12 +57,12 @@ public static ProtoCelValueConverter newInstance(
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String unusedProtoTypeName, MessageLite msg) {
 return fromProtoMessageToCelValue((MessageOrBuilder) msg);
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 return fromDescriptorMessageToCelValue((MessageOrBuilder) msg);
 }

 /** Adapts a Protobuf message into a {@link CelValue}. */
 public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 public CelValue fromDescriptorMessageToCelValue(MessageOrBuilder message) {
 Preconditions.checkNotNull(message);

 // Attempt to convert the proto from a dynamic message into a concrete message if possible.
Expand DownExpand Up@@ -151,7 +151,7 @@ public CelValue fromProtoMessageFieldToCelValue(
 return fromJavaObjectToCelValue(map);
 }

 return fromProtoMessageToCelValue((MessageOrBuilder) result);
 return fromDescriptorMessageToCelValue((MessageOrBuilder) result);
 case UINT32:
 return UintValue.create((int) result);
 case UINT64:
Expand Down

11 changes: 4 additions & 7 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,8 +157,7 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {

 Object defaultValue = getDefaultValue(fieldDescriptor);
 if (defaultValue instanceof MessageLite) {
 return fromProtoMessageToCelValue(
 fieldDescriptor.getFieldProtoTypeName(), (MessageLite) defaultValue);
 return fromProtoMessageToCelValue((MessageLite) defaultValue);
 }

 return fromJavaObjectToCelValue(defaultValue);
Expand DownExpand Up@@ -357,17 +356,15 @@ private static Object readUnknownField(int tagWireType, CodedInputStream inputSt
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 @SuppressWarnings("LiteProtoToString") // No alternative identifier to use. Debug only info is OK.
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor =
 descriptorPool
 .findDescriptor(msg)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Could not find a descriptor for: " + protoTypeName));
 () -> new NoSuchElementException("Could not find a descriptor for: " + msg));
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }

 MessageLite message = descriptor.newMessageBuilder().build();
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(structType, message));
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(message));
 }

 public static ProtoMessageLiteValueProvider newInstance(CelLiteDescriptor... descriptors) {
Expand Down

35 changes: 11 additions & 24 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
Expand All@@ -59,47 +58,36 @@ public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLit
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
"cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());
 TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BOOL(com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),
 FLOAT(FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(com.google.protobuf.DoubleValue.of(1.0), DoubleValue.create(1.0)),
 INT32(Int32Value.of(1), IntValue.create(1)),
 INT64(Int64Value.of(1L), IntValue.create(1L)),
 STRING(com.google.protobuf.StringValue.of("test"), StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 UINT32(UInt32Value.of(1), UintValue.create(1)),
 UINT64(UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 WellKnownProtoTestCase(MessageLite msg, CelValue celValue) {
 this.msg = msg;
 this.celValue = celValue;
 }
Expand All@@ -109,8 +97,7 @@ private enum WellKnownProtoTestCase {
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
Expand Down

20 changes: 8 additions & 12 deletions
runtime/src/main/java/dev/cel/runtime/CelValueRuntimeTypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ final class CelValueRuntimeTypeProvider implements RuntimeTypeProvider {
 private static final BaseProtoCelValueConverter DEFAULT_CEL_VALUE_CONVERTER =
 new BaseProtoCelValueConverter() {
 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 throw new UnsupportedOperationException(
 "A value provider must be provided in the runtime to handle protobuf messages");
 }
Expand DownExpand Up@@ -82,28 +82,24 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(typeName, message, fieldName);
 public Object selectField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return unwrapCelValue(selectableValue.select(StringValue.create(fieldName)));
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(messageName, message, fieldName);
 public Object hasField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return selectableValue.find(StringValue.create(fieldName)).isPresent();
 }

 @SuppressWarnings("unchecked")
 private SelectableValue<CelValue> getSelectableValueOrThrow(
 String typeName, Object obj, String fieldName) {
 private SelectableValue<CelValue> getSelectableValueOrThrow(Object obj, String fieldName) {
 CelValue convertedCelValue;
 if ((obj instanceof MessageLite)) {
 convertedCelValue =
 protoCelValueConverter.fromProtoMessageToCelValue(typeName, (MessageLite) obj);
 convertedCelValue = protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) obj);
 } else {
 convertedCelValue = protoCelValueConverter.fromJavaObjectToCelValue(obj);
 }
Expand All@@ -128,7 +124,7 @@ public Object adapt(String messageName, Object message) {

 if (message instanceof MessageLite) {
 return unwrapCelValue(
 protoCelValueConverter.fromProtoMessageToCelValue(messageName, (MessageLite) message));
 protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) message));
 } else {
 return unwrapCelValue(protoCelValueConverter.fromJavaObjectToCelValue(message));
 }
Expand Down

14 changes: 4 additions & 10 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,7 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 return eval(resolver, lateBoundFunctionResolver, CelEvaluationListener.noOpListener());
 }

 @Override
Expand DownExpand Up@@ -365,12 +363,10 @@ private IntermediateResult evalFieldSelect(
 return IntermediateResult.create(attribute, operand);
 }

 CelType operandCheckedType = getCheckedTypeOrThrow(operandExpr);
 if (isTestOnly) {
 return IntermediateResult.create(
 attribute, typeProvider.hasField(operandCheckedType.name(), operand, field));
 return IntermediateResult.create(attribute, typeProvider.hasField(operand, field));
 }
 Object fieldValue = typeProvider.selectField(operandCheckedType.name(), operand, field);
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
Expand DownExpand Up@@ -736,9 +732,7 @@ private Optional<IntermediateResult> maybeEvalOptionalSelectField(
 }

 String field = callExpr.args().get(1).constant().stringValue();
 CelType checkedType = getCheckedTypeOrThrow(expr);
 boolean hasField =
 (boolean) typeProvider.hasField(checkedType.name(), lhsResult.value(), field);
 boolean hasField = (boolean) typeProvider.hasField(lhsResult.value(), field);
 if (!hasField) {
 // Protobuf sets default (zero) values to uninitialized fields.
 // In case of CEL's optional values, we want to explicitly return Optional.none()
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ public DescriptorMessageProvider(ProtoMessageFactory protoMessageFactory, CelOpt

 @Override
 @SuppressWarnings("unchecked")
 public @Nullable Object selectField(String unusedTypeName, Object message, String fieldName) {
 public @Nullable Object selectField(Object message, String fieldName) {
 boolean isOptionalMessage = false;
 if (message instanceof Optional) {
 isOptionalMessage = true;
Expand DownExpand Up@@ -148,7 +148,7 @@ public Object adapt(String messageName, Object message) {
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 if (message instanceof Optional<?>) {
 Optional<?> optionalMessage = (Optional<?>) message;
 if (!optionalMessage.isPresent()) {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/MessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,10 +29,10 @@ public interface MessageProvider {
 Object createMessage(String messageName, Map<String, Object> values);

 /** Select field from message. */
 Object selectField(String messageName, Object message, String fieldName);
 Object selectField(Object message, String fieldName);

 /** Check whether a field is set on message. */
 Object hasField(String messageName, Object message, String fieldName);
 Object hasField(Object message, String fieldName);

 /** Adapt object to its message value with source location metadata on failure. */
 Object adapt(String messageName, Object message);
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,12 +58,12 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 public Object selectField(Object message, String fieldName) {
 return null;
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 return null;
 }

Expand Down

31 changes: 5 additions & 26 deletions
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,40 +140,24 @@ public void createMessage_badFieldError() {

 @Test
 public void hasField_mapKeyFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo(true);
 assertThat(provider.hasField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo(true);
 }

 @Test
 public void hasField_mapKeyNotFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"))
 .isEqualTo(false);
 assertThat(provider.hasField(ImmutableMap.of(), "hello")).isEqualTo(false);
 }

 @Test
 public void selectField_mapKeyFound() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo("world");
 assertThat(provider.selectField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo("world");
 }

 @Test
 public void selectField_mapKeyNotFound() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"));
 CelRuntimeException.class, () -> provider.selectField(ImmutableMap.of(), "hello"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -182,7 +166,6 @@ public void selectField_mapKeyNotFound() {
 public void selectField_unsetWrapperField() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 dev.cel.expr.conformance.proto3.TestAllTypes.getDefaultInstance(),
 "single_int64_wrapper"))
 .isEqualTo(NullValue.NULL_VALUE);
Expand All@@ -192,10 +175,7 @@ public void selectField_unsetWrapperField() {
 public void selectField_nonProtoObjectError() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), "hello", "not_a_field"));
 CelRuntimeException.class, () -> provider.selectField("hello", "not_a_field"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -214,7 +194,6 @@ public void selectField_extensionUsingDynamicTypes() {
 long result =
 (long)
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 10).build(),
 TestAllTypesProto.getDescriptor().getPackage() + ".int32_ext");

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
Remove extraneous protoTypeName argument from RuntimeTypeProvider interface#706

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

May 29, 2025
 Merged


Remove extraneous protoTypeName argument from RuntimeTypeProvider interface
#706
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


2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);
 public abstract CelValue fromProtoMessageToCelValue(MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
Expand Down

8 changes: 4 additions & 4 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@@ -57,12 +57,12 @@ public static ProtoCelValueConverter newInstance(
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String unusedProtoTypeName, MessageLite msg) {
 return fromProtoMessageToCelValue((MessageOrBuilder) msg);
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 return fromDescriptorMessageToCelValue((MessageOrBuilder) msg);
 }

 /** Adapts a Protobuf message into a {@link CelValue}. */
 public CelValue fromProtoMessageToCelValue(MessageOrBuilder message) {
 public CelValue fromDescriptorMessageToCelValue(MessageOrBuilder message) {
 Preconditions.checkNotNull(message);

 // Attempt to convert the proto from a dynamic message into a concrete message if possible.
Expand DownExpand Up@@ -151,7 +151,7 @@ public CelValue fromProtoMessageFieldToCelValue(
 return fromJavaObjectToCelValue(map);
 }

 return fromProtoMessageToCelValue((MessageOrBuilder) result);
 return fromDescriptorMessageToCelValue((MessageOrBuilder) result);
 case UINT32:
 return UintValue.create((int) result);
 case UINT64:
Expand Down

11 changes: 4 additions & 7 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,8 +157,7 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {

 Object defaultValue = getDefaultValue(fieldDescriptor);
 if (defaultValue instanceof MessageLite) {
 return fromProtoMessageToCelValue(
 fieldDescriptor.getFieldProtoTypeName(), (MessageLite) defaultValue);
 return fromProtoMessageToCelValue((MessageLite) defaultValue);
 }

 return fromJavaObjectToCelValue(defaultValue);
Expand DownExpand Up@@ -357,17 +356,15 @@ private static Object readUnknownField(int tagWireType, CodedInputStream inputSt
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 @SuppressWarnings("LiteProtoToString") // No alternative identifier to use. Debug only info is OK.
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor =
 descriptorPool
 .findDescriptor(msg)
 .orElseThrow(
 () ->
 new NoSuchElementException(
 "Could not find a descriptor for: " + protoTypeName));
 () -> new NoSuchElementException("Could not find a descriptor for: " + msg));
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }

 MessageLite message = descriptor.newMessageBuilder().build();
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(structType, message));
 return Optional.of(protoLiteCelValueConverter.fromProtoMessageToCelValue(message));
 }

 public static ProtoMessageLiteValueProvider newInstance(CelLiteDescriptor... descriptors) {
Expand Down

35 changes: 11 additions & 24 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,6 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.common.values.ProtoLiteCelValueConverter.MessageFields;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
Expand All@@ -59,47 +58,36 @@ public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLit
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
"cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());
 TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BOOL(com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),
 FLOAT(FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(com.google.protobuf.DoubleValue.of(1.0), DoubleValue.create(1.0)),
 INT32(Int32Value.of(1), IntValue.create(1)),
 INT64(Int64Value.of(1L), IntValue.create(1L)),
 STRING(com.google.protobuf.StringValue.of("test"), StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 UINT32(UInt32Value.of(1), UintValue.create(1)),
 UINT64(UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 WellKnownProtoTestCase(MessageLite msg, CelValue celValue) {
 this.msg = msg;
 this.celValue = celValue;
 }
Expand All@@ -109,8 +97,7 @@ private enum WellKnownProtoTestCase {
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
Expand Down

20 changes: 8 additions & 12 deletions
runtime/src/main/java/dev/cel/runtime/CelValueRuntimeTypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ final class CelValueRuntimeTypeProvider implements RuntimeTypeProvider {
 private static final BaseProtoCelValueConverter DEFAULT_CEL_VALUE_CONVERTER =
 new BaseProtoCelValueConverter() {
 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 public CelValue fromProtoMessageToCelValue(MessageLite msg) {
 throw new UnsupportedOperationException(
 "A value provider must be provided in the runtime to handle protobuf messages");
 }
Expand DownExpand Up@@ -82,28 +82,24 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(typeName, message, fieldName);
 public Object selectField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return unwrapCelValue(selectableValue.select(StringValue.create(fieldName)));
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue =
 getSelectableValueOrThrow(messageName, message, fieldName);
 public Object hasField(Object message, String fieldName) {
 SelectableValue<CelValue> selectableValue = getSelectableValueOrThrow(message, fieldName);

 return selectableValue.find(StringValue.create(fieldName)).isPresent();
 }

 @SuppressWarnings("unchecked")
 private SelectableValue<CelValue> getSelectableValueOrThrow(
 String typeName, Object obj, String fieldName) {
 private SelectableValue<CelValue> getSelectableValueOrThrow(Object obj, String fieldName) {
 CelValue convertedCelValue;
 if ((obj instanceof MessageLite)) {
 convertedCelValue =
 protoCelValueConverter.fromProtoMessageToCelValue(typeName, (MessageLite) obj);
 convertedCelValue = protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) obj);
 } else {
 convertedCelValue = protoCelValueConverter.fromJavaObjectToCelValue(obj);
 }
Expand All@@ -128,7 +124,7 @@ public Object adapt(String messageName, Object message) {

 if (message instanceof MessageLite) {
 return unwrapCelValue(
 protoCelValueConverter.fromProtoMessageToCelValue(messageName, (MessageLite) message));
 protoCelValueConverter.fromProtoMessageToCelValue((MessageLite) message));
 } else {
 return unwrapCelValue(protoCelValueConverter.fromJavaObjectToCelValue(message));
 }
Expand Down

14 changes: 4 additions & 10 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,7 @@ public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 @Override
 public Object eval(GlobalResolver resolver, FunctionResolver lateBoundFunctionResolver)
 throws CelEvaluationException {
 return eval(resolver,
 lateBoundFunctionResolver,
 CelEvaluationListener.noOpListener());
 return eval(resolver, lateBoundFunctionResolver, CelEvaluationListener.noOpListener());
 }

 @Override
Expand DownExpand Up@@ -365,12 +363,10 @@ private IntermediateResult evalFieldSelect(
 return IntermediateResult.create(attribute, operand);
 }

 CelType operandCheckedType = getCheckedTypeOrThrow(operandExpr);
 if (isTestOnly) {
 return IntermediateResult.create(
 attribute, typeProvider.hasField(operandCheckedType.name(), operand, field));
 return IntermediateResult.create(attribute, typeProvider.hasField(operand, field));
 }
 Object fieldValue = typeProvider.selectField(operandCheckedType.name(), operand, field);
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
Expand DownExpand Up@@ -736,9 +732,7 @@ private Optional<IntermediateResult> maybeEvalOptionalSelectField(
 }

 String field = callExpr.args().get(1).constant().stringValue();
 CelType checkedType = getCheckedTypeOrThrow(expr);
 boolean hasField =
 (boolean) typeProvider.hasField(checkedType.name(), lhsResult.value(), field);
 boolean hasField = (boolean) typeProvider.hasField(lhsResult.value(), field);
 if (!hasField) {
 // Protobuf sets default (zero) values to uninitialized fields.
 // In case of CEL's optional values, we want to explicitly return Optional.none()
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/DescriptorMessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ public DescriptorMessageProvider(ProtoMessageFactory protoMessageFactory, CelOpt

 @Override
 @SuppressWarnings("unchecked")
 public @Nullable Object selectField(String unusedTypeName, Object message, String fieldName) {
 public @Nullable Object selectField(Object message, String fieldName) {
 boolean isOptionalMessage = false;
 if (message instanceof Optional) {
 isOptionalMessage = true;
Expand DownExpand Up@@ -148,7 +148,7 @@ public Object adapt(String messageName, Object message) {
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 if (message instanceof Optional<?>) {
 Optional<?> optionalMessage = (Optional<?>) message;
 if (!optionalMessage.isPresent()) {
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/MessageProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,10 +29,10 @@ public interface MessageProvider {
 Object createMessage(String messageName, Map<String, Object> values);

 /** Select field from message. */
 Object selectField(String messageName, Object message, String fieldName);
 Object selectField(Object message, String fieldName);

 /** Check whether a field is set on message. */
 Object hasField(String messageName, Object message, String fieldName);
 Object hasField(Object message, String fieldName);

 /** Adapt object to its message value with source location metadata on failure. */
 Object adapt(String messageName, Object message);
Expand Down

4 changes: 2 additions & 2 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,12 +58,12 @@ public Object createMessage(String messageName, Map<String, Object> values) {
 }

 @Override
 public Object selectField(String typeName, Object message, String fieldName) {
 public Object selectField(Object message, String fieldName) {
 return null;
 }

 @Override
 public Object hasField(String messageName, Object message, String fieldName) {
 public Object hasField(Object message, String fieldName) {
 return null;
 }

Expand Down

31 changes: 5 additions & 26 deletions
runtime/src/test/java/dev/cel/runtime/DescriptorMessageProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,40 +140,24 @@ public void createMessage_badFieldError() {

 @Test
 public void hasField_mapKeyFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo(true);
 assertThat(provider.hasField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo(true);
 }

 @Test
 public void hasField_mapKeyNotFound() {
 assertThat(
 provider.hasField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"))
 .isEqualTo(false);
 assertThat(provider.hasField(ImmutableMap.of(), "hello")).isEqualTo(false);
 }

 @Test
 public void selectField_mapKeyFound() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 ImmutableMap.of("hello", "world"),
 "hello"))
 .isEqualTo("world");
 assertThat(provider.selectField(ImmutableMap.of("hello", "world"), "hello")).isEqualTo("world");
 }

 @Test
 public void selectField_mapKeyNotFound() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), ImmutableMap.of(), "hello"));
 CelRuntimeException.class, () -> provider.selectField(ImmutableMap.of(), "hello"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -182,7 +166,6 @@ public void selectField_mapKeyNotFound() {
 public void selectField_unsetWrapperField() {
 assertThat(
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 dev.cel.expr.conformance.proto3.TestAllTypes.getDefaultInstance(),
 "single_int64_wrapper"))
 .isEqualTo(NullValue.NULL_VALUE);
Expand All@@ -192,10 +175,7 @@ public void selectField_unsetWrapperField() {
 public void selectField_nonProtoObjectError() {
 CelRuntimeException e =
 Assert.assertThrows(
 CelRuntimeException.class,
 () ->
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(), "hello", "not_a_field"));
 CelRuntimeException.class, () -> provider.selectField("hello", "not_a_field"));
 assertThat(e).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
 assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ATTRIBUTE_NOT_FOUND);
 }
Expand All@@ -214,7 +194,6 @@ public void selectField_extensionUsingDynamicTypes() {
 long result =
 (long)
 provider.selectField(
 TestAllTypes.getDescriptor().getFullName(),
 TestAllTypes.newBuilder().setExtension(TestAllTypesExtensions.int32Ext, 10).build(),
 TestAllTypesProto.getDescriptor().getPackage() + ".int32_ext");

Expand Down