diff --git a/bundle/src/test/java/dev/cel/bundle/CelImplTest.java b/bundle/src/test/java/dev/cel/bundle/CelImplTest.java index 2d337e4cf..00b47494d 100644 --- a/bundle/src/test/java/dev/cel/bundle/CelImplTest.java +++ b/bundle/src/test/java/dev/cel/bundle/CelImplTest.java @@ -817,7 +817,6 @@ public void program_messageConstruction() throws Exception { public void program_duplicateTypeDescriptor() throws Exception { Cel cel = standardCelBuilderWithMacros() - .setOptions(CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build()) .addMessageTypes(Timestamp.getDescriptor()) .addMessageTypes(ImmutableList.of(Timestamp.getDescriptor())) .setContainer(CelContainer.ofName("google")) @@ -833,7 +832,6 @@ public void program_duplicateTypeDescriptor() throws Exception { public void program_hermeticDescriptors_wellKnownProtobuf() throws Exception { Cel cel = standardCelBuilderWithMacros() - .setOptions(CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build()) .addMessageTypes(Timestamp.getDescriptor()) .setContainer(CelContainer.ofName("google")) .setResultType(SimpleType.TIMESTAMP) @@ -962,7 +960,6 @@ public void program_deepTypeResolutionDisabledForRuntime_fails() throws Exceptio public void program_typeProvider() throws Exception { Cel cel = standardCelBuilderWithMacros() - .setOptions(CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build()) .setTypeProvider( new DescriptorTypeProvider(ImmutableList.of(Timestamp.getDescriptor()))) .setContainer(CelContainer.ofName("google")) @@ -1029,10 +1026,7 @@ public void program_enumTypeReferenceResolution(boolean resolveTypeDependencies) Cel cel = standardCelBuilderWithMacros() .setOptions( - CelOptions.current() - .evaluateCanonicalTypesToNativeValues(true) - .resolveTypeDependencies(resolveTypeDependencies) - .build()) + CelOptions.current().resolveTypeDependencies(resolveTypeDependencies).build()) .addMessageTypes(Struct.getDescriptor()) .setResultType(StructTypeReference.create("google.protobuf.NullValue")) .setContainer(CelContainer.ofName("google.protobuf")) @@ -1050,11 +1044,7 @@ public void program_enumTypeReferenceResolution(boolean resolveTypeDependencies) public void program_enumTypeTransitiveResolution() throws Exception { Cel cel = standardCelBuilderWithMacros() - .setOptions( - CelOptions.current() - .evaluateCanonicalTypesToNativeValues(true) - .resolveTypeDependencies(true) - .build()) + .setOptions(CelOptions.current().resolveTypeDependencies(true).build()) .addMessageTypes(Proto2ExtensionScopedMessage.getDescriptor()) .setResultType(StructTypeReference.create("google.protobuf.NullValue")) .setContainer(CelContainer.ofName("google.protobuf")) @@ -1643,11 +1633,7 @@ public void programAdvanceEvaluation_indexOnUnknownContainer() throws Exception public void programAdvanceEvaluation_unsupportedIndexIgnored() throws Exception { Cel cel = standardCelBuilderWithMacros() - .setOptions( - CelOptions.current() - .evaluateCanonicalTypesToNativeValues(true) - .enableUnknownTracking(true) - .build()) + .setOptions(CelOptions.current().enableUnknownTracking(true).build()) .addVar("unk", MapType.create(SimpleType.STRING, SimpleType.BOOL)) .setContainer(CelContainer.ofName("")) .addFunctionBindings() @@ -2168,11 +2154,7 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E Cel cel = standardCelBuilderWithMacros() .addMessageTypes(descriptors) - .setOptions( - CelOptions.current() - .evaluateCanonicalTypesToNativeValues(true) - .enableTimestampEpoch(true) - .build()) + .setOptions(CelOptions.current().enableTimestampEpoch(true).build()) .setContainer(CelContainer.ofName("cel.expr.conformance.proto3")) .build(); CelAbstractSyntaxTree ast = diff --git a/common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java b/common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java index 0ce37ac1d..61c71e4a6 100644 --- a/common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java +++ b/common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java @@ -153,7 +153,7 @@ public void adaptValueToProto_bidirectionalConversion() { ProtoAdapter protoAdapter = new ProtoAdapter( dynamicProto, - CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build()); + CelOptions.current().build()); assertThat(protoAdapter.adaptValueToProto(value, proto.getDescriptorForType().getFullName())) .isEqualTo(proto); assertThat(protoAdapter.adaptProtoToValue(proto)).isEqualTo(value); diff --git a/common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java b/common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java index f9bee1af1..b7e078f81 100644 --- a/common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java +++ b/common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java @@ -66,7 +66,7 @@ public void newValue_createEmptyProtoMessage() { public void newValue_createProtoMessage_fieldsPopulated() { ProtoMessageValueProvider protoMessageValueProvider = ProtoMessageValueProvider.newInstance( - CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build(), DYNAMIC_PROTO); + CelOptions.current().build(), DYNAMIC_PROTO); ProtoMessageValue protoMessageValue = (ProtoMessageValue) diff --git a/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java b/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java index c4cf8193d..bc5ecfd12 100644 --- a/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java +++ b/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java @@ -54,7 +54,6 @@ public final class ConformanceTest extends Statement { private static final CelOptions OPTIONS = CelOptions.current() - .evaluateCanonicalTypesToNativeValues(true) .enableTimestampEpoch(true) .enableHeterogeneousNumericComparisons(true) .enableProtoDifferencerEquality(true) diff --git a/extensions/src/test/java/dev/cel/extensions/CelEncoderExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelEncoderExtensionsTest.java index ece060011..7eed3dd5a 100644 --- a/extensions/src/test/java/dev/cel/extensions/CelEncoderExtensionsTest.java +++ b/extensions/src/test/java/dev/cel/extensions/CelEncoderExtensionsTest.java @@ -37,7 +37,7 @@ @RunWith(TestParameterInjector.class) public class CelEncoderExtensionsTest { private static final CelOptions CEL_OPTIONS = - CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build(); + CelOptions.current().build(); private static final CelCompiler CEL_COMPILER = CelCompilerFactory.standardCelCompilerBuilder() diff --git a/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java b/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java index a51fbedbf..dd94333c3 100644 --- a/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java +++ b/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java @@ -100,7 +100,6 @@ private static CelBuilder newCelBuilder(int version) { return CelFactory.standardCelBuilder() .setOptions( CelOptions.current() - .evaluateCanonicalTypesToNativeValues(true) .enableTimestampEpoch(true) .build()) .setStandardMacros(CelStandardMacro.STANDARD_MACROS) diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java index 821a31d69..9b3810b99 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java +++ b/optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java @@ -49,7 +49,6 @@ public class ConstantFoldingOptimizerTest { private static final CelOptions CEL_OPTIONS = CelOptions.current() .enableTimestampEpoch(true) - .evaluateCanonicalTypesToNativeValues(true) .build(); private static final Cel CEL = CelFactory.standardCelBuilder() diff --git a/runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java b/runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java index e1415eabd..45c322da9 100644 --- a/runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java +++ b/runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java @@ -204,7 +204,6 @@ private Builder() { this.celOptions = CelOptions.current() .enableCelValue(true) - .evaluateCanonicalTypesToNativeValues(true) .build(); this.celValueProvider = (structType, fields) -> Optional.empty(); this.customFunctionBindings = new HashMap<>(); diff --git a/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java b/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java index 4be456fb7..096114757 100644 --- a/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java +++ b/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java @@ -111,7 +111,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase { .enableTimestampEpoch(true) .enableHeterogeneousNumericComparisons(true) .enableOptionalSyntax(true) - .evaluateCanonicalTypesToNativeValues(true) .comprehensionMaxIterations(1_000) .build(); private CelRuntime celRuntime;