Migrate away from deprecated CelTypes methods#525

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
Dec 5, 2024
Merged

Migrate away from deprecated CelTypes methods #525

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
2 changes: 1 addition & 1 deletion bundle/src/main/java/dev/cel/bundle/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ java_library(
"//common:options",
"//common/internal:env_visitor",
"//common/internal:file_descriptor_converter",
"//common/types:cel_types",
"//common/types:cel_proto_types",
"//common/types:type_providers",
"//common/values:cel_value_provider",
"//compiler",
Expand Down
4 changes: 2 additions & 2 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@@ -39,9 +39,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.FileDescriptorSetConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerBuilder;
Expand DownExpand Up@@ -269,7 +269,7 @@ public CelBuilder addFunctionBindings(Iterable<CelRuntime.CelFunctionBinding> bi
@Override
public CelBuilder setResultType(CelType resultType) {
checkNotNull(resultType);
return setProtoResultType(CelTypes.celTypeToType(resultType));
return setProtoResultType(CelProtoTypes.celTypeToType(resultType));
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions checker/src/main/java/dev/cel/checker/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ java_library(
"//common/annotations",
"//common/internal:file_descriptor_converter",
"//common/types",
"//common/types:cel_types",
"//common/types:cel_proto_types",
"//common/types:type_providers",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -135,7 +135,7 @@ java_library(
"//common/annotations",
"//common/ast",
"//common/ast:expr_converter",
"//common/types:cel_types",
"//common/types:cel_proto_types",
"//common/types:type_providers",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -153,7 +153,7 @@ java_library(
"//:auto_value",
"//common/annotations",
"//common/types",
"//common/types:cel_types",
"//common/types:cel_proto_types",
"//common/types:type_providers",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -182,6 +182,7 @@ java_library(
"//common/internal:errors",
"//common/internal:file_descriptor_converter",
"//common/types",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:type_providers",
"//parser:macro",
Expand Down
4 changes: 2 additions & 2 deletions checker/src/main/java/dev/cel/checker/CelIdentDecl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExprConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;

/**
Expand DownExpand Up@@ -57,7 +57,7 @@ public static Decl celIdentToDecl(CelIdentDecl identDecl) {
IdentDecl.Builder identBuilder =
IdentDecl.newBuilder()
.setDoc(identDecl.doc())
.setType(CelTypes.celTypeToType(identDecl.type()));
.setType(CelProtoTypes.celTypeToType(identDecl.type()));
if (identDecl.constant().isPresent()) {
identBuilder.setValue(CelExprConverter.celConstantToExprConstant(identDecl.constant().get()));
}
Expand Down
17 changes: 9 additions & 8 deletions checker/src/main/java/dev/cel/checker/Env.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
import dev.cel.common.ast.CelReference;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.SimpleType;
Expand DownExpand Up@@ -342,7 +343,7 @@ public Map<Long, CelType> getTypeMap() {
@Deprecated
public Type getType(Expr expr) {
Preconditions.checkNotNull(expr);
return CelTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
return CelProtoTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
}

/**
Expand DownExpand Up@@ -395,7 +396,7 @@ public Env add(Decl decl) {
CelIdentDecl.Builder identBuilder =
CelIdentDecl.newBuilder()
.setName(decl.getName())
.setType(CelTypes.typeToCelType(decl.getIdent().getType()))
.setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
// Note: Setting doc and constant value exists for compatibility reason. This should
// not be set by the users.
.setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -440,7 +441,7 @@ public Env add(CelIdentDecl celIdentDecl) {
@CanIgnoreReturnValue
@Deprecated
public Env add(String name, Type type) {
return add(CelIdentDecl.newIdentDeclaration(name, CelTypes.typeToCelType(type)));
return add(CelIdentDecl.newIdentDeclaration(name, CelProtoTypes.typeToCelType(type)));
}

/**
Expand DownExpand Up@@ -766,7 +767,7 @@ public IdentBuilder(String name) {
@CanIgnoreReturnValue
public IdentBuilder type(Type value) {
Preconditions.checkNotNull(value);
builder.setType(CelTypes.typeToCelType(Preconditions.checkNotNull(value)));
builder.setType(CelProtoTypes.typeToCelType(Preconditions.checkNotNull(value)));
return this;
}

Expand DownExpand Up@@ -848,12 +849,12 @@ public FunctionBuilder add(String id, Type resultType, Type... argTypes) {
public FunctionBuilder add(String id, Type resultType, Iterable<Type> argTypes) {
ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
for (Type type : argTypes) {
argumentBuilder.add(CelTypes.typeToCelType(type));
argumentBuilder.add(CelProtoTypes.typeToCelType(type));
}
this.overloads.add(
CelOverloadDecl.newBuilder()
.setOverloadId(id)
.setResultType(CelTypes.typeToCelType(resultType))
.setResultType(CelProtoTypes.typeToCelType(resultType))
.addParameterTypes(argumentBuilder.build())
.setIsInstanceFunction(isInstance)
.build());
Expand All@@ -873,12 +874,12 @@ public FunctionBuilder add(
String id, List<String> typeParams, Type resultType, Iterable<Type> argTypes) {
ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
for (Type type : argTypes) {
argumentBuilder.add(CelTypes.typeToCelType(type));
argumentBuilder.add(CelProtoTypes.typeToCelType(type));
}
this.overloads.add(
CelOverloadDecl.newBuilder()
.setOverloadId(id)
.setResultType(CelTypes.typeToCelType(resultType))
.setResultType(CelProtoTypes.typeToCelType(resultType))
.addParameterTypes(argumentBuilder.build())
.setIsInstanceFunction(isInstance)
.build());
Expand Down
3 changes: 2 additions & 1 deletion checker/src/main/java/dev/cel/checker/ExprChecker.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelReference;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
Expand DownExpand Up@@ -88,7 +89,7 @@ public static CheckedExpr typecheck(
Env env, String inContainer, ParsedExpr parsedExpr, Optional<Type> expectedResultType) {
Optional<CelType> type =
expectedResultType.isPresent()
? Optional.of(CelTypes.typeToCelType(expectedResultType.get()))
? Optional.of(CelProtoTypes.typeToCelType(expectedResultType.get()))
: Optional.absent();
CelAbstractSyntaxTree ast =
typecheck(
Expand Down
8 changes: 4 additions & 4 deletions checker/src/main/java/dev/cel/checker/TypeProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,8 @@
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -38,7 +38,7 @@ public interface TypeProvider {
/** Lookup the a {@link CelType} given a qualified {@code typeName}. Returns null if not found. */
default Optional<CelType> lookupCelType(String typeName) {
Type type = lookupType(typeName);
return Optional.ofNullable(type).map(CelTypes::typeToCelType);
return Optional.ofNullable(type).map(CelProtoTypes::typeToCelType);
}

/** Lookup the {@code Integer} enum value given an {@code enumName}. Returns null if not found. */
Expand All@@ -61,7 +61,7 @@ default Optional<CelType> lookupCelType(String typeName) {
* check is supported via the ('has') macro.
*/
default @Nullable FieldType lookupFieldType(CelType type, String fieldName) {
return lookupFieldType(CelTypes.celTypeToType(type), fieldName);
return lookupFieldType(CelProtoTypes.celTypeToType(type), fieldName);
}

/**
Expand DownExpand Up@@ -89,7 +89,7 @@ public abstract class FieldType {
public abstract Type type();

public CelType celType() {
return CelTypes.typeToCelType(type());
return CelProtoTypes.typeToCelType(type());
}

/** Create a new {@code FieldType} instance from the provided {@code type}. */
Expand Down
11 changes: 6 additions & 5 deletions checker/src/main/java/dev/cel/checker/TypeProviderLegacyImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ProtoMessageType;
import dev.cel.common.types.StructType;
Expand All@@ -45,7 +45,7 @@ final class TypeProviderLegacyImpl implements TypeProvider {

@Override
public @Nullable Type lookupType(String typeName) {
return lookupCelType(typeName).map(CelTypes::celTypeToType).orElse(null);
return lookupCelType(typeName).map(CelProtoTypes::celTypeToType).orElse(null);
}

@Override
Expand All@@ -65,13 +65,13 @@ public Optional<CelType> lookupCelType(String typeName) {

return structType
.findField(fieldName)
.map(f -> FieldType.of(CelTypes.celTypeToType(f.type())))
.map(f -> FieldType.of(CelProtoTypes.celTypeToType(f.type())))
.orElse(null);
}

@Override
public @Nullable FieldType lookupFieldType(Type type, String fieldName) {
return lookupFieldType(CelTypes.typeToCelType(type), fieldName);
return lookupFieldType(CelProtoTypes.typeToCelType(type), fieldName);
}

@Override
Expand DownExpand Up@@ -114,7 +114,8 @@ public Optional<CelType> lookupCelType(String typeName) {
.map(
et ->
ExtensionFieldType.of(
CelTypes.celTypeToType(et.type()), CelTypes.celTypeToType(et.messageType())))
CelProtoTypes.celTypeToType(et.type()),
CelProtoTypes.celTypeToType(et.messageType())))
.orElse(null);
}
}
26 changes: 14 additions & 12 deletions checker/src/main/java/dev/cel/checker/Types.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@
import com.google.protobuf.NullValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
Expand DownExpand Up@@ -177,7 +177,7 @@ public static Type createWrapper(Type type) {
*/
@Deprecated
public static boolean isDynOrError(Type type) {
return isDynOrError(CelTypes.typeToCelType(type));
return isDynOrError(CelProtoTypes.typeToCelType(type));
}

/** Tests whether the type has error or dyn kind. Both have the property to match any type. */
Expand DownExpand Up@@ -238,18 +238,18 @@ public static CelType mostGeneral(CelType type1, CelType type2) {
subs.entrySet().stream()
.collect(
Collectors.toMap(
k -> CelTypes.typeToCelType(k.getKey()),
v -> CelTypes.typeToCelType(v.getValue()),
k -> CelProtoTypes.typeToCelType(k.getKey()),
v -> CelProtoTypes.typeToCelType(v.getValue()),
(prev, next) -> next,
HashMap::new));

if (internalIsAssignable(
subsCopy, CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2))) {
subsCopy, CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2))) {
return subsCopy.entrySet().stream()
.collect(
Collectors.toMap(
k -> CelTypes.celTypeToType(k.getKey()),
v -> CelTypes.celTypeToType(v.getValue()),
k -> CelProtoTypes.celTypeToType(k.getKey()),
v -> CelProtoTypes.celTypeToType(v.getValue()),
(prev, next) -> next,
HashMap::new));
}
Expand DownExpand Up@@ -384,7 +384,8 @@ private static boolean isAssignableFromNull(CelType targetType) {
*/
@Deprecated
public static boolean isEqualOrLessSpecific(Type type1, Type type2) {
return isEqualOrLessSpecific(CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2));
return isEqualOrLessSpecific(
CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2));
}

/**
Expand DownExpand Up@@ -426,7 +427,7 @@ public static boolean isEqualOrLessSpecific(CelType type1, CelType type2) {
TypeType typeType2 = (TypeType) type2;
return isEqualOrLessSpecific(typeType1.type(), typeType2.type());

// Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
// Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
default:
return type1.equals(type2);
}
Expand DownExpand Up@@ -493,10 +494,11 @@ private static boolean notReferencedIn(
public static Type substitute(Map<Type, Type> subs, Type type, boolean typeParamToDyn) {
ImmutableMap.Builder<CelType, CelType> subsMap = ImmutableMap.builder();
for (Map.Entry<Type, Type> sub : subs.entrySet()) {
subsMap.put(CelTypes.typeToCelType(sub.getKey()), CelTypes.typeToCelType(sub.getValue()));
subsMap.put(
CelProtoTypes.typeToCelType(sub.getKey()), CelProtoTypes.typeToCelType(sub.getValue()));
}
return CelTypes.celTypeToType(
substitute(subsMap.buildOrThrow(), CelTypes.typeToCelType(type), typeParamToDyn));
return CelProtoTypes.celTypeToType(
substitute(subsMap.buildOrThrow(), CelProtoTypes.typeToCelType(type), typeParamToDyn));
}

/**
Expand Down
1 change: 0 additions & 1 deletion checker/src/test/java/dev/cel/checker/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ java_library(
"//common/resources/testdata/proto3:standalone_global_enum_java_proto",
"//common/types",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:json",
"//common/types:message_type_provider",
"//common/types:type_providers",
Expand Down
7 changes: 4 additions & 3 deletions checker/src/test/java/dev/cel/checker/CelOverloadDeclTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import com.google.common.collect.ImmutableList;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import org.junit.Test;
Expand DownExpand Up@@ -81,9 +81,10 @@ public void toProtoOverload_withTypeParams() {
Overload protoOverload = CelOverloadDecl.celOverloadToOverload(celOverloadDecl);
assertThat(protoOverload.getOverloadId()).isEqualTo("overloadId");
assertThat(protoOverload.getIsInstanceFunction()).isTrue();
assertThat(protoOverload.getResultType()).isEqualTo(CelTypes.createTypeParam("A"));
assertThat(protoOverload.getResultType()).isEqualTo(CelProtoTypes.createTypeParam("A"));
assertThat(protoOverload.getParamsList())
.containsExactly(CelTypes.STRING, CelTypes.DOUBLE, CelTypes.createTypeParam("B"));
.containsExactly(
CelProtoTypes.STRING, CelProtoTypes.DOUBLE, CelProtoTypes.createTypeParam("B"));
assertThat(protoOverload.getTypeParamsList()).containsExactly("A", "B");
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Migrate away from deprecated CelTypes methods#525

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

Dec 5, 2024
 Merged


Migrate away from deprecated CelTypes methods
#525
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


2 changes: 1 addition & 1 deletion
bundle/src/main/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ java_library(
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "//common/values:cel_value_provider",
 "//compiler",
Expand Down

4 changes: 2 additions & 2 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@@ -39,9 +39,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.FileDescriptorSetConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerBuilder;
Expand DownExpand Up@@ -269,7 +269,7 @@ public CelBuilder addFunctionBindings(Iterable<CelRuntime.CelFunctionBinding> bi
 @Override
 public CelBuilder setResultType(CelType resultType) {
 checkNotNull(resultType);
 return setProtoResultType(CelTypes.celTypeToType(resultType));
 return setProtoResultType(CelProtoTypes.celTypeToType(resultType));
 }

 @Override
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ java_library(
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -135,7 +135,7 @@ java_library(
 "//common/annotations",
 "//common/ast",
 "//common/ast:expr_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -153,7 +153,7 @@ java_library(
 "//:auto_value",
 "//common/annotations",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -182,6 +182,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//parser:macro",
Expand Down

4 changes: 2 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelIdentDecl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExprConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;

/**
Expand DownExpand Up@@ -57,7 +57,7 @@ public static Decl celIdentToDecl(CelIdentDecl identDecl) {
 IdentDecl.Builder identBuilder =
 IdentDecl.newBuilder()
 .setDoc(identDecl.doc())
 .setType(CelTypes.celTypeToType(identDecl.type()));
 .setType(CelProtoTypes.celTypeToType(identDecl.type()));
 if (identDecl.constant().isPresent()) {
 identBuilder.setValue(CelExprConverter.celConstantToExprConstant(identDecl.constant().get()));
 }
Expand Down

17 changes: 9 additions & 8 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
import dev.cel.common.ast.CelReference;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.SimpleType;
Expand DownExpand Up@@ -342,7 +343,7 @@ public Map<Long, CelType> getTypeMap() {
 @Deprecated
 public Type getType(Expr expr) {
 Preconditions.checkNotNull(expr);
 return CelTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 return CelProtoTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 }

 /**
Expand DownExpand Up@@ -395,7 +396,7 @@ public Env add(Decl decl) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This should
 // not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -440,7 +441,7 @@ public Env add(CelIdentDecl celIdentDecl) {
 @CanIgnoreReturnValue
 @Deprecated
 public Env add(String name, Type type) {
 return add(CelIdentDecl.newIdentDeclaration(name, CelTypes.typeToCelType(type)));
 return add(CelIdentDecl.newIdentDeclaration(name, CelProtoTypes.typeToCelType(type)));
 }

 /**
Expand DownExpand Up@@ -766,7 +767,7 @@ public IdentBuilder(String name) {
 @CanIgnoreReturnValue
 public IdentBuilder type(Type value) {
 Preconditions.checkNotNull(value);
 builder.setType(CelTypes.typeToCelType(Preconditions.checkNotNull(value)));
 builder.setType(CelProtoTypes.typeToCelType(Preconditions.checkNotNull(value)));
 return this;
 }

Expand DownExpand Up@@ -848,12 +849,12 @@ public FunctionBuilder add(String id, Type resultType, Type... argTypes) {
 public FunctionBuilder add(String id, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand All@@ -873,12 +874,12 @@ public FunctionBuilder add(
 String id, List<String> typeParams, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand Down

3 changes: 2 additions & 1 deletion
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelReference;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
Expand DownExpand Up@@ -88,7 +89,7 @@ public static CheckedExpr typecheck(
 Env env, String inContainer, ParsedExpr parsedExpr, Optional<Type> expectedResultType) {
 Optional<CelType> type =
 expectedResultType.isPresent()
 ? Optional.of(CelTypes.typeToCelType(expectedResultType.get()))
 ? Optional.of(CelProtoTypes.typeToCelType(expectedResultType.get()))
 : Optional.absent();
 CelAbstractSyntaxTree ast =
 typecheck(
Expand Down

8 changes: 4 additions & 4 deletions
checker/src/main/java/dev/cel/checker/TypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,8 @@
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -38,7 +38,7 @@ public interface TypeProvider {
 /** Lookup the a {@link CelType} given a qualified {@code typeName}. Returns null if not found. */
 default Optional<CelType> lookupCelType(String typeName) {
 Type type = lookupType(typeName);
 return Optional.ofNullable(type).map(CelTypes::typeToCelType);
 return Optional.ofNullable(type).map(CelProtoTypes::typeToCelType);
 }

 /** Lookup the {@code Integer} enum value given an {@code enumName}. Returns null if not found. */
Expand All@@ -61,7 +61,7 @@ default Optional<CelType> lookupCelType(String typeName) {
 * check is supported via the ('has') macro.
 */
 default @Nullable FieldType lookupFieldType(CelType type, String fieldName) {
 return lookupFieldType(CelTypes.celTypeToType(type), fieldName);
 return lookupFieldType(CelProtoTypes.celTypeToType(type), fieldName);
 }

 /**
Expand DownExpand Up@@ -89,7 +89,7 @@ public abstract class FieldType {
 public abstract Type type();

 public CelType celType() {
 return CelTypes.typeToCelType(type());
 return CelProtoTypes.typeToCelType(type());
 }

 /** Create a new {@code FieldType} instance from the provided {@code type}. */
Expand Down

11 changes: 6 additions & 5 deletions
checker/src/main/java/dev/cel/checker/TypeProviderLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ProtoMessageType;
import dev.cel.common.types.StructType;
Expand All@@ -45,7 +45,7 @@ final class TypeProviderLegacyImpl implements TypeProvider {

 @Override
 public @Nullable Type lookupType(String typeName) {
 return lookupCelType(typeName).map(CelTypes::celTypeToType).orElse(null);
 return lookupCelType(typeName).map(CelProtoTypes::celTypeToType).orElse(null);
 }

 @Override
Expand All@@ -65,13 +65,13 @@ public Optional<CelType> lookupCelType(String typeName) {

 return structType
 .findField(fieldName)
 .map(f -> FieldType.of(CelTypes.celTypeToType(f.type())))
 .map(f -> FieldType.of(CelProtoTypes.celTypeToType(f.type())))
 .orElse(null);
 }

 @Override
 public @Nullable FieldType lookupFieldType(Type type, String fieldName) {
 return lookupFieldType(CelTypes.typeToCelType(type), fieldName);
 return lookupFieldType(CelProtoTypes.typeToCelType(type), fieldName);
 }

 @Override
Expand DownExpand Up@@ -114,7 +114,8 @@ public Optional<CelType> lookupCelType(String typeName) {
 .map(
 et ->
 ExtensionFieldType.of(
 CelTypes.celTypeToType(et.type()), CelTypes.celTypeToType(et.messageType())))
 CelProtoTypes.celTypeToType(et.type()),
 CelProtoTypes.celTypeToType(et.messageType())))
 .orElse(null);
 }
}

26 changes: 14 additions & 12 deletions
checker/src/main/java/dev/cel/checker/Types.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@
import com.google.protobuf.NullValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
Expand DownExpand Up@@ -177,7 +177,7 @@ public static Type createWrapper(Type type) {
 */
 @Deprecated
 public static boolean isDynOrError(Type type) {
 return isDynOrError(CelTypes.typeToCelType(type));
 return isDynOrError(CelProtoTypes.typeToCelType(type));
 }

 /** Tests whether the type has error or dyn kind. Both have the property to match any type. */
Expand DownExpand Up@@ -238,18 +238,18 @@ public static CelType mostGeneral(CelType type1, CelType type2) {
 subs.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.typeToCelType(k.getKey()),
 v -> CelTypes.typeToCelType(v.getValue()),
 k -> CelProtoTypes.typeToCelType(k.getKey()),
 v -> CelProtoTypes.typeToCelType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));

 if (internalIsAssignable(
 subsCopy, CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2))) {
 subsCopy, CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2))) {
 return subsCopy.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.celTypeToType(k.getKey()),
 v -> CelTypes.celTypeToType(v.getValue()),
 k -> CelProtoTypes.celTypeToType(k.getKey()),
 v -> CelProtoTypes.celTypeToType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));
 }
