Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Remove deprecated CelAbstractSyntaxTree#getProtoResultType #533

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 13, 2024
Merged

Remove deprecated CelAbstractSyntaxTree#getProtoResultType #533

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: 0 additions & 2 deletions 2 common/src/main/java/dev/cel/common/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ java_library(
"//common/internal",
"//common/internal:file_descriptor_converter",
"//common/types",
"//common/types:cel_proto_types",
"//common/types:cel_types",
"//common/types:type_providers",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
Expand Down
14 changes: 0 additions & 14 deletions 14 common/src/main/java/dev/cel/common/CelAbstractSyntaxTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

package dev.cel.common;

import dev.cel.expr.Type;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All @@ -23,7 +22,6 @@
import dev.cel.common.ast.CelConstant;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelReference;
import dev.cel.common.types.CelProtoTypes;
import dev.cel.common.types.CelType;
import dev.cel.common.types.SimpleType;
import java.util.Map;
Expand Down Expand Up @@ -94,18 +92,6 @@ public CelType getResultType() {
return isChecked() ? getType(getExpr().id()).get() : SimpleType.DYN;
}

/**
* For a type checked abstract syntax tree the resulting type is returned in proto format
* described in checked.proto. Otherwise, the dynamic type is returned.
*
* @deprecated Use {@link #getResultType} instead. Convert the resulting {@link CelType} into
* canonical CEL expr proto format via {@link CelProtoTypes#celTypeToType} if necessary.
*/
@Deprecated
public Type getProtoResultType() {
return CelProtoTypes.celTypeToType(getResultType());
}

/**
* Returns the {@link CelSource} that was used during construction of the abstract syntax tree.
*/
Expand Down
3 changes: 0 additions & 3 deletions 3 common/src/test/java/dev/cel/common/CelAbstractSyntaxTreeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
package dev.cel.common;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat;

import dev.cel.expr.CheckedExpr;
import dev.cel.expr.Constant;
Expand Down Expand Up @@ -95,15 +94,13 @@ public final class CelAbstractSyntaxTreeTest {
public void getResultType_isDynWhenParsedExpr() {
CelAbstractSyntaxTree ast = PARSED_AST;

assertThat(ast.getProtoResultType()).isEqualTo(CelProtoTypes.DYN);
assertThat(ast.getResultType()).isEqualTo(SimpleType.DYN);
}

@Test
public void getResultType_isStaticWhenCheckedExpr() {
CelAbstractSyntaxTree ast = CHECKED_AST;

assertThat(ast.getProtoResultType()).isEqualTo(CelProtoTypes.BOOL);
assertThat(ast.getResultType()).isEqualTo(SimpleType.BOOL);
}

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.