Internal Changes

PiperOrigin-RevId: 719018236
google · Jan 25, 2025 · 017a4fe · 017a4fe
1 parent 1ac9c4b
commit 017a4fe
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/runtime/src/main/java/dev/cel/runtime/BUILD.bazel b/runtime/src/main/java/dev/cel/runtime/BUILD.bazel
@@ -172,6 +172,7 @@ java_library(
         ":evaluation_exception",
         ":metadata",
         "//common:error_codes",
+        "//common:runtime_exception",
         "//common/annotations",
         "//common/internal:safe_string_formatter",
         "@maven//:com_google_errorprone_error_prone_annotations",

diff --git a/runtime/src/main/java/dev/cel/runtime/CelEvaluationExceptionBuilder.java b/runtime/src/main/java/dev/cel/runtime/CelEvaluationExceptionBuilder.java
@@ -16,6 +16,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import dev.cel.common.CelErrorCode;
+import dev.cel.common.CelRuntimeException;
 import dev.cel.common.annotations.Internal;
 import dev.cel.common.internal.SafeStringFormatter;
 import org.jspecify.annotations.Nullable;
@@ -74,6 +75,19 @@ public static CelEvaluationExceptionBuilder newBuilder(String message, Object...
     return new CelEvaluationExceptionBuilder(SafeStringFormatter.format(message, args));
   }
 
+  /**
+   * Constructs a new builder for {@link CelEvaluationException}
+   *
+   * <p>CEL Library Internals. Do not use.
+   */
+  @Internal
+  public static CelEvaluationExceptionBuilder newBuilder(CelRuntimeException celRuntimeException) {
+    Throwable cause = celRuntimeException.getCause();
+    return new CelEvaluationExceptionBuilder(cause.getMessage())
+        .setCause(cause)
+        .setErrorCode(celRuntimeException.getErrorCode());
+  }
+
   private CelEvaluationExceptionBuilder(String message) {
     this.message = message;
     this.errorCode = CelErrorCode.INTERNAL_ERROR;

diff --git a/runtime/src/test/java/dev/cel/runtime/CelEvaluationExceptionBuilderTest.java b/runtime/src/test/java/dev/cel/runtime/CelEvaluationExceptionBuilderTest.java
@@ -18,6 +18,7 @@
 
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import dev.cel.common.CelErrorCode;
+import dev.cel.common.CelRuntimeException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -77,4 +78,19 @@ public int getPosition(long exprId) {
     assertThat(e).hasCauseThat().isEqualTo(cause);
     assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.BAD_FORMAT);
   }
+
+  @Test
+  public void builder_fromCelRuntimeException() {
+    IllegalStateException cause = new IllegalStateException("cause error message");
+    CelRuntimeException celRuntimeException =
+        new CelRuntimeException(cause, CelErrorCode.BAD_FORMAT);
+    CelEvaluationExceptionBuilder builder =
+        CelEvaluationExceptionBuilder.newBuilder(celRuntimeException);
+
+    CelEvaluationException e = builder.build();
+
+    assertThat(e).hasMessageThat().isEqualTo("evaluation error: cause error message");
+    assertThat(e).hasCauseThat().isEqualTo(cause);
+    assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.BAD_FORMAT);
+  }
 }