Expand DownExpand Up@@ -384,7 +384,8 @@ private static boolean isAssignableFromNull(CelType targetType) {
 */
 @Deprecated
 public static boolean isEqualOrLessSpecific(Type type1, Type type2) {
 return isEqualOrLessSpecific(CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2));
 return isEqualOrLessSpecific(
 CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2));
 }

 /**
Expand DownExpand Up@@ -426,7 +427,7 @@ public static boolean isEqualOrLessSpecific(CelType type1, CelType type2) {
 TypeType typeType2 = (TypeType) type2;
 return isEqualOrLessSpecific(typeType1.type(), typeType2.type());

// Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 // Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 default:
 return type1.equals(type2);
 }
Expand DownExpand Up@@ -493,10 +494,11 @@ private static boolean notReferencedIn(
 public static Type substitute(Map<Type, Type> subs, Type type, boolean typeParamToDyn) {
 ImmutableMap.Builder<CelType, CelType> subsMap = ImmutableMap.builder();
 for (Map.Entry<Type, Type> sub : subs.entrySet()) {
 subsMap.put(CelTypes.typeToCelType(sub.getKey()), CelTypes.typeToCelType(sub.getValue()));
 subsMap.put(
 CelProtoTypes.typeToCelType(sub.getKey()), CelProtoTypes.typeToCelType(sub.getValue()));
 }
 return CelTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelTypes.typeToCelType(type), typeParamToDyn));
 return CelProtoTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelProtoTypes.typeToCelType(type), typeParamToDyn));
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/test/java/dev/cel/checker/CelOverloadDeclTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import com.google.common.collect.ImmutableList;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import org.junit.Test;
Expand DownExpand Up@@ -81,9 +81,10 @@ public void toProtoOverload_withTypeParams() {
 Overload protoOverload = CelOverloadDecl.celOverloadToOverload(celOverloadDecl);
 assertThat(protoOverload.getOverloadId()).isEqualTo("overloadId");
 assertThat(protoOverload.getIsInstanceFunction()).isTrue();
 assertThat(protoOverload.getResultType()).isEqualTo(CelTypes.createTypeParam("A"));
 assertThat(protoOverload.getResultType()).isEqualTo(CelProtoTypes.createTypeParam("A"));
 assertThat(protoOverload.getParamsList())
 .containsExactly(CelTypes.STRING, CelTypes.DOUBLE, CelTypes.createTypeParam("B"));
 .containsExactly(
 CelProtoTypes.STRING, CelProtoTypes.DOUBLE, CelProtoTypes.createTypeParam("B"));
 assertThat(protoOverload.getTypeParamsList()).containsExactly("A", "B");
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Migrate away from deprecated CelTypes methods#525

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

Dec 5, 2024
 Merged


Migrate away from deprecated CelTypes methods
#525
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


2 changes: 1 addition & 1 deletion
bundle/src/main/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ java_library(
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "//common/values:cel_value_provider",
 "//compiler",
Expand Down

4 changes: 2 additions & 2 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@@ -39,9 +39,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.FileDescriptorSetConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerBuilder;
Expand DownExpand Up@@ -269,7 +269,7 @@ public CelBuilder addFunctionBindings(Iterable<CelRuntime.CelFunctionBinding> bi
 @Override
 public CelBuilder setResultType(CelType resultType) {
 checkNotNull(resultType);
 return setProtoResultType(CelTypes.celTypeToType(resultType));
 return setProtoResultType(CelProtoTypes.celTypeToType(resultType));
 }

 @Override
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ java_library(
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -135,7 +135,7 @@ java_library(
 "//common/annotations",
 "//common/ast",
 "//common/ast:expr_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -153,7 +153,7 @@ java_library(
 "//:auto_value",
 "//common/annotations",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -182,6 +182,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//parser:macro",
Expand Down

4 changes: 2 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelIdentDecl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExprConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;

/**
Expand DownExpand Up@@ -57,7 +57,7 @@ public static Decl celIdentToDecl(CelIdentDecl identDecl) {
 IdentDecl.Builder identBuilder =
 IdentDecl.newBuilder()
 .setDoc(identDecl.doc())
 .setType(CelTypes.celTypeToType(identDecl.type()));
 .setType(CelProtoTypes.celTypeToType(identDecl.type()));
 if (identDecl.constant().isPresent()) {
 identBuilder.setValue(CelExprConverter.celConstantToExprConstant(identDecl.constant().get()));
 }
Expand Down

17 changes: 9 additions & 8 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
import dev.cel.common.ast.CelReference;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.SimpleType;
Expand DownExpand Up@@ -342,7 +343,7 @@ public Map<Long, CelType> getTypeMap() {
 @Deprecated
 public Type getType(Expr expr) {
 Preconditions.checkNotNull(expr);
 return CelTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 return CelProtoTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 }

 /**
Expand DownExpand Up@@ -395,7 +396,7 @@ public Env add(Decl decl) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This should
 // not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -440,7 +441,7 @@ public Env add(CelIdentDecl celIdentDecl) {
 @CanIgnoreReturnValue
 @Deprecated
 public Env add(String name, Type type) {
 return add(CelIdentDecl.newIdentDeclaration(name, CelTypes.typeToCelType(type)));
 return add(CelIdentDecl.newIdentDeclaration(name, CelProtoTypes.typeToCelType(type)));
 }

 /**
Expand DownExpand Up@@ -766,7 +767,7 @@ public IdentBuilder(String name) {
 @CanIgnoreReturnValue
 public IdentBuilder type(Type value) {
 Preconditions.checkNotNull(value);
 builder.setType(CelTypes.typeToCelType(Preconditions.checkNotNull(value)));
 builder.setType(CelProtoTypes.typeToCelType(Preconditions.checkNotNull(value)));
 return this;
 }

Expand DownExpand Up@@ -848,12 +849,12 @@ public FunctionBuilder add(String id, Type resultType, Type... argTypes) {
 public FunctionBuilder add(String id, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand All@@ -873,12 +874,12 @@ public FunctionBuilder add(
 String id, List<String> typeParams, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand Down

3 changes: 2 additions & 1 deletion
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelReference;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
Expand DownExpand Up@@ -88,7 +89,7 @@ public static CheckedExpr typecheck(
 Env env, String inContainer, ParsedExpr parsedExpr, Optional<Type> expectedResultType) {
 Optional<CelType> type =
 expectedResultType.isPresent()
 ? Optional.of(CelTypes.typeToCelType(expectedResultType.get()))
 ? Optional.of(CelProtoTypes.typeToCelType(expectedResultType.get()))
 : Optional.absent();
 CelAbstractSyntaxTree ast =
 typecheck(
Expand Down

8 changes: 4 additions & 4 deletions
checker/src/main/java/dev/cel/checker/TypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,8 @@
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -38,7 +38,7 @@ public interface TypeProvider {
 /** Lookup the a {@link CelType} given a qualified {@code typeName}. Returns null if not found. */
 default Optional<CelType> lookupCelType(String typeName) {
 Type type = lookupType(typeName);
 return Optional.ofNullable(type).map(CelTypes::typeToCelType);
 return Optional.ofNullable(type).map(CelProtoTypes::typeToCelType);
 }

 /** Lookup the {@code Integer} enum value given an {@code enumName}. Returns null if not found. */
