Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,11 +50,7 @@ public static CelBuilder plannerCelBuilder() {
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableHeterogeneousNumericComparisons(true)
.enableTimestampEpoch(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelExperimentalFactory() {}
Expand Down
1 change: 0 additions & 1 deletion bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2109,7 +2109,6 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E
standardCelBuilderWithMacros()
.addMessageTypes(descriptors)
// CEL-Internal-2
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.build();
CelAbstractSyntaxTree ast =
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public void toCheckerBuilder_isImmutable() {
public void toCheckerBuilder_singularFields_copied() {
CelStandardDeclarations subsetDecls =
CelStandardDeclarations.newBuilder().includeFunctions(StandardFunction.BOOL).build();
CelOptions celOptions = CelOptions.current().enableTimestampEpoch(true).build();
CelOptions celOptions = CelOptions.current().build();
CelContainer celContainer = CelContainer.ofName("foo");
CelType expectedResultType = SimpleType.BOOL;
CelTypeProvider customTypeProvider =
Expand Down
12 changes: 9 additions & 3 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,14 +293,20 @@ public abstract static class Builder {
public abstract Builder enableHomogeneousLiterals(boolean value);

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

/**
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,6 @@ public final class ConformanceTest extends Statement {

private static final CelOptions OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableProtoDifferencerEquality(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,7 @@ private CelBuilder newCelBuilder(int version) {
}

return celBuilder
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build())
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.addMessageTypes(TestAllTypes.getDescriptor())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@
@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build();
CelOptions.current().populateMacroCalls(true).build();
private static final Cel CEL =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.DYN)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,7 @@ public class InliningOptimizerTest {
"child",
StructTypeReference.create(TestAllTypes.NestedMessage.getDescriptor().getFullName()))
.addVar("shadowed_ident", SimpleType.INT)
.setOptions(
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.build();

@Test
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -265,8 +265,7 @@ private static CelBuilder newCelBuilder() {
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(
CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions())
.addRuntimeLibraries(CelExtensions.optional(), CelExtensions.comprehensions())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,8 +105,7 @@ private static CelBuilder newCelBuilder() {
return CelFactory.standardCelBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(CelExtensions.bindings())
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,7 @@ public final class CelRuntimeExperimentalFactory {
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeExperimentalFactory() {}
Expand Down
3 changes: 1 addition & 2 deletions runtime/src/test/java/dev/cel/runtime/ActivationTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,10 @@
public final class ActivationTest {

private static final CelOptions TEST_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).enableUnsignedLongs(true).build();
CelOptions.current().enableUnsignedLongs(true).build();

private static final CelOptions TEST_OPTIONS_SKIP_UNSET_FIELDS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableUnsignedLongs(true)
.fromProtoUnsetFieldOption(CelOptions.ProtoUnsetFieldOptions.SKIP)
.build();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,7 @@ public void unsignedLongsDisabled_int64Identity_throws() {
public void timestampEpochDisabled_int64Identity_throws() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.build();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.types.OpaqueType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.ProtoMessageTypeProvider;
Expand All@@ -44,7 +43,6 @@ public class DescriptorTypeResolverTest {

private static final Cel CEL =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setTypeProvider(PROTO_MESSAGE_TYPE_PROVIDER)
.addCompilerLibraries(CelOptionalLibrary.INSTANCE)
.addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,6 @@ public void planner_unknownResultSet_success() {
celRuntime =
newBaseRuntimeBuilder(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase {

private static final CelOptions BASE_CEL_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,6 @@ public abstract class CelBaselineTestCase extends BaselineTestCase {
protected static final int COMPREHENSION_MAX_ITERATIONS = 1_000;
protected static final CelOptions TEST_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableHiddenAccumulatorVar(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,7 @@

@RunWith(TestParameterInjector.class)
public class RegexLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,7 @@

@RunWith(TestParameterInjector.class)
public class TimestampLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand DownExpand Up@@ -205,7 +204,7 @@ public void parentIsNotCallExpr_doesNotThrow(String source) throws Exception {
public void env_withSetResultType_success() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.setResultType(SimpleType.BOOL)
.build();
CelValidator validator =
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,11 +50,7 @@ public static CelBuilder plannerCelBuilder() {
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableHeterogeneousNumericComparisons(true)
.enableTimestampEpoch(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelExperimentalFactory() {}
Expand Down
1 change: 0 additions & 1 deletion bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2109,7 +2109,6 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E
standardCelBuilderWithMacros()
.addMessageTypes(descriptors)
// CEL-Internal-2
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.build();
CelAbstractSyntaxTree ast =
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public void toCheckerBuilder_isImmutable() {
public void toCheckerBuilder_singularFields_copied() {
CelStandardDeclarations subsetDecls =
CelStandardDeclarations.newBuilder().includeFunctions(StandardFunction.BOOL).build();
CelOptions celOptions = CelOptions.current().enableTimestampEpoch(true).build();
CelOptions celOptions = CelOptions.current().build();
CelContainer celContainer = CelContainer.ofName("foo");
CelType expectedResultType = SimpleType.BOOL;
CelTypeProvider customTypeProvider =
Expand Down
12 changes: 9 additions & 3 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,14 +293,20 @@ public abstract static class Builder {
public abstract Builder enableHomogeneousLiterals(boolean value);

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

/**
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,6 @@ public final class ConformanceTest extends Statement {

private static final CelOptions OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableProtoDifferencerEquality(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,7 @@ private CelBuilder newCelBuilder(int version) {
}

return celBuilder
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build())
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.addMessageTypes(TestAllTypes.getDescriptor())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@
@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build();
CelOptions.current().populateMacroCalls(true).build();
private static final Cel CEL =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.DYN)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,7 @@ public class InliningOptimizerTest {
"child",
StructTypeReference.create(TestAllTypes.NestedMessage.getDescriptor().getFullName()))
.addVar("shadowed_ident", SimpleType.INT)
.setOptions(
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.build();

@Test
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -265,8 +265,7 @@ private static CelBuilder newCelBuilder() {
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(
CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions())
.addRuntimeLibraries(CelExtensions.optional(), CelExtensions.comprehensions())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,8 +105,7 @@ private static CelBuilder newCelBuilder() {
return CelFactory.standardCelBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(CelExtensions.bindings())
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,7 @@ public final class CelRuntimeExperimentalFactory {
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeExperimentalFactory() {}
Expand Down
3 changes: 1 addition & 2 deletions runtime/src/test/java/dev/cel/runtime/ActivationTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,10 @@
public final class ActivationTest {

private static final CelOptions TEST_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).enableUnsignedLongs(true).build();
CelOptions.current().enableUnsignedLongs(true).build();

private static final CelOptions TEST_OPTIONS_SKIP_UNSET_FIELDS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableUnsignedLongs(true)
.fromProtoUnsetFieldOption(CelOptions.ProtoUnsetFieldOptions.SKIP)
.build();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,7 @@ public void unsignedLongsDisabled_int64Identity_throws() {
public void timestampEpochDisabled_int64Identity_throws() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.build();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.types.OpaqueType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.ProtoMessageTypeProvider;
Expand All@@ -44,7 +43,6 @@ public class DescriptorTypeResolverTest {

private static final Cel CEL =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setTypeProvider(PROTO_MESSAGE_TYPE_PROVIDER)
.addCompilerLibraries(CelOptionalLibrary.INSTANCE)
.addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,6 @@ public void planner_unknownResultSet_success() {
celRuntime =
newBaseRuntimeBuilder(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase {

private static final CelOptions BASE_CEL_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,6 @@ public abstract class CelBaselineTestCase extends BaselineTestCase {
protected static final int COMPREHENSION_MAX_ITERATIONS = 1_000;
protected static final CelOptions TEST_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableHiddenAccumulatorVar(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,7 @@

@RunWith(TestParameterInjector.class)
public class RegexLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,7 @@

@RunWith(TestParameterInjector.class)
public class TimestampLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand DownExpand Up@@ -205,7 +204,7 @@ public void parentIsNotCallExpr_doesNotThrow(String source) throws Exception {
public void env_withSetResultType_success() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.setResultType(SimpleType.BOOL)
.build();
CelValidator validator =
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,11 +50,7 @@ public static CelBuilder plannerCelBuilder() {
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableHeterogeneousNumericComparisons(true)
.enableTimestampEpoch(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelExperimentalFactory() {}
Expand Down
1 change: 0 additions & 1 deletion bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2109,7 +2109,6 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E
standardCelBuilderWithMacros()
.addMessageTypes(descriptors)
// CEL-Internal-2
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.build();
CelAbstractSyntaxTree ast =
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public void toCheckerBuilder_isImmutable() {
public void toCheckerBuilder_singularFields_copied() {
CelStandardDeclarations subsetDecls =
CelStandardDeclarations.newBuilder().includeFunctions(StandardFunction.BOOL).build();
CelOptions celOptions = CelOptions.current().enableTimestampEpoch(true).build();
CelOptions celOptions = CelOptions.current().build();
CelContainer celContainer = CelContainer.ofName("foo");
CelType expectedResultType = SimpleType.BOOL;
CelTypeProvider customTypeProvider =
Expand Down
12 changes: 9 additions & 3 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,14 +293,20 @@ public abstract static class Builder {
public abstract Builder enableHomogeneousLiterals(boolean value);

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

/**
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,6 @@ public final class ConformanceTest extends Statement {

private static final CelOptions OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableProtoDifferencerEquality(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,7 @@ private CelBuilder newCelBuilder(int version) {
}

return celBuilder
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build())
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.addMessageTypes(TestAllTypes.getDescriptor())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@
@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build();
CelOptions.current().populateMacroCalls(true).build();
private static final Cel CEL =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.DYN)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,7 @@ public class InliningOptimizerTest {
"child",
StructTypeReference.create(TestAllTypes.NestedMessage.getDescriptor().getFullName()))
.addVar("shadowed_ident", SimpleType.INT)
.setOptions(
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.build();

@Test
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -265,8 +265,7 @@ private static CelBuilder newCelBuilder() {
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(
CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions())
.addRuntimeLibraries(CelExtensions.optional(), CelExtensions.comprehensions())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,8 +105,7 @@ private static CelBuilder newCelBuilder() {
return CelFactory.standardCelBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(CelExtensions.bindings())
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,7 @@ public final class CelRuntimeExperimentalFactory {
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeExperimentalFactory() {}
Expand Down
3 changes: 1 addition & 2 deletions runtime/src/test/java/dev/cel/runtime/ActivationTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,10 @@
public final class ActivationTest {

private static final CelOptions TEST_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).enableUnsignedLongs(true).build();
CelOptions.current().enableUnsignedLongs(true).build();

private static final CelOptions TEST_OPTIONS_SKIP_UNSET_FIELDS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableUnsignedLongs(true)
.fromProtoUnsetFieldOption(CelOptions.ProtoUnsetFieldOptions.SKIP)
.build();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,7 @@ public void unsignedLongsDisabled_int64Identity_throws() {
public void timestampEpochDisabled_int64Identity_throws() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.build();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.types.OpaqueType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.ProtoMessageTypeProvider;
Expand All@@ -44,7 +43,6 @@ public class DescriptorTypeResolverTest {

private static final Cel CEL =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setTypeProvider(PROTO_MESSAGE_TYPE_PROVIDER)
.addCompilerLibraries(CelOptionalLibrary.INSTANCE)
.addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,6 @@ public void planner_unknownResultSet_success() {
celRuntime =
newBaseRuntimeBuilder(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase {

private static final CelOptions BASE_CEL_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,6 @@ public abstract class CelBaselineTestCase extends BaselineTestCase {
protected static final int COMPREHENSION_MAX_ITERATIONS = 1_000;
protected static final CelOptions TEST_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableHiddenAccumulatorVar(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,7 @@

@RunWith(TestParameterInjector.class)
public class RegexLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,7 @@

@RunWith(TestParameterInjector.class)
public class TimestampLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand DownExpand Up@@ -205,7 +204,7 @@ public void parentIsNotCallExpr_doesNotThrow(String source) throws Exception {
public void env_withSetResultType_success() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.setResultType(SimpleType.BOOL)
.build();
CelValidator validator =
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,11 +50,7 @@ public static CelBuilder plannerCelBuilder() {
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableHeterogeneousNumericComparisons(true)
.enableTimestampEpoch(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelExperimentalFactory() {}
Expand Down
1 change: 0 additions & 1 deletion bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2109,7 +2109,6 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E
standardCelBuilderWithMacros()
.addMessageTypes(descriptors)
// CEL-Internal-2
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.build();
CelAbstractSyntaxTree ast =
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public void toCheckerBuilder_isImmutable() {
public void toCheckerBuilder_singularFields_copied() {
CelStandardDeclarations subsetDecls =
CelStandardDeclarations.newBuilder().includeFunctions(StandardFunction.BOOL).build();
CelOptions celOptions = CelOptions.current().enableTimestampEpoch(true).build();
CelOptions celOptions = CelOptions.current().build();
CelContainer celContainer = CelContainer.ofName("foo");
CelType expectedResultType = SimpleType.BOOL;
CelTypeProvider customTypeProvider =
Expand Down
12 changes: 9 additions & 3 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,14 +293,20 @@ public abstract static class Builder {
public abstract Builder enableHomogeneousLiterals(boolean value);

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

/**
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,6 @@ public final class ConformanceTest extends Statement {

private static final CelOptions OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableProtoDifferencerEquality(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,7 @@ private CelBuilder newCelBuilder(int version) {
}

return celBuilder
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build())
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.addMessageTypes(TestAllTypes.getDescriptor())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@
@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build();
CelOptions.current().populateMacroCalls(true).build();
private static final Cel CEL =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.DYN)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,7 @@ public class InliningOptimizerTest {
"child",
StructTypeReference.create(TestAllTypes.NestedMessage.getDescriptor().getFullName()))
.addVar("shadowed_ident", SimpleType.INT)
.setOptions(
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.build();

@Test
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -265,8 +265,7 @@ private static CelBuilder newCelBuilder() {
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(
CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions())
.addRuntimeLibraries(CelExtensions.optional(), CelExtensions.comprehensions())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,8 +105,7 @@ private static CelBuilder newCelBuilder() {
return CelFactory.standardCelBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(CelExtensions.bindings())
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,7 @@ public final class CelRuntimeExperimentalFactory {
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeExperimentalFactory() {}
Expand Down
3 changes: 1 addition & 2 deletions runtime/src/test/java/dev/cel/runtime/ActivationTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,10 @@
public final class ActivationTest {

private static final CelOptions TEST_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).enableUnsignedLongs(true).build();
CelOptions.current().enableUnsignedLongs(true).build();

private static final CelOptions TEST_OPTIONS_SKIP_UNSET_FIELDS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableUnsignedLongs(true)
.fromProtoUnsetFieldOption(CelOptions.ProtoUnsetFieldOptions.SKIP)
.build();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,7 @@ public void unsignedLongsDisabled_int64Identity_throws() {
public void timestampEpochDisabled_int64Identity_throws() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.build();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.types.OpaqueType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.ProtoMessageTypeProvider;
Expand All@@ -44,7 +43,6 @@ public class DescriptorTypeResolverTest {

private static final Cel CEL =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setTypeProvider(PROTO_MESSAGE_TYPE_PROVIDER)
.addCompilerLibraries(CelOptionalLibrary.INSTANCE)
.addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,6 @@ public void planner_unknownResultSet_success() {
celRuntime =
newBaseRuntimeBuilder(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase {

private static final CelOptions BASE_CEL_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,6 @@ public abstract class CelBaselineTestCase extends BaselineTestCase {
protected static final int COMPREHENSION_MAX_ITERATIONS = 1_000;
protected static final CelOptions TEST_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableHiddenAccumulatorVar(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,7 @@

@RunWith(TestParameterInjector.class)
public class RegexLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,7 @@

@RunWith(TestParameterInjector.class)
public class TimestampLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand DownExpand Up@@ -205,7 +204,7 @@ public void parentIsNotCallExpr_doesNotThrow(String source) throws Exception {
public void env_withSetResultType_success() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.setResultType(SimpleType.BOOL)
.build();
CelValidator validator =
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,11 +50,7 @@ public static CelBuilder plannerCelBuilder() {
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableHeterogeneousNumericComparisons(true)
.enableTimestampEpoch(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelExperimentalFactory() {}
Expand Down
1 change: 0 additions & 1 deletion bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2109,7 +2109,6 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E
standardCelBuilderWithMacros()
.addMessageTypes(descriptors)
// CEL-Internal-2
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.build();
CelAbstractSyntaxTree ast =
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public void toCheckerBuilder_isImmutable() {
public void toCheckerBuilder_singularFields_copied() {
CelStandardDeclarations subsetDecls =
CelStandardDeclarations.newBuilder().includeFunctions(StandardFunction.BOOL).build();
CelOptions celOptions = CelOptions.current().enableTimestampEpoch(true).build();
CelOptions celOptions = CelOptions.current().build();
CelContainer celContainer = CelContainer.ofName("foo");
CelType expectedResultType = SimpleType.BOOL;
CelTypeProvider customTypeProvider =
Expand Down
12 changes: 9 additions & 3 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,14 +293,20 @@ public abstract static class Builder {
public abstract Builder enableHomogeneousLiterals(boolean value);

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

/**
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,6 @@ public final class ConformanceTest extends Statement {

private static final CelOptions OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableProtoDifferencerEquality(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,7 @@ private CelBuilder newCelBuilder(int version) {
}

return celBuilder
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build())
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.addMessageTypes(TestAllTypes.getDescriptor())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@
@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build();
CelOptions.current().populateMacroCalls(true).build();
private static final Cel CEL =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.DYN)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,7 @@ public class InliningOptimizerTest {
"child",
StructTypeReference.create(TestAllTypes.NestedMessage.getDescriptor().getFullName()))
.addVar("shadowed_ident", SimpleType.INT)
.setOptions(
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.build();

@Test
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -265,8 +265,7 @@ private static CelBuilder newCelBuilder() {
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(
CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions())
.addRuntimeLibraries(CelExtensions.optional(), CelExtensions.comprehensions())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,8 +105,7 @@ private static CelBuilder newCelBuilder() {
return CelFactory.standardCelBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(CelExtensions.bindings())
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,7 @@ public final class CelRuntimeExperimentalFactory {
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeExperimentalFactory() {}
Expand Down
3 changes: 1 addition & 2 deletions runtime/src/test/java/dev/cel/runtime/ActivationTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,10 @@
public final class ActivationTest {

private static final CelOptions TEST_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).enableUnsignedLongs(true).build();
CelOptions.current().enableUnsignedLongs(true).build();

private static final CelOptions TEST_OPTIONS_SKIP_UNSET_FIELDS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableUnsignedLongs(true)
.fromProtoUnsetFieldOption(CelOptions.ProtoUnsetFieldOptions.SKIP)
.build();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,7 @@ public void unsignedLongsDisabled_int64Identity_throws() {
public void timestampEpochDisabled_int64Identity_throws() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.build();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.types.OpaqueType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.ProtoMessageTypeProvider;
Expand All@@ -44,7 +43,6 @@ public class DescriptorTypeResolverTest {

private static final Cel CEL =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setTypeProvider(PROTO_MESSAGE_TYPE_PROVIDER)
.addCompilerLibraries(CelOptionalLibrary.INSTANCE)
.addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,6 @@ public void planner_unknownResultSet_success() {
celRuntime =
newBaseRuntimeBuilder(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase {

private static final CelOptions BASE_CEL_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,6 @@ public abstract class CelBaselineTestCase extends BaselineTestCase {
protected static final int COMPREHENSION_MAX_ITERATIONS = 1_000;
protected static final CelOptions TEST_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableHiddenAccumulatorVar(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,7 @@

@RunWith(TestParameterInjector.class)
public class RegexLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,7 @@

@RunWith(TestParameterInjector.class)
public class TimestampLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand DownExpand Up@@ -205,7 +204,7 @@ public void parentIsNotCallExpr_doesNotThrow(String source) throws Exception {
public void env_withSetResultType_success() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.setResultType(SimpleType.BOOL)
.build();
CelValidator validator =
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,11 +50,7 @@ public static CelBuilder plannerCelBuilder() {
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableHeterogeneousNumericComparisons(true)
.enableTimestampEpoch(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelExperimentalFactory() {}
Expand Down
1 change: 0 additions & 1 deletion bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2109,7 +2109,6 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E
standardCelBuilderWithMacros()
.addMessageTypes(descriptors)
// CEL-Internal-2
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.build();
CelAbstractSyntaxTree ast =
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public void toCheckerBuilder_isImmutable() {
public void toCheckerBuilder_singularFields_copied() {
CelStandardDeclarations subsetDecls =
CelStandardDeclarations.newBuilder().includeFunctions(StandardFunction.BOOL).build();
CelOptions celOptions = CelOptions.current().enableTimestampEpoch(true).build();
CelOptions celOptions = CelOptions.current().build();
CelContainer celContainer = CelContainer.ofName("foo");
CelType expectedResultType = SimpleType.BOOL;
CelTypeProvider customTypeProvider =
Expand Down
12 changes: 9 additions & 3 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,14 +293,20 @@ public abstract static class Builder {
public abstract Builder enableHomogeneousLiterals(boolean value);

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

/**
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,6 @@ public final class ConformanceTest extends Statement {

private static final CelOptions OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableProtoDifferencerEquality(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,7 @@ private CelBuilder newCelBuilder(int version) {
}

return celBuilder
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build())
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.addMessageTypes(TestAllTypes.getDescriptor())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@
@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build();
CelOptions.current().populateMacroCalls(true).build();
private static final Cel CEL =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.DYN)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,7 @@ public class InliningOptimizerTest {
"child",
StructTypeReference.create(TestAllTypes.NestedMessage.getDescriptor().getFullName()))
.addVar("shadowed_ident", SimpleType.INT)
.setOptions(
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.build();

@Test
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -265,8 +265,7 @@ private static CelBuilder newCelBuilder() {
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(
CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions())
.addRuntimeLibraries(CelExtensions.optional(), CelExtensions.comprehensions())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,8 +105,7 @@ private static CelBuilder newCelBuilder() {
return CelFactory.standardCelBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(CelExtensions.bindings())
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,7 @@ public final class CelRuntimeExperimentalFactory {
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeExperimentalFactory() {}
Expand Down
3 changes: 1 addition & 2 deletions runtime/src/test/java/dev/cel/runtime/ActivationTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,10 @@
public final class ActivationTest {

private static final CelOptions TEST_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).enableUnsignedLongs(true).build();
CelOptions.current().enableUnsignedLongs(true).build();

private static final CelOptions TEST_OPTIONS_SKIP_UNSET_FIELDS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableUnsignedLongs(true)
.fromProtoUnsetFieldOption(CelOptions.ProtoUnsetFieldOptions.SKIP)
.build();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,7 @@ public void unsignedLongsDisabled_int64Identity_throws() {
public void timestampEpochDisabled_int64Identity_throws() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.build();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.types.OpaqueType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.ProtoMessageTypeProvider;
Expand All@@ -44,7 +43,6 @@ public class DescriptorTypeResolverTest {

private static final Cel CEL =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setTypeProvider(PROTO_MESSAGE_TYPE_PROVIDER)
.addCompilerLibraries(CelOptionalLibrary.INSTANCE)
.addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,6 @@ public void planner_unknownResultSet_success() {
celRuntime =
newBaseRuntimeBuilder(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase {

private static final CelOptions BASE_CEL_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,6 @@ public abstract class CelBaselineTestCase extends BaselineTestCase {
protected static final int COMPREHENSION_MAX_ITERATIONS = 1_000;
protected static final CelOptions TEST_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableHiddenAccumulatorVar(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,7 @@

@RunWith(TestParameterInjector.class)
public class RegexLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,7 @@

@RunWith(TestParameterInjector.class)
public class TimestampLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand DownExpand Up@@ -205,7 +204,7 @@ public void parentIsNotCallExpr_doesNotThrow(String source) throws Exception {
public void env_withSetResultType_success() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.setResultType(SimpleType.BOOL)
.build();
CelValidator validator =
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,11 +50,7 @@ public static CelBuilder plannerCelBuilder() {
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableHeterogeneousNumericComparisons(true)
.enableTimestampEpoch(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelExperimentalFactory() {}
Expand Down
1 change: 0 additions & 1 deletion bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2109,7 +2109,6 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E
standardCelBuilderWithMacros()
.addMessageTypes(descriptors)
// CEL-Internal-2
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.build();
CelAbstractSyntaxTree ast =
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public void toCheckerBuilder_isImmutable() {
public void toCheckerBuilder_singularFields_copied() {
CelStandardDeclarations subsetDecls =
CelStandardDeclarations.newBuilder().includeFunctions(StandardFunction.BOOL).build();
CelOptions celOptions = CelOptions.current().enableTimestampEpoch(true).build();
CelOptions celOptions = CelOptions.current().build();
CelContainer celContainer = CelContainer.ofName("foo");
CelType expectedResultType = SimpleType.BOOL;
CelTypeProvider customTypeProvider =
Expand Down
12 changes: 9 additions & 3 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,14 +293,20 @@ public abstract static class Builder {
public abstract Builder enableHomogeneousLiterals(boolean value);

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

/**
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,6 @@ public final class ConformanceTest extends Statement {

private static final CelOptions OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableProtoDifferencerEquality(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,7 @@ private CelBuilder newCelBuilder(int version) {
}

return celBuilder
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build())
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.addMessageTypes(TestAllTypes.getDescriptor())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@
@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build();
CelOptions.current().populateMacroCalls(true).build();
private static final Cel CEL =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.DYN)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,7 @@ public class InliningOptimizerTest {
"child",
StructTypeReference.create(TestAllTypes.NestedMessage.getDescriptor().getFullName()))
.addVar("shadowed_ident", SimpleType.INT)
.setOptions(
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.build();

@Test
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -265,8 +265,7 @@ private static CelBuilder newCelBuilder() {
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(
CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions())
.addRuntimeLibraries(CelExtensions.optional(), CelExtensions.comprehensions())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,8 +105,7 @@ private static CelBuilder newCelBuilder() {
return CelFactory.standardCelBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(CelExtensions.bindings())
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,7 @@ public final class CelRuntimeExperimentalFactory {
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeExperimentalFactory() {}
Expand Down
3 changes: 1 addition & 2 deletions runtime/src/test/java/dev/cel/runtime/ActivationTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,10 @@
public final class ActivationTest {

private static final CelOptions TEST_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).enableUnsignedLongs(true).build();
CelOptions.current().enableUnsignedLongs(true).build();

private static final CelOptions TEST_OPTIONS_SKIP_UNSET_FIELDS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableUnsignedLongs(true)
.fromProtoUnsetFieldOption(CelOptions.ProtoUnsetFieldOptions.SKIP)
.build();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,7 @@ public void unsignedLongsDisabled_int64Identity_throws() {
public void timestampEpochDisabled_int64Identity_throws() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.build();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.types.OpaqueType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.ProtoMessageTypeProvider;
Expand All@@ -44,7 +43,6 @@ public class DescriptorTypeResolverTest {

private static final Cel CEL =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setTypeProvider(PROTO_MESSAGE_TYPE_PROVIDER)
.addCompilerLibraries(CelOptionalLibrary.INSTANCE)
.addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,6 @@ public void planner_unknownResultSet_success() {
celRuntime =
newBaseRuntimeBuilder(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase {

private static final CelOptions BASE_CEL_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,6 @@ public abstract class CelBaselineTestCase extends BaselineTestCase {
protected static final int COMPREHENSION_MAX_ITERATIONS = 1_000;
protected static final CelOptions TEST_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableHiddenAccumulatorVar(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,7 @@

@RunWith(TestParameterInjector.class)
public class RegexLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,7 @@

@RunWith(TestParameterInjector.class)
public class TimestampLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand DownExpand Up@@ -205,7 +204,7 @@ public void parentIsNotCallExpr_doesNotThrow(String source) throws Exception {
public void env_withSetResultType_success() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.setResultType(SimpleType.BOOL)
.build();
CelValidator validator =
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,11 +50,7 @@ public static CelBuilder plannerCelBuilder() {
CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
CelRuntimeImpl.newBuilder())
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableHeterogeneousNumericComparisons(true)
.enableTimestampEpoch(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelExperimentalFactory() {}
Expand Down
1 change: 0 additions & 1 deletion bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2109,7 +2109,6 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E
standardCelBuilderWithMacros()
.addMessageTypes(descriptors)
// CEL-Internal-2
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.build();
CelAbstractSyntaxTree ast =
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public void toCheckerBuilder_isImmutable() {
public void toCheckerBuilder_singularFields_copied() {
CelStandardDeclarations subsetDecls =
CelStandardDeclarations.newBuilder().includeFunctions(StandardFunction.BOOL).build();
CelOptions celOptions = CelOptions.current().enableTimestampEpoch(true).build();
CelOptions celOptions = CelOptions.current().build();
CelContainer celContainer = CelContainer.ofName("foo");
CelType expectedResultType = SimpleType.BOOL;
CelTypeProvider customTypeProvider =
Expand Down
12 changes: 9 additions & 3 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,14 +293,20 @@ public abstract static class Builder {
public abstract Builder enableHomogeneousLiterals(boolean value);

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

/**
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,6 @@ public final class ConformanceTest extends Statement {

private static final CelOptions OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableProtoDifferencerEquality(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,7 @@ private CelBuilder newCelBuilder(int version) {
}

return celBuilder
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build())
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.addMessageTypes(TestAllTypes.getDescriptor())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@
@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build();
CelOptions.current().populateMacroCalls(true).build();
private static final Cel CEL =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.DYN)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,8 +58,7 @@ public class InliningOptimizerTest {
"child",
StructTypeReference.create(TestAllTypes.NestedMessage.getDescriptor().getFullName()))
.addVar("shadowed_ident", SimpleType.INT)
.setOptions(
CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.build();

@Test
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -265,8 +265,7 @@ private static CelBuilder newCelBuilder() {
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(
CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions())
.addRuntimeLibraries(CelExtensions.optional(), CelExtensions.comprehensions())
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,8 +105,7 @@ private static CelBuilder newCelBuilder() {
return CelFactory.standardCelBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(
CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(CelExtensions.bindings())
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,7 @@ public final class CelRuntimeExperimentalFactory {
public static CelRuntimeBuilder plannerRuntimeBuilder() {
return CelRuntimeImpl.newBuilder()
// CEL-Internal-2
.setOptions(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.build());
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
}

private CelRuntimeExperimentalFactory() {}
Expand Down
3 changes: 1 addition & 2 deletions runtime/src/test/java/dev/cel/runtime/ActivationTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,10 @@
public final class ActivationTest {

private static final CelOptions TEST_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).enableUnsignedLongs(true).build();
CelOptions.current().enableUnsignedLongs(true).build();

private static final CelOptions TEST_OPTIONS_SKIP_UNSET_FIELDS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableUnsignedLongs(true)
.fromProtoUnsetFieldOption(CelOptions.ProtoUnsetFieldOptions.SKIP)
.build();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,7 @@ public void unsignedLongsDisabled_int64Identity_throws() {
public void timestampEpochDisabled_int64Identity_throws() {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.build();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.types.OpaqueType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.ProtoMessageTypeProvider;
Expand All@@ -44,7 +43,6 @@ public class DescriptorTypeResolverTest {

private static final Cel CEL =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setTypeProvider(PROTO_MESSAGE_TYPE_PROVIDER)
.addCompilerLibraries(CelOptionalLibrary.INSTANCE)
.addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,6 @@ public void planner_unknownResultSet_success() {
celRuntime =
newBaseRuntimeBuilder(
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase {

private static final CelOptions BASE_CEL_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableOptionalSyntax(true)
.comprehensionMaxIterations(1_000)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,6 @@ public abstract class CelBaselineTestCase extends BaselineTestCase {
protected static final int COMPREHENSION_MAX_ITERATIONS = 1_000;
protected static final CelOptions TEST_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.enableHeterogeneousNumericComparisons(true)
.enableHiddenAccumulatorVar(true)
.enableOptionalSyntax(true)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,7 @@

@RunWith(TestParameterInjector.class)
public class RegexLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,8 +41,7 @@

@RunWith(TestParameterInjector.class)
public class TimestampLiteralValidatorTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current().enableTimestampEpoch(true).build();
private static final CelOptions CEL_OPTIONS = CelOptions.current().build();

private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();

Expand DownExpand Up@@ -205,7 +204,7 @@ public void parentIsNotCallExpr_doesNotThrow(String source) throws Exception {
public void env_withSetResultType_success() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableTimestampEpoch(true).build())
.setOptions(CelOptions.current().build())
.setResultType(SimpleType.BOOL)
.build();
CelValidator validator =
Expand Down
Loading