Skip to content

Commit e8d25be

Browse files
l46kokcopybara-github
l46kok
authored and
copybara-github
committed
Decouple ProtoCelValueConverter into BaseProtoCelValueConverter
PiperOrigin-RevId: 747642050
1 parent 5b4b234 commit e8d25be

File tree

50 files changed

+1962
-286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1962
-286
lines changed

‎WORKSPACE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,11 @@ http_archive(
242242
)
243243

244244
# cel-spec api/expr canonical protos
245-
CEL_SPEC_VERSION = "0.20.0"
245+
CEL_SPEC_VERSION = "0.23.1"
246246

247247
http_archive(
248248
name = "cel_spec",
249-
sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
249+
sha256 = "8bafa44e610eb281df8b1268a42b5e2d7b76d60d0b3c817835cfcfd14cc2bc9c",
250250
strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
251251
urls = [
252252
"https://github.com/google/cel-spec/archive/" +

‎bundle/src/test/java/dev/cel/bundle/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ java_library(
5959
"@maven//:com_google_truth_extensions_truth_proto_extension",
6060
"@maven//:junit_junit",
6161
"@maven//:org_jspecify_jspecify",
62+
"@maven_android//:com_google_protobuf_protobuf_javalite",
6263
],
6364
)
6465

‎codelab/src/main/codelab/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@ java_library(
3939
"@maven//:com_google_guava_guava", # unuseddeps: keep
4040
"@maven//:com_google_protobuf_protobuf_java", # unuseddeps: keep
4141
"@maven//:com_google_protobuf_protobuf_java_util", # unuseddeps: keep
42+
"@maven_android//:com_google_protobuf_protobuf_javalite", # unuseddeps: keep
4243
],
4344
)

‎codelab/src/main/codelab/solutions/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ java_library(
4040
"@maven//:com_google_guava_guava",
4141
"@maven//:com_google_protobuf_protobuf_java",
4242
"@maven//:com_google_protobuf_protobuf_java_util",
43+
"@maven_android//:com_google_protobuf_protobuf_javalite",
4344
],
4445
)

‎common/internal/BUILD.bazel‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,8 @@ cel_android_library(
9797
name = "internal_android",
9898
exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
9999
)
100+
101+
java_library(
102+
name = "proto_java_qualified_names",
103+
exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
104+
)

‎common/src/main/java/dev/cel/common/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ java_library(
208208
"@maven//:com_google_guava_guava",
209209
"@maven//:com_google_protobuf_protobuf_java",
210210
"@maven//:com_google_protobuf_protobuf_java_util",
211+
"@maven_android//:com_google_protobuf_protobuf_javalite",
211212
],
212213
)
213214

‎common/src/main/java/dev/cel/common/ast/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ java_library(
5353
"@maven//:com_google_guava_guava",
5454
"@maven//:com_google_protobuf_protobuf_java",
5555
"@maven//:org_jspecify_jspecify",
56+
"@maven_android//:com_google_protobuf_protobuf_javalite",
5657
],
5758
)
5859

@@ -114,7 +115,7 @@ java_library(
114115
":ast",
115116
"//common/annotations",
116117
"@maven//:com_google_guava_guava",
117-
"@maven//:com_google_protobuf_protobuf_java",
118+
"@maven_android//:com_google_protobuf_protobuf_javalite",
118119
],
119120
)
120121

@@ -138,7 +139,6 @@ cel_android_library(
138139
"//:auto_value",
139140
"//common/annotations",
140141
"@maven//:com_google_errorprone_error_prone_annotations",
141-
"@maven//:com_google_protobuf_protobuf_java",
142142
"@maven//:org_jspecify_jspecify",
143143
"@maven_android//:com_google_guava_guava",
144144
"@maven_android//:com_google_protobuf_protobuf_javalite",

‎common/src/main/java/dev/cel/common/internal/BUILD.bazel‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ java_library(
4747
"@maven//:com_google_guava_guava",
4848
"@maven//:com_google_protobuf_protobuf_java",
4949
"@maven//:org_antlr_antlr4_runtime",
50+
"@maven_android//:com_google_protobuf_protobuf_javalite",
5051
],
5152
)
5253

@@ -61,7 +62,6 @@ cel_android_library(
6162
"//common/ast:ast_android",
6263
"@maven//:com_google_errorprone_error_prone_annotations",
6364
"@maven//:com_google_guava_guava",
64-
"@maven//:com_google_protobuf_protobuf_java",
6565
"@maven//:org_antlr_antlr4_runtime",
6666
"@maven_android//:com_google_guava_guava",
6767
"@maven_android//:com_google_protobuf_protobuf_javalite",
@@ -140,6 +140,7 @@ java_library(
140140
":proto_java_qualified_names",
141141
"//common/annotations",
142142
"@maven//:com_google_protobuf_protobuf_java",
143+
"@maven_android//:com_google_protobuf_protobuf_javalite",
143144
],
144145
)
145146