Expand All@@ -61,7 +61,7 @@ default Optional<CelType> lookupCelType(String typeName) {
 * check is supported via the ('has') macro.
 */
 default @Nullable FieldType lookupFieldType(CelType type, String fieldName) {
 return lookupFieldType(CelTypes.celTypeToType(type), fieldName);
 return lookupFieldType(CelProtoTypes.celTypeToType(type), fieldName);
 }

 /**
Expand DownExpand Up@@ -89,7 +89,7 @@ public abstract class FieldType {
 public abstract Type type();

 public CelType celType() {
 return CelTypes.typeToCelType(type());
 return CelProtoTypes.typeToCelType(type());
 }

 /** Create a new {@code FieldType} instance from the provided {@code type}. */
Expand Down

11 changes: 6 additions & 5 deletions
checker/src/main/java/dev/cel/checker/TypeProviderLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ProtoMessageType;
import dev.cel.common.types.StructType;
Expand All@@ -45,7 +45,7 @@ final class TypeProviderLegacyImpl implements TypeProvider {

 @Override
 public @Nullable Type lookupType(String typeName) {
 return lookupCelType(typeName).map(CelTypes::celTypeToType).orElse(null);
 return lookupCelType(typeName).map(CelProtoTypes::celTypeToType).orElse(null);
 }

 @Override
Expand All@@ -65,13 +65,13 @@ public Optional<CelType> lookupCelType(String typeName) {

 return structType
 .findField(fieldName)
 .map(f -> FieldType.of(CelTypes.celTypeToType(f.type())))
 .map(f -> FieldType.of(CelProtoTypes.celTypeToType(f.type())))
 .orElse(null);
 }

 @Override
 public @Nullable FieldType lookupFieldType(Type type, String fieldName) {
 return lookupFieldType(CelTypes.typeToCelType(type), fieldName);
 return lookupFieldType(CelProtoTypes.typeToCelType(type), fieldName);
 }

 @Override
Expand DownExpand Up@@ -114,7 +114,8 @@ public Optional<CelType> lookupCelType(String typeName) {
 .map(
 et ->
 ExtensionFieldType.of(
 CelTypes.celTypeToType(et.type()), CelTypes.celTypeToType(et.messageType())))
 CelProtoTypes.celTypeToType(et.type()),
 CelProtoTypes.celTypeToType(et.messageType())))
 .orElse(null);
 }
}

26 changes: 14 additions & 12 deletions
checker/src/main/java/dev/cel/checker/Types.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@
import com.google.protobuf.NullValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
Expand DownExpand Up@@ -177,7 +177,7 @@ public static Type createWrapper(Type type) {
 */
 @Deprecated
 public static boolean isDynOrError(Type type) {
 return isDynOrError(CelTypes.typeToCelType(type));
 return isDynOrError(CelProtoTypes.typeToCelType(type));
 }

 /** Tests whether the type has error or dyn kind. Both have the property to match any type. */
Expand DownExpand Up@@ -238,18 +238,18 @@ public static CelType mostGeneral(CelType type1, CelType type2) {
 subs.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.typeToCelType(k.getKey()),
 v -> CelTypes.typeToCelType(v.getValue()),
 k -> CelProtoTypes.typeToCelType(k.getKey()),
 v -> CelProtoTypes.typeToCelType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));

 if (internalIsAssignable(
 subsCopy, CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2))) {
 subsCopy, CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2))) {
 return subsCopy.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.celTypeToType(k.getKey()),
 v -> CelTypes.celTypeToType(v.getValue()),
 k -> CelProtoTypes.celTypeToType(k.getKey()),
 v -> CelProtoTypes.celTypeToType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));
 }
