Remove deprecated setContainer(string) builder method#769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Aug 4, 2025
Merged

Remove deprecated setContainer(string) builder method #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions bundle/src/main/java/dev/cel/bundle/CelBuilder.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,17 +81,10 @@ public interface CelBuilder {
@CanIgnoreReturnValue
CelBuilder addMacros(Iterable<CelMacro> macros);

/**
* @deprecated Use {@link #setContainer(CelContainer)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
CelBuilder setContainer(String container);

/** Retrieves the currently configured {@link CelContainer} in the builder. */
CelContainer container();

/**
/*
* Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
* functions.
*/
Expand Down
6 changes: 0 additions & 6 deletions bundle/src/main/java/dev/cel/bundle/CelImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,12 +189,6 @@ public CelBuilder addMacros(Iterable<CelMacro> macros) {
return this;
}

@Override
public CelBuilder setContainer(String container) {
compilerBuilder.setContainer(container);
return this;
}

@Override
public CelContainer container() {
return compilerBuilder.container();
Expand Down
7 changes: 0 additions & 7 deletions checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,13 +35,6 @@ public interface CelCheckerBuilder {
@CanIgnoreReturnValue
CelCheckerBuilder setOptions(CelOptions options);

/**
* @deprecated Use {@link #setContainer(CelContainer)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
CelCheckerBuilder setContainer(String container);

/**
* Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
* functions.
Expand Down
6 changes: 0 additions & 6 deletions checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -197,12 +197,6 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {
return this;
}

@Override
public CelCheckerBuilder setContainer(String container) {
checkNotNull(container);
return setContainer(CelContainer.ofName(container));
}

@Override
public CelCheckerBuilder setContainer(CelContainer container) {
checkNotNull(container);
Expand Down
7 changes: 0 additions & 7 deletions compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,6 @@ public interface CelCompilerBuilder {
@CanIgnoreReturnValue
CelCompilerBuilder setOptions(CelOptions options);

/**
* @deprecated Use {@link #setContainer(CelContainer)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
CelCompilerBuilder setContainer(String container);

/**
* Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
* functions.
Expand Down
6 changes: 0 additions & 6 deletions compiler/src/main/java/dev/cel/compiler/CelCompilerImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,12 +158,6 @@ public CelCompilerBuilder addMacros(Iterable<CelMacro> macros) {
return this;
}

@Override
public CelCompilerBuilder setContainer(String container) {
checkerBuilder.setContainer(container);
return this;
}

@Override
public CelCompilerBuilder setContainer(CelContainer container) {
checkerBuilder.setContainer(container);
Expand Down
66 changes: 35 additions & 31 deletions extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
Expand All@@ -39,18 +40,18 @@ public class CelListsExtensionsTest {
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addCompilerLibraries(CelExtensions.lists())
.addRuntimeLibraries(CelExtensions.lists())
.setContainer("cel.expr.conformance.test")
.setContainer(CelContainer.ofName("cel.expr.conformance.test"))
.addMessageTypes(SimpleTest.getDescriptor())
.addVar("non_list", SimpleType.DYN)
.build();

private static final Cel CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS =
private static final Cel CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS =
CelFactory.standardCelBuilder()
.setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.addCompilerLibraries(CelExtensions.lists())
.addRuntimeLibraries(CelExtensions.lists())
.setContainer("cel.expr.conformance.test")
.setContainer(CelContainer.ofName("cel.expr.conformance.test"))
.addMessageTypes(SimpleTest.getDescriptor())
.build();

Expand DownExpand Up@@ -87,8 +88,9 @@ public void macroList_byVersion() {
@TestParameters("{expression: '[1,2,3,4].slice(1, 3)', expected: '[2, 3]'}")
@TestParameters("{expression: 'non_list.slice(1, 3)', expected: '[2, 3]'}")
public void slice_success(String expression, String expected) throws Exception {
Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
Object result =
CEL.createProgram(CEL.compile(expression).getAst())
.eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

assertThat(result).isEqualTo(expectedResult(expected));
}
Expand All@@ -106,9 +108,9 @@ public void slice_success(String expression, String expected) throws Exception {
+ "expectedError: 'Negative indexes not supported'}")
public void slice_throws(String expression, String expectedError) throws Exception {
assertThat(
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
.hasCauseThat()
.hasMessageThat()
.contains(expectedError);
Expand DownExpand Up@@ -183,8 +185,7 @@ public void range_success(String expression) throws Exception {
@TestParameters("{expression: '[].distinct()', expected: '[]'}")
@TestParameters("{expression: '[].distinct()', expected: '[]'}")
@TestParameters("{expression: '[1].distinct()', expected: '[1]'}")
@TestParameters(
"{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
@TestParameters("{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
@TestParameters(
"{expression: '[-2, 5, -2, 1, 1, 5, -2, 1, 5, -2, -2, 1].distinct()', "
+ "expected: '[-2, 5, 1]'}")
Expand All@@ -202,8 +203,11 @@ public void range_success(String expression) throws Exception {
+ "expected: '[SimpleTest{name: \"a\"}, SimpleTest{name: \"b\"}]'}")
@TestParameters("{expression: 'non_list.distinct()', expected: '[1, 2, 3, 4]'}")
public void distinct_success(String expression, String expected) throws Exception {
Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
ImmutableMap.of("non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));
Object result =
CEL.createProgram(CEL.compile(expression).getAst())
.eval(
ImmutableMap.of(
"non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));

assertThat(result).isEqualTo(expectedResult(expected));
}
Expand All@@ -219,8 +223,9 @@ public void distinct_success(String expression, String expected) throws Exceptio
"{expression: '[false, true, true].reverse().reverse()', expected: '[false, true, true]'}")
@TestParameters("{expression: 'non_list.reverse()', expected: '[4, 3, 2, 1]'}")
public void reverse_success(String expression, String expected) throws Exception {
Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
Object result =
CEL.createProgram(CEL.compile(expression).getAst())
.eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

assertThat(result).isEqualTo(expectedResult(expected));
}
Expand All@@ -243,8 +248,10 @@ public void sort_success(String expression, String expected) throws Exception {
@TestParameters("{expression: '[4, 3, 2, 1].sort()', expected: '[1, 2, 3, 4]'}")
public void sort_success_heterogeneousNumbers(String expression, String expected)
throws Exception {
Object result = CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.createProgram(
CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.compile(expression).getAst()).eval();
Object result =
CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS
.createProgram(CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS.compile(expression).getAst())
.eval();

assertThat(result).isEqualTo(expectedResult(expected));
}
Expand All@@ -261,9 +268,9 @@ public void sort_success_heterogeneousNumbers(String expression, String expected
+ "expectedError: 'List elements must be comparable'}")
public void sort_throws(String expression, String expectedError) throws Exception {
assertThat(
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
.hasCauseThat()
.hasMessageThat()
.contains(expectedError);
Expand All@@ -273,14 +280,11 @@ public void sort_throws(String expression, String expectedError) throws Exceptio
@TestParameters("{expression: '[].sortBy(e, e)', expected: '[]'}")
@TestParameters("{expression: '[\"a\"].sortBy(e, e)', expected: '[\"a\"]'}")
@TestParameters(
"{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', "
+ "expected: '[-5, 4, -3, -2, 1]'}")
"{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', " + "expected: '[-5, 4, -3, -2, 1]'}")
@TestParameters(
"{expression: '[-3, 1, -5, -2, 4].map(e, e * 2).sortBy(e, -(e * e)) ', "
+ "expected: '[-10, 8, -6, -4, 2]'}")
@TestParameters(
"{expression: 'lists.range(3).sortBy(e, -e) ', "
+ "expected: '[2, 1, 0]'}")
@TestParameters("{expression: 'lists.range(3).sortBy(e, -e) ', " + "expected: '[2, 1, 0]'}")
@TestParameters(
"{expression: '[\"a\", \"c\", \"b\", \"first\"].sortBy(e, e == \"first\" ? \"\" : e)', "
+ "expected: '[\"first\", \"a\", \"b\", \"c\"]'}")
Expand All@@ -307,9 +311,9 @@ public void sortBy_success(String expression, String expected) throws Exception
public void sortBy_throws_validationException(String expression, String expectedError)
throws Exception {
assertThat(
assertThrows(
CelValidationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelValidationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
.hasMessageThat()
.contains(expectedError);
}
Expand All@@ -324,9 +328,9 @@ public void sortBy_throws_validationException(String expression, String expected
public void sortBy_throws_evaluationException(String expression, String expectedError)
throws Exception {
assertThat(
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
.hasCauseThat()
.hasMessageThat()
.contains(expectedError);
Expand All@@ -336,4 +340,4 @@ private static Object expectedResult(String expression)
throws CelEvaluationException, CelValidationException {
return CEL.createProgram(CEL.compile(expression).getAst()).eval();
}
}
}
, '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
Remove deprecated setContainer(string) builder method#769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 4, 2025
 Merged


Remove deprecated setContainer(string) builder method
#769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 1 addition & 8 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,17 +81,10 @@ public interface CelBuilder {
 @CanIgnoreReturnValue
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /** Retrieves the currently configured {@link CelContainer} in the builder. */
 CelContainer container();

 /**
 /*
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
Expand Down

6 changes: 0 additions & 6 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,12 +189,6 @@ public CelBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelBuilder setContainer(String container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelContainer container() {
 return compilerBuilder.container();
Expand Down

7 changes: 0 additions & 7 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,13 +35,6 @@ public interface CelCheckerBuilder {
 @CanIgnoreReturnValue
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,12 +197,6 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {
 return this;
 }

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
Expand Down

7 changes: 0 additions & 7 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,6 @@ public interface CelCompilerBuilder {
 @CanIgnoreReturnValue
 CelCompilerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCompilerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,12 +158,6 @@ public CelCompilerBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(String container) {
 checkerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(CelContainer container) {
 checkerBuilder.setContainer(container);
Expand Down

66 changes: 35 additions & 31 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
Expand All@@ -39,18 +40,18 @@ public class CelListsExtensionsTest {
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .addVar("non_list", SimpleType.DYN)
 .build();

 private static final Cel CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS =
 private static final Cel CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS =
 CelFactory.standardCelBuilder()
 .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .build();

Expand DownExpand Up@@ -87,8 +88,9 @@ public void macroList_byVersion() {
 @TestParameters("{expression: '[1,2,3,4].slice(1, 3)', expected: '[2, 3]'}")
 @TestParameters("{expression: 'non_list.slice(1, 3)', expected: '[2, 3]'}")
 public void slice_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -106,9 +108,9 @@ public void slice_success(String expression, String expected) throws Exception {
 + "expectedError: 'Negative indexes not supported'}")
 public void slice_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand DownExpand Up@@ -183,8 +185,7 @@ public void range_success(String expression) throws Exception {
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[1].distinct()', expected: '[1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters("{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1, 5, -2, -2, 1].distinct()', "
 + "expected: '[-2, 5, 1]'}")
Expand All@@ -202,8 +203,11 @@ public void range_success(String expression) throws Exception {
 + "expected: '[SimpleTest{name: \"a\"}, SimpleTest{name: \"b\"}]'}")
 @TestParameters("{expression: 'non_list.distinct()', expected: '[1, 2, 3, 4]'}")
 public void distinct_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(
 ImmutableMap.of(
 "non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -219,8 +223,9 @@ public void distinct_success(String expression, String expected) throws Exceptio
 "{expression: '[false, true, true].reverse().reverse()', expected: '[false, true, true]'}")
 @TestParameters("{expression: 'non_list.reverse()', expected: '[4, 3, 2, 1]'}")
 public void reverse_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -243,8 +248,10 @@ public void sort_success(String expression, String expected) throws Exception {
 @TestParameters("{expression: '[4, 3, 2, 1].sort()', expected: '[1, 2, 3, 4]'}")
 public void sort_success_heterogeneousNumbers(String expression, String expected)
 throws Exception {
 Object result = CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.createProgram(
 CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.compile(expression).getAst()).eval();
 Object result =
 CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS
 .createProgram(CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS.compile(expression).getAst())
 .eval();

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -261,9 +268,9 @@ public void sort_success_heterogeneousNumbers(String expression, String expected
 + "expectedError: 'List elements must be comparable'}")
 public void sort_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -273,14 +280,11 @@ public void sort_throws(String expression, String expectedError) throws Exceptio
 @TestParameters("{expression: '[].sortBy(e, e)', expected: '[]'}")
 @TestParameters("{expression: '[\"a\"].sortBy(e, e)', expected: '[\"a\"]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', "
 + "expected: '[-5, 4, -3, -2, 1]'}")
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', " + "expected: '[-5, 4, -3, -2, 1]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].map(e, e * 2).sortBy(e, -(e * e)) ', "
 + "expected: '[-10, 8, -6, -4, 2]'}")
 @TestParameters(
 "{expression: 'lists.range(3).sortBy(e, -e) ', "
 + "expected: '[2, 1, 0]'}")
 @TestParameters("{expression: 'lists.range(3).sortBy(e, -e) ', " + "expected: '[2, 1, 0]'}")
 @TestParameters(
 "{expression: '[\"a\", \"c\", \"b\", \"first\"].sortBy(e, e == \"first\" ? \"\" : e)', "
 + "expected: '[\"first\", \"a\", \"b\", \"c\"]'}")
Expand All@@ -307,9 +311,9 @@ public void sortBy_success(String expression, String expected) throws Exception
 public void sortBy_throws_validationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelValidationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelValidationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasMessageThat()
 .contains(expectedError);
 }
Expand All@@ -324,9 +328,9 @@ public void sortBy_throws_validationException(String expression, String expected
 public void sortBy_throws_evaluationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -336,4 +340,4 @@ private static Object expectedResult(String expression)
 throws CelEvaluationException, CelValidationException {
 return CEL.createProgram(CEL.compile(expression).getAst()).eval();
 }
}
}

, '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
Remove deprecated setContainer(string) builder method#769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 4, 2025
 Merged


Remove deprecated setContainer(string) builder method
#769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 1 addition & 8 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,17 +81,10 @@ public interface CelBuilder {
 @CanIgnoreReturnValue
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /** Retrieves the currently configured {@link CelContainer} in the builder. */
 CelContainer container();

 /**
 /*
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
Expand Down

6 changes: 0 additions & 6 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,12 +189,6 @@ public CelBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelBuilder setContainer(String container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelContainer container() {
 return compilerBuilder.container();
Expand Down

7 changes: 0 additions & 7 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,13 +35,6 @@ public interface CelCheckerBuilder {
 @CanIgnoreReturnValue
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,12 +197,6 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {
 return this;
 }

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
Expand Down

7 changes: 0 additions & 7 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,6 @@ public interface CelCompilerBuilder {
 @CanIgnoreReturnValue
 CelCompilerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCompilerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,12 +158,6 @@ public CelCompilerBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(String container) {
 checkerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(CelContainer container) {
 checkerBuilder.setContainer(container);
Expand Down

66 changes: 35 additions & 31 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
Expand All@@ -39,18 +40,18 @@ public class CelListsExtensionsTest {
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .addVar("non_list", SimpleType.DYN)
 .build();

 private static final Cel CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS =
 private static final Cel CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS =
 CelFactory.standardCelBuilder()
 .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .build();

Expand DownExpand Up@@ -87,8 +88,9 @@ public void macroList_byVersion() {
 @TestParameters("{expression: '[1,2,3,4].slice(1, 3)', expected: '[2, 3]'}")
 @TestParameters("{expression: 'non_list.slice(1, 3)', expected: '[2, 3]'}")
 public void slice_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -106,9 +108,9 @@ public void slice_success(String expression, String expected) throws Exception {
 + "expectedError: 'Negative indexes not supported'}")
 public void slice_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand DownExpand Up@@ -183,8 +185,7 @@ public void range_success(String expression) throws Exception {
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[1].distinct()', expected: '[1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters("{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1, 5, -2, -2, 1].distinct()', "
 + "expected: '[-2, 5, 1]'}")
Expand All@@ -202,8 +203,11 @@ public void range_success(String expression) throws Exception {
 + "expected: '[SimpleTest{name: \"a\"}, SimpleTest{name: \"b\"}]'}")
 @TestParameters("{expression: 'non_list.distinct()', expected: '[1, 2, 3, 4]'}")
 public void distinct_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(
 ImmutableMap.of(
 "non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -219,8 +223,9 @@ public void distinct_success(String expression, String expected) throws Exceptio
 "{expression: '[false, true, true].reverse().reverse()', expected: '[false, true, true]'}")
 @TestParameters("{expression: 'non_list.reverse()', expected: '[4, 3, 2, 1]'}")
 public void reverse_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -243,8 +248,10 @@ public void sort_success(String expression, String expected) throws Exception {
 @TestParameters("{expression: '[4, 3, 2, 1].sort()', expected: '[1, 2, 3, 4]'}")
 public void sort_success_heterogeneousNumbers(String expression, String expected)
 throws Exception {
 Object result = CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.createProgram(
 CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.compile(expression).getAst()).eval();
 Object result =
 CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS
 .createProgram(CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS.compile(expression).getAst())
 .eval();

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -261,9 +268,9 @@ public void sort_success_heterogeneousNumbers(String expression, String expected
 + "expectedError: 'List elements must be comparable'}")
 public void sort_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -273,14 +280,11 @@ public void sort_throws(String expression, String expectedError) throws Exceptio
 @TestParameters("{expression: '[].sortBy(e, e)', expected: '[]'}")
 @TestParameters("{expression: '[\"a\"].sortBy(e, e)', expected: '[\"a\"]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', "
 + "expected: '[-5, 4, -3, -2, 1]'}")
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', " + "expected: '[-5, 4, -3, -2, 1]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].map(e, e * 2).sortBy(e, -(e * e)) ', "
 + "expected: '[-10, 8, -6, -4, 2]'}")
 @TestParameters(
 "{expression: 'lists.range(3).sortBy(e, -e) ', "
 + "expected: '[2, 1, 0]'}")
 @TestParameters("{expression: 'lists.range(3).sortBy(e, -e) ', " + "expected: '[2, 1, 0]'}")
 @TestParameters(
 "{expression: '[\"a\", \"c\", \"b\", \"first\"].sortBy(e, e == \"first\" ? \"\" : e)', "
 + "expected: '[\"first\", \"a\", \"b\", \"c\"]'}")
Expand All@@ -307,9 +311,9 @@ public void sortBy_success(String expression, String expected) throws Exception
 public void sortBy_throws_validationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelValidationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelValidationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasMessageThat()
 .contains(expectedError);
 }
Expand All@@ -324,9 +328,9 @@ public void sortBy_throws_validationException(String expression, String expected
 public void sortBy_throws_evaluationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -336,4 +340,4 @@ private static Object expectedResult(String expression)
 throws CelEvaluationException, CelValidationException {
 return CEL.createProgram(CEL.compile(expression).getAst()).eval();
 }
}
}

, '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
Remove deprecated setContainer(string) builder method#769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 4, 2025
 Merged


Remove deprecated setContainer(string) builder method
#769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 1 addition & 8 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,17 +81,10 @@ public interface CelBuilder {
 @CanIgnoreReturnValue
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /** Retrieves the currently configured {@link CelContainer} in the builder. */
 CelContainer container();

 /**
 /*
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
Expand Down

6 changes: 0 additions & 6 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,12 +189,6 @@ public CelBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelBuilder setContainer(String container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelContainer container() {
 return compilerBuilder.container();
Expand Down

7 changes: 0 additions & 7 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,13 +35,6 @@ public interface CelCheckerBuilder {
 @CanIgnoreReturnValue
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,12 +197,6 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {
 return this;
 }

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
Expand Down

7 changes: 0 additions & 7 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,6 @@ public interface CelCompilerBuilder {
 @CanIgnoreReturnValue
 CelCompilerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCompilerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,12 +158,6 @@ public CelCompilerBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(String container) {
 checkerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(CelContainer container) {
 checkerBuilder.setContainer(container);
Expand Down

66 changes: 35 additions & 31 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
Expand All@@ -39,18 +40,18 @@ public class CelListsExtensionsTest {
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .addVar("non_list", SimpleType.DYN)
 .build();

 private static final Cel CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS =
 private static final Cel CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS =
 CelFactory.standardCelBuilder()
 .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .build();

Expand DownExpand Up@@ -87,8 +88,9 @@ public void macroList_byVersion() {
 @TestParameters("{expression: '[1,2,3,4].slice(1, 3)', expected: '[2, 3]'}")
 @TestParameters("{expression: 'non_list.slice(1, 3)', expected: '[2, 3]'}")
 public void slice_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -106,9 +108,9 @@ public void slice_success(String expression, String expected) throws Exception {
 + "expectedError: 'Negative indexes not supported'}")
 public void slice_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand DownExpand Up@@ -183,8 +185,7 @@ public void range_success(String expression) throws Exception {
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[1].distinct()', expected: '[1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters("{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1, 5, -2, -2, 1].distinct()', "
 + "expected: '[-2, 5, 1]'}")
Expand All@@ -202,8 +203,11 @@ public void range_success(String expression) throws Exception {
 + "expected: '[SimpleTest{name: \"a\"}, SimpleTest{name: \"b\"}]'}")
 @TestParameters("{expression: 'non_list.distinct()', expected: '[1, 2, 3, 4]'}")
 public void distinct_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(
 ImmutableMap.of(
 "non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -219,8 +223,9 @@ public void distinct_success(String expression, String expected) throws Exceptio
 "{expression: '[false, true, true].reverse().reverse()', expected: '[false, true, true]'}")
 @TestParameters("{expression: 'non_list.reverse()', expected: '[4, 3, 2, 1]'}")
 public void reverse_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -243,8 +248,10 @@ public void sort_success(String expression, String expected) throws Exception {
 @TestParameters("{expression: '[4, 3, 2, 1].sort()', expected: '[1, 2, 3, 4]'}")
 public void sort_success_heterogeneousNumbers(String expression, String expected)
 throws Exception {
 Object result = CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.createProgram(
 CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.compile(expression).getAst()).eval();
 Object result =
 CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS
 .createProgram(CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS.compile(expression).getAst())
 .eval();

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -261,9 +268,9 @@ public void sort_success_heterogeneousNumbers(String expression, String expected
 + "expectedError: 'List elements must be comparable'}")
 public void sort_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -273,14 +280,11 @@ public void sort_throws(String expression, String expectedError) throws Exceptio
 @TestParameters("{expression: '[].sortBy(e, e)', expected: '[]'}")
 @TestParameters("{expression: '[\"a\"].sortBy(e, e)', expected: '[\"a\"]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', "
 + "expected: '[-5, 4, -3, -2, 1]'}")
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', " + "expected: '[-5, 4, -3, -2, 1]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].map(e, e * 2).sortBy(e, -(e * e)) ', "
 + "expected: '[-10, 8, -6, -4, 2]'}")
 @TestParameters(
 "{expression: 'lists.range(3).sortBy(e, -e) ', "
 + "expected: '[2, 1, 0]'}")
 @TestParameters("{expression: 'lists.range(3).sortBy(e, -e) ', " + "expected: '[2, 1, 0]'}")
 @TestParameters(
 "{expression: '[\"a\", \"c\", \"b\", \"first\"].sortBy(e, e == \"first\" ? \"\" : e)', "
 + "expected: '[\"first\", \"a\", \"b\", \"c\"]'}")
Expand All@@ -307,9 +311,9 @@ public void sortBy_success(String expression, String expected) throws Exception
 public void sortBy_throws_validationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelValidationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelValidationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasMessageThat()
 .contains(expectedError);
 }
Expand All@@ -324,9 +328,9 @@ public void sortBy_throws_validationException(String expression, String expected
 public void sortBy_throws_evaluationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -336,4 +340,4 @@ private static Object expectedResult(String expression)
 throws CelEvaluationException, CelValidationException {
 return CEL.createProgram(CEL.compile(expression).getAst()).eval();
 }
}
}

, '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
Remove deprecated setContainer(string) builder method#769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 4, 2025
 Merged


Remove deprecated setContainer(string) builder method
#769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 1 addition & 8 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,17 +81,10 @@ public interface CelBuilder {
 @CanIgnoreReturnValue
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /** Retrieves the currently configured {@link CelContainer} in the builder. */
 CelContainer container();

 /**
 /*
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
Expand Down

6 changes: 0 additions & 6 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,12 +189,6 @@ public CelBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelBuilder setContainer(String container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelContainer container() {
 return compilerBuilder.container();
Expand Down

7 changes: 0 additions & 7 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,13 +35,6 @@ public interface CelCheckerBuilder {
 @CanIgnoreReturnValue
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,12 +197,6 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {
 return this;
 }

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
Expand Down

7 changes: 0 additions & 7 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,6 @@ public interface CelCompilerBuilder {
 @CanIgnoreReturnValue
 CelCompilerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCompilerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,12 +158,6 @@ public CelCompilerBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(String container) {
 checkerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(CelContainer container) {
 checkerBuilder.setContainer(container);
Expand Down

66 changes: 35 additions & 31 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
Expand All@@ -39,18 +40,18 @@ public class CelListsExtensionsTest {
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .addVar("non_list", SimpleType.DYN)
 .build();

 private static final Cel CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS =
 private static final Cel CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS =
 CelFactory.standardCelBuilder()
 .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .build();

Expand DownExpand Up@@ -87,8 +88,9 @@ public void macroList_byVersion() {
 @TestParameters("{expression: '[1,2,3,4].slice(1, 3)', expected: '[2, 3]'}")
 @TestParameters("{expression: 'non_list.slice(1, 3)', expected: '[2, 3]'}")
 public void slice_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -106,9 +108,9 @@ public void slice_success(String expression, String expected) throws Exception {
 + "expectedError: 'Negative indexes not supported'}")
 public void slice_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand DownExpand Up@@ -183,8 +185,7 @@ public void range_success(String expression) throws Exception {
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[1].distinct()', expected: '[1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters("{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1, 5, -2, -2, 1].distinct()', "
 + "expected: '[-2, 5, 1]'}")
Expand All@@ -202,8 +203,11 @@ public void range_success(String expression) throws Exception {
 + "expected: '[SimpleTest{name: \"a\"}, SimpleTest{name: \"b\"}]'}")
 @TestParameters("{expression: 'non_list.distinct()', expected: '[1, 2, 3, 4]'}")
 public void distinct_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(
 ImmutableMap.of(
 "non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -219,8 +223,9 @@ public void distinct_success(String expression, String expected) throws Exceptio
 "{expression: '[false, true, true].reverse().reverse()', expected: '[false, true, true]'}")
 @TestParameters("{expression: 'non_list.reverse()', expected: '[4, 3, 2, 1]'}")
 public void reverse_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -243,8 +248,10 @@ public void sort_success(String expression, String expected) throws Exception {
 @TestParameters("{expression: '[4, 3, 2, 1].sort()', expected: '[1, 2, 3, 4]'}")
 public void sort_success_heterogeneousNumbers(String expression, String expected)
 throws Exception {
 Object result = CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.createProgram(
 CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.compile(expression).getAst()).eval();
 Object result =
 CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS
 .createProgram(CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS.compile(expression).getAst())
 .eval();

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -261,9 +268,9 @@ public void sort_success_heterogeneousNumbers(String expression, String expected
 + "expectedError: 'List elements must be comparable'}")
 public void sort_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -273,14 +280,11 @@ public void sort_throws(String expression, String expectedError) throws Exceptio
 @TestParameters("{expression: '[].sortBy(e, e)', expected: '[]'}")
 @TestParameters("{expression: '[\"a\"].sortBy(e, e)', expected: '[\"a\"]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', "
 + "expected: '[-5, 4, -3, -2, 1]'}")
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', " + "expected: '[-5, 4, -3, -2, 1]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].map(e, e * 2).sortBy(e, -(e * e)) ', "
 + "expected: '[-10, 8, -6, -4, 2]'}")
 @TestParameters(
 "{expression: 'lists.range(3).sortBy(e, -e) ', "
 + "expected: '[2, 1, 0]'}")
 @TestParameters("{expression: 'lists.range(3).sortBy(e, -e) ', " + "expected: '[2, 1, 0]'}")
 @TestParameters(
 "{expression: '[\"a\", \"c\", \"b\", \"first\"].sortBy(e, e == \"first\" ? \"\" : e)', "
 + "expected: '[\"first\", \"a\", \"b\", \"c\"]'}")
Expand All@@ -307,9 +311,9 @@ public void sortBy_success(String expression, String expected) throws Exception
 public void sortBy_throws_validationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelValidationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelValidationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasMessageThat()
 .contains(expectedError);
 }
Expand All@@ -324,9 +328,9 @@ public void sortBy_throws_validationException(String expression, String expected
 public void sortBy_throws_evaluationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -336,4 +340,4 @@ private static Object expectedResult(String expression)
 throws CelEvaluationException, CelValidationException {
 return CEL.createProgram(CEL.compile(expression).getAst()).eval();
 }
}
}

, '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
Remove deprecated setContainer(string) builder method#769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 4, 2025
 Merged


Remove deprecated setContainer(string) builder method
#769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 1 addition & 8 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,17 +81,10 @@ public interface CelBuilder {
 @CanIgnoreReturnValue
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /** Retrieves the currently configured {@link CelContainer} in the builder. */
 CelContainer container();

 /**
 /*
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
Expand Down

6 changes: 0 additions & 6 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,12 +189,6 @@ public CelBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelBuilder setContainer(String container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelContainer container() {
 return compilerBuilder.container();
Expand Down

7 changes: 0 additions & 7 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,13 +35,6 @@ public interface CelCheckerBuilder {
 @CanIgnoreReturnValue
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,12 +197,6 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {
 return this;
 }

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
Expand Down

7 changes: 0 additions & 7 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,6 @@ public interface CelCompilerBuilder {
 @CanIgnoreReturnValue
 CelCompilerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCompilerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,12 +158,6 @@ public CelCompilerBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(String container) {
 checkerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(CelContainer container) {
 checkerBuilder.setContainer(container);
Expand Down

66 changes: 35 additions & 31 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
Expand All@@ -39,18 +40,18 @@ public class CelListsExtensionsTest {
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .addVar("non_list", SimpleType.DYN)
 .build();

 private static final Cel CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS =
 private static final Cel CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS =
 CelFactory.standardCelBuilder()
 .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .build();

Expand DownExpand Up@@ -87,8 +88,9 @@ public void macroList_byVersion() {
 @TestParameters("{expression: '[1,2,3,4].slice(1, 3)', expected: '[2, 3]'}")
 @TestParameters("{expression: 'non_list.slice(1, 3)', expected: '[2, 3]'}")
 public void slice_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -106,9 +108,9 @@ public void slice_success(String expression, String expected) throws Exception {
 + "expectedError: 'Negative indexes not supported'}")
 public void slice_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand DownExpand Up@@ -183,8 +185,7 @@ public void range_success(String expression) throws Exception {
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[1].distinct()', expected: '[1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters("{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1, 5, -2, -2, 1].distinct()', "
 + "expected: '[-2, 5, 1]'}")
Expand All@@ -202,8 +203,11 @@ public void range_success(String expression) throws Exception {
 + "expected: '[SimpleTest{name: \"a\"}, SimpleTest{name: \"b\"}]'}")
 @TestParameters("{expression: 'non_list.distinct()', expected: '[1, 2, 3, 4]'}")
 public void distinct_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(
 ImmutableMap.of(
 "non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -219,8 +223,9 @@ public void distinct_success(String expression, String expected) throws Exceptio
 "{expression: '[false, true, true].reverse().reverse()', expected: '[false, true, true]'}")
 @TestParameters("{expression: 'non_list.reverse()', expected: '[4, 3, 2, 1]'}")
 public void reverse_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -243,8 +248,10 @@ public void sort_success(String expression, String expected) throws Exception {
 @TestParameters("{expression: '[4, 3, 2, 1].sort()', expected: '[1, 2, 3, 4]'}")
 public void sort_success_heterogeneousNumbers(String expression, String expected)
 throws Exception {
 Object result = CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.createProgram(
 CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.compile(expression).getAst()).eval();
 Object result =
 CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS
 .createProgram(CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS.compile(expression).getAst())
 .eval();

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -261,9 +268,9 @@ public void sort_success_heterogeneousNumbers(String expression, String expected
 + "expectedError: 'List elements must be comparable'}")
 public void sort_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -273,14 +280,11 @@ public void sort_throws(String expression, String expectedError) throws Exceptio
 @TestParameters("{expression: '[].sortBy(e, e)', expected: '[]'}")
 @TestParameters("{expression: '[\"a\"].sortBy(e, e)', expected: '[\"a\"]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', "
 + "expected: '[-5, 4, -3, -2, 1]'}")
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', " + "expected: '[-5, 4, -3, -2, 1]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].map(e, e * 2).sortBy(e, -(e * e)) ', "
 + "expected: '[-10, 8, -6, -4, 2]'}")
 @TestParameters(
 "{expression: 'lists.range(3).sortBy(e, -e) ', "
 + "expected: '[2, 1, 0]'}")
 @TestParameters("{expression: 'lists.range(3).sortBy(e, -e) ', " + "expected: '[2, 1, 0]'}")
 @TestParameters(
 "{expression: '[\"a\", \"c\", \"b\", \"first\"].sortBy(e, e == \"first\" ? \"\" : e)', "
 + "expected: '[\"first\", \"a\", \"b\", \"c\"]'}")
Expand All@@ -307,9 +311,9 @@ public void sortBy_success(String expression, String expected) throws Exception
 public void sortBy_throws_validationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelValidationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelValidationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasMessageThat()
 .contains(expectedError);
 }
Expand All@@ -324,9 +328,9 @@ public void sortBy_throws_validationException(String expression, String expected
 public void sortBy_throws_evaluationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -336,4 +340,4 @@ private static Object expectedResult(String expression)
 throws CelEvaluationException, CelValidationException {
 return CEL.createProgram(CEL.compile(expression).getAst()).eval();
 }
}
}

, '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
Remove deprecated setContainer(string) builder method#769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 4, 2025
 Merged


Remove deprecated setContainer(string) builder method
#769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 1 addition & 8 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,17 +81,10 @@ public interface CelBuilder {
 @CanIgnoreReturnValue
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /** Retrieves the currently configured {@link CelContainer} in the builder. */
 CelContainer container();

 /**
 /*
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
Expand Down

6 changes: 0 additions & 6 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,12 +189,6 @@ public CelBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelBuilder setContainer(String container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelContainer container() {
 return compilerBuilder.container();
Expand Down

7 changes: 0 additions & 7 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,13 +35,6 @@ public interface CelCheckerBuilder {
 @CanIgnoreReturnValue
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,12 +197,6 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {
 return this;
 }

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
Expand Down

7 changes: 0 additions & 7 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,6 @@ public interface CelCompilerBuilder {
 @CanIgnoreReturnValue
 CelCompilerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCompilerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,12 +158,6 @@ public CelCompilerBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(String container) {
 checkerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(CelContainer container) {
 checkerBuilder.setContainer(container);
Expand Down

66 changes: 35 additions & 31 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
Expand All@@ -39,18 +40,18 @@ public class CelListsExtensionsTest {
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .addVar("non_list", SimpleType.DYN)
 .build();

 private static final Cel CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS =
 private static final Cel CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS =
 CelFactory.standardCelBuilder()
 .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .build();

Expand DownExpand Up@@ -87,8 +88,9 @@ public void macroList_byVersion() {
 @TestParameters("{expression: '[1,2,3,4].slice(1, 3)', expected: '[2, 3]'}")
 @TestParameters("{expression: 'non_list.slice(1, 3)', expected: '[2, 3]'}")
 public void slice_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -106,9 +108,9 @@ public void slice_success(String expression, String expected) throws Exception {
 + "expectedError: 'Negative indexes not supported'}")
 public void slice_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand DownExpand Up@@ -183,8 +185,7 @@ public void range_success(String expression) throws Exception {
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[1].distinct()', expected: '[1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters("{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1, 5, -2, -2, 1].distinct()', "
 + "expected: '[-2, 5, 1]'}")
Expand All@@ -202,8 +203,11 @@ public void range_success(String expression) throws Exception {
 + "expected: '[SimpleTest{name: \"a\"}, SimpleTest{name: \"b\"}]'}")
 @TestParameters("{expression: 'non_list.distinct()', expected: '[1, 2, 3, 4]'}")
 public void distinct_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(
 ImmutableMap.of(
 "non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -219,8 +223,9 @@ public void distinct_success(String expression, String expected) throws Exceptio
 "{expression: '[false, true, true].reverse().reverse()', expected: '[false, true, true]'}")
 @TestParameters("{expression: 'non_list.reverse()', expected: '[4, 3, 2, 1]'}")
 public void reverse_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -243,8 +248,10 @@ public void sort_success(String expression, String expected) throws Exception {
 @TestParameters("{expression: '[4, 3, 2, 1].sort()', expected: '[1, 2, 3, 4]'}")
 public void sort_success_heterogeneousNumbers(String expression, String expected)
 throws Exception {
 Object result = CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.createProgram(
 CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.compile(expression).getAst()).eval();
 Object result =
 CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS
 .createProgram(CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS.compile(expression).getAst())
 .eval();

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -261,9 +268,9 @@ public void sort_success_heterogeneousNumbers(String expression, String expected
 + "expectedError: 'List elements must be comparable'}")
 public void sort_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -273,14 +280,11 @@ public void sort_throws(String expression, String expectedError) throws Exceptio
 @TestParameters("{expression: '[].sortBy(e, e)', expected: '[]'}")
 @TestParameters("{expression: '[\"a\"].sortBy(e, e)', expected: '[\"a\"]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', "
 + "expected: '[-5, 4, -3, -2, 1]'}")
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', " + "expected: '[-5, 4, -3, -2, 1]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].map(e, e * 2).sortBy(e, -(e * e)) ', "
 + "expected: '[-10, 8, -6, -4, 2]'}")
 @TestParameters(
 "{expression: 'lists.range(3).sortBy(e, -e) ', "
 + "expected: '[2, 1, 0]'}")
 @TestParameters("{expression: 'lists.range(3).sortBy(e, -e) ', " + "expected: '[2, 1, 0]'}")
 @TestParameters(
 "{expression: '[\"a\", \"c\", \"b\", \"first\"].sortBy(e, e == \"first\" ? \"\" : e)', "
 + "expected: '[\"first\", \"a\", \"b\", \"c\"]'}")
Expand All@@ -307,9 +311,9 @@ public void sortBy_success(String expression, String expected) throws Exception
 public void sortBy_throws_validationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelValidationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelValidationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasMessageThat()
 .contains(expectedError);
 }
Expand All@@ -324,9 +328,9 @@ public void sortBy_throws_validationException(String expression, String expected
 public void sortBy_throws_evaluationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -336,4 +340,4 @@ private static Object expectedResult(String expression)
 throws CelEvaluationException, CelValidationException {
 return CEL.createProgram(CEL.compile(expression).getAst()).eval();
 }
}
}

, '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
Remove deprecated setContainer(string) builder method#769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Aug 4, 2025
 Merged


Remove deprecated setContainer(string) builder method
#769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 1 addition & 8 deletions
bundle/src/main/java/dev/cel/bundle/CelBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,17 +81,10 @@ public interface CelBuilder {
 @CanIgnoreReturnValue
 CelBuilder addMacros(Iterable<CelMacro> macros);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelBuilder setContainer(String container);

 /** Retrieves the currently configured {@link CelContainer} in the builder. */
 CelContainer container();

 /**
 /*
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
 */
Expand Down

6 changes: 0 additions & 6 deletions
bundle/src/main/java/dev/cel/bundle/CelImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,12 +189,6 @@ public CelBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelBuilder setContainer(String container) {
 compilerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelContainer container() {
 return compilerBuilder.container();
Expand Down

7 changes: 0 additions & 7 deletions
checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,13 +35,6 @@ public interface CelCheckerBuilder {
 @CanIgnoreReturnValue
 CelCheckerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCheckerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,12 +197,6 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {
 return this;
 }

 @Override
 public CelCheckerBuilder setContainer(String container) {
 checkNotNull(container);
 return setContainer(CelContainer.ofName(container));
 }

 @Override
 public CelCheckerBuilder setContainer(CelContainer container) {
 checkNotNull(container);
Expand Down

7 changes: 0 additions & 7 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,13 +75,6 @@ public interface CelCompilerBuilder {
 @CanIgnoreReturnValue
 CelCompilerBuilder setOptions(CelOptions options);

 /**
 * @deprecated Use {@link #setContainer(CelContainer)} instead.
 */
 @CanIgnoreReturnValue
 @Deprecated
 CelCompilerBuilder setContainer(String container);

 /**
 * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
 * functions.
Expand Down

6 changes: 0 additions & 6 deletions
compiler/src/main/java/dev/cel/compiler/CelCompilerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,12 +158,6 @@ public CelCompilerBuilder addMacros(Iterable<CelMacro> macros) {
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(String container) {
 checkerBuilder.setContainer(container);
 return this;
 }

 @Override
 public CelCompilerBuilder setContainer(CelContainer container) {
 checkerBuilder.setContainer(container);
Expand Down

66 changes: 35 additions & 31 deletions
extensions/src/test/java/dev/cel/extensions/CelListsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
import com.google.testing.junit.testparameterinjector.TestParameters;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelContainer;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
Expand All@@ -39,18 +40,18 @@ public class CelListsExtensionsTest {
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .addVar("non_list", SimpleType.DYN)
 .build();

 private static final Cel CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS =
 private static final Cel CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS =
 CelFactory.standardCelBuilder()
 .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
 .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
 .addCompilerLibraries(CelExtensions.lists())
 .addRuntimeLibraries(CelExtensions.lists())
 .setContainer("cel.expr.conformance.test")
 .setContainer(CelContainer.ofName("cel.expr.conformance.test"))
 .addMessageTypes(SimpleTest.getDescriptor())
 .build();

Expand DownExpand Up@@ -87,8 +88,9 @@ public void macroList_byVersion() {
 @TestParameters("{expression: '[1,2,3,4].slice(1, 3)', expected: '[2, 3]'}")
 @TestParameters("{expression: 'non_list.slice(1, 3)', expected: '[2, 3]'}")
 public void slice_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -106,9 +108,9 @@ public void slice_success(String expression, String expected) throws Exception {
 + "expectedError: 'Negative indexes not supported'}")
 public void slice_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand DownExpand Up@@ -183,8 +185,7 @@ public void range_success(String expression) throws Exception {
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[].distinct()', expected: '[]'}")
 @TestParameters("{expression: '[1].distinct()', expected: '[1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters("{expression: '[-2, 5, -2, 1, 1, 5, -2, 1].distinct()', expected: '[-2, 5, 1]'}")
 @TestParameters(
 "{expression: '[-2, 5, -2, 1, 1, 5, -2, 1, 5, -2, -2, 1].distinct()', "
 + "expected: '[-2, 5, 1]'}")
Expand All@@ -202,8 +203,11 @@ public void range_success(String expression) throws Exception {
 + "expected: '[SimpleTest{name: \"a\"}, SimpleTest{name: \"b\"}]'}")
 @TestParameters("{expression: 'non_list.distinct()', expected: '[1, 2, 3, 4]'}")
 public void distinct_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(
 ImmutableMap.of(
 "non_list", ImmutableSortedMultiset.of(1L, 2L, 3L, 4L, 4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -219,8 +223,9 @@ public void distinct_success(String expression, String expected) throws Exceptio
 "{expression: '[false, true, true].reverse().reverse()', expected: '[false, true, true]'}")
 @TestParameters("{expression: 'non_list.reverse()', expected: '[4, 3, 2, 1]'}")
 public void reverse_success(String expression, String expected) throws Exception {
 Object result = CEL.createProgram(CEL.compile(expression).getAst()).eval(
 ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));
 Object result =
 CEL.createProgram(CEL.compile(expression).getAst())
 .eval(ImmutableMap.of("non_list", ImmutableSortedSet.of(4L, 1L, 3L, 2L)));

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -243,8 +248,10 @@ public void sort_success(String expression, String expected) throws Exception {
 @TestParameters("{expression: '[4, 3, 2, 1].sort()', expected: '[1, 2, 3, 4]'}")
 public void sort_success_heterogeneousNumbers(String expression, String expected)
 throws Exception {
 Object result = CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.createProgram(
 CEL_WITH_HETEROGENOUS_NUMERIC_COMPARISONS.compile(expression).getAst()).eval();
 Object result =
 CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS
 .createProgram(CEL_WITH_HETEROGENEOUS_NUMERIC_COMPARISONS.compile(expression).getAst())
 .eval();

 assertThat(result).isEqualTo(expectedResult(expected));
 }
Expand All@@ -261,9 +268,9 @@ public void sort_success_heterogeneousNumbers(String expression, String expected
 + "expectedError: 'List elements must be comparable'}")
 public void sort_throws(String expression, String expectedError) throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -273,14 +280,11 @@ public void sort_throws(String expression, String expectedError) throws Exceptio
 @TestParameters("{expression: '[].sortBy(e, e)', expected: '[]'}")
 @TestParameters("{expression: '[\"a\"].sortBy(e, e)', expected: '[\"a\"]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', "
 + "expected: '[-5, 4, -3, -2, 1]'}")
 "{expression: '[-3, 1, -5, -2, 4].sortBy(e, -(e * e))', " + "expected: '[-5, 4, -3, -2, 1]'}")
 @TestParameters(
 "{expression: '[-3, 1, -5, -2, 4].map(e, e * 2).sortBy(e, -(e * e)) ', "
 + "expected: '[-10, 8, -6, -4, 2]'}")
 @TestParameters(
 "{expression: 'lists.range(3).sortBy(e, -e) ', "
 + "expected: '[2, 1, 0]'}")
 @TestParameters("{expression: 'lists.range(3).sortBy(e, -e) ', " + "expected: '[2, 1, 0]'}")
 @TestParameters(
 "{expression: '[\"a\", \"c\", \"b\", \"first\"].sortBy(e, e == \"first\" ? \"\" : e)', "
 + "expected: '[\"first\", \"a\", \"b\", \"c\"]'}")
Expand All@@ -307,9 +311,9 @@ public void sortBy_success(String expression, String expected) throws Exception
 public void sortBy_throws_validationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelValidationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelValidationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasMessageThat()
 .contains(expectedError);
 }
Expand All@@ -324,9 +328,9 @@ public void sortBy_throws_validationException(String expression, String expected
 public void sortBy_throws_evaluationException(String expression, String expectedError)
 throws Exception {
 assertThat(
 assertThrows(
 CelEvaluationException.class,
 () -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
assertThrows(
CelEvaluationException.class,
() -> CEL.createProgram(CEL.compile(expression).getAst()).eval()))
 .hasCauseThat()
 .hasMessageThat()
 .contains(expectedError);
Expand All@@ -336,4 +340,4 @@ private static Object expectedResult(String expression)
 throws CelEvaluationException, CelValidationException {
 return CEL.createProgram(CEL.compile(expression).getAst()).eval();
 }
}
}