Create a builder for CelEvaluationException#561

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Jan 24, 2025
Merged

Create a builder for CelEvaluationException #561

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ java_library(
"//parser",
"//parser:macro",
"//runtime",
"//runtime:evaluation_exception_builder",
"//runtime:unknown_attributes",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down
6 changes: 4 additions & 2 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@
import dev.cel.runtime.CelAttribute.Qualifier;
import dev.cel.runtime.CelAttributePattern;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime.Program;
Expand DownExpand Up@@ -754,8 +755,9 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
"throws",
ImmutableList.of(),
(args) -> {
throw new CelEvaluationException(
"this method always throws", new RuntimeException("reason"));
throw CelEvaluationExceptionBuilder.newBuilder("this method always throws")
.setCause(new RuntimeException("reason"))
.build();
}))
.setResultType(SimpleType.BOOL)
.build();
Expand Down
1 change: 1 addition & 0 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ java_library(
"//common/types",
"//compiler:compiler_builder",
"//runtime",
"//runtime:evaluation_exception_builder",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
Expand Down
76 changes: 44 additions & 32 deletions extensions/src/main/java/dev/cel/extensions/CelStringExtensions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.CelRuntimeLibrary;
Expand DownExpand Up@@ -264,17 +265,20 @@ private static String charAt(String s, long i) throws CelEvaluationException {
try {
index = Math.toIntExact(i);
} catch (ArithmeticException e) {
throw new CelEvaluationException(
String.format("charAt failure: Index must not exceed the int32 range: %d", i), e);
throw CelEvaluationExceptionBuilder.newBuilder(
"charAt failure: Index must not exceed the int32 range: %d", i)
.setCause(e)
.build();
}

CelCodePointArray codePointArray = CelCodePointArray.fromString(s);
if (index == codePointArray.length()) {
return "";
}
if (index < 0 || index > codePointArray.length()) {
throw new CelEvaluationException(
String.format("charAt failure: Index out of range: %d", index));
throw CelEvaluationExceptionBuilder.newBuilder(
"charAt failure: Index out of range: %d", index)
.build();
}

return codePointArray.slice(index, index + 1).toString();
Expand All@@ -296,10 +300,10 @@ private static Long indexOf(Object[] args) throws CelEvaluationException {
try {
offset = Math.toIntExact(offsetInLong);
} catch (ArithmeticException e) {
throw new CelEvaluationException(
String.format(
"indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong),
e);
throw CelEvaluationExceptionBuilder.newBuilder(
"indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong)
.setCause(e)
.build();
}

return indexOf(str, substr, offset);
Expand All@@ -314,8 +318,9 @@ private static Long indexOf(String str, String substr, int offset) throws CelEva
CelCodePointArray substrCpa = CelCodePointArray.fromString(substr);

if (offset < 0 || offset >= strCpa.length()) {
throw new CelEvaluationException(
String.format("indexOf failure: Offset out of range: %d", offset));
throw CelEvaluationExceptionBuilder.newBuilder(
"indexOf failure: Offset out of range: %d", offset)
.build();
}

return safeIndexOf(strCpa, substrCpa, offset);
Expand DownExpand Up@@ -376,14 +381,16 @@ private static Long lastIndexOf(CelCodePointArray str, CelCodePointArray substr,
try {
off = Math.toIntExact(offset);
} catch (ArithmeticException e) {
throw new CelEvaluationException(
String.format("lastIndexOf failure: Offset must not exceed the int32 range: %d", offset),
e);
throw CelEvaluationExceptionBuilder.newBuilder(
"lastIndexOf failure: Offset must not exceed the int32 range: %d", offset)
.setCause(e)
.build();
}

if (off < 0 || off >= str.length()) {
throw new CelEvaluationException(
String.format("lastIndexOf failure: Offset out of range: %d", offset));
throw CelEvaluationExceptionBuilder.newBuilder(
"lastIndexOf failure: Offset out of range: %d", offset)
.build();
}

if (off > str.length() - substr.length()) {
Expand DownExpand Up@@ -416,9 +423,10 @@ private static String replace(Object[] objects) throws CelEvaluationException {
try {
index = Math.toIntExact(indexInLong);
} catch (ArithmeticException e) {
throw new CelEvaluationException(
String.format("replace failure: Index must not exceed the int32 range: %d", indexInLong),
e);
throw CelEvaluationExceptionBuilder.newBuilder(
"replace failure: Index must not exceed the int32 range: %d", indexInLong)
.setCause(e)
.build();
}

return replace((String) objects[0], (String) objects[1], (String) objects[2], index);
Expand DownExpand Up@@ -473,9 +481,10 @@ private static List<String> split(Object[] args) throws CelEvaluationException {
try {
limit = Math.toIntExact(limitInLong);
} catch (ArithmeticException e) {
throw new CelEvaluationException(
String.format("split failure: Limit must not exceed the int32 range: %d", limitInLong),
e);
throw CelEvaluationExceptionBuilder.newBuilder(
"split failure: Limit must not exceed the int32 range: %d", limitInLong)
.setCause(e)
.build();
}

return split((String) args[0], (String) args[1], limit);
Expand DownExpand Up@@ -536,18 +545,20 @@ private static Object substring(String s, long i) throws CelEvaluationException
try {
beginIndex = Math.toIntExact(i);
} catch (ArithmeticException e) {
throw new CelEvaluationException(
String.format("substring failure: Index must not exceed the int32 range: %d", i), e);
throw CelEvaluationExceptionBuilder.newBuilder(
"substring failure: Index must not exceed the int32 range: %d", i)
.setCause(e)
.build();
}

CelCodePointArray codePointArray = CelCodePointArray.fromString(s);

boolean indexIsInRange = beginIndex <= codePointArray.length() && beginIndex >= 0;
if (!indexIsInRange) {
throw new CelEvaluationException(
String.format(
throw CelEvaluationExceptionBuilder.newBuilder(
"substring failure: Range [%d, %d) out of bounds",
beginIndex, codePointArray.length()));
beginIndex, codePointArray.length())
.build();
}

if (beginIndex == codePointArray.length()) {
Expand All@@ -569,11 +580,11 @@ private static String substring(Object[] args) throws CelEvaluationException {
beginIndex = Math.toIntExact(beginIndexInLong);
endIndex = Math.toIntExact(endIndexInLong);
} catch (ArithmeticException e) {
throw new CelEvaluationException(
String.format(
throw CelEvaluationExceptionBuilder.newBuilder(
"substring failure: Indices must not exceed the int32 range: [%d, %d)",
beginIndexInLong, endIndexInLong),
e);
beginIndexInLong, endIndexInLong)
.setCause(e)
.build();
}

String s = (String) args[0];
Expand All@@ -585,8 +596,9 @@ private static String substring(Object[] args) throws CelEvaluationException {
&& beginIndex <= codePointArray.length()
&& endIndex <= codePointArray.length();
if (!indicesIsInRange) {
throw new CelEvaluationException(
String.format("substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex));
throw CelEvaluationExceptionBuilder.newBuilder(
"substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex)
.build();
}

if (beginIndex == endIndex) {
Expand Down
11 changes: 10 additions & 1 deletion runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,15 @@ java_library(
exports = [
"//runtime/src/main/java/dev/cel/runtime",
"//runtime/src/main/java/dev/cel/runtime:evaluation_exception",
"//runtime/src/main/java/dev/cel/runtime:metadata",
],
)

java_library(
name = "evaluation_exception_builder",
exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception_builder"],
)

java_library(
name = "interpreter",
exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter"],
Expand DownExpand Up@@ -46,5 +52,8 @@ java_library(

java_library(
name = "base",
exports = ["//runtime/src/main/java/dev/cel/runtime:base"],
exports = [
"//runtime/src/main/java/dev/cel/runtime:base",
"//runtime/src/main/java/dev/cel/runtime:metadata",
],
)
35 changes: 33 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ BASE_SOURCES = [
"FunctionOverload.java",
"InterpreterException.java",
"MessageProvider.java",
"Metadata.java",
"Registrar.java",
"ResolvedOverload.java",
]
Expand DownExpand Up@@ -56,6 +55,7 @@ java_library(
tags = [
],
deps = [
":metadata",
"//:auto_value",
"//common",
"//common:error_codes",
Expand All@@ -81,6 +81,7 @@ java_library(
":base",
":cel_type_resolver",
":evaluation_listener",
":metadata",
":runtime_helper",
":unknown_attributes",
"//:auto_value",
Expand DownExpand Up@@ -150,12 +151,41 @@ RUNTIME_SOURCES = [

java_library(
name = "evaluation_exception",
srcs = ["CelEvaluationException.java"],
srcs = [
"CelEvaluationException.java",
],
tags = [
],
deps = [
"//common",
"//common:error_codes",
"@maven//:org_jspecify_jspecify",
],
)

java_library(
name = "evaluation_exception_builder",
srcs = ["CelEvaluationExceptionBuilder.java"],
tags = [
],
deps = [
":evaluation_exception",
":metadata",
"//common:error_codes",
"//common/annotations",
"//common/internal:safe_string_formatter",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:org_jspecify_jspecify",
],
)

java_library(
name = "metadata",
srcs = ["Metadata.java"],
deps = [
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

Expand All@@ -166,6 +196,7 @@ java_library(
],
deps = [
":evaluation_exception",
":evaluation_exception_builder",
":evaluation_listener",
":runtime_helper",
":runtime_type_provider_legacy",
Expand Down
24 changes: 6 additions & 18 deletions runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

import dev.cel.common.CelErrorCode;
import dev.cel.common.CelException;
import org.jspecify.annotations.Nullable;

/**
* CelEvaluationException encapsulates the potential issues which could arise during the
Expand All@@ -24,27 +25,14 @@
public final class CelEvaluationException extends CelException {

public CelEvaluationException(String message) {
super(formatErrorMessage(message));
super(message);
}

public CelEvaluationException(String message, Throwable cause) {
super(formatErrorMessage(message), cause);
public CelEvaluationException(String message, @Nullable Throwable cause) {
super(message, cause);
}

public CelEvaluationException(String message, CelErrorCode errorCode) {
super(formatErrorMessage(message), errorCode);
}

public CelEvaluationException(String message, Throwable cause, CelErrorCode errorCode) {
this(message, cause, errorCode, true);
}

CelEvaluationException(
String message, Throwable cause, CelErrorCode errorCode, boolean formatErrorMessage) {
super(formatErrorMessage ? formatErrorMessage(message) : message, cause, errorCode);
}

private static String formatErrorMessage(String message) {
return String.format("evaluation error: %s", message);
CelEvaluationException(String message, @Nullable Throwable cause, CelErrorCode errorCode) {
super(message, cause, errorCode);
}
}
Loading
, '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
Create a builder for CelEvaluationException#561

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jan 24, 2025
 Merged


Create a builder for CelEvaluationException
#561
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ java_library(
 "//parser",
 "//parser:macro",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

6 changes: 4 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@
import dev.cel.runtime.CelAttribute.Qualifier;
import dev.cel.runtime.CelAttributePattern;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime.Program;
Expand DownExpand Up@@ -754,8 +755,9 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 "throws",
 ImmutableList.of(),
 (args) -> {
 throw new CelEvaluationException(
 "this method always throws", new RuntimeException("reason"));
 throw CelEvaluationExceptionBuilder.newBuilder("this method always throws")
 .setCause(new RuntimeException("reason"))
 .build();
 }))
 .setResultType(SimpleType.BOOL)
 .build();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ java_library(
 "//common/types",
 "//compiler:compiler_builder",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
Expand Down

76 changes: 44 additions & 32 deletions
extensions/src/main/java/dev/cel/extensions/CelStringExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.CelRuntimeLibrary;
Expand DownExpand Up@@ -264,17 +265,20 @@ private static String charAt(String s, long i) throws CelEvaluationException {
 try {
 index = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);
 if (index == codePointArray.length()) {
 return "";
 }
 if (index < 0 || index > codePointArray.length()) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index out of range: %d", index));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index out of range: %d", index)
 .build();
 }

 return codePointArray.slice(index, index + 1).toString();
Expand All@@ -296,10 +300,10 @@ private static Long indexOf(Object[] args) throws CelEvaluationException {
 try {
 offset = Math.toIntExact(offsetInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
String.format(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong),
e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong)
.setCause(e)
.build();
 }

 return indexOf(str, substr, offset);
Expand All@@ -314,8 +318,9 @@ private static Long indexOf(String str, String substr, int offset) throws CelEva
 CelCodePointArray substrCpa = CelCodePointArray.fromString(substr);

 if (offset < 0 || offset >= strCpa.length()) {
 throw new CelEvaluationException(
 String.format("indexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset out of range: %d", offset)
 .build();
 }

 return safeIndexOf(strCpa, substrCpa, offset);
Expand DownExpand Up@@ -376,14 +381,16 @@ private static Long lastIndexOf(CelCodePointArray str, CelCodePointArray substr,
 try {
 off = Math.toIntExact(offset);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset must not exceed the int32 range: %d", offset),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset must not exceed the int32 range: %d", offset)
 .setCause(e)
 .build();
 }

 if (off < 0 || off >= str.length()) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset out of range: %d", offset)
 .build();
 }

 if (off > str.length() - substr.length()) {
Expand DownExpand Up@@ -416,9 +423,10 @@ private static String replace(Object[] objects) throws CelEvaluationException {
 try {
 index = Math.toIntExact(indexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("replace failure: Index must not exceed the int32 range: %d", indexInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "replace failure: Index must not exceed the int32 range: %d", indexInLong)
 .setCause(e)
 .build();
 }

 return replace((String) objects[0], (String) objects[1], (String) objects[2], index);
Expand DownExpand Up@@ -473,9 +481,10 @@ private static List<String> split(Object[] args) throws CelEvaluationException {
 try {
 limit = Math.toIntExact(limitInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("split failure: Limit must not exceed the int32 range: %d", limitInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "split failure: Limit must not exceed the int32 range: %d", limitInLong)
 .setCause(e)
 .build();
 }

 return split((String) args[0], (String) args[1], limit);
Expand DownExpand Up@@ -536,18 +545,20 @@ private static Object substring(String s, long i) throws CelEvaluationException
 try {
 beginIndex = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("substring failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);

 boolean indexIsInRange = beginIndex <= codePointArray.length() && beginIndex >= 0;
 if (!indexIsInRange) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds",
 beginIndex, codePointArray.length()));
 beginIndex, codePointArray.length())
 .build();
 }

 if (beginIndex == codePointArray.length()) {
Expand All@@ -569,11 +580,11 @@ private static String substring(Object[] args) throws CelEvaluationException {
 beginIndex = Math.toIntExact(beginIndexInLong);
 endIndex = Math.toIntExact(endIndexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Indices must not exceed the int32 range: [%d, %d)",
 beginIndexInLong, endIndexInLong),
 e);
 beginIndexInLong, endIndexInLong)
 .setCause(e)
 .build();
 }

 String s = (String) args[0];
Expand All@@ -585,8 +596,9 @@ private static String substring(Object[] args) throws CelEvaluationException {
 && beginIndex <= codePointArray.length()
 && endIndex <= codePointArray.length();
 if (!indicesIsInRange) {
 throw new CelEvaluationException(
 String.format("substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex)
 .build();
 }

 if (beginIndex == endIndex) {
Expand Down

11 changes: 10 additions & 1 deletion
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,15 @@ java_library(
 exports = [
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:evaluation_exception",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception_builder"],
)

java_library(
 name = "interpreter",
 exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter"],
Expand DownExpand Up@@ -46,5 +52,8 @@ java_library(

java_library(
 name = "base",
 exports = ["//runtime/src/main/java/dev/cel/runtime:base"],
 exports = [
 "//runtime/src/main/java/dev/cel/runtime:base",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

35 changes: 33 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ BASE_SOURCES = [
 "FunctionOverload.java",
 "InterpreterException.java",
 "MessageProvider.java",
 "Metadata.java",
 "Registrar.java",
 "ResolvedOverload.java",
]
Expand DownExpand Up@@ -56,6 +55,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -81,6 +81,7 @@ java_library(
 ":base",
 ":cel_type_resolver",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helper",
 ":unknown_attributes",
 "//:auto_value",
Expand DownExpand Up@@ -150,12 +151,41 @@ RUNTIME_SOURCES = [

java_library(
 name = "evaluation_exception",
 srcs = ["CelEvaluationException.java"],
 srcs = [
 "CelEvaluationException.java",
 ],
 tags = [
 ],
 deps = [
 "//common",
 "//common:error_codes",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 srcs = ["CelEvaluationExceptionBuilder.java"],
 tags = [
 ],
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//common:error_codes",
 "//common/annotations",
 "//common/internal:safe_string_formatter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "metadata",
 srcs = ["Metadata.java"],
 deps = [
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

Expand All@@ -166,6 +196,7 @@ java_library(
 ],
 deps = [
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
Expand Down

24 changes: 6 additions & 18 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

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

import dev.cel.common.CelErrorCode;
import dev.cel.common.CelException;
import org.jspecify.annotations.Nullable;

/**
 * CelEvaluationException encapsulates the potential issues which could arise during the
Expand All@@ -24,27 +25,14 @@
public final class CelEvaluationException extends CelException {

 public CelEvaluationException(String message) {
 super(formatErrorMessage(message));
 super(message);
 }

 public CelEvaluationException(String message, Throwable cause) {
 super(formatErrorMessage(message), cause);
 public CelEvaluationException(String message, @Nullable Throwable cause) {
 super(message, cause);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(formatErrorMessage(message), errorCode);
 }

 public CelEvaluationException(String message, Throwable cause, CelErrorCode errorCode) {
 this(message, cause, errorCode, true);
 }

 CelEvaluationException(
 String message, Throwable cause, CelErrorCode errorCode, boolean formatErrorMessage) {
 super(formatErrorMessage ? formatErrorMessage(message) : message, cause, errorCode);
 }

 private static String formatErrorMessage(String message) {
 return String.format("evaluation error: %s", message);
 CelEvaluationException(String message, @Nullable Throwable cause, CelErrorCode errorCode) {
 super(message, cause, errorCode);
 }
}
Loading

, '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
Create a builder for CelEvaluationException#561

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jan 24, 2025
 Merged


Create a builder for CelEvaluationException
#561
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ java_library(
 "//parser",
 "//parser:macro",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

6 changes: 4 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@
import dev.cel.runtime.CelAttribute.Qualifier;
import dev.cel.runtime.CelAttributePattern;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime.Program;
Expand DownExpand Up@@ -754,8 +755,9 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 "throws",
 ImmutableList.of(),
 (args) -> {
 throw new CelEvaluationException(
 "this method always throws", new RuntimeException("reason"));
 throw CelEvaluationExceptionBuilder.newBuilder("this method always throws")
 .setCause(new RuntimeException("reason"))
 .build();
 }))
 .setResultType(SimpleType.BOOL)
 .build();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ java_library(
 "//common/types",
 "//compiler:compiler_builder",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
Expand Down

76 changes: 44 additions & 32 deletions
extensions/src/main/java/dev/cel/extensions/CelStringExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.CelRuntimeLibrary;
Expand DownExpand Up@@ -264,17 +265,20 @@ private static String charAt(String s, long i) throws CelEvaluationException {
 try {
 index = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);
 if (index == codePointArray.length()) {
 return "";
 }
 if (index < 0 || index > codePointArray.length()) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index out of range: %d", index));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index out of range: %d", index)
 .build();
 }

 return codePointArray.slice(index, index + 1).toString();
Expand All@@ -296,10 +300,10 @@ private static Long indexOf(Object[] args) throws CelEvaluationException {
 try {
 offset = Math.toIntExact(offsetInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
String.format(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong),
e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong)
.setCause(e)
.build();
 }

 return indexOf(str, substr, offset);
Expand All@@ -314,8 +318,9 @@ private static Long indexOf(String str, String substr, int offset) throws CelEva
 CelCodePointArray substrCpa = CelCodePointArray.fromString(substr);

 if (offset < 0 || offset >= strCpa.length()) {
 throw new CelEvaluationException(
 String.format("indexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset out of range: %d", offset)
 .build();
 }

 return safeIndexOf(strCpa, substrCpa, offset);
Expand DownExpand Up@@ -376,14 +381,16 @@ private static Long lastIndexOf(CelCodePointArray str, CelCodePointArray substr,
 try {
 off = Math.toIntExact(offset);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset must not exceed the int32 range: %d", offset),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset must not exceed the int32 range: %d", offset)
 .setCause(e)
 .build();
 }

 if (off < 0 || off >= str.length()) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset out of range: %d", offset)
 .build();
 }

 if (off > str.length() - substr.length()) {
Expand DownExpand Up@@ -416,9 +423,10 @@ private static String replace(Object[] objects) throws CelEvaluationException {
 try {
 index = Math.toIntExact(indexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("replace failure: Index must not exceed the int32 range: %d", indexInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "replace failure: Index must not exceed the int32 range: %d", indexInLong)
 .setCause(e)
 .build();
 }

 return replace((String) objects[0], (String) objects[1], (String) objects[2], index);
Expand DownExpand Up@@ -473,9 +481,10 @@ private static List<String> split(Object[] args) throws CelEvaluationException {
 try {
 limit = Math.toIntExact(limitInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("split failure: Limit must not exceed the int32 range: %d", limitInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "split failure: Limit must not exceed the int32 range: %d", limitInLong)
 .setCause(e)
 .build();
 }

 return split((String) args[0], (String) args[1], limit);
Expand DownExpand Up@@ -536,18 +545,20 @@ private static Object substring(String s, long i) throws CelEvaluationException
 try {
 beginIndex = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("substring failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);

 boolean indexIsInRange = beginIndex <= codePointArray.length() && beginIndex >= 0;
 if (!indexIsInRange) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds",
 beginIndex, codePointArray.length()));
 beginIndex, codePointArray.length())
 .build();
 }

 if (beginIndex == codePointArray.length()) {
Expand All@@ -569,11 +580,11 @@ private static String substring(Object[] args) throws CelEvaluationException {
 beginIndex = Math.toIntExact(beginIndexInLong);
 endIndex = Math.toIntExact(endIndexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Indices must not exceed the int32 range: [%d, %d)",
 beginIndexInLong, endIndexInLong),
 e);
 beginIndexInLong, endIndexInLong)
 .setCause(e)
 .build();
 }

 String s = (String) args[0];
Expand All@@ -585,8 +596,9 @@ private static String substring(Object[] args) throws CelEvaluationException {
 && beginIndex <= codePointArray.length()
 && endIndex <= codePointArray.length();
 if (!indicesIsInRange) {
 throw new CelEvaluationException(
 String.format("substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex)
 .build();
 }

 if (beginIndex == endIndex) {
Expand Down

11 changes: 10 additions & 1 deletion
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,15 @@ java_library(
 exports = [
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:evaluation_exception",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception_builder"],
)

java_library(
 name = "interpreter",
 exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter"],
Expand DownExpand Up@@ -46,5 +52,8 @@ java_library(

java_library(
 name = "base",
 exports = ["//runtime/src/main/java/dev/cel/runtime:base"],
 exports = [
 "//runtime/src/main/java/dev/cel/runtime:base",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

35 changes: 33 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ BASE_SOURCES = [
 "FunctionOverload.java",
 "InterpreterException.java",
 "MessageProvider.java",
 "Metadata.java",
 "Registrar.java",
 "ResolvedOverload.java",
]
Expand DownExpand Up@@ -56,6 +55,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -81,6 +81,7 @@ java_library(
 ":base",
 ":cel_type_resolver",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helper",
 ":unknown_attributes",
 "//:auto_value",
Expand DownExpand Up@@ -150,12 +151,41 @@ RUNTIME_SOURCES = [

java_library(
 name = "evaluation_exception",
 srcs = ["CelEvaluationException.java"],
 srcs = [
 "CelEvaluationException.java",
 ],
 tags = [
 ],
 deps = [
 "//common",
 "//common:error_codes",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 srcs = ["CelEvaluationExceptionBuilder.java"],
 tags = [
 ],
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//common:error_codes",
 "//common/annotations",
 "//common/internal:safe_string_formatter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "metadata",
 srcs = ["Metadata.java"],
 deps = [
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

Expand All@@ -166,6 +196,7 @@ java_library(
 ],
 deps = [
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
Expand Down

24 changes: 6 additions & 18 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

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

import dev.cel.common.CelErrorCode;
import dev.cel.common.CelException;
import org.jspecify.annotations.Nullable;

/**
 * CelEvaluationException encapsulates the potential issues which could arise during the
Expand All@@ -24,27 +25,14 @@
public final class CelEvaluationException extends CelException {

 public CelEvaluationException(String message) {
 super(formatErrorMessage(message));
 super(message);
 }

 public CelEvaluationException(String message, Throwable cause) {
 super(formatErrorMessage(message), cause);
 public CelEvaluationException(String message, @Nullable Throwable cause) {
 super(message, cause);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(formatErrorMessage(message), errorCode);
 }

 public CelEvaluationException(String message, Throwable cause, CelErrorCode errorCode) {
 this(message, cause, errorCode, true);
 }

 CelEvaluationException(
 String message, Throwable cause, CelErrorCode errorCode, boolean formatErrorMessage) {
 super(formatErrorMessage ? formatErrorMessage(message) : message, cause, errorCode);
 }

 private static String formatErrorMessage(String message) {
 return String.format("evaluation error: %s", message);
 CelEvaluationException(String message, @Nullable Throwable cause, CelErrorCode errorCode) {
 super(message, cause, errorCode);
 }
}
Loading

, '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
Create a builder for CelEvaluationException#561

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jan 24, 2025
 Merged


Create a builder for CelEvaluationException
#561
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ java_library(
 "//parser",
 "//parser:macro",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

6 changes: 4 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@
import dev.cel.runtime.CelAttribute.Qualifier;
import dev.cel.runtime.CelAttributePattern;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime.Program;
Expand DownExpand Up@@ -754,8 +755,9 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 "throws",
 ImmutableList.of(),
 (args) -> {
 throw new CelEvaluationException(
 "this method always throws", new RuntimeException("reason"));
 throw CelEvaluationExceptionBuilder.newBuilder("this method always throws")
 .setCause(new RuntimeException("reason"))
 .build();
 }))
 .setResultType(SimpleType.BOOL)
 .build();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ java_library(
 "//common/types",
 "//compiler:compiler_builder",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
Expand Down

76 changes: 44 additions & 32 deletions
extensions/src/main/java/dev/cel/extensions/CelStringExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.CelRuntimeLibrary;
Expand DownExpand Up@@ -264,17 +265,20 @@ private static String charAt(String s, long i) throws CelEvaluationException {
 try {
 index = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);
 if (index == codePointArray.length()) {
 return "";
 }
 if (index < 0 || index > codePointArray.length()) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index out of range: %d", index));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index out of range: %d", index)
 .build();
 }

 return codePointArray.slice(index, index + 1).toString();
Expand All@@ -296,10 +300,10 @@ private static Long indexOf(Object[] args) throws CelEvaluationException {
 try {
 offset = Math.toIntExact(offsetInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
String.format(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong),
e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong)
.setCause(e)
.build();
 }

 return indexOf(str, substr, offset);
Expand All@@ -314,8 +318,9 @@ private static Long indexOf(String str, String substr, int offset) throws CelEva
 CelCodePointArray substrCpa = CelCodePointArray.fromString(substr);

 if (offset < 0 || offset >= strCpa.length()) {
 throw new CelEvaluationException(
 String.format("indexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset out of range: %d", offset)
 .build();
 }

 return safeIndexOf(strCpa, substrCpa, offset);
Expand DownExpand Up@@ -376,14 +381,16 @@ private static Long lastIndexOf(CelCodePointArray str, CelCodePointArray substr,
 try {
 off = Math.toIntExact(offset);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset must not exceed the int32 range: %d", offset),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset must not exceed the int32 range: %d", offset)
 .setCause(e)
 .build();
 }

 if (off < 0 || off >= str.length()) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset out of range: %d", offset)
 .build();
 }

 if (off > str.length() - substr.length()) {
Expand DownExpand Up@@ -416,9 +423,10 @@ private static String replace(Object[] objects) throws CelEvaluationException {
 try {
 index = Math.toIntExact(indexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("replace failure: Index must not exceed the int32 range: %d", indexInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "replace failure: Index must not exceed the int32 range: %d", indexInLong)
 .setCause(e)
 .build();
 }

 return replace((String) objects[0], (String) objects[1], (String) objects[2], index);
Expand DownExpand Up@@ -473,9 +481,10 @@ private static List<String> split(Object[] args) throws CelEvaluationException {
 try {
 limit = Math.toIntExact(limitInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("split failure: Limit must not exceed the int32 range: %d", limitInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "split failure: Limit must not exceed the int32 range: %d", limitInLong)
 .setCause(e)
 .build();
 }

 return split((String) args[0], (String) args[1], limit);
Expand DownExpand Up@@ -536,18 +545,20 @@ private static Object substring(String s, long i) throws CelEvaluationException
 try {
 beginIndex = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("substring failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);

 boolean indexIsInRange = beginIndex <= codePointArray.length() && beginIndex >= 0;
 if (!indexIsInRange) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds",
 beginIndex, codePointArray.length()));
 beginIndex, codePointArray.length())
 .build();
 }

 if (beginIndex == codePointArray.length()) {
Expand All@@ -569,11 +580,11 @@ private static String substring(Object[] args) throws CelEvaluationException {
 beginIndex = Math.toIntExact(beginIndexInLong);
 endIndex = Math.toIntExact(endIndexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Indices must not exceed the int32 range: [%d, %d)",
 beginIndexInLong, endIndexInLong),
 e);
 beginIndexInLong, endIndexInLong)
 .setCause(e)
 .build();
 }

 String s = (String) args[0];
Expand All@@ -585,8 +596,9 @@ private static String substring(Object[] args) throws CelEvaluationException {
 && beginIndex <= codePointArray.length()
 && endIndex <= codePointArray.length();
 if (!indicesIsInRange) {
 throw new CelEvaluationException(
 String.format("substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex)
 .build();
 }

 if (beginIndex == endIndex) {
Expand Down

11 changes: 10 additions & 1 deletion
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,15 @@ java_library(
 exports = [
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:evaluation_exception",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception_builder"],
)

java_library(
 name = "interpreter",
 exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter"],
Expand DownExpand Up@@ -46,5 +52,8 @@ java_library(

java_library(
 name = "base",
 exports = ["//runtime/src/main/java/dev/cel/runtime:base"],
 exports = [
 "//runtime/src/main/java/dev/cel/runtime:base",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

35 changes: 33 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ BASE_SOURCES = [
 "FunctionOverload.java",
 "InterpreterException.java",
 "MessageProvider.java",
 "Metadata.java",
 "Registrar.java",
 "ResolvedOverload.java",
]
Expand DownExpand Up@@ -56,6 +55,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -81,6 +81,7 @@ java_library(
 ":base",
 ":cel_type_resolver",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helper",
 ":unknown_attributes",
 "//:auto_value",
Expand DownExpand Up@@ -150,12 +151,41 @@ RUNTIME_SOURCES = [

java_library(
 name = "evaluation_exception",
 srcs = ["CelEvaluationException.java"],
 srcs = [
 "CelEvaluationException.java",
 ],
 tags = [
 ],
 deps = [
 "//common",
 "//common:error_codes",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 srcs = ["CelEvaluationExceptionBuilder.java"],
 tags = [
 ],
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//common:error_codes",
 "//common/annotations",
 "//common/internal:safe_string_formatter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "metadata",
 srcs = ["Metadata.java"],
 deps = [
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

Expand All@@ -166,6 +196,7 @@ java_library(
 ],
 deps = [
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
Expand Down

24 changes: 6 additions & 18 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

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

import dev.cel.common.CelErrorCode;
import dev.cel.common.CelException;
import org.jspecify.annotations.Nullable;

/**
 * CelEvaluationException encapsulates the potential issues which could arise during the
Expand All@@ -24,27 +25,14 @@
public final class CelEvaluationException extends CelException {

 public CelEvaluationException(String message) {
 super(formatErrorMessage(message));
 super(message);
 }

 public CelEvaluationException(String message, Throwable cause) {
 super(formatErrorMessage(message), cause);
 public CelEvaluationException(String message, @Nullable Throwable cause) {
 super(message, cause);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(formatErrorMessage(message), errorCode);
 }

 public CelEvaluationException(String message, Throwable cause, CelErrorCode errorCode) {
 this(message, cause, errorCode, true);
 }

 CelEvaluationException(
 String message, Throwable cause, CelErrorCode errorCode, boolean formatErrorMessage) {
 super(formatErrorMessage ? formatErrorMessage(message) : message, cause, errorCode);
 }

 private static String formatErrorMessage(String message) {
 return String.format("evaluation error: %s", message);
 CelEvaluationException(String message, @Nullable Throwable cause, CelErrorCode errorCode) {
 super(message, cause, errorCode);
 }
}
Loading

, '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
Create a builder for CelEvaluationException#561

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jan 24, 2025
 Merged


Create a builder for CelEvaluationException
#561
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ java_library(
 "//parser",
 "//parser:macro",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

6 changes: 4 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@
import dev.cel.runtime.CelAttribute.Qualifier;
import dev.cel.runtime.CelAttributePattern;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime.Program;
Expand DownExpand Up@@ -754,8 +755,9 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 "throws",
 ImmutableList.of(),
 (args) -> {
 throw new CelEvaluationException(
 "this method always throws", new RuntimeException("reason"));
 throw CelEvaluationExceptionBuilder.newBuilder("this method always throws")
 .setCause(new RuntimeException("reason"))
 .build();
 }))
 .setResultType(SimpleType.BOOL)
 .build();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ java_library(
 "//common/types",
 "//compiler:compiler_builder",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
Expand Down

76 changes: 44 additions & 32 deletions
extensions/src/main/java/dev/cel/extensions/CelStringExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.CelRuntimeLibrary;
Expand DownExpand Up@@ -264,17 +265,20 @@ private static String charAt(String s, long i) throws CelEvaluationException {
 try {
 index = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);
 if (index == codePointArray.length()) {
 return "";
 }
 if (index < 0 || index > codePointArray.length()) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index out of range: %d", index));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index out of range: %d", index)
 .build();
 }

 return codePointArray.slice(index, index + 1).toString();
Expand All@@ -296,10 +300,10 @@ private static Long indexOf(Object[] args) throws CelEvaluationException {
 try {
 offset = Math.toIntExact(offsetInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
String.format(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong),
e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong)
.setCause(e)
.build();
 }

 return indexOf(str, substr, offset);
Expand All@@ -314,8 +318,9 @@ private static Long indexOf(String str, String substr, int offset) throws CelEva
 CelCodePointArray substrCpa = CelCodePointArray.fromString(substr);

 if (offset < 0 || offset >= strCpa.length()) {
 throw new CelEvaluationException(
 String.format("indexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset out of range: %d", offset)
 .build();
 }

 return safeIndexOf(strCpa, substrCpa, offset);
Expand DownExpand Up@@ -376,14 +381,16 @@ private static Long lastIndexOf(CelCodePointArray str, CelCodePointArray substr,
 try {
 off = Math.toIntExact(offset);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset must not exceed the int32 range: %d", offset),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset must not exceed the int32 range: %d", offset)
 .setCause(e)
 .build();
 }

 if (off < 0 || off >= str.length()) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset out of range: %d", offset)
 .build();
 }

 if (off > str.length() - substr.length()) {
Expand DownExpand Up@@ -416,9 +423,10 @@ private static String replace(Object[] objects) throws CelEvaluationException {
 try {
 index = Math.toIntExact(indexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("replace failure: Index must not exceed the int32 range: %d", indexInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "replace failure: Index must not exceed the int32 range: %d", indexInLong)
 .setCause(e)
 .build();
 }

 return replace((String) objects[0], (String) objects[1], (String) objects[2], index);
Expand DownExpand Up@@ -473,9 +481,10 @@ private static List<String> split(Object[] args) throws CelEvaluationException {
 try {
 limit = Math.toIntExact(limitInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("split failure: Limit must not exceed the int32 range: %d", limitInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "split failure: Limit must not exceed the int32 range: %d", limitInLong)
 .setCause(e)
 .build();
 }

 return split((String) args[0], (String) args[1], limit);
Expand DownExpand Up@@ -536,18 +545,20 @@ private static Object substring(String s, long i) throws CelEvaluationException
 try {
 beginIndex = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("substring failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);

 boolean indexIsInRange = beginIndex <= codePointArray.length() && beginIndex >= 0;
 if (!indexIsInRange) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds",
 beginIndex, codePointArray.length()));
 beginIndex, codePointArray.length())
 .build();
 }

 if (beginIndex == codePointArray.length()) {
Expand All@@ -569,11 +580,11 @@ private static String substring(Object[] args) throws CelEvaluationException {
 beginIndex = Math.toIntExact(beginIndexInLong);
 endIndex = Math.toIntExact(endIndexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Indices must not exceed the int32 range: [%d, %d)",
 beginIndexInLong, endIndexInLong),
 e);
 beginIndexInLong, endIndexInLong)
 .setCause(e)
 .build();
 }

 String s = (String) args[0];
Expand All@@ -585,8 +596,9 @@ private static String substring(Object[] args) throws CelEvaluationException {
 && beginIndex <= codePointArray.length()
 && endIndex <= codePointArray.length();
 if (!indicesIsInRange) {
 throw new CelEvaluationException(
 String.format("substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex)
 .build();
 }

 if (beginIndex == endIndex) {
Expand Down

11 changes: 10 additions & 1 deletion
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,15 @@ java_library(
 exports = [
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:evaluation_exception",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception_builder"],
)

java_library(
 name = "interpreter",
 exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter"],
Expand DownExpand Up@@ -46,5 +52,8 @@ java_library(

java_library(
 name = "base",
 exports = ["//runtime/src/main/java/dev/cel/runtime:base"],
 exports = [
 "//runtime/src/main/java/dev/cel/runtime:base",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

35 changes: 33 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ BASE_SOURCES = [
 "FunctionOverload.java",
 "InterpreterException.java",
 "MessageProvider.java",
 "Metadata.java",
 "Registrar.java",
 "ResolvedOverload.java",
]
Expand DownExpand Up@@ -56,6 +55,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -81,6 +81,7 @@ java_library(
 ":base",
 ":cel_type_resolver",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helper",
 ":unknown_attributes",
 "//:auto_value",
Expand DownExpand Up@@ -150,12 +151,41 @@ RUNTIME_SOURCES = [

java_library(
 name = "evaluation_exception",
 srcs = ["CelEvaluationException.java"],
 srcs = [
 "CelEvaluationException.java",
 ],
 tags = [
 ],
 deps = [
 "//common",
 "//common:error_codes",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 srcs = ["CelEvaluationExceptionBuilder.java"],
 tags = [
 ],
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//common:error_codes",
 "//common/annotations",
 "//common/internal:safe_string_formatter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "metadata",
 srcs = ["Metadata.java"],
 deps = [
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

Expand All@@ -166,6 +196,7 @@ java_library(
 ],
 deps = [
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
Expand Down

24 changes: 6 additions & 18 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

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

import dev.cel.common.CelErrorCode;
import dev.cel.common.CelException;
import org.jspecify.annotations.Nullable;

/**
 * CelEvaluationException encapsulates the potential issues which could arise during the
Expand All@@ -24,27 +25,14 @@
public final class CelEvaluationException extends CelException {

 public CelEvaluationException(String message) {
 super(formatErrorMessage(message));
 super(message);
 }

 public CelEvaluationException(String message, Throwable cause) {
 super(formatErrorMessage(message), cause);
 public CelEvaluationException(String message, @Nullable Throwable cause) {
 super(message, cause);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(formatErrorMessage(message), errorCode);
 }

 public CelEvaluationException(String message, Throwable cause, CelErrorCode errorCode) {
 this(message, cause, errorCode, true);
 }

 CelEvaluationException(
 String message, Throwable cause, CelErrorCode errorCode, boolean formatErrorMessage) {
 super(formatErrorMessage ? formatErrorMessage(message) : message, cause, errorCode);
 }

 private static String formatErrorMessage(String message) {
 return String.format("evaluation error: %s", message);
 CelEvaluationException(String message, @Nullable Throwable cause, CelErrorCode errorCode) {
 super(message, cause, errorCode);
 }
}
Loading

, '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
Create a builder for CelEvaluationException#561

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jan 24, 2025
 Merged


Create a builder for CelEvaluationException
#561
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ java_library(
 "//parser",
 "//parser:macro",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

6 changes: 4 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@
import dev.cel.runtime.CelAttribute.Qualifier;
import dev.cel.runtime.CelAttributePattern;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime.Program;
Expand DownExpand Up@@ -754,8 +755,9 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 "throws",
 ImmutableList.of(),
 (args) -> {
 throw new CelEvaluationException(
 "this method always throws", new RuntimeException("reason"));
 throw CelEvaluationExceptionBuilder.newBuilder("this method always throws")
 .setCause(new RuntimeException("reason"))
 .build();
 }))
 .setResultType(SimpleType.BOOL)
 .build();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ java_library(
 "//common/types",
 "//compiler:compiler_builder",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
Expand Down

76 changes: 44 additions & 32 deletions
extensions/src/main/java/dev/cel/extensions/CelStringExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.CelRuntimeLibrary;
Expand DownExpand Up@@ -264,17 +265,20 @@ private static String charAt(String s, long i) throws CelEvaluationException {
 try {
 index = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);
 if (index == codePointArray.length()) {
 return "";
 }
 if (index < 0 || index > codePointArray.length()) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index out of range: %d", index));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index out of range: %d", index)
 .build();
 }

 return codePointArray.slice(index, index + 1).toString();
Expand All@@ -296,10 +300,10 @@ private static Long indexOf(Object[] args) throws CelEvaluationException {
 try {
 offset = Math.toIntExact(offsetInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
String.format(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong),
e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong)
.setCause(e)
.build();
 }

 return indexOf(str, substr, offset);
Expand All@@ -314,8 +318,9 @@ private static Long indexOf(String str, String substr, int offset) throws CelEva
 CelCodePointArray substrCpa = CelCodePointArray.fromString(substr);

 if (offset < 0 || offset >= strCpa.length()) {
 throw new CelEvaluationException(
 String.format("indexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset out of range: %d", offset)
 .build();
 }

 return safeIndexOf(strCpa, substrCpa, offset);
Expand DownExpand Up@@ -376,14 +381,16 @@ private static Long lastIndexOf(CelCodePointArray str, CelCodePointArray substr,
 try {
 off = Math.toIntExact(offset);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset must not exceed the int32 range: %d", offset),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset must not exceed the int32 range: %d", offset)
 .setCause(e)
 .build();
 }

 if (off < 0 || off >= str.length()) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset out of range: %d", offset)
 .build();
 }

 if (off > str.length() - substr.length()) {
Expand DownExpand Up@@ -416,9 +423,10 @@ private static String replace(Object[] objects) throws CelEvaluationException {
 try {
 index = Math.toIntExact(indexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("replace failure: Index must not exceed the int32 range: %d", indexInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "replace failure: Index must not exceed the int32 range: %d", indexInLong)
 .setCause(e)
 .build();
 }

 return replace((String) objects[0], (String) objects[1], (String) objects[2], index);
Expand DownExpand Up@@ -473,9 +481,10 @@ private static List<String> split(Object[] args) throws CelEvaluationException {
 try {
 limit = Math.toIntExact(limitInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("split failure: Limit must not exceed the int32 range: %d", limitInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "split failure: Limit must not exceed the int32 range: %d", limitInLong)
 .setCause(e)
 .build();
 }

 return split((String) args[0], (String) args[1], limit);
Expand DownExpand Up@@ -536,18 +545,20 @@ private static Object substring(String s, long i) throws CelEvaluationException
 try {
 beginIndex = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("substring failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);

 boolean indexIsInRange = beginIndex <= codePointArray.length() && beginIndex >= 0;
 if (!indexIsInRange) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds",
 beginIndex, codePointArray.length()));
 beginIndex, codePointArray.length())
 .build();
 }

 if (beginIndex == codePointArray.length()) {
Expand All@@ -569,11 +580,11 @@ private static String substring(Object[] args) throws CelEvaluationException {
 beginIndex = Math.toIntExact(beginIndexInLong);
 endIndex = Math.toIntExact(endIndexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Indices must not exceed the int32 range: [%d, %d)",
 beginIndexInLong, endIndexInLong),
 e);
 beginIndexInLong, endIndexInLong)
 .setCause(e)
 .build();
 }

 String s = (String) args[0];
Expand All@@ -585,8 +596,9 @@ private static String substring(Object[] args) throws CelEvaluationException {
 && beginIndex <= codePointArray.length()
 && endIndex <= codePointArray.length();
 if (!indicesIsInRange) {
 throw new CelEvaluationException(
 String.format("substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex)
 .build();
 }

 if (beginIndex == endIndex) {
Expand Down

11 changes: 10 additions & 1 deletion
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,15 @@ java_library(
 exports = [
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:evaluation_exception",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception_builder"],
)

java_library(
 name = "interpreter",
 exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter"],
Expand DownExpand Up@@ -46,5 +52,8 @@ java_library(

java_library(
 name = "base",
 exports = ["//runtime/src/main/java/dev/cel/runtime:base"],
 exports = [
 "//runtime/src/main/java/dev/cel/runtime:base",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

35 changes: 33 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ BASE_SOURCES = [
 "FunctionOverload.java",
 "InterpreterException.java",
 "MessageProvider.java",
 "Metadata.java",
 "Registrar.java",
 "ResolvedOverload.java",
]
Expand DownExpand Up@@ -56,6 +55,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -81,6 +81,7 @@ java_library(
 ":base",
 ":cel_type_resolver",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helper",
 ":unknown_attributes",
 "//:auto_value",
Expand DownExpand Up@@ -150,12 +151,41 @@ RUNTIME_SOURCES = [

java_library(
 name = "evaluation_exception",
 srcs = ["CelEvaluationException.java"],
 srcs = [
 "CelEvaluationException.java",
 ],
 tags = [
 ],
 deps = [
 "//common",
 "//common:error_codes",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 srcs = ["CelEvaluationExceptionBuilder.java"],
 tags = [
 ],
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//common:error_codes",
 "//common/annotations",
 "//common/internal:safe_string_formatter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "metadata",
 srcs = ["Metadata.java"],
 deps = [
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

Expand All@@ -166,6 +196,7 @@ java_library(
 ],
 deps = [
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
Expand Down

24 changes: 6 additions & 18 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

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

import dev.cel.common.CelErrorCode;
import dev.cel.common.CelException;
import org.jspecify.annotations.Nullable;

/**
 * CelEvaluationException encapsulates the potential issues which could arise during the
Expand All@@ -24,27 +25,14 @@
public final class CelEvaluationException extends CelException {

 public CelEvaluationException(String message) {
 super(formatErrorMessage(message));
 super(message);
 }

 public CelEvaluationException(String message, Throwable cause) {
 super(formatErrorMessage(message), cause);
 public CelEvaluationException(String message, @Nullable Throwable cause) {
 super(message, cause);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(formatErrorMessage(message), errorCode);
 }

 public CelEvaluationException(String message, Throwable cause, CelErrorCode errorCode) {
 this(message, cause, errorCode, true);
 }

 CelEvaluationException(
 String message, Throwable cause, CelErrorCode errorCode, boolean formatErrorMessage) {
 super(formatErrorMessage ? formatErrorMessage(message) : message, cause, errorCode);
 }

 private static String formatErrorMessage(String message) {
 return String.format("evaluation error: %s", message);
 CelEvaluationException(String message, @Nullable Throwable cause, CelErrorCode errorCode) {
 super(message, cause, errorCode);
 }
}
Loading

, '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
Create a builder for CelEvaluationException#561

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jan 24, 2025
 Merged


Create a builder for CelEvaluationException
#561
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ java_library(
 "//parser",
 "//parser:macro",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

6 changes: 4 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@
import dev.cel.runtime.CelAttribute.Qualifier;
import dev.cel.runtime.CelAttributePattern;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime.Program;
Expand DownExpand Up@@ -754,8 +755,9 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 "throws",
 ImmutableList.of(),
 (args) -> {
 throw new CelEvaluationException(
 "this method always throws", new RuntimeException("reason"));
 throw CelEvaluationExceptionBuilder.newBuilder("this method always throws")
 .setCause(new RuntimeException("reason"))
 .build();
 }))
 .setResultType(SimpleType.BOOL)
 .build();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ java_library(
 "//common/types",
 "//compiler:compiler_builder",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
Expand Down

76 changes: 44 additions & 32 deletions
extensions/src/main/java/dev/cel/extensions/CelStringExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.CelRuntimeLibrary;
Expand DownExpand Up@@ -264,17 +265,20 @@ private static String charAt(String s, long i) throws CelEvaluationException {
 try {
 index = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);
 if (index == codePointArray.length()) {
 return "";
 }
 if (index < 0 || index > codePointArray.length()) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index out of range: %d", index));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index out of range: %d", index)
 .build();
 }

 return codePointArray.slice(index, index + 1).toString();
Expand All@@ -296,10 +300,10 @@ private static Long indexOf(Object[] args) throws CelEvaluationException {
 try {
 offset = Math.toIntExact(offsetInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
String.format(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong),
e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong)
.setCause(e)
.build();
 }

 return indexOf(str, substr, offset);
Expand All@@ -314,8 +318,9 @@ private static Long indexOf(String str, String substr, int offset) throws CelEva
 CelCodePointArray substrCpa = CelCodePointArray.fromString(substr);

 if (offset < 0 || offset >= strCpa.length()) {
 throw new CelEvaluationException(
 String.format("indexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset out of range: %d", offset)
 .build();
 }

 return safeIndexOf(strCpa, substrCpa, offset);
Expand DownExpand Up@@ -376,14 +381,16 @@ private static Long lastIndexOf(CelCodePointArray str, CelCodePointArray substr,
 try {
 off = Math.toIntExact(offset);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset must not exceed the int32 range: %d", offset),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset must not exceed the int32 range: %d", offset)
 .setCause(e)
 .build();
 }

 if (off < 0 || off >= str.length()) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset out of range: %d", offset)
 .build();
 }

 if (off > str.length() - substr.length()) {
Expand DownExpand Up@@ -416,9 +423,10 @@ private static String replace(Object[] objects) throws CelEvaluationException {
 try {
 index = Math.toIntExact(indexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("replace failure: Index must not exceed the int32 range: %d", indexInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "replace failure: Index must not exceed the int32 range: %d", indexInLong)
 .setCause(e)
 .build();
 }

 return replace((String) objects[0], (String) objects[1], (String) objects[2], index);
Expand DownExpand Up@@ -473,9 +481,10 @@ private static List<String> split(Object[] args) throws CelEvaluationException {
 try {
 limit = Math.toIntExact(limitInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("split failure: Limit must not exceed the int32 range: %d", limitInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "split failure: Limit must not exceed the int32 range: %d", limitInLong)
 .setCause(e)
 .build();
 }

 return split((String) args[0], (String) args[1], limit);
Expand DownExpand Up@@ -536,18 +545,20 @@ private static Object substring(String s, long i) throws CelEvaluationException
 try {
 beginIndex = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("substring failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);

 boolean indexIsInRange = beginIndex <= codePointArray.length() && beginIndex >= 0;
 if (!indexIsInRange) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds",
 beginIndex, codePointArray.length()));
 beginIndex, codePointArray.length())
 .build();
 }

 if (beginIndex == codePointArray.length()) {
Expand All@@ -569,11 +580,11 @@ private static String substring(Object[] args) throws CelEvaluationException {
 beginIndex = Math.toIntExact(beginIndexInLong);
 endIndex = Math.toIntExact(endIndexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Indices must not exceed the int32 range: [%d, %d)",
 beginIndexInLong, endIndexInLong),
 e);
 beginIndexInLong, endIndexInLong)
 .setCause(e)
 .build();
 }

 String s = (String) args[0];
Expand All@@ -585,8 +596,9 @@ private static String substring(Object[] args) throws CelEvaluationException {
 && beginIndex <= codePointArray.length()
 && endIndex <= codePointArray.length();
 if (!indicesIsInRange) {
 throw new CelEvaluationException(
 String.format("substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex)
 .build();
 }

 if (beginIndex == endIndex) {
Expand Down

11 changes: 10 additions & 1 deletion
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,15 @@ java_library(
 exports = [
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:evaluation_exception",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception_builder"],
)

java_library(
 name = "interpreter",
 exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter"],
Expand DownExpand Up@@ -46,5 +52,8 @@ java_library(

java_library(
 name = "base",
 exports = ["//runtime/src/main/java/dev/cel/runtime:base"],
 exports = [
 "//runtime/src/main/java/dev/cel/runtime:base",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

35 changes: 33 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ BASE_SOURCES = [
 "FunctionOverload.java",
 "InterpreterException.java",
 "MessageProvider.java",
 "Metadata.java",
 "Registrar.java",
 "ResolvedOverload.java",
]
Expand DownExpand Up@@ -56,6 +55,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -81,6 +81,7 @@ java_library(
 ":base",
 ":cel_type_resolver",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helper",
 ":unknown_attributes",
 "//:auto_value",
Expand DownExpand Up@@ -150,12 +151,41 @@ RUNTIME_SOURCES = [

java_library(
 name = "evaluation_exception",
 srcs = ["CelEvaluationException.java"],
 srcs = [
 "CelEvaluationException.java",
 ],
 tags = [
 ],
 deps = [
 "//common",
 "//common:error_codes",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 srcs = ["CelEvaluationExceptionBuilder.java"],
 tags = [
 ],
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//common:error_codes",
 "//common/annotations",
 "//common/internal:safe_string_formatter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "metadata",
 srcs = ["Metadata.java"],
 deps = [
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

Expand All@@ -166,6 +196,7 @@ java_library(
 ],
 deps = [
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
Expand Down

24 changes: 6 additions & 18 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

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

import dev.cel.common.CelErrorCode;
import dev.cel.common.CelException;
import org.jspecify.annotations.Nullable;

/**
 * CelEvaluationException encapsulates the potential issues which could arise during the
Expand All@@ -24,27 +25,14 @@
public final class CelEvaluationException extends CelException {

 public CelEvaluationException(String message) {
 super(formatErrorMessage(message));
 super(message);
 }

 public CelEvaluationException(String message, Throwable cause) {
 super(formatErrorMessage(message), cause);
 public CelEvaluationException(String message, @Nullable Throwable cause) {
 super(message, cause);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(formatErrorMessage(message), errorCode);
 }

 public CelEvaluationException(String message, Throwable cause, CelErrorCode errorCode) {
 this(message, cause, errorCode, true);
 }

 CelEvaluationException(
 String message, Throwable cause, CelErrorCode errorCode, boolean formatErrorMessage) {
 super(formatErrorMessage ? formatErrorMessage(message) : message, cause, errorCode);
 }

 private static String formatErrorMessage(String message) {
 return String.format("evaluation error: %s", message);
 CelEvaluationException(String message, @Nullable Throwable cause, CelErrorCode errorCode) {
 super(message, cause, errorCode);
 }
}
Loading

, '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
Create a builder for CelEvaluationException#561

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Jan 24, 2025
 Merged


Create a builder for CelEvaluationException
#561
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ java_library(
 "//parser",
 "//parser:macro",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "//runtime:unknown_attributes",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
Expand Down

6 changes: 4 additions & 2 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@
import dev.cel.runtime.CelAttribute.Qualifier;
import dev.cel.runtime.CelAttributePattern;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime.Program;
Expand DownExpand Up@@ -754,8 +755,9 @@ public void program_withThrowingFunctionShortcircuited() throws Exception {
 "throws",
 ImmutableList.of(),
 (args) -> {
 throw new CelEvaluationException(
 "this method always throws", new RuntimeException("reason"));
 throw CelEvaluationExceptionBuilder.newBuilder("this method always throws")
 .setCause(new RuntimeException("reason"))
 .build();
 }))
 .setResultType(SimpleType.BOOL)
 .build();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@ java_library(
 "//common/types",
 "//compiler:compiler_builder",
 "//runtime",
 "//runtime:evaluation_exception_builder",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
Expand Down

76 changes: 44 additions & 32 deletions
extensions/src/main/java/dev/cel/extensions/CelStringExtensions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompilerLibrary;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelEvaluationExceptionBuilder;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeBuilder;
import dev.cel.runtime.CelRuntimeLibrary;
Expand DownExpand Up@@ -264,17 +265,20 @@ private static String charAt(String s, long i) throws CelEvaluationException {
 try {
 index = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);
 if (index == codePointArray.length()) {
 return "";
 }
 if (index < 0 || index > codePointArray.length()) {
 throw new CelEvaluationException(
 String.format("charAt failure: Index out of range: %d", index));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "charAt failure: Index out of range: %d", index)
 .build();
 }

 return codePointArray.slice(index, index + 1).toString();
Expand All@@ -296,10 +300,10 @@ private static Long indexOf(Object[] args) throws CelEvaluationException {
 try {
 offset = Math.toIntExact(offsetInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
String.format(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong),
e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset must not exceed the int32 range: %d", offsetInLong)
.setCause(e)
.build();
 }

 return indexOf(str, substr, offset);
Expand All@@ -314,8 +318,9 @@ private static Long indexOf(String str, String substr, int offset) throws CelEva
 CelCodePointArray substrCpa = CelCodePointArray.fromString(substr);

 if (offset < 0 || offset >= strCpa.length()) {
 throw new CelEvaluationException(
 String.format("indexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "indexOf failure: Offset out of range: %d", offset)
 .build();
 }

 return safeIndexOf(strCpa, substrCpa, offset);
Expand DownExpand Up@@ -376,14 +381,16 @@ private static Long lastIndexOf(CelCodePointArray str, CelCodePointArray substr,
 try {
 off = Math.toIntExact(offset);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset must not exceed the int32 range: %d", offset),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset must not exceed the int32 range: %d", offset)
 .setCause(e)
 .build();
 }

 if (off < 0 || off >= str.length()) {
 throw new CelEvaluationException(
 String.format("lastIndexOf failure: Offset out of range: %d", offset));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "lastIndexOf failure: Offset out of range: %d", offset)
 .build();
 }

 if (off > str.length() - substr.length()) {
Expand DownExpand Up@@ -416,9 +423,10 @@ private static String replace(Object[] objects) throws CelEvaluationException {
 try {
 index = Math.toIntExact(indexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("replace failure: Index must not exceed the int32 range: %d", indexInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "replace failure: Index must not exceed the int32 range: %d", indexInLong)
 .setCause(e)
 .build();
 }

 return replace((String) objects[0], (String) objects[1], (String) objects[2], index);
Expand DownExpand Up@@ -473,9 +481,10 @@ private static List<String> split(Object[] args) throws CelEvaluationException {
 try {
 limit = Math.toIntExact(limitInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("split failure: Limit must not exceed the int32 range: %d", limitInLong),
 e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "split failure: Limit must not exceed the int32 range: %d", limitInLong)
 .setCause(e)
 .build();
 }

 return split((String) args[0], (String) args[1], limit);
Expand DownExpand Up@@ -536,18 +545,20 @@ private static Object substring(String s, long i) throws CelEvaluationException
 try {
 beginIndex = Math.toIntExact(i);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format("substring failure: Index must not exceed the int32 range: %d", i), e);
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Index must not exceed the int32 range: %d", i)
 .setCause(e)
 .build();
 }

 CelCodePointArray codePointArray = CelCodePointArray.fromString(s);

 boolean indexIsInRange = beginIndex <= codePointArray.length() && beginIndex >= 0;
 if (!indexIsInRange) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds",
 beginIndex, codePointArray.length()));
 beginIndex, codePointArray.length())
 .build();
 }

 if (beginIndex == codePointArray.length()) {
Expand All@@ -569,11 +580,11 @@ private static String substring(Object[] args) throws CelEvaluationException {
 beginIndex = Math.toIntExact(beginIndexInLong);
 endIndex = Math.toIntExact(endIndexInLong);
 } catch (ArithmeticException e) {
 throw new CelEvaluationException(
 String.format(
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Indices must not exceed the int32 range: [%d, %d)",
 beginIndexInLong, endIndexInLong),
 e);
 beginIndexInLong, endIndexInLong)
 .setCause(e)
 .build();
 }

 String s = (String) args[0];
Expand All@@ -585,8 +596,9 @@ private static String substring(Object[] args) throws CelEvaluationException {
 && beginIndex <= codePointArray.length()
 && endIndex <= codePointArray.length();
 if (!indicesIsInRange) {
 throw new CelEvaluationException(
 String.format("substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex));
 throw CelEvaluationExceptionBuilder.newBuilder(
 "substring failure: Range [%d, %d) out of bounds", beginIndex, endIndex)
 .build();
 }

 if (beginIndex == endIndex) {
Expand Down

11 changes: 10 additions & 1 deletion
runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,15 @@ java_library(
 exports = [
 "//runtime/src/main/java/dev/cel/runtime",
 "//runtime/src/main/java/dev/cel/runtime:evaluation_exception",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 exports = ["//runtime/src/main/java/dev/cel/runtime:evaluation_exception_builder"],
)

java_library(
 name = "interpreter",
 exports = ["//runtime/src/main/java/dev/cel/runtime:interpreter"],
Expand DownExpand Up@@ -46,5 +52,8 @@ java_library(

java_library(
 name = "base",
 exports = ["//runtime/src/main/java/dev/cel/runtime:base"],
 exports = [
 "//runtime/src/main/java/dev/cel/runtime:base",
 "//runtime/src/main/java/dev/cel/runtime:metadata",
 ],
)

35 changes: 33 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ BASE_SOURCES = [
 "FunctionOverload.java",
 "InterpreterException.java",
 "MessageProvider.java",
 "Metadata.java",
 "Registrar.java",
 "ResolvedOverload.java",
]
Expand DownExpand Up@@ -56,6 +55,7 @@ java_library(
 tags = [
 ],
 deps = [
 ":metadata",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -81,6 +81,7 @@ java_library(
 ":base",
 ":cel_type_resolver",
 ":evaluation_listener",
 ":metadata",
 ":runtime_helper",
 ":unknown_attributes",
 "//:auto_value",
Expand DownExpand Up@@ -150,12 +151,41 @@ RUNTIME_SOURCES = [

java_library(
 name = "evaluation_exception",
 srcs = ["CelEvaluationException.java"],
 srcs = [
 "CelEvaluationException.java",
 ],
 tags = [
 ],
 deps = [
 "//common",
 "//common:error_codes",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "evaluation_exception_builder",
 srcs = ["CelEvaluationExceptionBuilder.java"],
 tags = [
 ],
 deps = [
 ":evaluation_exception",
 ":metadata",
 "//common:error_codes",
 "//common/annotations",
 "//common/internal:safe_string_formatter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
)

java_library(
 name = "metadata",
 srcs = ["Metadata.java"],
 deps = [
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

Expand All@@ -166,6 +196,7 @@ java_library(
 ],
 deps = [
 ":evaluation_exception",
 ":evaluation_exception_builder",
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
Expand Down

24 changes: 6 additions & 18 deletions
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

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

import dev.cel.common.CelErrorCode;
import dev.cel.common.CelException;
import org.jspecify.annotations.Nullable;

/**
 * CelEvaluationException encapsulates the potential issues which could arise during the
Expand All@@ -24,27 +25,14 @@
public final class CelEvaluationException extends CelException {

 public CelEvaluationException(String message) {
 super(formatErrorMessage(message));
 super(message);
 }

 public CelEvaluationException(String message, Throwable cause) {
 super(formatErrorMessage(message), cause);
 public CelEvaluationException(String message, @Nullable Throwable cause) {
 super(message, cause);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(formatErrorMessage(message), errorCode);
 }

 public CelEvaluationException(String message, Throwable cause, CelErrorCode errorCode) {
 this(message, cause, errorCode, true);
 }

 CelEvaluationException(
 String message, Throwable cause, CelErrorCode errorCode, boolean formatErrorMessage) {
 super(formatErrorMessage ? formatErrorMessage(message) : message, cause, errorCode);
 }

 private static String formatErrorMessage(String message) {
 return String.format("evaluation error: %s", message);
 CelEvaluationException(String message, @Nullable Throwable cause, CelErrorCode errorCode) {
 super(message, cause, errorCode);
 }
}
Loading