Expand DownExpand Up@@ -384,7 +384,8 @@ private static boolean isAssignableFromNull(CelType targetType) {
 */
 @Deprecated
 public static boolean isEqualOrLessSpecific(Type type1, Type type2) {
 return isEqualOrLessSpecific(CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2));
 return isEqualOrLessSpecific(
 CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2));
 }

 /**
Expand DownExpand Up@@ -426,7 +427,7 @@ public static boolean isEqualOrLessSpecific(CelType type1, CelType type2) {
 TypeType typeType2 = (TypeType) type2;
 return isEqualOrLessSpecific(typeType1.type(), typeType2.type());

// Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 // Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 default:
 return type1.equals(type2);
 }
Expand DownExpand Up@@ -493,10 +494,11 @@ private static boolean notReferencedIn(
 public static Type substitute(Map<Type, Type> subs, Type type, boolean typeParamToDyn) {
 ImmutableMap.Builder<CelType, CelType> subsMap = ImmutableMap.builder();
 for (Map.Entry<Type, Type> sub : subs.entrySet()) {
 subsMap.put(CelTypes.typeToCelType(sub.getKey()), CelTypes.typeToCelType(sub.getValue()));
 subsMap.put(
 CelProtoTypes.typeToCelType(sub.getKey()), CelProtoTypes.typeToCelType(sub.getValue()));
 }
 return CelTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelTypes.typeToCelType(type), typeParamToDyn));
 return CelProtoTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelProtoTypes.typeToCelType(type), typeParamToDyn));
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/test/java/dev/cel/checker/CelOverloadDeclTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import com.google.common.collect.ImmutableList;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import org.junit.Test;
Expand DownExpand Up@@ -81,9 +81,10 @@ public void toProtoOverload_withTypeParams() {
 Overload protoOverload = CelOverloadDecl.celOverloadToOverload(celOverloadDecl);
 assertThat(protoOverload.getOverloadId()).isEqualTo("overloadId");
 assertThat(protoOverload.getIsInstanceFunction()).isTrue();
 assertThat(protoOverload.getResultType()).isEqualTo(CelTypes.createTypeParam("A"));
 assertThat(protoOverload.getResultType()).isEqualTo(CelProtoTypes.createTypeParam("A"));
 assertThat(protoOverload.getParamsList())
 .containsExactly(CelTypes.STRING, CelTypes.DOUBLE, CelTypes.createTypeParam("B"));
 .containsExactly(
 CelProtoTypes.STRING, CelProtoTypes.DOUBLE, CelProtoTypes.createTypeParam("B"));
 assertThat(protoOverload.getTypeParamsList()).containsExactly("A", "B");
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Migrate away from deprecated CelTypes methods#525

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

Dec 5, 2024
 Merged


Migrate away from deprecated CelTypes methods
#525
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


2 changes: 1 addition & 1 deletion
bundle/src/main/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ java_library(
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "//common/values:cel_value_provider",
 "//compiler",
Expand Down

4 changes: 2 additions & 2 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@@ -39,9 +39,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.FileDescriptorSetConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerBuilder;
Expand DownExpand Up@@ -269,7 +269,7 @@ public CelBuilder addFunctionBindings(Iterable<CelRuntime.CelFunctionBinding> bi
 @Override
 public CelBuilder setResultType(CelType resultType) {
 checkNotNull(resultType);
 return setProtoResultType(CelTypes.celTypeToType(resultType));
 return setProtoResultType(CelProtoTypes.celTypeToType(resultType));
 }

 @Override
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ java_library(
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -135,7 +135,7 @@ java_library(
 "//common/annotations",
 "//common/ast",
 "//common/ast:expr_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -153,7 +153,7 @@ java_library(
 "//:auto_value",
 "//common/annotations",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -182,6 +182,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//parser:macro",
Expand Down

4 changes: 2 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelIdentDecl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExprConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;

/**
Expand DownExpand Up@@ -57,7 +57,7 @@ public static Decl celIdentToDecl(CelIdentDecl identDecl) {
 IdentDecl.Builder identBuilder =
 IdentDecl.newBuilder()
 .setDoc(identDecl.doc())
 .setType(CelTypes.celTypeToType(identDecl.type()));
 .setType(CelProtoTypes.celTypeToType(identDecl.type()));
 if (identDecl.constant().isPresent()) {
 identBuilder.setValue(CelExprConverter.celConstantToExprConstant(identDecl.constant().get()));
 }
Expand Down

17 changes: 9 additions & 8 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
import dev.cel.common.ast.CelReference;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.SimpleType;
Expand DownExpand Up@@ -342,7 +343,7 @@ public Map<Long, CelType> getTypeMap() {
 @Deprecated
 public Type getType(Expr expr) {
 Preconditions.checkNotNull(expr);
 return CelTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 return CelProtoTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 }

 /**
Expand DownExpand Up@@ -395,7 +396,7 @@ public Env add(Decl decl) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This should
 // not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -440,7 +441,7 @@ public Env add(CelIdentDecl celIdentDecl) {
 @CanIgnoreReturnValue
 @Deprecated
 public Env add(String name, Type type) {
 return add(CelIdentDecl.newIdentDeclaration(name, CelTypes.typeToCelType(type)));
 return add(CelIdentDecl.newIdentDeclaration(name, CelProtoTypes.typeToCelType(type)));
 }

 /**
Expand DownExpand Up@@ -766,7 +767,7 @@ public IdentBuilder(String name) {
 @CanIgnoreReturnValue
 public IdentBuilder type(Type value) {
 Preconditions.checkNotNull(value);
 builder.setType(CelTypes.typeToCelType(Preconditions.checkNotNull(value)));
 builder.setType(CelProtoTypes.typeToCelType(Preconditions.checkNotNull(value)));
 return this;
 }

Expand DownExpand Up@@ -848,12 +849,12 @@ public FunctionBuilder add(String id, Type resultType, Type... argTypes) {
 public FunctionBuilder add(String id, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand All@@ -873,12 +874,12 @@ public FunctionBuilder add(
 String id, List<String> typeParams, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand Down

3 changes: 2 additions & 1 deletion
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelReference;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
Expand DownExpand Up@@ -88,7 +89,7 @@ public static CheckedExpr typecheck(
 Env env, String inContainer, ParsedExpr parsedExpr, Optional<Type> expectedResultType) {
 Optional<CelType> type =
 expectedResultType.isPresent()
 ? Optional.of(CelTypes.typeToCelType(expectedResultType.get()))
 ? Optional.of(CelProtoTypes.typeToCelType(expectedResultType.get()))
 : Optional.absent();
 CelAbstractSyntaxTree ast =
 typecheck(
Expand Down

8 changes: 4 additions & 4 deletions
checker/src/main/java/dev/cel/checker/TypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,8 @@
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -38,7 +38,7 @@ public interface TypeProvider {
 /** Lookup the a {@link CelType} given a qualified {@code typeName}. Returns null if not found. */
 default Optional<CelType> lookupCelType(String typeName) {
 Type type = lookupType(typeName);
 return Optional.ofNullable(type).map(CelTypes::typeToCelType);
 return Optional.ofNullable(type).map(CelProtoTypes::typeToCelType);
 }

 /** Lookup the {@code Integer} enum value given an {@code enumName}. Returns null if not found. */
Expand All@@ -61,7 +61,7 @@ default Optional<CelType> lookupCelType(String typeName) {
 * check is supported via the ('has') macro.
 */
 default @Nullable FieldType lookupFieldType(CelType type, String fieldName) {
 return lookupFieldType(CelTypes.celTypeToType(type), fieldName);
 return lookupFieldType(CelProtoTypes.celTypeToType(type), fieldName);
 }

 /**
Expand DownExpand Up@@ -89,7 +89,7 @@ public abstract class FieldType {
 public abstract Type type();

 public CelType celType() {
 return CelTypes.typeToCelType(type());
 return CelProtoTypes.typeToCelType(type());
 }

 /** Create a new {@code FieldType} instance from the provided {@code type}. */
Expand Down

11 changes: 6 additions & 5 deletions
checker/src/main/java/dev/cel/checker/TypeProviderLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ProtoMessageType;
import dev.cel.common.types.StructType;
Expand All@@ -45,7 +45,7 @@ final class TypeProviderLegacyImpl implements TypeProvider {

 @Override
 public @Nullable Type lookupType(String typeName) {
 return lookupCelType(typeName).map(CelTypes::celTypeToType).orElse(null);
 return lookupCelType(typeName).map(CelProtoTypes::celTypeToType).orElse(null);
 }

 @Override
Expand All@@ -65,13 +65,13 @@ public Optional<CelType> lookupCelType(String typeName) {

 return structType
 .findField(fieldName)
 .map(f -> FieldType.of(CelTypes.celTypeToType(f.type())))
 .map(f -> FieldType.of(CelProtoTypes.celTypeToType(f.type())))
 .orElse(null);
 }

 @Override
 public @Nullable FieldType lookupFieldType(Type type, String fieldName) {
 return lookupFieldType(CelTypes.typeToCelType(type), fieldName);
 return lookupFieldType(CelProtoTypes.typeToCelType(type), fieldName);
 }

 @Override
Expand DownExpand Up@@ -114,7 +114,8 @@ public Optional<CelType> lookupCelType(String typeName) {
 .map(
 et ->
 ExtensionFieldType.of(
 CelTypes.celTypeToType(et.type()), CelTypes.celTypeToType(et.messageType())))
 CelProtoTypes.celTypeToType(et.type()),
 CelProtoTypes.celTypeToType(et.messageType())))
 .orElse(null);
 }
}

26 changes: 14 additions & 12 deletions
checker/src/main/java/dev/cel/checker/Types.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@
import com.google.protobuf.NullValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
Expand DownExpand Up@@ -177,7 +177,7 @@ public static Type createWrapper(Type type) {
 */
 @Deprecated
 public static boolean isDynOrError(Type type) {
 return isDynOrError(CelTypes.typeToCelType(type));
 return isDynOrError(CelProtoTypes.typeToCelType(type));
 }

 /** Tests whether the type has error or dyn kind. Both have the property to match any type. */
Expand DownExpand Up@@ -238,18 +238,18 @@ public static CelType mostGeneral(CelType type1, CelType type2) {
 subs.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.typeToCelType(k.getKey()),
 v -> CelTypes.typeToCelType(v.getValue()),
 k -> CelProtoTypes.typeToCelType(k.getKey()),
 v -> CelProtoTypes.typeToCelType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));

 if (internalIsAssignable(
 subsCopy, CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2))) {
 subsCopy, CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2))) {
 return subsCopy.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.celTypeToType(k.getKey()),
 v -> CelTypes.celTypeToType(v.getValue()),
 k -> CelProtoTypes.celTypeToType(k.getKey()),
 v -> CelProtoTypes.celTypeToType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));
 }
