Enable evaluateCanonicalTypesToNativeValues by default

PiperOrigin-RevId: 808650209

Author: l46kok

codelab/README.md

@@ -1065,8 +1065,8 @@ public void validate_invalidTimestampLiteral_returnsError() throws Exception {
   assertThat(validationResult.hasError()).isTrue();
   assertThat(validationResult.getErrorString())
       .isEqualTo(
-          "ERROR: <input>:1:11: timestamp validation failed. Reason: evaluation error: Failed to"
-              + " parse timestamp: invalid timestamp \"bad\"\n"
+          "ERROR: <input>:1:11: timestamp validation failed. Reason: evaluation error: Text 'bad'"
+              + " could not be parsed at index 0\n"
               + " | timestamp('bad')\n"
               + " | ..........^");
 }

codelab/src/test/codelab/Exercise8Test.java

@@ -43,8 +43,8 @@ public void validate_invalidTimestampLiteral_returnsError() throws Exception {
     assertThat(validationResult.hasError()).isTrue();
     assertThat(validationResult.getErrorString())
         .isEqualTo(
-            "ERROR: <input>:1:11: timestamp validation failed. Reason: evaluation error: Failed to"
-                + " parse timestamp: invalid timestamp \"bad\"\n"
+            "ERROR: <input>:1:11: timestamp validation failed. Reason: evaluation error: Text 'bad'"
+                + " could not be parsed at index 0\n"
                 + " | timestamp('bad')\n"
                 + " | ..........^");
   }

codelab/src/test/codelab/solutions/Exercise8Test.java

@@ -43,8 +43,8 @@ public void validate_invalidTimestampLiteral_returnsError() throws Exception {
     assertThat(validationResult.hasError()).isTrue();
     assertThat(validationResult.getErrorString())
         .isEqualTo(
-            "ERROR: <input>:1:11: timestamp validation failed. Reason: evaluation error: Failed to"
-                + " parse timestamp: invalid timestamp \"bad\"\n"
+            "ERROR: <input>:1:11: timestamp validation failed. Reason: evaluation error: Text 'bad'"
+                + " could not be parsed at index 0\n"
                 + " | timestamp('bad')\n"
                 + " | ..........^");
   }

common/src/main/java/dev/cel/common/CelOptions.java

