Skip to content

Commit 690d082

Browse files
l46kokcopybara-github
authored andcommitted
Deprecate enableTimestampEpoch option
PiperOrigin-RevId: 886867078
1 parent 3572797 commit 690d082

File tree

19 files changed

+22
-41
lines changed

19 files changed

+22
-41
lines changed

bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ public static CelBuilder plannerCelBuilder() {
5050
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
5151
CelRuntimeImpl.newBuilder())
5252
// CEL-Internal-2
53-
.setOptions(
54-
CelOptions.current()
55-
.enableHeterogeneousNumericComparisons(true)
56-
.enableTimestampEpoch(true)
57-
.build());
53+
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
5854
}
5955

6056
private CelExperimentalFactory() {}

bundle/src/test/java/dev/cel/bundle/CelImplTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2109,7 +2109,6 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E
21092109
standardCelBuilderWithMacros()
21102110
.addMessageTypes(descriptors)
21112111
// CEL-Internal-2
2112-
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
21132112
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
21142113
.build();
21152114
CelAbstractSyntaxTree ast =

checker/src/test/java/dev/cel/checker/CelCheckerLegacyImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void toCheckerBuilder_isImmutable() {
6363
public void toCheckerBuilder_singularFields_copied() {
6464
CelStandardDeclarations subsetDecls =
6565
CelStandardDeclarations.newBuilder().includeFunctions(StandardFunction.BOOL).build();
66-
CelOptions celOptions = CelOptions.current().enableTimestampEpoch(true).build();
66+
CelOptions celOptions = CelOptions.current().build();
6767
CelContainer celContainer = CelContainer.ofName("foo");
6868
CelType expectedResultType = SimpleType.BOOL;
6969
CelTypeProvider customTypeProvider =

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,14 +293,20 @@ public abstract static class Builder {
293293
public abstract Builder enableHomogeneousLiterals(boolean value);
294294

295295
/**
296-
* Enable the {@code int64_to_timestamp} overload which creates a timestamp from Uxix epoch
296+
* Enable the {@code int64_to_timestamp} overload which creates a timestamp from Unix epoch
297297
* seconds.
298298
*
299-
* <p>This option will be automatically enabled after a sufficient period of time has elapsed to
300-
* ensure that all runtimes support the implementation.
299+
* <p>Historically used to opt-in to this feature, this option is now enabled by default across
300+
* all runtimes.
301301
*
302302
* <p>TODO: Remove this feature once it has been auto-enabled.
303+
*
304+
* @deprecated This option is now enabled by default. If you are passing {@code true}, simply
305+
* remove this method call. If you are passing {@code false} to disable this feature, subset
306+
* the environment instead using {@code dev.cel.checker.CelStandardDeclarations} and {@code
307+
* dev.cel.runtime.CelStandardFunctions}.
303308
*/
309+
@Deprecated
304310
public abstract Builder enableTimestampEpoch(boolean value);
305311

306312
/**

conformance/src/test/java/dev/cel/conformance/ConformanceTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public final class ConformanceTest extends Statement {
5858

5959
private static final CelOptions OPTIONS =
6060
CelOptions.current()
61-
.enableTimestampEpoch(true)
6261
.enableHeterogeneousNumericComparisons(true)
6362
.enableProtoDifferencerEquality(true)
6463
.enableOptionalSyntax(true)

extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,7 @@ private CelBuilder newCelBuilder(int version) {
123123
}
124124

125125
return celBuilder
126-
.setOptions(
127-
CelOptions.current()
128-
.enableTimestampEpoch(true)
129-
.enableHeterogeneousNumericComparisons(true)
130-
.build())
126+
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
131127
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
132128
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
133129
.addMessageTypes(TestAllTypes.getDescriptor())

optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
@RunWith(TestParameterInjector.class)
4848
public class ConstantFoldingOptimizerTest {
4949
private static final CelOptions CEL_OPTIONS =
50-
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build();
50+
CelOptions.current().populateMacroCalls(true).build();
5151
private static final Cel CEL =
5252
CelFactory.standardCelBuilder()
5353
.addVar("x", SimpleType.DYN)

optimizer/src/test/java/dev/cel/optimizer/optimizers/InliningOptimizerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ public class InliningOptimizerTest {
5858
"child",
5959
StructTypeReference.create(TestAllTypes.NestedMessage.getDescriptor().getFullName()))
6060
.addVar("shadowed_ident", SimpleType.INT)
61-
.setOptions(
62-
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build())
61+
.setOptions(CelOptions.current().populateMacroCalls(true).build())
6362
.build();
6463

6564
@Test

optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerBaselineTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,7 @@ private static CelBuilder newCelBuilder() {
265265
.addMessageTypes(TestAllTypes.getDescriptor())
266266
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
267267
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
268-
.setOptions(
269-
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
268+
.setOptions(CelOptions.current().populateMacroCalls(true).build())
270269
.addCompilerLibraries(
271270
CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions())
272271
.addRuntimeLibraries(CelExtensions.optional(), CelExtensions.comprehensions())

optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ private static CelBuilder newCelBuilder() {
105105
return CelFactory.standardCelBuilder()
106106
.addMessageTypes(TestAllTypes.getDescriptor())
107107
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
108-
.setOptions(
109-
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
108+
.setOptions(CelOptions.current().populateMacroCalls(true).build())
110109
.addCompilerLibraries(CelExtensions.bindings())
111110
.addFunctionDeclarations(
112111
CelFunctionDecl.newFunctionDeclaration(

0 commit comments

Comments
 (0)