Expand DownExpand Up@@ -384,7 +384,8 @@ private static boolean isAssignableFromNull(CelType targetType) {
 */
 @Deprecated
 public static boolean isEqualOrLessSpecific(Type type1, Type type2) {
 return isEqualOrLessSpecific(CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2));
 return isEqualOrLessSpecific(
 CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2));
 }

 /**
Expand DownExpand Up@@ -426,7 +427,7 @@ public static boolean isEqualOrLessSpecific(CelType type1, CelType type2) {
 TypeType typeType2 = (TypeType) type2;
 return isEqualOrLessSpecific(typeType1.type(), typeType2.type());

// Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 // Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 default:
 return type1.equals(type2);
 }
Expand DownExpand Up@@ -493,10 +494,11 @@ private static boolean notReferencedIn(
 public static Type substitute(Map<Type, Type> subs, Type type, boolean typeParamToDyn) {
 ImmutableMap.Builder<CelType, CelType> subsMap = ImmutableMap.builder();
 for (Map.Entry<Type, Type> sub : subs.entrySet()) {
 subsMap.put(CelTypes.typeToCelType(sub.getKey()), CelTypes.typeToCelType(sub.getValue()));
 subsMap.put(
 CelProtoTypes.typeToCelType(sub.getKey()), CelProtoTypes.typeToCelType(sub.getValue()));
 }
 return CelTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelTypes.typeToCelType(type), typeParamToDyn));
 return CelProtoTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelProtoTypes.typeToCelType(type), typeParamToDyn));
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/test/java/dev/cel/checker/CelOverloadDeclTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import com.google.common.collect.ImmutableList;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import org.junit.Test;
Expand DownExpand Up@@ -81,9 +81,10 @@ public void toProtoOverload_withTypeParams() {
 Overload protoOverload = CelOverloadDecl.celOverloadToOverload(celOverloadDecl);
 assertThat(protoOverload.getOverloadId()).isEqualTo("overloadId");
 assertThat(protoOverload.getIsInstanceFunction()).isTrue();
 assertThat(protoOverload.getResultType()).isEqualTo(CelTypes.createTypeParam("A"));
 assertThat(protoOverload.getResultType()).isEqualTo(CelProtoTypes.createTypeParam("A"));
 assertThat(protoOverload.getParamsList())
 .containsExactly(CelTypes.STRING, CelTypes.DOUBLE, CelTypes.createTypeParam("B"));
 .containsExactly(
 CelProtoTypes.STRING, CelProtoTypes.DOUBLE, CelProtoTypes.createTypeParam("B"));
 assertThat(protoOverload.getTypeParamsList()).containsExactly("A", "B");
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Migrate away from deprecated CelTypes methods#525

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

Dec 5, 2024
 Merged


Migrate away from deprecated CelTypes methods
#525
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


2 changes: 1 addition & 1 deletion
bundle/src/main/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ java_library(
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "//common/values:cel_value_provider",
 "//compiler",
Expand Down

4 changes: 2 additions & 2 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@@ -39,9 +39,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.FileDescriptorSetConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerBuilder;
Expand DownExpand Up@@ -269,7 +269,7 @@ public CelBuilder addFunctionBindings(Iterable<CelRuntime.CelFunctionBinding> bi
 @Override
 public CelBuilder setResultType(CelType resultType) {
 checkNotNull(resultType);
 return setProtoResultType(CelTypes.celTypeToType(resultType));
 return setProtoResultType(CelProtoTypes.celTypeToType(resultType));
 }

 @Override
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ java_library(
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -135,7 +135,7 @@ java_library(
 "//common/annotations",
 "//common/ast",
 "//common/ast:expr_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -153,7 +153,7 @@ java_library(
 "//:auto_value",
 "//common/annotations",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -182,6 +182,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//parser:macro",
Expand Down

4 changes: 2 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelIdentDecl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExprConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;

/**
Expand DownExpand Up@@ -57,7 +57,7 @@ public static Decl celIdentToDecl(CelIdentDecl identDecl) {
 IdentDecl.Builder identBuilder =
 IdentDecl.newBuilder()
 .setDoc(identDecl.doc())
 .setType(CelTypes.celTypeToType(identDecl.type()));
 .setType(CelProtoTypes.celTypeToType(identDecl.type()));
 if (identDecl.constant().isPresent()) {
 identBuilder.setValue(CelExprConverter.celConstantToExprConstant(identDecl.constant().get()));
 }
Expand Down

17 changes: 9 additions & 8 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
import dev.cel.common.ast.CelReference;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.SimpleType;
Expand DownExpand Up@@ -342,7 +343,7 @@ public Map<Long, CelType> getTypeMap() {
 @Deprecated
 public Type getType(Expr expr) {
 Preconditions.checkNotNull(expr);
 return CelTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 return CelProtoTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 }

 /**
Expand DownExpand Up@@ -395,7 +396,7 @@ public Env add(Decl decl) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This should
 // not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -440,7 +441,7 @@ public Env add(CelIdentDecl celIdentDecl) {
 @CanIgnoreReturnValue
 @Deprecated
 public Env add(String name, Type type) {
 return add(CelIdentDecl.newIdentDeclaration(name, CelTypes.typeToCelType(type)));
 return add(CelIdentDecl.newIdentDeclaration(name, CelProtoTypes.typeToCelType(type)));
 }

 /**
Expand DownExpand Up@@ -766,7 +767,7 @@ public IdentBuilder(String name) {
 @CanIgnoreReturnValue
 public IdentBuilder type(Type value) {
 Preconditions.checkNotNull(value);
 builder.setType(CelTypes.typeToCelType(Preconditions.checkNotNull(value)));
 builder.setType(CelProtoTypes.typeToCelType(Preconditions.checkNotNull(value)));
 return this;
 }

Expand DownExpand Up@@ -848,12 +849,12 @@ public FunctionBuilder add(String id, Type resultType, Type... argTypes) {
 public FunctionBuilder add(String id, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand All@@ -873,12 +874,12 @@ public FunctionBuilder add(
 String id, List<String> typeParams, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand Down

3 changes: 2 additions & 1 deletion
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelReference;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
Expand DownExpand Up@@ -88,7 +89,7 @@ public static CheckedExpr typecheck(
 Env env, String inContainer, ParsedExpr parsedExpr, Optional<Type> expectedResultType) {
 Optional<CelType> type =
 expectedResultType.isPresent()
 ? Optional.of(CelTypes.typeToCelType(expectedResultType.get()))
 ? Optional.of(CelProtoTypes.typeToCelType(expectedResultType.get()))
 : Optional.absent();
 CelAbstractSyntaxTree ast =
 typecheck(
Expand Down

8 changes: 4 additions & 4 deletions
checker/src/main/java/dev/cel/checker/TypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,8 @@
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -38,7 +38,7 @@ public interface TypeProvider {
 /** Lookup the a {@link CelType} given a qualified {@code typeName}. Returns null if not found. */
 default Optional<CelType> lookupCelType(String typeName) {
 Type type = lookupType(typeName);
 return Optional.ofNullable(type).map(CelTypes::typeToCelType);
 return Optional.ofNullable(type).map(CelProtoTypes::typeToCelType);
 }

 /** Lookup the {@code Integer} enum value given an {@code enumName}. Returns null if not found. */
Expand All@@ -61,7 +61,7 @@ default Optional<CelType> lookupCelType(String typeName) {
 * check is supported via the ('has') macro.
 */
 default @Nullable FieldType lookupFieldType(CelType type, String fieldName) {
 return lookupFieldType(CelTypes.celTypeToType(type), fieldName);
 return lookupFieldType(CelProtoTypes.celTypeToType(type), fieldName);
 }

 /**
Expand DownExpand Up@@ -89,7 +89,7 @@ public abstract class FieldType {
 public abstract Type type();

 public CelType celType() {
 return CelTypes.typeToCelType(type());
 return CelProtoTypes.typeToCelType(type());
 }

 /** Create a new {@code FieldType} instance from the provided {@code type}. */
Expand Down

11 changes: 6 additions & 5 deletions
checker/src/main/java/dev/cel/checker/TypeProviderLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ProtoMessageType;
import dev.cel.common.types.StructType;
Expand All@@ -45,7 +45,7 @@ final class TypeProviderLegacyImpl implements TypeProvider {

 @Override
 public @Nullable Type lookupType(String typeName) {
 return lookupCelType(typeName).map(CelTypes::celTypeToType).orElse(null);
 return lookupCelType(typeName).map(CelProtoTypes::celTypeToType).orElse(null);
 }

 @Override
Expand All@@ -65,13 +65,13 @@ public Optional<CelType> lookupCelType(String typeName) {

 return structType
 .findField(fieldName)
 .map(f -> FieldType.of(CelTypes.celTypeToType(f.type())))
 .map(f -> FieldType.of(CelProtoTypes.celTypeToType(f.type())))
 .orElse(null);
 }

 @Override
 public @Nullable FieldType lookupFieldType(Type type, String fieldName) {
 return lookupFieldType(CelTypes.typeToCelType(type), fieldName);
 return lookupFieldType(CelProtoTypes.typeToCelType(type), fieldName);
 }

 @Override
Expand DownExpand Up@@ -114,7 +114,8 @@ public Optional<CelType> lookupCelType(String typeName) {
 .map(
 et ->
 ExtensionFieldType.of(
 CelTypes.celTypeToType(et.type()), CelTypes.celTypeToType(et.messageType())))
 CelProtoTypes.celTypeToType(et.type()),
 CelProtoTypes.celTypeToType(et.messageType())))
 .orElse(null);
 }
}

26 changes: 14 additions & 12 deletions
checker/src/main/java/dev/cel/checker/Types.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@
import com.google.protobuf.NullValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
Expand DownExpand Up@@ -177,7 +177,7 @@ public static Type createWrapper(Type type) {
 */
 @Deprecated
 public static boolean isDynOrError(Type type) {
 return isDynOrError(CelTypes.typeToCelType(type));
 return isDynOrError(CelProtoTypes.typeToCelType(type));
 }

 /** Tests whether the type has error or dyn kind. Both have the property to match any type. */
Expand DownExpand Up@@ -238,18 +238,18 @@ public static CelType mostGeneral(CelType type1, CelType type2) {
 subs.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.typeToCelType(k.getKey()),
 v -> CelTypes.typeToCelType(v.getValue()),
 k -> CelProtoTypes.typeToCelType(k.getKey()),
 v -> CelProtoTypes.typeToCelType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));

 if (internalIsAssignable(
 subsCopy, CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2))) {
 subsCopy, CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2))) {
 return subsCopy.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.celTypeToType(k.getKey()),
 v -> CelTypes.celTypeToType(v.getValue()),
 k -> CelProtoTypes.celTypeToType(k.getKey()),
 v -> CelProtoTypes.celTypeToType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));
 }
