Skip to content

Bridge legacy TypeProvider into CelTypeProvider to decouple checker internals #1247

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

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

Bridge legacy TypeProvider into CelTypeProvider to decouple checker internals #1247

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
17 changes: 10 additions & 7 deletions checker/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = ["//:license"],
Expand Down Expand Up @@ -26,16 +27,13 @@ java_library(
exports = ["//checker/src/main/java/dev/cel/checker:type_provider_legacy"],
)

java_library(
name = "type_provider_legacy_impl",
visibility = ["//:internal"],
exports = ["//checker/src/main/java/dev/cel/checker:type_provider_legacy_impl"],
)

java_library(
name = "checker_legacy_environment",
deprecation = "See go/cel-java-migration-guide. Please use CEL-Java Fluent APIs //compiler instead",
exports = ["//checker/src/main/java/dev/cel/checker:checker_legacy_environment"],
exports = [
":type_provider_legacy",
"//checker/src/main/java/dev/cel/checker:checker_legacy_environment",
],
)

java_library(
Expand All @@ -53,3 +51,8 @@ java_library(
name = "standard_decl",
exports = ["//checker/src/main/java/dev/cel/checker:standard_decl"],
)

cel_android_library(
name = "standard_decl_android",
exports = ["//checker/src/main/java/dev/cel/checker:standard_decl_android"],
)
50 changes: 25 additions & 25 deletions checker/src/main/java/dev/cel/checker/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//:cel_android_rules.bzl", "cel_android_library")

package(
default_applicable_licenses = [
Expand All @@ -25,14 +26,12 @@ CHECKER_BUILDER_SOURCES = [

# keep sorted
CHECKER_LEGACY_ENV_SOURCES = [
"DescriptorTypeProvider.java",
"Env.java",
"ExprChecker.java",
"ExprVisitor.java",
"InferenceContext.java",
"LegacyTypeProviderBridge.java",
"TypeFormatter.java",
"TypeProvider.java",
"Types.java",
]

java_library(
Expand Down Expand Up @@ -69,7 +68,7 @@ java_library(
":checker_legacy_environment",
":proto_type_mask",
":standard_decl",
":type_provider_legacy_impl",
":type_provider_legacy",
"//common:cel_ast",
"//common:cel_descriptor_util",
"//common:cel_function_decl",
Expand Down Expand Up @@ -102,9 +101,9 @@ java_library(
tags = [
],
deps = [
":checker_legacy_environment",
":proto_type_mask",
":standard_decl",
":type_provider_legacy",
"//common:cel_ast",
"//common:cel_function_decl",
"//common:cel_validation_result",
Expand All @@ -131,31 +130,14 @@ java_library(
],
)

java_library(
name = "type_provider_legacy_impl",
srcs = ["TypeProviderLegacyImpl.java"],
tags = [
],
deps = [
":checker_legacy_environment",
"//common/annotations",
"//common/types",
"//common/types:cel_proto_types",
"//common/types:type_providers",
"@cel_spec//proto/cel/expr:checked_java_proto",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:org_jspecify_jspecify",
],
)

java_library(
name = "checker_legacy_environment",
srcs = CHECKER_LEGACY_ENV_SOURCES,
tags = [
],
deps = [
":standard_decl",
":type_provider_legacy",
"//:auto_value",
"//common:cel_ast",
"//common:cel_function_decl",
Expand All @@ -173,7 +155,6 @@ java_library(
"//common/ast:expr_converter",
"//common/ast:mutable_expr",
"//common/internal:errors",
"//common/internal:file_descriptor_converter",
"//common/types",
"//common/types:cel_proto_types",
"//common/types:cel_types",
Expand All @@ -183,7 +164,6 @@ java_library(
"@cel_spec//proto/cel/expr:syntax_java_proto",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
],
)
Expand Down Expand Up @@ -235,3 +215,23 @@ java_library(
"@maven//:com_google_guava_guava",
],
)

cel_android_library(
name = "standard_decl_android",
srcs = [
"CelStandardDeclarations.java",
],
tags = [
],
deps = [
"//common:cel_function_decl_android",
"//common:cel_overload_decl_android",
"//common:cel_var_decl_android",
"//common:operator_android",
"//common/types:cel_types_android",
"//common/types:type_providers_android",
"//common/types:types_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)
Loading
Loading