@@ -184,6 +184,7 @@ public static Builder current() {
         .enableUnsignedLongs(true)
         .enableRegexPartialMatch(true)
         .errorOnDuplicateMapKeys(true)
+        .evaluateCanonicalTypesToNativeValues(true)
         .errorOnIntWrap(true)
         .resolveTypeDependencies(true)
         .disableCelStandardEquality(false);
@@ -465,7 +466,10 @@ public abstract static class Builder {
      *   <li>Timestamp: {@code java.time.Instant} instead of {@code com.google.protobuf.Timestamp}.
      *   <li>Duration: {@code java.time.Duration} instead of {@code com.google.protobuf.Duration}.
      * </ul>
+     *
+     * @deprecated Do not use. This flag is enabled by default and will be removed in the future.
      */
+    @Deprecated
     public abstract Builder evaluateCanonicalTypesToNativeValues(boolean value);
 
     /**

validator/src/main/java/dev/cel/validator/validators/DurationLiteralValidator.java

@@ -14,7 +14,7 @@
 
 package dev.cel.validator.validators;
 
-import com.google.protobuf.Duration;
+import java.time.Duration;
 
 /** DurationLiteralValidator ensures that duration literal arguments are valid. */
 public final class DurationLiteralValidator extends LiteralValidator {

validator/src/main/java/dev/cel/validator/validators/TimestampLiteralValidator.java

@@ -14,12 +14,12 @@
 
 package dev.cel.validator.validators;
 
-import com.google.protobuf.Timestamp;
+import java.time.Instant;
 
 /** TimestampLiteralValidator ensures that timestamp literal arguments are valid. */
 public final class TimestampLiteralValidator extends LiteralValidator {
   public static final TimestampLiteralValidator INSTANCE =
-      new TimestampLiteralValidator("timestamp", Timestamp.class);
+      new TimestampLiteralValidator("timestamp", Instant.class);
 
   private TimestampLiteralValidator(String functionName, Class<?> expectedResultType) {
     super(functionName, expectedResultType);

validator/src/test/java/dev/cel/validator/validators/DurationLiteralValidatorTest.java

@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.protobuf.Duration;
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import com.google.testing.junit.testparameterinjector.TestParameters;
 import dev.cel.bundle.Cel;
@@ -35,6 +34,7 @@
 import dev.cel.validator.CelValidator;
 import dev.cel.validator.CelValidatorFactory;
 import java.text.ParseException;
+import java.time.Duration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -174,7 +174,7 @@ public void duration_unexpectedResultType_throws() throws Exception {
     assertThat(result.getAllIssues().get(0).toDisplayString(ast.getSource()))
         .isEqualTo(
             "ERROR: <input>:1:10: duration validation failed. Reason: Expected"
-                + " com.google.protobuf.Duration type but got java.lang.Integer instead\n"
+                + " java.time.Duration type but got java.lang.Integer instead\n"
                 + " | duration('1h')\n"
                 + " | .........^");
   }

validator/src/test/java/dev/cel/validator/validators/TimestampLiteralValidatorTest.java

@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.protobuf.Timestamp;
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import com.google.testing.junit.testparameterinjector.TestParameters;
 import dev.cel.bundle.Cel;
@@ -36,6 +35,7 @@
 import dev.cel.validator.CelValidator;
 import dev.cel.validator.CelValidatorFactory;
 import java.text.ParseException;
+import java.time.Instant;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -63,7 +63,7 @@ public void timestamp_validFormat(String source) throws Exception {
 
     assertThat(result.hasError()).isFalse();
     assertThat(result.getAllIssues()).isEmpty();
-    assertThat(CEL.createProgram(ast).eval()).isInstanceOf(Timestamp.class);
+    assertThat(CEL.createProgram(ast).eval()).isInstanceOf(Instant.class);
   }
 
   @Test
@@ -100,8 +100,7 @@ public void timestamp_withVariable_noOp() throws Exception {
             () -> CEL.createProgram(ast).eval(ImmutableMap.of("str_var", "bad")));
     assertThat(e)
         .hasMessageThat()
-        .contains(
-            "evaluation error at <input>:9: Failed to parse timestamp: invalid timestamp \"bad\"");
+        .contains("evaluation error at <input>:9: Text 'bad' could not be parsed at index 0");
   }
 
   @Test
@@ -153,8 +152,8 @@ public void timestamp_invalidFormat() throws Exception {
     assertThat(result.getAllIssues().get(0).getSeverity()).isEqualTo(Severity.ERROR);
     assertThat(result.getAllIssues().get(0).toDisplayString(ast.getSource()))
         .isEqualTo(
-            "ERROR: <input>:1:11: timestamp validation failed. Reason: evaluation error: Failed to"
-                + " parse timestamp: invalid timestamp \"bad\"\n"
+            "ERROR: <input>:1:11: timestamp validation failed. Reason: evaluation error: Text 'bad'"
+                + " could not be parsed at index 0\n"
                 + " | timestamp('bad')\n"
                 + " | ..........^");
   }
@@ -185,7 +184,7 @@ public void timestamp_unexpectedResultType_throws() throws Exception {
     assertThat(result.getAllIssues().get(0).toDisplayString(ast.getSource()))
         .isEqualTo(
             "ERROR: <input>:1:11: timestamp validation failed. Reason: Expected"
-                + " com.google.protobuf.Timestamp type but got java.lang.Integer instead\n"
+                + " java.time.Instant type but got java.lang.Integer instead\n"
                 + " | timestamp(0)\n"
                 + " | ..........^");
   }