Expand DownExpand Up@@ -384,7 +384,8 @@ private static boolean isAssignableFromNull(CelType targetType) {
 */
 @Deprecated
 public static boolean isEqualOrLessSpecific(Type type1, Type type2) {
 return isEqualOrLessSpecific(CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2));
 return isEqualOrLessSpecific(
 CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2));
 }

 /**
Expand DownExpand Up@@ -426,7 +427,7 @@ public static boolean isEqualOrLessSpecific(CelType type1, CelType type2) {
 TypeType typeType2 = (TypeType) type2;
 return isEqualOrLessSpecific(typeType1.type(), typeType2.type());

// Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 // Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 default:
 return type1.equals(type2);
 }
Expand DownExpand Up@@ -493,10 +494,11 @@ private static boolean notReferencedIn(
 public static Type substitute(Map<Type, Type> subs, Type type, boolean typeParamToDyn) {
 ImmutableMap.Builder<CelType, CelType> subsMap = ImmutableMap.builder();
 for (Map.Entry<Type, Type> sub : subs.entrySet()) {
 subsMap.put(CelTypes.typeToCelType(sub.getKey()), CelTypes.typeToCelType(sub.getValue()));
 subsMap.put(
 CelProtoTypes.typeToCelType(sub.getKey()), CelProtoTypes.typeToCelType(sub.getValue()));
 }
 return CelTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelTypes.typeToCelType(type), typeParamToDyn));
 return CelProtoTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelProtoTypes.typeToCelType(type), typeParamToDyn));
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/test/java/dev/cel/checker/CelOverloadDeclTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import com.google.common.collect.ImmutableList;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import org.junit.Test;
Expand DownExpand Up@@ -81,9 +81,10 @@ public void toProtoOverload_withTypeParams() {
 Overload protoOverload = CelOverloadDecl.celOverloadToOverload(celOverloadDecl);
 assertThat(protoOverload.getOverloadId()).isEqualTo("overloadId");
 assertThat(protoOverload.getIsInstanceFunction()).isTrue();
 assertThat(protoOverload.getResultType()).isEqualTo(CelTypes.createTypeParam("A"));
 assertThat(protoOverload.getResultType()).isEqualTo(CelProtoTypes.createTypeParam("A"));
 assertThat(protoOverload.getParamsList())
 .containsExactly(CelTypes.STRING, CelTypes.DOUBLE, CelTypes.createTypeParam("B"));
 .containsExactly(
 CelProtoTypes.STRING, CelProtoTypes.DOUBLE, CelProtoTypes.createTypeParam("B"));
 assertThat(protoOverload.getTypeParamsList()).containsExactly("A", "B");
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Migrate away from deprecated CelTypes methods#525

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

Dec 5, 2024
 Merged


Migrate away from deprecated CelTypes methods
#525
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


2 changes: 1 addition & 1 deletion
bundle/src/main/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ java_library(
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "//common/values:cel_value_provider",
 "//compiler",
Expand Down

4 changes: 2 additions & 2 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@@ -39,9 +39,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.FileDescriptorSetConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerBuilder;
Expand DownExpand Up@@ -269,7 +269,7 @@ public CelBuilder addFunctionBindings(Iterable<CelRuntime.CelFunctionBinding> bi
 @Override
 public CelBuilder setResultType(CelType resultType) {
 checkNotNull(resultType);
 return setProtoResultType(CelTypes.celTypeToType(resultType));
 return setProtoResultType(CelProtoTypes.celTypeToType(resultType));
 }

 @Override
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ java_library(
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -135,7 +135,7 @@ java_library(
 "//common/annotations",
 "//common/ast",
 "//common/ast:expr_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -153,7 +153,7 @@ java_library(
 "//:auto_value",
 "//common/annotations",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -182,6 +182,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//parser:macro",
Expand Down

4 changes: 2 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelIdentDecl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExprConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;

/**
Expand DownExpand Up@@ -57,7 +57,7 @@ public static Decl celIdentToDecl(CelIdentDecl identDecl) {
 IdentDecl.Builder identBuilder =
 IdentDecl.newBuilder()
 .setDoc(identDecl.doc())
 .setType(CelTypes.celTypeToType(identDecl.type()));
 .setType(CelProtoTypes.celTypeToType(identDecl.type()));
 if (identDecl.constant().isPresent()) {
 identBuilder.setValue(CelExprConverter.celConstantToExprConstant(identDecl.constant().get()));
 }
Expand Down

17 changes: 9 additions & 8 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
import dev.cel.common.ast.CelReference;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.SimpleType;
Expand DownExpand Up@@ -342,7 +343,7 @@ public Map<Long, CelType> getTypeMap() {
 @Deprecated
 public Type getType(Expr expr) {
 Preconditions.checkNotNull(expr);
 return CelTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 return CelProtoTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 }

 /**
Expand DownExpand Up@@ -395,7 +396,7 @@ public Env add(Decl decl) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This should
 // not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -440,7 +441,7 @@ public Env add(CelIdentDecl celIdentDecl) {
 @CanIgnoreReturnValue
 @Deprecated
 public Env add(String name, Type type) {
 return add(CelIdentDecl.newIdentDeclaration(name, CelTypes.typeToCelType(type)));
 return add(CelIdentDecl.newIdentDeclaration(name, CelProtoTypes.typeToCelType(type)));
 }

 /**
Expand DownExpand Up@@ -766,7 +767,7 @@ public IdentBuilder(String name) {
 @CanIgnoreReturnValue
 public IdentBuilder type(Type value) {
 Preconditions.checkNotNull(value);
 builder.setType(CelTypes.typeToCelType(Preconditions.checkNotNull(value)));
 builder.setType(CelProtoTypes.typeToCelType(Preconditions.checkNotNull(value)));
 return this;
 }

Expand DownExpand Up@@ -848,12 +849,12 @@ public FunctionBuilder add(String id, Type resultType, Type... argTypes) {
 public FunctionBuilder add(String id, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand All@@ -873,12 +874,12 @@ public FunctionBuilder add(
 String id, List<String> typeParams, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand Down

3 changes: 2 additions & 1 deletion
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelReference;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
Expand DownExpand Up@@ -88,7 +89,7 @@ public static CheckedExpr typecheck(
 Env env, String inContainer, ParsedExpr parsedExpr, Optional<Type> expectedResultType) {
 Optional<CelType> type =
 expectedResultType.isPresent()
 ? Optional.of(CelTypes.typeToCelType(expectedResultType.get()))
 ? Optional.of(CelProtoTypes.typeToCelType(expectedResultType.get()))
 : Optional.absent();
 CelAbstractSyntaxTree ast =
 typecheck(
Expand Down

8 changes: 4 additions & 4 deletions
checker/src/main/java/dev/cel/checker/TypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,8 @@
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -38,7 +38,7 @@ public interface TypeProvider {
 /** Lookup the a {@link CelType} given a qualified {@code typeName}. Returns null if not found. */
 default Optional<CelType> lookupCelType(String typeName) {
 Type type = lookupType(typeName);
 return Optional.ofNullable(type).map(CelTypes::typeToCelType);
 return Optional.ofNullable(type).map(CelProtoTypes::typeToCelType);
 }

 /** Lookup the {@code Integer} enum value given an {@code enumName}. Returns null if not found. */
Expand All@@ -61,7 +61,7 @@ default Optional<CelType> lookupCelType(String typeName) {
 * check is supported via the ('has') macro.
 */
 default @Nullable FieldType lookupFieldType(CelType type, String fieldName) {
 return lookupFieldType(CelTypes.celTypeToType(type), fieldName);
 return lookupFieldType(CelProtoTypes.celTypeToType(type), fieldName);
 }

 /**
Expand DownExpand Up@@ -89,7 +89,7 @@ public abstract class FieldType {
 public abstract Type type();

 public CelType celType() {
 return CelTypes.typeToCelType(type());
 return CelProtoTypes.typeToCelType(type());
 }

 /** Create a new {@code FieldType} instance from the provided {@code type}. */
Expand Down

11 changes: 6 additions & 5 deletions
checker/src/main/java/dev/cel/checker/TypeProviderLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ProtoMessageType;
import dev.cel.common.types.StructType;
Expand All@@ -45,7 +45,7 @@ final class TypeProviderLegacyImpl implements TypeProvider {

 @Override
 public @Nullable Type lookupType(String typeName) {
 return lookupCelType(typeName).map(CelTypes::celTypeToType).orElse(null);
 return lookupCelType(typeName).map(CelProtoTypes::celTypeToType).orElse(null);
 }

 @Override
Expand All@@ -65,13 +65,13 @@ public Optional<CelType> lookupCelType(String typeName) {

 return structType
 .findField(fieldName)
 .map(f -> FieldType.of(CelTypes.celTypeToType(f.type())))
 .map(f -> FieldType.of(CelProtoTypes.celTypeToType(f.type())))
 .orElse(null);
 }

 @Override
 public @Nullable FieldType lookupFieldType(Type type, String fieldName) {
 return lookupFieldType(CelTypes.typeToCelType(type), fieldName);
 return lookupFieldType(CelProtoTypes.typeToCelType(type), fieldName);
 }

 @Override
Expand DownExpand Up@@ -114,7 +114,8 @@ public Optional<CelType> lookupCelType(String typeName) {
 .map(
 et ->
 ExtensionFieldType.of(
 CelTypes.celTypeToType(et.type()), CelTypes.celTypeToType(et.messageType())))
 CelProtoTypes.celTypeToType(et.type()),
 CelProtoTypes.celTypeToType(et.messageType())))
 .orElse(null);
 }
}

26 changes: 14 additions & 12 deletions
checker/src/main/java/dev/cel/checker/Types.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@
import com.google.protobuf.NullValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
Expand DownExpand Up@@ -177,7 +177,7 @@ public static Type createWrapper(Type type) {
 */
 @Deprecated
 public static boolean isDynOrError(Type type) {
 return isDynOrError(CelTypes.typeToCelType(type));
 return isDynOrError(CelProtoTypes.typeToCelType(type));
 }

 /** Tests whether the type has error or dyn kind. Both have the property to match any type. */
Expand DownExpand Up@@ -238,18 +238,18 @@ public static CelType mostGeneral(CelType type1, CelType type2) {
 subs.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.typeToCelType(k.getKey()),
 v -> CelTypes.typeToCelType(v.getValue()),
 k -> CelProtoTypes.typeToCelType(k.getKey()),
 v -> CelProtoTypes.typeToCelType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));

 if (internalIsAssignable(
 subsCopy, CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2))) {
 subsCopy, CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2))) {
 return subsCopy.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.celTypeToType(k.getKey()),
 v -> CelTypes.celTypeToType(v.getValue()),
 k -> CelProtoTypes.celTypeToType(k.getKey()),
 v -> CelProtoTypes.celTypeToType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));
 }
Expand DownExpand Up@@ -384,7 +384,8 @@ private static boolean isAssignableFromNull(CelType targetType) {
 */
 @Deprecated
 public static boolean isEqualOrLessSpecific(Type type1, Type type2) {
 return isEqualOrLessSpecific(CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2));
 return isEqualOrLessSpecific(
 CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2));
 }

 /**
Expand DownExpand Up@@ -426,7 +427,7 @@ public static boolean isEqualOrLessSpecific(CelType type1, CelType type2) {
 TypeType typeType2 = (TypeType) type2;
 return isEqualOrLessSpecific(typeType1.type(), typeType2.type());

// Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 // Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 default:
 return type1.equals(type2);
 }
Expand DownExpand Up@@ -493,10 +494,11 @@ private static boolean notReferencedIn(
 public static Type substitute(Map<Type, Type> subs, Type type, boolean typeParamToDyn) {
 ImmutableMap.Builder<CelType, CelType> subsMap = ImmutableMap.builder();
 for (Map.Entry<Type, Type> sub : subs.entrySet()) {
 subsMap.put(CelTypes.typeToCelType(sub.getKey()), CelTypes.typeToCelType(sub.getValue()));
 subsMap.put(
 CelProtoTypes.typeToCelType(sub.getKey()), CelProtoTypes.typeToCelType(sub.getValue()));
 }
 return CelTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelTypes.typeToCelType(type), typeParamToDyn));
 return CelProtoTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelProtoTypes.typeToCelType(type), typeParamToDyn));
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/test/java/dev/cel/checker/CelOverloadDeclTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import com.google.common.collect.ImmutableList;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import org.junit.Test;
Expand DownExpand Up@@ -81,9 +81,10 @@ public void toProtoOverload_withTypeParams() {
 Overload protoOverload = CelOverloadDecl.celOverloadToOverload(celOverloadDecl);
 assertThat(protoOverload.getOverloadId()).isEqualTo("overloadId");
 assertThat(protoOverload.getIsInstanceFunction()).isTrue();
 assertThat(protoOverload.getResultType()).isEqualTo(CelTypes.createTypeParam("A"));
 assertThat(protoOverload.getResultType()).isEqualTo(CelProtoTypes.createTypeParam("A"));
 assertThat(protoOverload.getParamsList())
 .containsExactly(CelTypes.STRING, CelTypes.DOUBLE, CelTypes.createTypeParam("B"));
 .containsExactly(
 CelProtoTypes.STRING, CelProtoTypes.DOUBLE, CelProtoTypes.createTypeParam("B"));
 assertThat(protoOverload.getTypeParamsList()).containsExactly("A", "B");
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Migrate away from deprecated CelTypes methods#525

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

Dec 5, 2024
 Merged


Migrate away from deprecated CelTypes methods
#525
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


2 changes: 1 addition & 1 deletion
bundle/src/main/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ java_library(
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "//common/values:cel_value_provider",
 "//compiler",
Expand Down

4 changes: 2 additions & 2 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@@ -39,9 +39,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.FileDescriptorSetConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerBuilder;
Expand DownExpand Up@@ -269,7 +269,7 @@ public CelBuilder addFunctionBindings(Iterable<CelRuntime.CelFunctionBinding> bi
 @Override
 public CelBuilder setResultType(CelType resultType) {
 checkNotNull(resultType);
 return setProtoResultType(CelTypes.celTypeToType(resultType));
 return setProtoResultType(CelProtoTypes.celTypeToType(resultType));
 }

 @Override
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ java_library(
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -135,7 +135,7 @@ java_library(
 "//common/annotations",
 "//common/ast",
 "//common/ast:expr_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -153,7 +153,7 @@ java_library(
 "//:auto_value",
 "//common/annotations",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -182,6 +182,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//parser:macro",
Expand Down

4 changes: 2 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelIdentDecl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExprConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;

/**
Expand DownExpand Up@@ -57,7 +57,7 @@ public static Decl celIdentToDecl(CelIdentDecl identDecl) {
 IdentDecl.Builder identBuilder =
 IdentDecl.newBuilder()
 .setDoc(identDecl.doc())
 .setType(CelTypes.celTypeToType(identDecl.type()));
 .setType(CelProtoTypes.celTypeToType(identDecl.type()));
 if (identDecl.constant().isPresent()) {
 identBuilder.setValue(CelExprConverter.celConstantToExprConstant(identDecl.constant().get()));
 }
Expand Down

17 changes: 9 additions & 8 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
import dev.cel.common.ast.CelReference;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.SimpleType;
Expand DownExpand Up@@ -342,7 +343,7 @@ public Map<Long, CelType> getTypeMap() {
 @Deprecated
 public Type getType(Expr expr) {
 Preconditions.checkNotNull(expr);
 return CelTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 return CelProtoTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 }

 /**
Expand DownExpand Up@@ -395,7 +396,7 @@ public Env add(Decl decl) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This should
 // not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -440,7 +441,7 @@ public Env add(CelIdentDecl celIdentDecl) {
 @CanIgnoreReturnValue
 @Deprecated
 public Env add(String name, Type type) {
 return add(CelIdentDecl.newIdentDeclaration(name, CelTypes.typeToCelType(type)));
 return add(CelIdentDecl.newIdentDeclaration(name, CelProtoTypes.typeToCelType(type)));
 }

 /**
Expand DownExpand Up@@ -766,7 +767,7 @@ public IdentBuilder(String name) {
 @CanIgnoreReturnValue
 public IdentBuilder type(Type value) {
 Preconditions.checkNotNull(value);
 builder.setType(CelTypes.typeToCelType(Preconditions.checkNotNull(value)));
 builder.setType(CelProtoTypes.typeToCelType(Preconditions.checkNotNull(value)));
 return this;
 }

Expand DownExpand Up@@ -848,12 +849,12 @@ public FunctionBuilder add(String id, Type resultType, Type... argTypes) {
 public FunctionBuilder add(String id, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand All@@ -873,12 +874,12 @@ public FunctionBuilder add(
 String id, List<String> typeParams, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand Down

3 changes: 2 additions & 1 deletion
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelReference;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
Expand DownExpand Up@@ -88,7 +89,7 @@ public static CheckedExpr typecheck(
 Env env, String inContainer, ParsedExpr parsedExpr, Optional<Type> expectedResultType) {
 Optional<CelType> type =
 expectedResultType.isPresent()
 ? Optional.of(CelTypes.typeToCelType(expectedResultType.get()))
 ? Optional.of(CelProtoTypes.typeToCelType(expectedResultType.get()))
 : Optional.absent();
 CelAbstractSyntaxTree ast =
 typecheck(
Expand Down

8 changes: 4 additions & 4 deletions
checker/src/main/java/dev/cel/checker/TypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,8 @@
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -38,7 +38,7 @@ public interface TypeProvider {
 /** Lookup the a {@link CelType} given a qualified {@code typeName}. Returns null if not found. */
 default Optional<CelType> lookupCelType(String typeName) {
 Type type = lookupType(typeName);
 return Optional.ofNullable(type).map(CelTypes::typeToCelType);
 return Optional.ofNullable(type).map(CelProtoTypes::typeToCelType);
 }

 /** Lookup the {@code Integer} enum value given an {@code enumName}. Returns null if not found. */
