Skip to content

Internal Changes #1121

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Internal Changes #1121

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
25 changes: 14 additions & 11 deletions extensions/src/main/java/dev/cel/extensions/CelComprehensionsExtensions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,12 @@ public final class CelComprehensionsExtensions
private static final String MAP_INSERT_FUNCTION = "cel.@mapInsert";
private static final String MAP_INSERT_OVERLOAD_MAP_MAP = "cel_@mapInsert_map_map";
private static final String MAP_INSERT_OVERLOAD_KEY_VALUE = "cel_@mapInsert_map_key_value";
private static final TypeParamType TYPE_PARAM_K = TypeParamType.create("K");
private static final TypeParamType TYPE_PARAM_V = TypeParamType.create("V");
private static final MapType MAP_KV_TYPE = MapType.create(TYPE_PARAM_K, TYPE_PARAM_V);

private static final class Types {
private static final TypeParamType TYPE_PARAM_K = TypeParamType.create("K");
private static final TypeParamType TYPE_PARAM_V = TypeParamType.create("V");
private static final MapType MAP_KV_TYPE = MapType.create(TYPE_PARAM_K, TYPE_PARAM_V);
}

/** Enumeration of functions for Comprehensions extension. */
public enum Function {
Expand All @@ -60,16 +63,16 @@ public enum Function {
CelOverloadDecl.newGlobalOverload(
MAP_INSERT_OVERLOAD_MAP_MAP,
"Returns a map that's the result of merging given two maps.",
MAP_KV_TYPE,
MAP_KV_TYPE,
MAP_KV_TYPE),
Types.MAP_KV_TYPE,
Types.MAP_KV_TYPE,
Types.MAP_KV_TYPE),
CelOverloadDecl.newGlobalOverload(
MAP_INSERT_OVERLOAD_KEY_VALUE,
"Adds the given key-value pair to the map.",
MAP_KV_TYPE,
MAP_KV_TYPE,
TYPE_PARAM_K,
TYPE_PARAM_V)));
Types.MAP_KV_TYPE,
Types.MAP_KV_TYPE,
Types.TYPE_PARAM_K,
Types.TYPE_PARAM_V)));

private final CelFunctionDecl functionDecl;

Expand Down Expand Up @@ -118,7 +121,7 @@ static CelExtensionLibrary<CelComprehensionsExtensions> library() {

@Override
public void setCheckerOptions(CelCheckerBuilder checkerBuilder) {
functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl));
functions.forEach(function -> checkerBuilder.addFunctionDeclarations(function.functionDecl()));
}

@Override
Expand Down
Loading