@@ -152,7 +153,7 @@ java_library(
152153
":reflection_util",
153154
"//common/annotations",
154155
"@maven//:com_google_guava_guava",
155-
"@maven//:com_google_protobuf_protobuf_java",
156+
"@maven_android//:com_google_protobuf_protobuf_javalite",
156157
],
157158
)
158159

@@ -174,6 +175,7 @@ java_library(
174175
"@maven//:com_google_errorprone_error_prone_annotations",
175176
"@maven//:com_google_guava_guava",
176177
"@maven//:com_google_protobuf_protobuf_java",
178+
"@maven_android//:com_google_protobuf_protobuf_javalite",
177179
],
178180
)
179181

@@ -191,6 +193,7 @@ java_library(
191193
"@maven//:com_google_errorprone_error_prone_annotations",
192194
"@maven//:com_google_guava_guava",
193195
"@maven//:com_google_protobuf_protobuf_java",
196+
"@maven_android//:com_google_protobuf_protobuf_javalite",
194197
],
195198
)
196199

@@ -207,6 +210,7 @@ java_library(
207210
"@maven//:com_google_guava_guava",
208211
"@maven//:com_google_protobuf_protobuf_java",
209212
"@maven//:org_jspecify_jspecify",
213+
"@maven_android//:com_google_protobuf_protobuf_javalite",
210214
],
211215
)
212216

@@ -245,7 +249,6 @@ java_library(
245249
"//common/annotations",
246250
"@maven//:com_google_guava_guava",
247251
"@maven//:com_google_protobuf_protobuf_java",
248-
"@maven//:org_jspecify_jspecify",
249252
],
250253
)
251254

@@ -309,6 +312,7 @@ java_library(
309312
tags = [
310313
],
311314
deps = [
315+
"//common/annotations",
312316
"@maven//:com_google_guava_guava",
313317
"@maven//:com_google_protobuf_protobuf_java",
314318
],

‎common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,16 @@
2424
import com.google.protobuf.Descriptors.FileDescriptor;
2525
import com.google.protobuf.Descriptors.GenericDescriptor;
2626
import com.google.protobuf.Descriptors.ServiceDescriptor;
27+
import dev.cel.common.annotations.Internal;
2728
import java.util.ArrayDeque;
2829

29-
/** Helper class for constructing a fully qualified Java class name from a protobuf descriptor. */
30-
final class ProtoJavaQualifiedNames {
30+
/**
31+
* Helper class for constructing a fully qualified Java class name from a protobuf descriptor. * *
32+
*
33+
* <p>CEL Library Internals. Do Not Use.
34+
*/
35+
@Internal
36+
public final class ProtoJavaQualifiedNames {
3137
// Controls how many times we should recursively inspect a nested message for building fully
3238
// qualified java class name before aborting.
3339
private static final int SAFE_RECURSE_LIMIT = 50;

‎common/src/main/java/dev/cel/common/values/BUILD.bazel‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ java_library(
7676
":cel_value",
7777
"//:auto_value",
7878
"//common:error_codes",
79-
"//common:options",
8079
"//common:runtime_exception",
8180
"//common/annotations",
8281
"//common/types",
@@ -94,7 +93,25 @@ java_library(
9493
],
9594
deps = [
9695
"@maven//:com_google_errorprone_error_prone_annotations",
96+
],
97+
)
98+
99+
java_library(
100+
name = "base_proto_cel_value_converter",
101+
srcs = ["BaseProtoCelValueConverter.java"],
102+
tags = [
103+
],
104+
deps = [
105+
":cel_byte_string",
106+
":cel_value",
107+
":values",
108+
"//common/annotations",
109+
"//common/internal:well_known_proto",
110+
"@maven//:com_google_errorprone_error_prone_annotations",
97111
"@maven//:com_google_guava_guava",
112+
"@maven//:com_google_protobuf_protobuf_java",
113+
"@maven//:com_google_protobuf_protobuf_java_util",
114+
"@maven_android//:com_google_protobuf_protobuf_javalite",
98115
],
99116
)
100117

@@ -104,23 +121,22 @@ java_library(
104121
tags = [
105122
],
106123
deps = [
124+
":base_proto_cel_value_converter",
107125
":cel_value",
108126
":values",
109127
"//:auto_value",
110-
"//common:options",
111128
"//common/annotations",
112129
"//common/internal:cel_descriptor_pools",
113130
"//common/internal:dynamic_proto",
114131
"//common/internal:well_known_proto",
115132
"//common/types",
116133
"//common/types:cel_types",
117134
"//common/types:type_providers",
118-
"//common/values:cel_byte_string",
119135
"@maven//:com_google_errorprone_error_prone_annotations",
120136
"@maven//:com_google_guava_guava",
121137
"@maven//:com_google_protobuf_protobuf_java",
122-
"@maven//:com_google_protobuf_protobuf_java_util",
123138
"@maven//:org_jspecify_jspecify",
139+
"@maven_android//:com_google_protobuf_protobuf_javalite",
124140
],
125141
)
126142

0 commit comments

Comments
 (0)