Expand All@@ -61,7 +61,7 @@ default Optional<CelType> lookupCelType(String typeName) {
 * check is supported via the ('has') macro.
 */
 default @Nullable FieldType lookupFieldType(CelType type, String fieldName) {
 return lookupFieldType(CelTypes.celTypeToType(type), fieldName);
 return lookupFieldType(CelProtoTypes.celTypeToType(type), fieldName);
 }

 /**
Expand DownExpand Up@@ -89,7 +89,7 @@ public abstract class FieldType {
 public abstract Type type();

 public CelType celType() {
 return CelTypes.typeToCelType(type());
 return CelProtoTypes.typeToCelType(type());
 }

 /** Create a new {@code FieldType} instance from the provided {@code type}. */
Expand Down

11 changes: 6 additions & 5 deletions
checker/src/main/java/dev/cel/checker/TypeProviderLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ProtoMessageType;
import dev.cel.common.types.StructType;
Expand All@@ -45,7 +45,7 @@ final class TypeProviderLegacyImpl implements TypeProvider {

 @Override
 public @Nullable Type lookupType(String typeName) {
 return lookupCelType(typeName).map(CelTypes::celTypeToType).orElse(null);
 return lookupCelType(typeName).map(CelProtoTypes::celTypeToType).orElse(null);
 }

 @Override
Expand All@@ -65,13 +65,13 @@ public Optional<CelType> lookupCelType(String typeName) {

 return structType
 .findField(fieldName)
 .map(f -> FieldType.of(CelTypes.celTypeToType(f.type())))
 .map(f -> FieldType.of(CelProtoTypes.celTypeToType(f.type())))
 .orElse(null);
 }

 @Override
 public @Nullable FieldType lookupFieldType(Type type, String fieldName) {
 return lookupFieldType(CelTypes.typeToCelType(type), fieldName);
 return lookupFieldType(CelProtoTypes.typeToCelType(type), fieldName);
 }

 @Override
Expand DownExpand Up@@ -114,7 +114,8 @@ public Optional<CelType> lookupCelType(String typeName) {
 .map(
 et ->
 ExtensionFieldType.of(
 CelTypes.celTypeToType(et.type()), CelTypes.celTypeToType(et.messageType())))
 CelProtoTypes.celTypeToType(et.type()),
 CelProtoTypes.celTypeToType(et.messageType())))
 .orElse(null);
 }
}

26 changes: 14 additions & 12 deletions
checker/src/main/java/dev/cel/checker/Types.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@
import com.google.protobuf.NullValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
Expand DownExpand Up@@ -177,7 +177,7 @@ public static Type createWrapper(Type type) {
 */
 @Deprecated
 public static boolean isDynOrError(Type type) {
 return isDynOrError(CelTypes.typeToCelType(type));
 return isDynOrError(CelProtoTypes.typeToCelType(type));
 }

 /** Tests whether the type has error or dyn kind. Both have the property to match any type. */
Expand DownExpand Up@@ -238,18 +238,18 @@ public static CelType mostGeneral(CelType type1, CelType type2) {
 subs.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.typeToCelType(k.getKey()),
 v -> CelTypes.typeToCelType(v.getValue()),
 k -> CelProtoTypes.typeToCelType(k.getKey()),
 v -> CelProtoTypes.typeToCelType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));

 if (internalIsAssignable(
 subsCopy, CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2))) {
 subsCopy, CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2))) {
 return subsCopy.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.celTypeToType(k.getKey()),
 v -> CelTypes.celTypeToType(v.getValue()),
 k -> CelProtoTypes.celTypeToType(k.getKey()),
 v -> CelProtoTypes.celTypeToType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));
 }
Expand DownExpand Up@@ -384,7 +384,8 @@ private static boolean isAssignableFromNull(CelType targetType) {
 */
 @Deprecated
 public static boolean isEqualOrLessSpecific(Type type1, Type type2) {
 return isEqualOrLessSpecific(CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2));
 return isEqualOrLessSpecific(
 CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2));
 }

 /**
Expand DownExpand Up@@ -426,7 +427,7 @@ public static boolean isEqualOrLessSpecific(CelType type1, CelType type2) {
 TypeType typeType2 = (TypeType) type2;
 return isEqualOrLessSpecific(typeType1.type(), typeType2.type());

// Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 // Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 default:
 return type1.equals(type2);
 }
Expand DownExpand Up@@ -493,10 +494,11 @@ private static boolean notReferencedIn(
 public static Type substitute(Map<Type, Type> subs, Type type, boolean typeParamToDyn) {
 ImmutableMap.Builder<CelType, CelType> subsMap = ImmutableMap.builder();
 for (Map.Entry<Type, Type> sub : subs.entrySet()) {
 subsMap.put(CelTypes.typeToCelType(sub.getKey()), CelTypes.typeToCelType(sub.getValue()));
 subsMap.put(
 CelProtoTypes.typeToCelType(sub.getKey()), CelProtoTypes.typeToCelType(sub.getValue()));
 }
 return CelTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelTypes.typeToCelType(type), typeParamToDyn));
 return CelProtoTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelProtoTypes.typeToCelType(type), typeParamToDyn));
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/test/java/dev/cel/checker/CelOverloadDeclTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import com.google.common.collect.ImmutableList;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import org.junit.Test;
Expand DownExpand Up@@ -81,9 +81,10 @@ public void toProtoOverload_withTypeParams() {
 Overload protoOverload = CelOverloadDecl.celOverloadToOverload(celOverloadDecl);
 assertThat(protoOverload.getOverloadId()).isEqualTo("overloadId");
 assertThat(protoOverload.getIsInstanceFunction()).isTrue();
 assertThat(protoOverload.getResultType()).isEqualTo(CelTypes.createTypeParam("A"));
 assertThat(protoOverload.getResultType()).isEqualTo(CelProtoTypes.createTypeParam("A"));
 assertThat(protoOverload.getParamsList())
 .containsExactly(CelTypes.STRING, CelTypes.DOUBLE, CelTypes.createTypeParam("B"));
 .containsExactly(
 CelProtoTypes.STRING, CelProtoTypes.DOUBLE, CelProtoTypes.createTypeParam("B"));
 assertThat(protoOverload.getTypeParamsList()).containsExactly("A", "B");
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Migrate away from deprecated CelTypes methods#525

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

Dec 5, 2024
 Merged


Migrate away from deprecated CelTypes methods
#525
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


2 changes: 1 addition & 1 deletion
bundle/src/main/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ java_library(
 "//common:options",
 "//common/internal:env_visitor",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "//common/values:cel_value_provider",
 "//compiler",
Expand Down

4 changes: 2 additions & 2 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@@ -39,9 +39,9 @@
import dev.cel.common.internal.EnvVisitable;
import dev.cel.common.internal.EnvVisitor;
import dev.cel.common.internal.FileDescriptorSetConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerBuilder;
Expand DownExpand Up@@ -269,7 +269,7 @@ public CelBuilder addFunctionBindings(Iterable<CelRuntime.CelFunctionBinding> bi
 @Override
 public CelBuilder setResultType(CelType resultType) {
 checkNotNull(resultType);
 return setProtoResultType(CelTypes.celTypeToType(resultType));
 return setProtoResultType(CelProtoTypes.celTypeToType(resultType));
 }

 @Override
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ java_library(
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -135,7 +135,7 @@ java_library(
 "//common/annotations",
 "//common/ast",
 "//common/ast:expr_converter",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -153,7 +153,7 @@ java_library(
 "//:auto_value",
 "//common/annotations",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:cel_proto_types",
 "//common/types:type_providers",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand DownExpand Up@@ -182,6 +182,7 @@ java_library(
 "//common/internal:errors",
 "//common/internal:file_descriptor_converter",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//parser:macro",
Expand Down

4 changes: 2 additions & 2 deletions
checker/src/main/java/dev/cel/checker/CelIdentDecl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,8 @@
import dev.cel.common.annotations.Internal;
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExprConverter;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;

/**
Expand DownExpand Up@@ -57,7 +57,7 @@ public static Decl celIdentToDecl(CelIdentDecl identDecl) {
 IdentDecl.Builder identBuilder =
 IdentDecl.newBuilder()
 .setDoc(identDecl.doc())
 .setType(CelTypes.celTypeToType(identDecl.type()));
 .setType(CelProtoTypes.celTypeToType(identDecl.type()));
 if (identDecl.constant().isPresent()) {
 identBuilder.setValue(CelExprConverter.celConstantToExprConstant(identDecl.constant().get()));
 }
Expand Down

17 changes: 9 additions & 8 deletions
checker/src/main/java/dev/cel/checker/Env.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
import dev.cel.common.ast.CelReference;
import dev.cel.common.internal.Errors;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.SimpleType;
Expand DownExpand Up@@ -342,7 +343,7 @@ public Map<Long, CelType> getTypeMap() {
 @Deprecated
 public Type getType(Expr expr) {
 Preconditions.checkNotNull(expr);
 return CelTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 return CelProtoTypes.celTypeToType(getType(CelExprConverter.fromExpr(expr)));
 }

 /**
Expand DownExpand Up@@ -395,7 +396,7 @@ public Env add(Decl decl) {
 CelIdentDecl.Builder identBuilder =
 CelIdentDecl.newBuilder()
 .setName(decl.getName())
 .setType(CelTypes.typeToCelType(decl.getIdent().getType()))
 .setType(CelProtoTypes.typeToCelType(decl.getIdent().getType()))
 // Note: Setting doc and constant value exists for compatibility reason. This should
 // not be set by the users.
 .setDoc(decl.getIdent().getDoc());
Expand DownExpand Up@@ -440,7 +441,7 @@ public Env add(CelIdentDecl celIdentDecl) {
 @CanIgnoreReturnValue
 @Deprecated
 public Env add(String name, Type type) {
 return add(CelIdentDecl.newIdentDeclaration(name, CelTypes.typeToCelType(type)));
 return add(CelIdentDecl.newIdentDeclaration(name, CelProtoTypes.typeToCelType(type)));
 }

 /**
Expand DownExpand Up@@ -766,7 +767,7 @@ public IdentBuilder(String name) {
 @CanIgnoreReturnValue
 public IdentBuilder type(Type value) {
 Preconditions.checkNotNull(value);
 builder.setType(CelTypes.typeToCelType(Preconditions.checkNotNull(value)));
 builder.setType(CelProtoTypes.typeToCelType(Preconditions.checkNotNull(value)));
 return this;
 }

Expand DownExpand Up@@ -848,12 +849,12 @@ public FunctionBuilder add(String id, Type resultType, Type... argTypes) {
 public FunctionBuilder add(String id, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand All@@ -873,12 +874,12 @@ public FunctionBuilder add(
 String id, List<String> typeParams, Type resultType, Iterable<Type> argTypes) {
 ImmutableList.Builder<CelType> argumentBuilder = new ImmutableList.Builder<>();
 for (Type type : argTypes) {
 argumentBuilder.add(CelTypes.typeToCelType(type));
 argumentBuilder.add(CelProtoTypes.typeToCelType(type));
 }
 this.overloads.add(
 CelOverloadDecl.newBuilder()
 .setOverloadId(id)
 .setResultType(CelTypes.typeToCelType(resultType))
 .setResultType(CelProtoTypes.typeToCelType(resultType))
 .addParameterTypes(argumentBuilder.build())
 .setIsInstanceFunction(isInstance)
 .build());
Expand Down

3 changes: 2 additions & 1 deletion
checker/src/main/java/dev/cel/checker/ExprChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelReference;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
Expand DownExpand Up@@ -88,7 +89,7 @@ public static CheckedExpr typecheck(
 Env env, String inContainer, ParsedExpr parsedExpr, Optional<Type> expectedResultType) {
 Optional<CelType> type =
 expectedResultType.isPresent()
 ? Optional.of(CelTypes.typeToCelType(expectedResultType.get()))
 ? Optional.of(CelProtoTypes.typeToCelType(expectedResultType.get()))
 : Optional.absent();
 CelAbstractSyntaxTree ast =
 typecheck(
Expand Down

8 changes: 4 additions & 4 deletions
checker/src/main/java/dev/cel/checker/TypeProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,8 @@
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -38,7 +38,7 @@ public interface TypeProvider {
 /** Lookup the a {@link CelType} given a qualified {@code typeName}. Returns null if not found. */
 default Optional<CelType> lookupCelType(String typeName) {
 Type type = lookupType(typeName);
 return Optional.ofNullable(type).map(CelTypes::typeToCelType);
 return Optional.ofNullable(type).map(CelProtoTypes::typeToCelType);
 }

 /** Lookup the {@code Integer} enum value given an {@code enumName}. Returns null if not found. */
