Upgrade CEL from 0.10.1 to 0.11.0#345

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
pkwarren merged 2 commits into from
Sep 8, 2025
Merged

Upgrade CEL from 0.10.1 to 0.11.0 #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2138340
Upgrade CEL from 0.10.1 to 0.11.0
pkwarren Sep 8, 2025
a02479e
Further cleanup to use CEL types
pkwarren Sep 8, 2025
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
5 changes: 1 addition & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -338,10 +338,7 @@ dependencies {
annotationProcessor(libs.nullaway)
api(libs.jspecify)
api(libs.protobuf.java)
implementation(libs.cel) {
// https://github.com/google/cel-java/issues/748
exclude(group = "com.google.protobuf", module = "protobuf-javalite")

@pkwarrenpkwarrenSep 8, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream issue is fixed in this release.

}
implementation(libs.cel)

buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

Expand Down
2 changes: 1 addition & 1 deletion conformance/src/test/java/build/buf/protovalidate/ValidatorTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ public void testDynRuntimeError() {
public void strictBytesIn() throws ValidationException {
BytesIn invalid = BytesIn.newBuilder().setVal(ByteString.copyFromUtf8("bar")).build();
ValidationResult validate = validator.validate(invalid);
assertThat(validate.isSuccess()).isTrue();
assertThat(validate.getViolations()).isEmpty();

@pkwarrenpkwarrenSep 8, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just showing expected true, got false isn't great for debugging. Made it use isEmpty so it will print the violations.

}

@Test
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# Version of buf.build/bufbuild/protovalidate to use.
protovalidate.version = v0.14.0
protovalidate.version = v0.14.2

# Arguments to the protovalidate-conformance CLI
protovalidate.conformance.args = --strict_message --strict_error --expected_failures=expected-failures.yaml
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[versions]
assertj = "3.27.4"
buf = "1.57.0"
cel = "0.10.1"
cel = "0.11.0"
error-prone = "2.41.0"
junit = "5.13.4"
maven-publish = "0.34.0"
Expand Down
26 changes: 15 additions & 11 deletions src/main/java/build/buf/protovalidate/CustomOverload.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,11 @@

package build.buf.protovalidate;

import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
import dev.cel.common.types.CelType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelFunctionBinding;
import java.util.ArrayList;
Expand DownExpand Up@@ -131,14 +131,16 @@ private static List<CelFunctionBinding> celUnique() {
private static CelFunctionBinding celStartsWithBytes() {
return CelFunctionBinding.from(
"starts_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
(receiver, param) -> {
if (receiver.size() < param.size()) {
return false;
}
for (int i = 0; i < param.size(); i++) {
if (param.byteAt(i) != receiver.byteAt(i)) {
byte[] paramBytes = param.toByteArray();

@pkwarrenpkwarrenSep 8, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if there was a byteAt method on CelByteString to avoid having to allocate a byte array to access a single byte.

byte[] receiverBytes = receiver.toByteArray();
for (int i = 0; i < paramBytes.length; i++) {
if (paramBytes[i] != receiverBytes[i]) {
return false;
}
}
Expand All@@ -154,14 +156,16 @@ private static CelFunctionBinding celStartsWithBytes() {
private static CelFunctionBinding celEndsWithBytes() {
return CelFunctionBinding.from(
"ends_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
(receiver, param) -> {
if (receiver.size() < param.size()) {
return false;
}
for (int i = 0; i < param.size(); i++) {
if (param.byteAt(param.size() - i - 1) != receiver.byteAt(receiver.size() - i - 1)) {
byte[] paramBytes = param.toByteArray();
byte[] receiverBytes = receiver.toByteArray();
for (int i = 0; i < paramBytes.length; i++) {
if (paramBytes[param.size() - i - 1] != receiverBytes[receiver.size() - i - 1]) {
return false;
}
}
Expand All@@ -177,8 +181,8 @@ private static CelFunctionBinding celEndsWithBytes() {
private static CelFunctionBinding celContainsBytes() {
return CelFunctionBinding.from(
"contains_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
(receiver, param) -> bytesContains(receiver.toByteArray(), param.toByteArray()));
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/build/buf/protovalidate/DescriptorMappings.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ static FieldDescriptor expectedWrapperRules(String fqn) {
}

/**
* Maps a {@link FieldDescriptor.Type} to a compatible {@link com.google.api.expr.v1alpha1.Type}.
* Maps a {@link FieldDescriptor.Type} to a compatible {@link dev.cel.common.types.CelType}.
*
* @param kind The protobuf field type.
* @return The corresponding CEL type for the protobuf field.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/build/buf/protovalidate/EvaluatorBuilder.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
import build.buf.validate.MessageRules;
import build.buf.validate.OneofRules;
import build.buf.validate.Rule;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
Expand All@@ -33,6 +32,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.util.ArrayList;
import java.util.Collections;
Expand DownExpand Up@@ -320,7 +320,7 @@ private Object zeroValue(FieldDescriptor fieldDescriptor, boolean forItems)
zero = "";
break;
case BYTE_STRING:
zero = ByteString.EMPTY;
zero = CelByteString.EMPTY;
break;
case ENUM:
zero = (long) fieldDescriptor.getEnumType().getValues().get(0).getNumber();
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/build/buf/protovalidate/Format.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,10 @@
import static java.time.format.DateTimeFormatter.ISO_INSTANT;

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.TypeType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
Expand DownExpand Up@@ -147,8 +146,8 @@ private static String formatString(Object val) throws CelEvaluationException {
return str.get();
}
return val.toString();
} else if (val instanceof ByteString) {
String byteStr = ((ByteString) val).toStringUtf8();
} else if (val instanceof CelByteString) {
String byteStr = ((CelByteString) val).toStringUtf8();
// Collapse any contiguous placeholders into one
return byteStr.replaceAll("\\ufffd+", "\ufffd");
} else if (val instanceof Double) {
Expand All@@ -165,7 +164,7 @@ private static String formatString(Object val) throws CelEvaluationException {
return formatList((List<?>) val);
} else if (val instanceof Map) {
return formatMap((Map<?, ?>) val);
} else if (val == null || val instanceof NullValue) {
} else if (val == null || val instanceof dev.cel.common.values.NullValue) {
return "null";
}
throw new CelEvaluationException(
Expand DownExpand Up@@ -250,9 +249,10 @@ private static String formatHex(Object val) throws CelEvaluationException {
return Long.toHexString((Long) val);
} else if (val instanceof UnsignedLong) {
return Long.toHexString(((UnsignedLong) val).longValue());
} else if (val instanceof ByteString) {
} else if (val instanceof CelByteString) {
StringBuilder hexString = new StringBuilder();
for (byte b : (ByteString) val) {
byte[] celBytes = ((CelByteString) val).toByteArray();
for (byte b : celBytes) {
hexString.append(String.format("%02x", b));
}
return hexString.toString();
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/build/buf/protovalidate/ProtoAdapter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import dev.cel.common.values.CelByteString;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand DownExpand Up@@ -66,6 +68,11 @@ static Object toCel(Descriptors.FieldDescriptor fieldDescriptor, Object value) {
/** Converts a scalar type to cel value. */
static Object scalarToCel(Descriptors.FieldDescriptor.Type type, Object value) {
switch (type) {
case BYTES:
if (value instanceof ByteString) {
return CelByteString.of(((ByteString) value).toByteArray());
}
return value;
case ENUM:
if (value instanceof Descriptors.EnumValueDescriptor) {
return (long) ((Descriptors.EnumValueDescriptor) value).getNumber();
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/build/buf/protovalidate/RuleViolation.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -260,4 +260,9 @@ public build.buf.validate.Violation toProto() {
public @Nullable FieldValue getRuleValue() {
return ruleValue;
}

@Override
public String toString() {
return proto.toString();

@pkwarrenpkwarrenSep 8, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This made debugging more painful - added a toString which will dump the contents of the proto Validation message.

}
}
5 changes: 5 additions & 0 deletions src/main/java/build/buf/protovalidate/ValidatorImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.protobuf.Message;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import java.util.ArrayList;
import java.util.List;

Expand All@@ -39,6 +40,8 @@ final class ValidatorImpl implements Validator {
CelFactory.standardCelBuilder()
.addCompilerLibraries(validateLibrary)
.addRuntimeLibraries(validateLibrary)
.setOptions(
CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())

@pkwarrenpkwarrenSep 8, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This opts in to the new behavior which uses CEL types instead of Protobuf types for NullValue / ByteString. This is apparently coming soon as the default, so since we had to update our overloads to use the new types just opted in to migrate everything to use them.

.build();
this.evaluatorBuilder = new EvaluatorBuilder(cel, config);
this.failFast = config.isFailFast();
Expand All@@ -51,6 +54,8 @@ final class ValidatorImpl implements Validator {
CelFactory.standardCelBuilder()
.addCompilerLibraries(validateLibrary)
.addRuntimeLibraries(validateLibrary)
.setOptions(
CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
.build();
this.evaluatorBuilder = new EvaluatorBuilder(cel, config, descriptors, disableLazy);
this.failFast = config.isFailFast();
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/buf/validate/validate.proto
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,7 +274,7 @@ message FieldRules {
// message UpdateRequest {
// // The uri rule only applies if the field is not an empty string.
// string url = 1 [
// (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED,
// (buf.validate.field).ignore = IGNORE_IF_ZERO_VALUE,
// (buf.validate.field).string.uri = true
// ];
// }
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/build/buf/protovalidate/CustomOverloadTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -35,6 +36,8 @@ public class CustomOverloadTest {
CelFactory.standardCelBuilder()
.addCompilerLibraries(validateLibrary)
.addRuntimeLibraries(validateLibrary)
.setOptions(
CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
.build();

@Test
Expand Down
5 changes: 4 additions & 1 deletion src/test/java/build/buf/protovalidate/FormatTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.common.types.SimpleType;
Expand All@@ -50,7 +51,7 @@
class FormatTest {
// Version of the cel-spec that this implementation is conformant with
// This should be kept in sync with the version in gradle.properties
private static String CEL_SPEC_VERSION = "v0.24.0";
private static final String CEL_SPEC_VERSION = "v0.24.0";

private static Cel cel;

Expand DownExpand Up@@ -91,6 +92,8 @@ public static void setUp() throws Exception {
CelFactory.standardCelBuilder()
.addCompilerLibraries(validateLibrary)
.addRuntimeLibraries(validateLibrary)
.setOptions(
CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
.build();
}

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
Upgrade CEL from 0.10.1 to 0.11.0#345

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

pkwarren
merged 2 commits into

from

Sep 8, 2025
 Merged


Upgrade CEL from 0.10.1 to 0.11.0
#345
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2138340

Upgrade CEL from 0.10.1 to 0.11.0


pkwarren Sep 8, 2025
a02479e

Further cleanup to use CEL types


pkwarren Sep 8, 2025

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


5 changes: 1 addition & 4 deletions
build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,10 +338,7 @@ dependencies {
 annotationProcessor(libs.nullaway)
 api(libs.jspecify)
 api(libs.protobuf.java)
 implementation(libs.cel) {
 // https://github.com/google/cel-java/issues/748
 exclude(group = "com.google.protobuf", module = "protobuf-javalite")
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream issue is fixed in this release.
 }
 implementation(libs.cel)

 buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

Expand Down

2 changes: 1 addition & 1 deletion
conformance/src/test/java/build/buf/protovalidate/ValidatorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ public void testDynRuntimeError() {
 public void strictBytesIn() throws ValidationException {
 BytesIn invalid = BytesIn.newBuilder().setVal(ByteString.copyFromUtf8("bar")).build();
 ValidationResult validate = validator.validate(invalid);
 assertThat(validate.isSuccess()).isTrue();
 assertThat(validate.getViolations()).isEmpty();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just showing expected true, got false isn't great for debugging. Made it use isEmpty so it will print the violations.
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# Version of buf.build/bufbuild/protovalidate to use.
protovalidate.version = v0.14.0
protovalidate.version = v0.14.2

# Arguments to the protovalidate-conformance CLI
protovalidate.conformance.args = --strict_message --strict_error --expected_failures=expected-failures.yaml
Expand Down

2 changes: 1 addition & 1 deletion
gradle/libs.versions.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[versions]
assertj = "3.27.4"
buf = "1.57.0"
cel = "0.10.1"
cel = "0.11.0"
error-prone = "2.41.0"
junit = "5.13.4"
maven-publish = "0.34.0"
Expand Down

26 changes: 15 additions & 11 deletions
src/main/java/build/buf/protovalidate/CustomOverload.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,11 @@

package build.buf.protovalidate;

import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
import dev.cel.common.types.CelType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelFunctionBinding;
import java.util.ArrayList;
Expand DownExpand Up@@ -131,14 +131,16 @@ private static List<CelFunctionBinding> celUnique() {
 private static CelFunctionBinding celStartsWithBytes() {
 return CelFunctionBinding.from(
 "starts_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(i) != receiver.byteAt(i)) {
 byte[] paramBytes = param.toByteArray();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if there was a byteAt method on CelByteString to avoid having to allocate a byte array to access a single byte.
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[i] != receiverBytes[i]) {
 return false;
 }
 }
Expand All@@ -154,14 +156,16 @@ private static CelFunctionBinding celStartsWithBytes() {
 private static CelFunctionBinding celEndsWithBytes() {
 return CelFunctionBinding.from(
 "ends_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(param.size() - i - 1) != receiver.byteAt(receiver.size() - i - 1)) {
 byte[] paramBytes = param.toByteArray();
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[param.size() - i - 1] != receiverBytes[receiver.size() - i - 1]) {
 return false;
 }
 }
Expand All@@ -177,8 +181,8 @@ private static CelFunctionBinding celEndsWithBytes() {
 private static CelFunctionBinding celContainsBytes() {
 return CelFunctionBinding.from(
 "contains_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> bytesContains(receiver.toByteArray(), param.toByteArray()));
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/main/java/build/buf/protovalidate/DescriptorMappings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ static FieldDescriptor expectedWrapperRules(String fqn) {
 }

 /**
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link com.google.api.expr.v1alpha1.Type}.
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link dev.cel.common.types.CelType}.
 *
 * @param kind The protobuf field type.
 * @return The corresponding CEL type for the protobuf field.
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/build/buf/protovalidate/EvaluatorBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
import build.buf.validate.MessageRules;
import build.buf.validate.OneofRules;
import build.buf.validate.Rule;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
Expand All@@ -33,6 +32,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.util.ArrayList;
import java.util.Collections;
Expand DownExpand Up@@ -320,7 +320,7 @@ private Object zeroValue(FieldDescriptor fieldDescriptor, boolean forItems)
 zero = "";
 break;
 case BYTE_STRING:
 zero = ByteString.EMPTY;
 zero = CelByteString.EMPTY;
 break;
 case ENUM:
 zero = (long) fieldDescriptor.getEnumType().getValues().get(0).getNumber();
Expand Down

14 changes: 7 additions & 7 deletions
src/main/java/build/buf/protovalidate/Format.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,10 @@
import static java.time.format.DateTimeFormatter.ISO_INSTANT;

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.TypeType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
Expand DownExpand Up@@ -147,8 +146,8 @@ private static String formatString(Object val) throws CelEvaluationException {
 return str.get();
 }
 return val.toString();
 } else if (val instanceof ByteString) {
 String byteStr = ((ByteString) val).toStringUtf8();
 } else if (val instanceof CelByteString) {
 String byteStr = ((CelByteString) val).toStringUtf8();
 // Collapse any contiguous placeholders into one
 return byteStr.replaceAll("\\ufffd+", "\ufffd");
 } else if (val instanceof Double) {
Expand All@@ -165,7 +164,7 @@ private static String formatString(Object val) throws CelEvaluationException {
 return formatList((List<?>) val);
 } else if (val instanceof Map) {
 return formatMap((Map<?, ?>) val);
 } else if (val == null || val instanceof NullValue) {
 } else if (val == null || val instanceof dev.cel.common.values.NullValue) {
 return "null";
 }
 throw new CelEvaluationException(
Expand DownExpand Up@@ -250,9 +249,10 @@ private static String formatHex(Object val) throws CelEvaluationException {
 return Long.toHexString((Long) val);
 } else if (val instanceof UnsignedLong) {
 return Long.toHexString(((UnsignedLong) val).longValue());
 } else if (val instanceof ByteString) {
 } else if (val instanceof CelByteString) {
 StringBuilder hexString = new StringBuilder();
 for (byte b : (ByteString) val) {
 byte[] celBytes = ((CelByteString) val).toByteArray();
 for (byte b : celBytes) {
 hexString.append(String.format("%02x", b));
 }
 return hexString.toString();
Expand Down

7 changes: 7 additions & 0 deletions
src/main/java/build/buf/protovalidate/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import dev.cel.common.values.CelByteString;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand DownExpand Up@@ -66,6 +68,11 @@ static Object toCel(Descriptors.FieldDescriptor fieldDescriptor, Object value) {
 /** Converts a scalar type to cel value. */
 static Object scalarToCel(Descriptors.FieldDescriptor.Type type, Object value) {
 switch (type) {
 case BYTES:
 if (value instanceof ByteString) {
 return CelByteString.of(((ByteString) value).toByteArray());
 }
 return value;
 case ENUM:
 if (value instanceof Descriptors.EnumValueDescriptor) {
 return (long) ((Descriptors.EnumValueDescriptor) value).getNumber();
Expand Down

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/RuleViolation.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -260,4 +260,9 @@ public build.buf.validate.Violation toProto() {
 public @Nullable FieldValue getRuleValue() {
 return ruleValue;
 }

 @Override
 public String toString() {
 return proto.toString();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This made debugging more painful - added a toString which will dump the contents of the proto Validation message.
 }
}

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/ValidatorImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.protobuf.Message;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import java.util.ArrayList;
import java.util.List;

Expand All@@ -39,6 +40,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This opts in to the new behavior which uses CEL types instead of Protobuf types for NullValue / ByteString. This is apparently coming soon as the default, so since we had to update our overloads to use the new types just opted in to migrate everything to use them.
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config);
 this.failFast = config.isFailFast();
Expand All@@ -51,6 +54,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config, descriptors, disableLazy);
 this.failFast = config.isFailFast();
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/buf/validate/validate.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,7 +274,7 @@ message FieldRules {
 // message UpdateRequest {
 // // The uri rule only applies if the field is not an empty string.
 // string url = 1 [
 // (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED,
 // (buf.validate.field).ignore = IGNORE_IF_ZERO_VALUE,
 // (buf.validate.field).string.uri = true
 // ];
 // }
Expand Down

3 changes: 3 additions & 0 deletions
src/test/java/build/buf/protovalidate/CustomOverloadTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -35,6 +36,8 @@ public class CustomOverloadTest {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();

 @Test
Expand Down

5 changes: 4 additions & 1 deletion
src/test/java/build/buf/protovalidate/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.common.types.SimpleType;
Expand All@@ -50,7 +51,7 @@
class FormatTest {
 // Version of the cel-spec that this implementation is conformant with
 // This should be kept in sync with the version in gradle.properties
 private static String CEL_SPEC_VERSION = "v0.24.0";
 private static final String CEL_SPEC_VERSION = "v0.24.0";

 private static Cel cel;

Expand DownExpand Up@@ -91,6 +92,8 @@ public static void setUp() throws Exception {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 }

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
Upgrade CEL from 0.10.1 to 0.11.0#345

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

pkwarren
merged 2 commits into

from

Sep 8, 2025
 Merged


Upgrade CEL from 0.10.1 to 0.11.0
#345
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2138340

Upgrade CEL from 0.10.1 to 0.11.0


pkwarren Sep 8, 2025
a02479e

Further cleanup to use CEL types


pkwarren Sep 8, 2025

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


5 changes: 1 addition & 4 deletions
build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,10 +338,7 @@ dependencies {
 annotationProcessor(libs.nullaway)
 api(libs.jspecify)
 api(libs.protobuf.java)
 implementation(libs.cel) {
 // https://github.com/google/cel-java/issues/748
 exclude(group = "com.google.protobuf", module = "protobuf-javalite")
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream issue is fixed in this release.
 }
 implementation(libs.cel)

 buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

Expand Down

2 changes: 1 addition & 1 deletion
conformance/src/test/java/build/buf/protovalidate/ValidatorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ public void testDynRuntimeError() {
 public void strictBytesIn() throws ValidationException {
 BytesIn invalid = BytesIn.newBuilder().setVal(ByteString.copyFromUtf8("bar")).build();
 ValidationResult validate = validator.validate(invalid);
 assertThat(validate.isSuccess()).isTrue();
 assertThat(validate.getViolations()).isEmpty();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just showing expected true, got false isn't great for debugging. Made it use isEmpty so it will print the violations.
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# Version of buf.build/bufbuild/protovalidate to use.
protovalidate.version = v0.14.0
protovalidate.version = v0.14.2

# Arguments to the protovalidate-conformance CLI
protovalidate.conformance.args = --strict_message --strict_error --expected_failures=expected-failures.yaml
Expand Down

2 changes: 1 addition & 1 deletion
gradle/libs.versions.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[versions]
assertj = "3.27.4"
buf = "1.57.0"
cel = "0.10.1"
cel = "0.11.0"
error-prone = "2.41.0"
junit = "5.13.4"
maven-publish = "0.34.0"
Expand Down

26 changes: 15 additions & 11 deletions
src/main/java/build/buf/protovalidate/CustomOverload.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,11 @@

package build.buf.protovalidate;

import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
import dev.cel.common.types.CelType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelFunctionBinding;
import java.util.ArrayList;
Expand DownExpand Up@@ -131,14 +131,16 @@ private static List<CelFunctionBinding> celUnique() {
 private static CelFunctionBinding celStartsWithBytes() {
 return CelFunctionBinding.from(
 "starts_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(i) != receiver.byteAt(i)) {
 byte[] paramBytes = param.toByteArray();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if there was a byteAt method on CelByteString to avoid having to allocate a byte array to access a single byte.
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[i] != receiverBytes[i]) {
 return false;
 }
 }
Expand All@@ -154,14 +156,16 @@ private static CelFunctionBinding celStartsWithBytes() {
 private static CelFunctionBinding celEndsWithBytes() {
 return CelFunctionBinding.from(
 "ends_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(param.size() - i - 1) != receiver.byteAt(receiver.size() - i - 1)) {
 byte[] paramBytes = param.toByteArray();
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[param.size() - i - 1] != receiverBytes[receiver.size() - i - 1]) {
 return false;
 }
 }
Expand All@@ -177,8 +181,8 @@ private static CelFunctionBinding celEndsWithBytes() {
 private static CelFunctionBinding celContainsBytes() {
 return CelFunctionBinding.from(
 "contains_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> bytesContains(receiver.toByteArray(), param.toByteArray()));
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/main/java/build/buf/protovalidate/DescriptorMappings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ static FieldDescriptor expectedWrapperRules(String fqn) {
 }

 /**
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link com.google.api.expr.v1alpha1.Type}.
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link dev.cel.common.types.CelType}.
 *
 * @param kind The protobuf field type.
 * @return The corresponding CEL type for the protobuf field.
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/build/buf/protovalidate/EvaluatorBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
import build.buf.validate.MessageRules;
import build.buf.validate.OneofRules;
import build.buf.validate.Rule;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
Expand All@@ -33,6 +32,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.util.ArrayList;
import java.util.Collections;
Expand DownExpand Up@@ -320,7 +320,7 @@ private Object zeroValue(FieldDescriptor fieldDescriptor, boolean forItems)
 zero = "";
 break;
 case BYTE_STRING:
 zero = ByteString.EMPTY;
 zero = CelByteString.EMPTY;
 break;
 case ENUM:
 zero = (long) fieldDescriptor.getEnumType().getValues().get(0).getNumber();
Expand Down

14 changes: 7 additions & 7 deletions
src/main/java/build/buf/protovalidate/Format.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,10 @@
import static java.time.format.DateTimeFormatter.ISO_INSTANT;

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.TypeType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
Expand DownExpand Up@@ -147,8 +146,8 @@ private static String formatString(Object val) throws CelEvaluationException {
 return str.get();
 }
 return val.toString();
 } else if (val instanceof ByteString) {
 String byteStr = ((ByteString) val).toStringUtf8();
 } else if (val instanceof CelByteString) {
 String byteStr = ((CelByteString) val).toStringUtf8();
 // Collapse any contiguous placeholders into one
 return byteStr.replaceAll("\\ufffd+", "\ufffd");
 } else if (val instanceof Double) {
Expand All@@ -165,7 +164,7 @@ private static String formatString(Object val) throws CelEvaluationException {
 return formatList((List<?>) val);
 } else if (val instanceof Map) {
 return formatMap((Map<?, ?>) val);
 } else if (val == null || val instanceof NullValue) {
 } else if (val == null || val instanceof dev.cel.common.values.NullValue) {
 return "null";
 }
 throw new CelEvaluationException(
Expand DownExpand Up@@ -250,9 +249,10 @@ private static String formatHex(Object val) throws CelEvaluationException {
 return Long.toHexString((Long) val);
 } else if (val instanceof UnsignedLong) {
 return Long.toHexString(((UnsignedLong) val).longValue());
 } else if (val instanceof ByteString) {
 } else if (val instanceof CelByteString) {
 StringBuilder hexString = new StringBuilder();
 for (byte b : (ByteString) val) {
 byte[] celBytes = ((CelByteString) val).toByteArray();
 for (byte b : celBytes) {
 hexString.append(String.format("%02x", b));
 }
 return hexString.toString();
Expand Down

7 changes: 7 additions & 0 deletions
src/main/java/build/buf/protovalidate/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import dev.cel.common.values.CelByteString;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand DownExpand Up@@ -66,6 +68,11 @@ static Object toCel(Descriptors.FieldDescriptor fieldDescriptor, Object value) {
 /** Converts a scalar type to cel value. */
 static Object scalarToCel(Descriptors.FieldDescriptor.Type type, Object value) {
 switch (type) {
 case BYTES:
 if (value instanceof ByteString) {
 return CelByteString.of(((ByteString) value).toByteArray());
 }
 return value;
 case ENUM:
 if (value instanceof Descriptors.EnumValueDescriptor) {
 return (long) ((Descriptors.EnumValueDescriptor) value).getNumber();
Expand Down

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/RuleViolation.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -260,4 +260,9 @@ public build.buf.validate.Violation toProto() {
 public @Nullable FieldValue getRuleValue() {
 return ruleValue;
 }

 @Override
 public String toString() {
 return proto.toString();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This made debugging more painful - added a toString which will dump the contents of the proto Validation message.
 }
}

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/ValidatorImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.protobuf.Message;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import java.util.ArrayList;
import java.util.List;

Expand All@@ -39,6 +40,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This opts in to the new behavior which uses CEL types instead of Protobuf types for NullValue / ByteString. This is apparently coming soon as the default, so since we had to update our overloads to use the new types just opted in to migrate everything to use them.
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config);
 this.failFast = config.isFailFast();
Expand All@@ -51,6 +54,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config, descriptors, disableLazy);
 this.failFast = config.isFailFast();
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/buf/validate/validate.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,7 +274,7 @@ message FieldRules {
 // message UpdateRequest {
 // // The uri rule only applies if the field is not an empty string.
 // string url = 1 [
 // (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED,
 // (buf.validate.field).ignore = IGNORE_IF_ZERO_VALUE,
 // (buf.validate.field).string.uri = true
 // ];
 // }
Expand Down

3 changes: 3 additions & 0 deletions
src/test/java/build/buf/protovalidate/CustomOverloadTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -35,6 +36,8 @@ public class CustomOverloadTest {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();

 @Test
Expand Down

5 changes: 4 additions & 1 deletion
src/test/java/build/buf/protovalidate/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.common.types.SimpleType;
Expand All@@ -50,7 +51,7 @@
class FormatTest {
 // Version of the cel-spec that this implementation is conformant with
 // This should be kept in sync with the version in gradle.properties
 private static String CEL_SPEC_VERSION = "v0.24.0";
 private static final String CEL_SPEC_VERSION = "v0.24.0";

 private static Cel cel;

Expand DownExpand Up@@ -91,6 +92,8 @@ public static void setUp() throws Exception {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 }

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
Upgrade CEL from 0.10.1 to 0.11.0#345

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

pkwarren
merged 2 commits into

from

Sep 8, 2025
 Merged


Upgrade CEL from 0.10.1 to 0.11.0
#345
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2138340

Upgrade CEL from 0.10.1 to 0.11.0


pkwarren Sep 8, 2025
a02479e

Further cleanup to use CEL types


pkwarren Sep 8, 2025

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


5 changes: 1 addition & 4 deletions
build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,10 +338,7 @@ dependencies {
 annotationProcessor(libs.nullaway)
 api(libs.jspecify)
 api(libs.protobuf.java)
 implementation(libs.cel) {
 // https://github.com/google/cel-java/issues/748
 exclude(group = "com.google.protobuf", module = "protobuf-javalite")
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream issue is fixed in this release.
 }
 implementation(libs.cel)

 buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

Expand Down

2 changes: 1 addition & 1 deletion
conformance/src/test/java/build/buf/protovalidate/ValidatorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ public void testDynRuntimeError() {
 public void strictBytesIn() throws ValidationException {
 BytesIn invalid = BytesIn.newBuilder().setVal(ByteString.copyFromUtf8("bar")).build();
 ValidationResult validate = validator.validate(invalid);
 assertThat(validate.isSuccess()).isTrue();
 assertThat(validate.getViolations()).isEmpty();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just showing expected true, got false isn't great for debugging. Made it use isEmpty so it will print the violations.
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# Version of buf.build/bufbuild/protovalidate to use.
protovalidate.version = v0.14.0
protovalidate.version = v0.14.2

# Arguments to the protovalidate-conformance CLI
protovalidate.conformance.args = --strict_message --strict_error --expected_failures=expected-failures.yaml
Expand Down

2 changes: 1 addition & 1 deletion
gradle/libs.versions.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[versions]
assertj = "3.27.4"
buf = "1.57.0"
cel = "0.10.1"
cel = "0.11.0"
error-prone = "2.41.0"
junit = "5.13.4"
maven-publish = "0.34.0"
Expand Down

26 changes: 15 additions & 11 deletions
src/main/java/build/buf/protovalidate/CustomOverload.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,11 @@

package build.buf.protovalidate;

import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
import dev.cel.common.types.CelType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelFunctionBinding;
import java.util.ArrayList;
Expand DownExpand Up@@ -131,14 +131,16 @@ private static List<CelFunctionBinding> celUnique() {
 private static CelFunctionBinding celStartsWithBytes() {
 return CelFunctionBinding.from(
 "starts_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(i) != receiver.byteAt(i)) {
 byte[] paramBytes = param.toByteArray();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if there was a byteAt method on CelByteString to avoid having to allocate a byte array to access a single byte.
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[i] != receiverBytes[i]) {
 return false;
 }
 }
Expand All@@ -154,14 +156,16 @@ private static CelFunctionBinding celStartsWithBytes() {
 private static CelFunctionBinding celEndsWithBytes() {
 return CelFunctionBinding.from(
 "ends_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(param.size() - i - 1) != receiver.byteAt(receiver.size() - i - 1)) {
 byte[] paramBytes = param.toByteArray();
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[param.size() - i - 1] != receiverBytes[receiver.size() - i - 1]) {
 return false;
 }
 }
Expand All@@ -177,8 +181,8 @@ private static CelFunctionBinding celEndsWithBytes() {
 private static CelFunctionBinding celContainsBytes() {
 return CelFunctionBinding.from(
 "contains_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> bytesContains(receiver.toByteArray(), param.toByteArray()));
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/main/java/build/buf/protovalidate/DescriptorMappings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ static FieldDescriptor expectedWrapperRules(String fqn) {
 }

 /**
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link com.google.api.expr.v1alpha1.Type}.
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link dev.cel.common.types.CelType}.
 *
 * @param kind The protobuf field type.
 * @return The corresponding CEL type for the protobuf field.
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/build/buf/protovalidate/EvaluatorBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
import build.buf.validate.MessageRules;
import build.buf.validate.OneofRules;
import build.buf.validate.Rule;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
Expand All@@ -33,6 +32,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.util.ArrayList;
import java.util.Collections;
Expand DownExpand Up@@ -320,7 +320,7 @@ private Object zeroValue(FieldDescriptor fieldDescriptor, boolean forItems)
 zero = "";
 break;
 case BYTE_STRING:
 zero = ByteString.EMPTY;
 zero = CelByteString.EMPTY;
 break;
 case ENUM:
 zero = (long) fieldDescriptor.getEnumType().getValues().get(0).getNumber();
Expand Down

14 changes: 7 additions & 7 deletions
src/main/java/build/buf/protovalidate/Format.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,10 @@
import static java.time.format.DateTimeFormatter.ISO_INSTANT;

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.TypeType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
Expand DownExpand Up@@ -147,8 +146,8 @@ private static String formatString(Object val) throws CelEvaluationException {
 return str.get();
 }
 return val.toString();
 } else if (val instanceof ByteString) {
 String byteStr = ((ByteString) val).toStringUtf8();
 } else if (val instanceof CelByteString) {
 String byteStr = ((CelByteString) val).toStringUtf8();
 // Collapse any contiguous placeholders into one
 return byteStr.replaceAll("\\ufffd+", "\ufffd");
 } else if (val instanceof Double) {
Expand All@@ -165,7 +164,7 @@ private static String formatString(Object val) throws CelEvaluationException {
 return formatList((List<?>) val);
 } else if (val instanceof Map) {
 return formatMap((Map<?, ?>) val);
 } else if (val == null || val instanceof NullValue) {
 } else if (val == null || val instanceof dev.cel.common.values.NullValue) {
 return "null";
 }
 throw new CelEvaluationException(
Expand DownExpand Up@@ -250,9 +249,10 @@ private static String formatHex(Object val) throws CelEvaluationException {
 return Long.toHexString((Long) val);
 } else if (val instanceof UnsignedLong) {
 return Long.toHexString(((UnsignedLong) val).longValue());
 } else if (val instanceof ByteString) {
 } else if (val instanceof CelByteString) {
 StringBuilder hexString = new StringBuilder();
 for (byte b : (ByteString) val) {
 byte[] celBytes = ((CelByteString) val).toByteArray();
 for (byte b : celBytes) {
 hexString.append(String.format("%02x", b));
 }
 return hexString.toString();
Expand Down

7 changes: 7 additions & 0 deletions
src/main/java/build/buf/protovalidate/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import dev.cel.common.values.CelByteString;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand DownExpand Up@@ -66,6 +68,11 @@ static Object toCel(Descriptors.FieldDescriptor fieldDescriptor, Object value) {
 /** Converts a scalar type to cel value. */
 static Object scalarToCel(Descriptors.FieldDescriptor.Type type, Object value) {
 switch (type) {
 case BYTES:
 if (value instanceof ByteString) {
 return CelByteString.of(((ByteString) value).toByteArray());
 }
 return value;
 case ENUM:
 if (value instanceof Descriptors.EnumValueDescriptor) {
 return (long) ((Descriptors.EnumValueDescriptor) value).getNumber();
Expand Down

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/RuleViolation.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -260,4 +260,9 @@ public build.buf.validate.Violation toProto() {
 public @Nullable FieldValue getRuleValue() {
 return ruleValue;
 }

 @Override
 public String toString() {
 return proto.toString();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This made debugging more painful - added a toString which will dump the contents of the proto Validation message.
 }
}

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/ValidatorImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.protobuf.Message;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import java.util.ArrayList;
import java.util.List;

Expand All@@ -39,6 +40,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This opts in to the new behavior which uses CEL types instead of Protobuf types for NullValue / ByteString. This is apparently coming soon as the default, so since we had to update our overloads to use the new types just opted in to migrate everything to use them.
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config);
 this.failFast = config.isFailFast();
Expand All@@ -51,6 +54,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config, descriptors, disableLazy);
 this.failFast = config.isFailFast();
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/buf/validate/validate.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,7 +274,7 @@ message FieldRules {
 // message UpdateRequest {
 // // The uri rule only applies if the field is not an empty string.
 // string url = 1 [
 // (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED,
 // (buf.validate.field).ignore = IGNORE_IF_ZERO_VALUE,
 // (buf.validate.field).string.uri = true
 // ];
 // }
Expand Down

3 changes: 3 additions & 0 deletions
src/test/java/build/buf/protovalidate/CustomOverloadTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -35,6 +36,8 @@ public class CustomOverloadTest {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();

 @Test
Expand Down

5 changes: 4 additions & 1 deletion
src/test/java/build/buf/protovalidate/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.common.types.SimpleType;
Expand All@@ -50,7 +51,7 @@
class FormatTest {
 // Version of the cel-spec that this implementation is conformant with
 // This should be kept in sync with the version in gradle.properties
 private static String CEL_SPEC_VERSION = "v0.24.0";
 private static final String CEL_SPEC_VERSION = "v0.24.0";

 private static Cel cel;

Expand DownExpand Up@@ -91,6 +92,8 @@ public static void setUp() throws Exception {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 }

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
Upgrade CEL from 0.10.1 to 0.11.0#345

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

pkwarren
merged 2 commits into

from

Sep 8, 2025
 Merged


Upgrade CEL from 0.10.1 to 0.11.0
#345
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2138340

Upgrade CEL from 0.10.1 to 0.11.0


pkwarren Sep 8, 2025
a02479e

Further cleanup to use CEL types


pkwarren Sep 8, 2025

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


5 changes: 1 addition & 4 deletions
build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,10 +338,7 @@ dependencies {
 annotationProcessor(libs.nullaway)
 api(libs.jspecify)
 api(libs.protobuf.java)
 implementation(libs.cel) {
 // https://github.com/google/cel-java/issues/748
 exclude(group = "com.google.protobuf", module = "protobuf-javalite")
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream issue is fixed in this release.
 }
 implementation(libs.cel)

 buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

Expand Down

2 changes: 1 addition & 1 deletion
conformance/src/test/java/build/buf/protovalidate/ValidatorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ public void testDynRuntimeError() {
 public void strictBytesIn() throws ValidationException {
 BytesIn invalid = BytesIn.newBuilder().setVal(ByteString.copyFromUtf8("bar")).build();
 ValidationResult validate = validator.validate(invalid);
 assertThat(validate.isSuccess()).isTrue();
 assertThat(validate.getViolations()).isEmpty();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just showing expected true, got false isn't great for debugging. Made it use isEmpty so it will print the violations.
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# Version of buf.build/bufbuild/protovalidate to use.
protovalidate.version = v0.14.0
protovalidate.version = v0.14.2

# Arguments to the protovalidate-conformance CLI
protovalidate.conformance.args = --strict_message --strict_error --expected_failures=expected-failures.yaml
Expand Down

2 changes: 1 addition & 1 deletion
gradle/libs.versions.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[versions]
assertj = "3.27.4"
buf = "1.57.0"
cel = "0.10.1"
cel = "0.11.0"
error-prone = "2.41.0"
junit = "5.13.4"
maven-publish = "0.34.0"
Expand Down

26 changes: 15 additions & 11 deletions
src/main/java/build/buf/protovalidate/CustomOverload.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,11 @@

package build.buf.protovalidate;

import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
import dev.cel.common.types.CelType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelFunctionBinding;
import java.util.ArrayList;
Expand DownExpand Up@@ -131,14 +131,16 @@ private static List<CelFunctionBinding> celUnique() {
 private static CelFunctionBinding celStartsWithBytes() {
 return CelFunctionBinding.from(
 "starts_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(i) != receiver.byteAt(i)) {
 byte[] paramBytes = param.toByteArray();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if there was a byteAt method on CelByteString to avoid having to allocate a byte array to access a single byte.
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[i] != receiverBytes[i]) {
 return false;
 }
 }
Expand All@@ -154,14 +156,16 @@ private static CelFunctionBinding celStartsWithBytes() {
 private static CelFunctionBinding celEndsWithBytes() {
 return CelFunctionBinding.from(
 "ends_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(param.size() - i - 1) != receiver.byteAt(receiver.size() - i - 1)) {
 byte[] paramBytes = param.toByteArray();
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[param.size() - i - 1] != receiverBytes[receiver.size() - i - 1]) {
 return false;
 }
 }
Expand All@@ -177,8 +181,8 @@ private static CelFunctionBinding celEndsWithBytes() {
 private static CelFunctionBinding celContainsBytes() {
 return CelFunctionBinding.from(
 "contains_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> bytesContains(receiver.toByteArray(), param.toByteArray()));
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/main/java/build/buf/protovalidate/DescriptorMappings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ static FieldDescriptor expectedWrapperRules(String fqn) {
 }

 /**
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link com.google.api.expr.v1alpha1.Type}.
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link dev.cel.common.types.CelType}.
 *
 * @param kind The protobuf field type.
 * @return The corresponding CEL type for the protobuf field.
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/build/buf/protovalidate/EvaluatorBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
import build.buf.validate.MessageRules;
import build.buf.validate.OneofRules;
import build.buf.validate.Rule;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
Expand All@@ -33,6 +32,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.util.ArrayList;
import java.util.Collections;
Expand DownExpand Up@@ -320,7 +320,7 @@ private Object zeroValue(FieldDescriptor fieldDescriptor, boolean forItems)
 zero = "";
 break;
 case BYTE_STRING:
 zero = ByteString.EMPTY;
 zero = CelByteString.EMPTY;
 break;
 case ENUM:
 zero = (long) fieldDescriptor.getEnumType().getValues().get(0).getNumber();
Expand Down

14 changes: 7 additions & 7 deletions
src/main/java/build/buf/protovalidate/Format.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,10 @@
import static java.time.format.DateTimeFormatter.ISO_INSTANT;

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.TypeType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
Expand DownExpand Up@@ -147,8 +146,8 @@ private static String formatString(Object val) throws CelEvaluationException {
 return str.get();
 }
 return val.toString();
 } else if (val instanceof ByteString) {
 String byteStr = ((ByteString) val).toStringUtf8();
 } else if (val instanceof CelByteString) {
 String byteStr = ((CelByteString) val).toStringUtf8();
 // Collapse any contiguous placeholders into one
 return byteStr.replaceAll("\\ufffd+", "\ufffd");
 } else if (val instanceof Double) {
Expand All@@ -165,7 +164,7 @@ private static String formatString(Object val) throws CelEvaluationException {
 return formatList((List<?>) val);
 } else if (val instanceof Map) {
 return formatMap((Map<?, ?>) val);
 } else if (val == null || val instanceof NullValue) {
 } else if (val == null || val instanceof dev.cel.common.values.NullValue) {
 return "null";
 }
 throw new CelEvaluationException(
Expand DownExpand Up@@ -250,9 +249,10 @@ private static String formatHex(Object val) throws CelEvaluationException {
 return Long.toHexString((Long) val);
 } else if (val instanceof UnsignedLong) {
 return Long.toHexString(((UnsignedLong) val).longValue());
 } else if (val instanceof ByteString) {
 } else if (val instanceof CelByteString) {
 StringBuilder hexString = new StringBuilder();
 for (byte b : (ByteString) val) {
 byte[] celBytes = ((CelByteString) val).toByteArray();
 for (byte b : celBytes) {
 hexString.append(String.format("%02x", b));
 }
 return hexString.toString();
Expand Down

7 changes: 7 additions & 0 deletions
src/main/java/build/buf/protovalidate/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import dev.cel.common.values.CelByteString;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand DownExpand Up@@ -66,6 +68,11 @@ static Object toCel(Descriptors.FieldDescriptor fieldDescriptor, Object value) {
 /** Converts a scalar type to cel value. */
 static Object scalarToCel(Descriptors.FieldDescriptor.Type type, Object value) {
 switch (type) {
 case BYTES:
 if (value instanceof ByteString) {
 return CelByteString.of(((ByteString) value).toByteArray());
 }
 return value;
 case ENUM:
 if (value instanceof Descriptors.EnumValueDescriptor) {
 return (long) ((Descriptors.EnumValueDescriptor) value).getNumber();
Expand Down

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/RuleViolation.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -260,4 +260,9 @@ public build.buf.validate.Violation toProto() {
 public @Nullable FieldValue getRuleValue() {
 return ruleValue;
 }

 @Override
 public String toString() {
 return proto.toString();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This made debugging more painful - added a toString which will dump the contents of the proto Validation message.
 }
}

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/ValidatorImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.protobuf.Message;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import java.util.ArrayList;
import java.util.List;

Expand All@@ -39,6 +40,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This opts in to the new behavior which uses CEL types instead of Protobuf types for NullValue / ByteString. This is apparently coming soon as the default, so since we had to update our overloads to use the new types just opted in to migrate everything to use them.
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config);
 this.failFast = config.isFailFast();
Expand All@@ -51,6 +54,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config, descriptors, disableLazy);
 this.failFast = config.isFailFast();
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/buf/validate/validate.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,7 +274,7 @@ message FieldRules {
 // message UpdateRequest {
 // // The uri rule only applies if the field is not an empty string.
 // string url = 1 [
 // (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED,
 // (buf.validate.field).ignore = IGNORE_IF_ZERO_VALUE,
 // (buf.validate.field).string.uri = true
 // ];
 // }
Expand Down

3 changes: 3 additions & 0 deletions
src/test/java/build/buf/protovalidate/CustomOverloadTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -35,6 +36,8 @@ public class CustomOverloadTest {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();

 @Test
Expand Down

5 changes: 4 additions & 1 deletion
src/test/java/build/buf/protovalidate/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.common.types.SimpleType;
Expand All@@ -50,7 +51,7 @@
class FormatTest {
 // Version of the cel-spec that this implementation is conformant with
 // This should be kept in sync with the version in gradle.properties
 private static String CEL_SPEC_VERSION = "v0.24.0";
 private static final String CEL_SPEC_VERSION = "v0.24.0";

 private static Cel cel;

Expand DownExpand Up@@ -91,6 +92,8 @@ public static void setUp() throws Exception {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 }

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
Upgrade CEL from 0.10.1 to 0.11.0#345

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

pkwarren
merged 2 commits into

from

Sep 8, 2025
 Merged


Upgrade CEL from 0.10.1 to 0.11.0
#345
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2138340

Upgrade CEL from 0.10.1 to 0.11.0


pkwarren Sep 8, 2025
a02479e

Further cleanup to use CEL types


pkwarren Sep 8, 2025

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


5 changes: 1 addition & 4 deletions
build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,10 +338,7 @@ dependencies {
 annotationProcessor(libs.nullaway)
 api(libs.jspecify)
 api(libs.protobuf.java)
 implementation(libs.cel) {
 // https://github.com/google/cel-java/issues/748
 exclude(group = "com.google.protobuf", module = "protobuf-javalite")
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream issue is fixed in this release.
 }
 implementation(libs.cel)

 buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

Expand Down

2 changes: 1 addition & 1 deletion
conformance/src/test/java/build/buf/protovalidate/ValidatorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ public void testDynRuntimeError() {
 public void strictBytesIn() throws ValidationException {
 BytesIn invalid = BytesIn.newBuilder().setVal(ByteString.copyFromUtf8("bar")).build();
 ValidationResult validate = validator.validate(invalid);
 assertThat(validate.isSuccess()).isTrue();
 assertThat(validate.getViolations()).isEmpty();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just showing expected true, got false isn't great for debugging. Made it use isEmpty so it will print the violations.
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# Version of buf.build/bufbuild/protovalidate to use.
protovalidate.version = v0.14.0
protovalidate.version = v0.14.2

# Arguments to the protovalidate-conformance CLI
protovalidate.conformance.args = --strict_message --strict_error --expected_failures=expected-failures.yaml
Expand Down

2 changes: 1 addition & 1 deletion
gradle/libs.versions.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[versions]
assertj = "3.27.4"
buf = "1.57.0"
cel = "0.10.1"
cel = "0.11.0"
error-prone = "2.41.0"
junit = "5.13.4"
maven-publish = "0.34.0"
Expand Down

26 changes: 15 additions & 11 deletions
src/main/java/build/buf/protovalidate/CustomOverload.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,11 @@

package build.buf.protovalidate;

import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
import dev.cel.common.types.CelType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelFunctionBinding;
import java.util.ArrayList;
Expand DownExpand Up@@ -131,14 +131,16 @@ private static List<CelFunctionBinding> celUnique() {
 private static CelFunctionBinding celStartsWithBytes() {
 return CelFunctionBinding.from(
 "starts_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(i) != receiver.byteAt(i)) {
 byte[] paramBytes = param.toByteArray();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if there was a byteAt method on CelByteString to avoid having to allocate a byte array to access a single byte.
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[i] != receiverBytes[i]) {
 return false;
 }
 }
Expand All@@ -154,14 +156,16 @@ private static CelFunctionBinding celStartsWithBytes() {
 private static CelFunctionBinding celEndsWithBytes() {
 return CelFunctionBinding.from(
 "ends_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(param.size() - i - 1) != receiver.byteAt(receiver.size() - i - 1)) {
 byte[] paramBytes = param.toByteArray();
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[param.size() - i - 1] != receiverBytes[receiver.size() - i - 1]) {
 return false;
 }
 }
Expand All@@ -177,8 +181,8 @@ private static CelFunctionBinding celEndsWithBytes() {
 private static CelFunctionBinding celContainsBytes() {
 return CelFunctionBinding.from(
 "contains_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> bytesContains(receiver.toByteArray(), param.toByteArray()));
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/main/java/build/buf/protovalidate/DescriptorMappings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ static FieldDescriptor expectedWrapperRules(String fqn) {
 }

 /**
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link com.google.api.expr.v1alpha1.Type}.
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link dev.cel.common.types.CelType}.
 *
 * @param kind The protobuf field type.
 * @return The corresponding CEL type for the protobuf field.
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/build/buf/protovalidate/EvaluatorBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
import build.buf.validate.MessageRules;
import build.buf.validate.OneofRules;
import build.buf.validate.Rule;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
Expand All@@ -33,6 +32,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.util.ArrayList;
import java.util.Collections;
Expand DownExpand Up@@ -320,7 +320,7 @@ private Object zeroValue(FieldDescriptor fieldDescriptor, boolean forItems)
 zero = "";
 break;
 case BYTE_STRING:
 zero = ByteString.EMPTY;
 zero = CelByteString.EMPTY;
 break;
 case ENUM:
 zero = (long) fieldDescriptor.getEnumType().getValues().get(0).getNumber();
Expand Down

14 changes: 7 additions & 7 deletions
src/main/java/build/buf/protovalidate/Format.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,10 @@
import static java.time.format.DateTimeFormatter.ISO_INSTANT;

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.TypeType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
Expand DownExpand Up@@ -147,8 +146,8 @@ private static String formatString(Object val) throws CelEvaluationException {
 return str.get();
 }
 return val.toString();
 } else if (val instanceof ByteString) {
 String byteStr = ((ByteString) val).toStringUtf8();
 } else if (val instanceof CelByteString) {
 String byteStr = ((CelByteString) val).toStringUtf8();
 // Collapse any contiguous placeholders into one
 return byteStr.replaceAll("\\ufffd+", "\ufffd");
 } else if (val instanceof Double) {
Expand All@@ -165,7 +164,7 @@ private static String formatString(Object val) throws CelEvaluationException {
 return formatList((List<?>) val);
 } else if (val instanceof Map) {
 return formatMap((Map<?, ?>) val);
 } else if (val == null || val instanceof NullValue) {
 } else if (val == null || val instanceof dev.cel.common.values.NullValue) {
 return "null";
 }
 throw new CelEvaluationException(
Expand DownExpand Up@@ -250,9 +249,10 @@ private static String formatHex(Object val) throws CelEvaluationException {
 return Long.toHexString((Long) val);
 } else if (val instanceof UnsignedLong) {
 return Long.toHexString(((UnsignedLong) val).longValue());
 } else if (val instanceof ByteString) {
 } else if (val instanceof CelByteString) {
 StringBuilder hexString = new StringBuilder();
 for (byte b : (ByteString) val) {
 byte[] celBytes = ((CelByteString) val).toByteArray();
 for (byte b : celBytes) {
 hexString.append(String.format("%02x", b));
 }
 return hexString.toString();
Expand Down

7 changes: 7 additions & 0 deletions
src/main/java/build/buf/protovalidate/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import dev.cel.common.values.CelByteString;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand DownExpand Up@@ -66,6 +68,11 @@ static Object toCel(Descriptors.FieldDescriptor fieldDescriptor, Object value) {
 /** Converts a scalar type to cel value. */
 static Object scalarToCel(Descriptors.FieldDescriptor.Type type, Object value) {
 switch (type) {
 case BYTES:
 if (value instanceof ByteString) {
 return CelByteString.of(((ByteString) value).toByteArray());
 }
 return value;
 case ENUM:
 if (value instanceof Descriptors.EnumValueDescriptor) {
 return (long) ((Descriptors.EnumValueDescriptor) value).getNumber();
Expand Down

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/RuleViolation.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -260,4 +260,9 @@ public build.buf.validate.Violation toProto() {
 public @Nullable FieldValue getRuleValue() {
 return ruleValue;
 }

 @Override
 public String toString() {
 return proto.toString();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This made debugging more painful - added a toString which will dump the contents of the proto Validation message.
 }
}

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/ValidatorImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.protobuf.Message;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import java.util.ArrayList;
import java.util.List;

Expand All@@ -39,6 +40,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This opts in to the new behavior which uses CEL types instead of Protobuf types for NullValue / ByteString. This is apparently coming soon as the default, so since we had to update our overloads to use the new types just opted in to migrate everything to use them.
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config);
 this.failFast = config.isFailFast();
Expand All@@ -51,6 +54,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config, descriptors, disableLazy);
 this.failFast = config.isFailFast();
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/buf/validate/validate.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,7 +274,7 @@ message FieldRules {
 // message UpdateRequest {
 // // The uri rule only applies if the field is not an empty string.
 // string url = 1 [
 // (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED,
 // (buf.validate.field).ignore = IGNORE_IF_ZERO_VALUE,
 // (buf.validate.field).string.uri = true
 // ];
 // }
Expand Down

3 changes: 3 additions & 0 deletions
src/test/java/build/buf/protovalidate/CustomOverloadTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -35,6 +36,8 @@ public class CustomOverloadTest {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();

 @Test
Expand Down

5 changes: 4 additions & 1 deletion
src/test/java/build/buf/protovalidate/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.common.types.SimpleType;
Expand All@@ -50,7 +51,7 @@
class FormatTest {
 // Version of the cel-spec that this implementation is conformant with
 // This should be kept in sync with the version in gradle.properties
 private static String CEL_SPEC_VERSION = "v0.24.0";
 private static final String CEL_SPEC_VERSION = "v0.24.0";

 private static Cel cel;

Expand DownExpand Up@@ -91,6 +92,8 @@ public static void setUp() throws Exception {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 }

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
Upgrade CEL from 0.10.1 to 0.11.0#345

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

pkwarren
merged 2 commits into

from

Sep 8, 2025
 Merged


Upgrade CEL from 0.10.1 to 0.11.0
#345
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2138340

Upgrade CEL from 0.10.1 to 0.11.0


pkwarren Sep 8, 2025
a02479e

Further cleanup to use CEL types


pkwarren Sep 8, 2025

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


5 changes: 1 addition & 4 deletions
build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,10 +338,7 @@ dependencies {
 annotationProcessor(libs.nullaway)
 api(libs.jspecify)
 api(libs.protobuf.java)
 implementation(libs.cel) {
 // https://github.com/google/cel-java/issues/748
 exclude(group = "com.google.protobuf", module = "protobuf-javalite")
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream issue is fixed in this release.
 }
 implementation(libs.cel)

 buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

Expand Down

2 changes: 1 addition & 1 deletion
conformance/src/test/java/build/buf/protovalidate/ValidatorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ public void testDynRuntimeError() {
 public void strictBytesIn() throws ValidationException {
 BytesIn invalid = BytesIn.newBuilder().setVal(ByteString.copyFromUtf8("bar")).build();
 ValidationResult validate = validator.validate(invalid);
 assertThat(validate.isSuccess()).isTrue();
 assertThat(validate.getViolations()).isEmpty();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just showing expected true, got false isn't great for debugging. Made it use isEmpty so it will print the violations.
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# Version of buf.build/bufbuild/protovalidate to use.
protovalidate.version = v0.14.0
protovalidate.version = v0.14.2

# Arguments to the protovalidate-conformance CLI
protovalidate.conformance.args = --strict_message --strict_error --expected_failures=expected-failures.yaml
Expand Down

2 changes: 1 addition & 1 deletion
gradle/libs.versions.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[versions]
assertj = "3.27.4"
buf = "1.57.0"
cel = "0.10.1"
cel = "0.11.0"
error-prone = "2.41.0"
junit = "5.13.4"
maven-publish = "0.34.0"
Expand Down

26 changes: 15 additions & 11 deletions
src/main/java/build/buf/protovalidate/CustomOverload.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,11 @@

package build.buf.protovalidate;

import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
import dev.cel.common.types.CelType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelFunctionBinding;
import java.util.ArrayList;
Expand DownExpand Up@@ -131,14 +131,16 @@ private static List<CelFunctionBinding> celUnique() {
 private static CelFunctionBinding celStartsWithBytes() {
 return CelFunctionBinding.from(
 "starts_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(i) != receiver.byteAt(i)) {
 byte[] paramBytes = param.toByteArray();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if there was a byteAt method on CelByteString to avoid having to allocate a byte array to access a single byte.
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[i] != receiverBytes[i]) {
 return false;
 }
 }
Expand All@@ -154,14 +156,16 @@ private static CelFunctionBinding celStartsWithBytes() {
 private static CelFunctionBinding celEndsWithBytes() {
 return CelFunctionBinding.from(
 "ends_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(param.size() - i - 1) != receiver.byteAt(receiver.size() - i - 1)) {
 byte[] paramBytes = param.toByteArray();
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[param.size() - i - 1] != receiverBytes[receiver.size() - i - 1]) {
 return false;
 }
 }
Expand All@@ -177,8 +181,8 @@ private static CelFunctionBinding celEndsWithBytes() {
 private static CelFunctionBinding celContainsBytes() {
 return CelFunctionBinding.from(
 "contains_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> bytesContains(receiver.toByteArray(), param.toByteArray()));
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/main/java/build/buf/protovalidate/DescriptorMappings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ static FieldDescriptor expectedWrapperRules(String fqn) {
 }

 /**
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link com.google.api.expr.v1alpha1.Type}.
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link dev.cel.common.types.CelType}.
 *
 * @param kind The protobuf field type.
 * @return The corresponding CEL type for the protobuf field.
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/build/buf/protovalidate/EvaluatorBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
import build.buf.validate.MessageRules;
import build.buf.validate.OneofRules;
import build.buf.validate.Rule;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
Expand All@@ -33,6 +32,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.util.ArrayList;
import java.util.Collections;
Expand DownExpand Up@@ -320,7 +320,7 @@ private Object zeroValue(FieldDescriptor fieldDescriptor, boolean forItems)
 zero = "";
 break;
 case BYTE_STRING:
 zero = ByteString.EMPTY;
 zero = CelByteString.EMPTY;
 break;
 case ENUM:
 zero = (long) fieldDescriptor.getEnumType().getValues().get(0).getNumber();
Expand Down

14 changes: 7 additions & 7 deletions
src/main/java/build/buf/protovalidate/Format.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,10 @@
import static java.time.format.DateTimeFormatter.ISO_INSTANT;

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.TypeType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
Expand DownExpand Up@@ -147,8 +146,8 @@ private static String formatString(Object val) throws CelEvaluationException {
 return str.get();
 }
 return val.toString();
 } else if (val instanceof ByteString) {
 String byteStr = ((ByteString) val).toStringUtf8();
 } else if (val instanceof CelByteString) {
 String byteStr = ((CelByteString) val).toStringUtf8();
 // Collapse any contiguous placeholders into one
 return byteStr.replaceAll("\\ufffd+", "\ufffd");
 } else if (val instanceof Double) {
Expand All@@ -165,7 +164,7 @@ private static String formatString(Object val) throws CelEvaluationException {
 return formatList((List<?>) val);
 } else if (val instanceof Map) {
 return formatMap((Map<?, ?>) val);
 } else if (val == null || val instanceof NullValue) {
 } else if (val == null || val instanceof dev.cel.common.values.NullValue) {
 return "null";
 }
 throw new CelEvaluationException(
Expand DownExpand Up@@ -250,9 +249,10 @@ private static String formatHex(Object val) throws CelEvaluationException {
 return Long.toHexString((Long) val);
 } else if (val instanceof UnsignedLong) {
 return Long.toHexString(((UnsignedLong) val).longValue());
 } else if (val instanceof ByteString) {
 } else if (val instanceof CelByteString) {
 StringBuilder hexString = new StringBuilder();
 for (byte b : (ByteString) val) {
 byte[] celBytes = ((CelByteString) val).toByteArray();
 for (byte b : celBytes) {
 hexString.append(String.format("%02x", b));
 }
 return hexString.toString();
Expand Down

7 changes: 7 additions & 0 deletions
src/main/java/build/buf/protovalidate/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import dev.cel.common.values.CelByteString;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand DownExpand Up@@ -66,6 +68,11 @@ static Object toCel(Descriptors.FieldDescriptor fieldDescriptor, Object value) {
 /** Converts a scalar type to cel value. */
 static Object scalarToCel(Descriptors.FieldDescriptor.Type type, Object value) {
 switch (type) {
 case BYTES:
 if (value instanceof ByteString) {
 return CelByteString.of(((ByteString) value).toByteArray());
 }
 return value;
 case ENUM:
 if (value instanceof Descriptors.EnumValueDescriptor) {
 return (long) ((Descriptors.EnumValueDescriptor) value).getNumber();
Expand Down

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/RuleViolation.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -260,4 +260,9 @@ public build.buf.validate.Violation toProto() {
 public @Nullable FieldValue getRuleValue() {
 return ruleValue;
 }

 @Override
 public String toString() {
 return proto.toString();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This made debugging more painful - added a toString which will dump the contents of the proto Validation message.
 }
}

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/ValidatorImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.protobuf.Message;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import java.util.ArrayList;
import java.util.List;

Expand All@@ -39,6 +40,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This opts in to the new behavior which uses CEL types instead of Protobuf types for NullValue / ByteString. This is apparently coming soon as the default, so since we had to update our overloads to use the new types just opted in to migrate everything to use them.
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config);
 this.failFast = config.isFailFast();
Expand All@@ -51,6 +54,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config, descriptors, disableLazy);
 this.failFast = config.isFailFast();
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/buf/validate/validate.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,7 +274,7 @@ message FieldRules {
 // message UpdateRequest {
 // // The uri rule only applies if the field is not an empty string.
 // string url = 1 [
 // (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED,
 // (buf.validate.field).ignore = IGNORE_IF_ZERO_VALUE,
 // (buf.validate.field).string.uri = true
 // ];
 // }
Expand Down

3 changes: 3 additions & 0 deletions
src/test/java/build/buf/protovalidate/CustomOverloadTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -35,6 +36,8 @@ public class CustomOverloadTest {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();

 @Test
Expand Down

5 changes: 4 additions & 1 deletion
src/test/java/build/buf/protovalidate/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.common.types.SimpleType;
Expand All@@ -50,7 +51,7 @@
class FormatTest {
 // Version of the cel-spec that this implementation is conformant with
 // This should be kept in sync with the version in gradle.properties
 private static String CEL_SPEC_VERSION = "v0.24.0";
 private static final String CEL_SPEC_VERSION = "v0.24.0";

 private static Cel cel;

Expand DownExpand Up@@ -91,6 +92,8 @@ public static void setUp() throws Exception {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 }

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
Upgrade CEL from 0.10.1 to 0.11.0#345

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

pkwarren
merged 2 commits into

from

Sep 8, 2025
 Merged


Upgrade CEL from 0.10.1 to 0.11.0
#345
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2138340

Upgrade CEL from 0.10.1 to 0.11.0


pkwarren Sep 8, 2025
a02479e

Further cleanup to use CEL types


pkwarren Sep 8, 2025

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


5 changes: 1 addition & 4 deletions
build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -338,10 +338,7 @@ dependencies {
 annotationProcessor(libs.nullaway)
 api(libs.jspecify)
 api(libs.protobuf.java)
 implementation(libs.cel) {
 // https://github.com/google/cel-java/issues/748
 exclude(group = "com.google.protobuf", module = "protobuf-javalite")
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream issue is fixed in this release.
 }
 implementation(libs.cel)

 buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

Expand Down

2 changes: 1 addition & 1 deletion
conformance/src/test/java/build/buf/protovalidate/ValidatorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,7 @@ public void testDynRuntimeError() {
 public void strictBytesIn() throws ValidationException {
 BytesIn invalid = BytesIn.newBuilder().setVal(ByteString.copyFromUtf8("bar")).build();
 ValidationResult validate = validator.validate(invalid);
 assertThat(validate.isSuccess()).isTrue();
 assertThat(validate.getViolations()).isEmpty();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just showing expected true, got false isn't great for debugging. Made it use isEmpty so it will print the violations.
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# Version of buf.build/bufbuild/protovalidate to use.
protovalidate.version = v0.14.0
protovalidate.version = v0.14.2

# Arguments to the protovalidate-conformance CLI
protovalidate.conformance.args = --strict_message --strict_error --expected_failures=expected-failures.yaml
Expand Down

2 changes: 1 addition & 1 deletion
gradle/libs.versions.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[versions]
assertj = "3.27.4"
buf = "1.57.0"
cel = "0.10.1"
cel = "0.11.0"
error-prone = "2.41.0"
junit = "5.13.4"
maven-publish = "0.34.0"
Expand Down

26 changes: 15 additions & 11 deletions
src/main/java/build/buf/protovalidate/CustomOverload.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,11 +14,11 @@

package build.buf.protovalidate;

import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
import dev.cel.common.types.CelType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelFunctionBinding;
import java.util.ArrayList;
Expand DownExpand Up@@ -131,14 +131,16 @@ private static List<CelFunctionBinding> celUnique() {
 private static CelFunctionBinding celStartsWithBytes() {
 return CelFunctionBinding.from(
 "starts_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(i) != receiver.byteAt(i)) {
 byte[] paramBytes = param.toByteArray();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if there was a byteAt method on CelByteString to avoid having to allocate a byte array to access a single byte.
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[i] != receiverBytes[i]) {
 return false;
 }
 }
Expand All@@ -154,14 +156,16 @@ private static CelFunctionBinding celStartsWithBytes() {
 private static CelFunctionBinding celEndsWithBytes() {
 return CelFunctionBinding.from(
 "ends_with_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> {
 if (receiver.size() < param.size()) {
 return false;
 }
 for (int i = 0; i < param.size(); i++) {
 if (param.byteAt(param.size() - i - 1) != receiver.byteAt(receiver.size() - i - 1)) {
 byte[] paramBytes = param.toByteArray();
 byte[] receiverBytes = receiver.toByteArray();
 for (int i = 0; i < paramBytes.length; i++) {
 if (paramBytes[param.size() - i - 1] != receiverBytes[receiver.size() - i - 1]) {
 return false;
 }
 }
Expand All@@ -177,8 +181,8 @@ private static CelFunctionBinding celEndsWithBytes() {
 private static CelFunctionBinding celContainsBytes() {
 return CelFunctionBinding.from(
 "contains_bytes",
ByteString.class,
ByteString.class,
CelByteString.class,
CelByteString.class,
 (receiver, param) -> bytesContains(receiver.toByteArray(), param.toByteArray()));
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/main/java/build/buf/protovalidate/DescriptorMappings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ static FieldDescriptor expectedWrapperRules(String fqn) {
 }

 /**
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link com.google.api.expr.v1alpha1.Type}.
 * Maps a {@link FieldDescriptor.Type} to a compatible {@link dev.cel.common.types.CelType}.
 *
 * @param kind The protobuf field type.
 * @return The corresponding CEL type for the protobuf field.
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/build/buf/protovalidate/EvaluatorBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
import build.buf.validate.MessageRules;
import build.buf.validate.OneofRules;
import build.buf.validate.Rule;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
Expand All@@ -33,6 +32,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.common.types.StructTypeReference;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.util.ArrayList;
import java.util.Collections;
Expand DownExpand Up@@ -320,7 +320,7 @@ private Object zeroValue(FieldDescriptor fieldDescriptor, boolean forItems)
 zero = "";
 break;
 case BYTE_STRING:
 zero = ByteString.EMPTY;
 zero = CelByteString.EMPTY;
 break;
 case ENUM:
 zero = (long) fieldDescriptor.getEnumType().getValues().get(0).getNumber();
Expand Down

14 changes: 7 additions & 7 deletions
src/main/java/build/buf/protovalidate/Format.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,10 @@
import static java.time.format.DateTimeFormatter.ISO_INSTANT;

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.NullValue;
import com.google.protobuf.Timestamp;
import dev.cel.common.types.TypeType;
import dev.cel.common.values.CelByteString;
import dev.cel.runtime.CelEvaluationException;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
Expand DownExpand Up@@ -147,8 +146,8 @@ private static String formatString(Object val) throws CelEvaluationException {
 return str.get();
 }
 return val.toString();
 } else if (val instanceof ByteString) {
 String byteStr = ((ByteString) val).toStringUtf8();
 } else if (val instanceof CelByteString) {
 String byteStr = ((CelByteString) val).toStringUtf8();
 // Collapse any contiguous placeholders into one
 return byteStr.replaceAll("\\ufffd+", "\ufffd");
 } else if (val instanceof Double) {
Expand All@@ -165,7 +164,7 @@ private static String formatString(Object val) throws CelEvaluationException {
 return formatList((List<?>) val);
 } else if (val instanceof Map) {
 return formatMap((Map<?, ?>) val);
 } else if (val == null || val instanceof NullValue) {
 } else if (val == null || val instanceof dev.cel.common.values.NullValue) {
 return "null";
 }
 throw new CelEvaluationException(
Expand DownExpand Up@@ -250,9 +249,10 @@ private static String formatHex(Object val) throws CelEvaluationException {
 return Long.toHexString((Long) val);
 } else if (val instanceof UnsignedLong) {
 return Long.toHexString(((UnsignedLong) val).longValue());
 } else if (val instanceof ByteString) {
 } else if (val instanceof CelByteString) {
 StringBuilder hexString = new StringBuilder();
 for (byte b : (ByteString) val) {
 byte[] celBytes = ((CelByteString) val).toByteArray();
 for (byte b : celBytes) {
 hexString.append(String.format("%02x", b));
 }
 return hexString.toString();
Expand Down

7 changes: 7 additions & 0 deletions
src/main/java/build/buf/protovalidate/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,9 @@

import com.google.common.primitives.UnsignedLong;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors;
import dev.cel.common.values.CelByteString;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand DownExpand Up@@ -66,6 +68,11 @@ static Object toCel(Descriptors.FieldDescriptor fieldDescriptor, Object value) {
 /** Converts a scalar type to cel value. */
 static Object scalarToCel(Descriptors.FieldDescriptor.Type type, Object value) {
 switch (type) {
 case BYTES:
 if (value instanceof ByteString) {
 return CelByteString.of(((ByteString) value).toByteArray());
 }
 return value;
 case ENUM:
 if (value instanceof Descriptors.EnumValueDescriptor) {
 return (long) ((Descriptors.EnumValueDescriptor) value).getNumber();
Expand Down

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/RuleViolation.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -260,4 +260,9 @@ public build.buf.validate.Violation toProto() {
 public @Nullable FieldValue getRuleValue() {
 return ruleValue;
 }

 @Override
 public String toString() {
 return proto.toString();
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This made debugging more painful - added a toString which will dump the contents of the proto Validation message.
 }
}

5 changes: 5 additions & 0 deletions
src/main/java/build/buf/protovalidate/ValidatorImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import com.google.protobuf.Message;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import java.util.ArrayList;
import java.util.List;

Expand All@@ -39,6 +40,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
@pkwarrenpkwarrenSep 8, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This opts in to the new behavior which uses CEL types instead of Protobuf types for NullValue / ByteString. This is apparently coming soon as the default, so since we had to update our overloads to use the new types just opted in to migrate everything to use them.
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config);
 this.failFast = config.isFailFast();
Expand All@@ -51,6 +54,8 @@ final class ValidatorImpl implements Validator {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 this.evaluatorBuilder = new EvaluatorBuilder(cel, config, descriptors, disableLazy);
 this.failFast = config.isFailFast();
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/buf/validate/validate.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,7 +274,7 @@ message FieldRules {
 // message UpdateRequest {
 // // The uri rule only applies if the field is not an empty string.
 // string url = 1 [
 // (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED,
 // (buf.validate.field).ignore = IGNORE_IF_ZERO_VALUE,
 // (buf.validate.field).string.uri = true
 // ];
 // }
Expand Down

3 changes: 3 additions & 0 deletions
src/test/java/build/buf/protovalidate/CustomOverloadTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.runtime.CelEvaluationException;
Expand All@@ -35,6 +36,8 @@ public class CustomOverloadTest {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();

 @Test
Expand Down

5 changes: 4 additions & 1 deletion
src/test/java/build/buf/protovalidate/FormatTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelBuilder;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.CelValidationResult;
import dev.cel.common.types.SimpleType;
Expand All@@ -50,7 +51,7 @@
class FormatTest {
 // Version of the cel-spec that this implementation is conformant with
 // This should be kept in sync with the version in gradle.properties
 private static String CEL_SPEC_VERSION = "v0.24.0";
 private static final String CEL_SPEC_VERSION = "v0.24.0";

 private static Cel cel;

Expand DownExpand Up@@ -91,6 +92,8 @@ public static void setUp() throws Exception {
 CelFactory.standardCelBuilder()
 .addCompilerLibraries(validateLibrary)
 .addRuntimeLibraries(validateLibrary)
 .setOptions(
 CelOptions.DEFAULT.toBuilder().evaluateCanonicalTypesToNativeValues(true).build())
 .build();
 }

Expand Down