Expand All@@ -61,7 +61,7 @@ default Optional<CelType> lookupCelType(String typeName) {
 * check is supported via the ('has') macro.
 */
 default @Nullable FieldType lookupFieldType(CelType type, String fieldName) {
 return lookupFieldType(CelTypes.celTypeToType(type), fieldName);
 return lookupFieldType(CelProtoTypes.celTypeToType(type), fieldName);
 }

 /**
Expand DownExpand Up@@ -89,7 +89,7 @@ public abstract class FieldType {
 public abstract Type type();

 public CelType celType() {
 return CelTypes.typeToCelType(type());
 return CelProtoTypes.typeToCelType(type());
 }

 /** Create a new {@code FieldType} instance from the provided {@code type}. */
Expand Down

11 changes: 6 additions & 5 deletions
checker/src/main/java/dev/cel/checker/TypeProviderLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CheckReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.EnumType;
import dev.cel.common.types.ProtoMessageType;
import dev.cel.common.types.StructType;
Expand All@@ -45,7 +45,7 @@ final class TypeProviderLegacyImpl implements TypeProvider {

 @Override
 public @Nullable Type lookupType(String typeName) {
 return lookupCelType(typeName).map(CelTypes::celTypeToType).orElse(null);
 return lookupCelType(typeName).map(CelProtoTypes::celTypeToType).orElse(null);
 }

 @Override
Expand All@@ -65,13 +65,13 @@ public Optional<CelType> lookupCelType(String typeName) {

 return structType
 .findField(fieldName)
 .map(f -> FieldType.of(CelTypes.celTypeToType(f.type())))
 .map(f -> FieldType.of(CelProtoTypes.celTypeToType(f.type())))
 .orElse(null);
 }

 @Override
 public @Nullable FieldType lookupFieldType(Type type, String fieldName) {
 return lookupFieldType(CelTypes.typeToCelType(type), fieldName);
 return lookupFieldType(CelProtoTypes.typeToCelType(type), fieldName);
 }

 @Override
Expand DownExpand Up@@ -114,7 +114,8 @@ public Optional<CelType> lookupCelType(String typeName) {
 .map(
 et ->
 ExtensionFieldType.of(
 CelTypes.celTypeToType(et.type()), CelTypes.celTypeToType(et.messageType())))
 CelProtoTypes.celTypeToType(et.type()),
 CelProtoTypes.celTypeToType(et.messageType())))
 .orElse(null);
 }
}

26 changes: 14 additions & 12 deletions
checker/src/main/java/dev/cel/checker/Types.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@
import com.google.protobuf.NullValue;
import dev.cel.common.annotations.Internal;
import dev.cel.common.types.CelKind;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
Expand DownExpand Up@@ -177,7 +177,7 @@ public static Type createWrapper(Type type) {
 */
 @Deprecated
 public static boolean isDynOrError(Type type) {
 return isDynOrError(CelTypes.typeToCelType(type));
 return isDynOrError(CelProtoTypes.typeToCelType(type));
 }

 /** Tests whether the type has error or dyn kind. Both have the property to match any type. */
Expand DownExpand Up@@ -238,18 +238,18 @@ public static CelType mostGeneral(CelType type1, CelType type2) {
 subs.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.typeToCelType(k.getKey()),
 v -> CelTypes.typeToCelType(v.getValue()),
 k -> CelProtoTypes.typeToCelType(k.getKey()),
 v -> CelProtoTypes.typeToCelType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));

 if (internalIsAssignable(
 subsCopy, CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2))) {
 subsCopy, CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2))) {
 return subsCopy.entrySet().stream()
 .collect(
 Collectors.toMap(
 k -> CelTypes.celTypeToType(k.getKey()),
 v -> CelTypes.celTypeToType(v.getValue()),
 k -> CelProtoTypes.celTypeToType(k.getKey()),
 v -> CelProtoTypes.celTypeToType(v.getValue()),
 (prev, next) -> next,
 HashMap::new));
 }
Expand DownExpand Up@@ -384,7 +384,8 @@ private static boolean isAssignableFromNull(CelType targetType) {
 */
 @Deprecated
 public static boolean isEqualOrLessSpecific(Type type1, Type type2) {
 return isEqualOrLessSpecific(CelTypes.typeToCelType(type1), CelTypes.typeToCelType(type2));
 return isEqualOrLessSpecific(
 CelProtoTypes.typeToCelType(type1), CelProtoTypes.typeToCelType(type2));
 }

 /**
Expand DownExpand Up@@ -426,7 +427,7 @@ public static boolean isEqualOrLessSpecific(CelType type1, CelType type2) {
 TypeType typeType2 = (TypeType) type2;
 return isEqualOrLessSpecific(typeType1.type(), typeType2.type());

// Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 // Message, primitive, well-known, and wrapper type names must be equal to be equivalent.
 default:
 return type1.equals(type2);
 }
Expand DownExpand Up@@ -493,10 +494,11 @@ private static boolean notReferencedIn(
 public static Type substitute(Map<Type, Type> subs, Type type, boolean typeParamToDyn) {
 ImmutableMap.Builder<CelType, CelType> subsMap = ImmutableMap.builder();
 for (Map.Entry<Type, Type> sub : subs.entrySet()) {
 subsMap.put(CelTypes.typeToCelType(sub.getKey()), CelTypes.typeToCelType(sub.getValue()));
 subsMap.put(
 CelProtoTypes.typeToCelType(sub.getKey()), CelProtoTypes.typeToCelType(sub.getValue()));
 }
 return CelTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelTypes.typeToCelType(type), typeParamToDyn));
 return CelProtoTypes.celTypeToType(
 substitute(subsMap.buildOrThrow(), CelProtoTypes.typeToCelType(type), typeParamToDyn));
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
checker/src/test/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@ java_library(
 "//common/resources/testdata/proto3:standalone_global_enum_java_proto",
 "//common/types",
 "//common/types:cel_proto_types",
 "//common/types:cel_types",
 "//common/types:json",
 "//common/types:message_type_provider",
 "//common/types:type_providers",
Expand Down

7 changes: 4 additions & 3 deletions
checker/src/test/java/dev/cel/checker/CelOverloadDeclTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
import dev.cel.expr.Decl.FunctionDecl.Overload;
import com.google.common.collect.ImmutableList;
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.CelTypes;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.TypeParamType;
import org.junit.Test;
Expand DownExpand Up@@ -81,9 +81,10 @@ public void toProtoOverload_withTypeParams() {
 Overload protoOverload = CelOverloadDecl.celOverloadToOverload(celOverloadDecl);
 assertThat(protoOverload.getOverloadId()).isEqualTo("overloadId");
 assertThat(protoOverload.getIsInstanceFunction()).isTrue();
 assertThat(protoOverload.getResultType()).isEqualTo(CelTypes.createTypeParam("A"));
 assertThat(protoOverload.getResultType()).isEqualTo(CelProtoTypes.createTypeParam("A"));
 assertThat(protoOverload.getParamsList())
 .containsExactly(CelTypes.STRING, CelTypes.DOUBLE, CelTypes.createTypeParam("B"));
 .containsExactly(
 CelProtoTypes.STRING, CelProtoTypes.DOUBLE, CelProtoTypes.createTypeParam("B"));
 assertThat(protoOverload.getTypeParamsList()).containsExactly("A", "B");
 }

Expand Down
Loading