Skip to content

Commit 15c543c

Browse files
l46kokcopybara-github
l46kok
authored and
copybara-github
committed
Internal Changes
PiperOrigin-RevId: 711534576
1 parent f1efc00 commit 15c543c

File tree

59 files changed

+3457
-276
lines changed

Some content is hidden

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

59 files changed

+3457
-276
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.22.1"
246246

247247
http_archive(
248248
name = "cel_spec",
249-
sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
249+
sha256 = "1f1ad32bce5d31cf82e9c8f40685b1902de3ab07c78403601e7a43c3fb4de9a6",
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: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ java_library(
7272
exports = ["//common/src/main/java/dev/cel/common/internal:well_known_proto"],
7373
)
7474

75+
cel_android_library(
76+
name = "well_known_proto_android",
77+
exports = ["//common/src/main/java/dev/cel/common/internal:well_known_proto_android"],
78+
)
79+
7580
java_library(
7681
name = "proto_message_factory",
7782
exports = ["//common/src/main/java/dev/cel/common/internal:proto_message_factory"],
@@ -87,6 +92,26 @@ java_library(
8792
exports = ["//common/src/main/java/dev/cel/common/internal:cel_descriptor_pools"],
8893
)
8994

95+
java_library(
96+
name = "cel_lite_descriptor_pool",
97+
exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
98+
)
99+
100+
cel_android_library(
101+
name = "cel_lite_descriptor_pool_android",
102+
exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool_android"],
103+
)
104+
105+
java_library(
106+
name = "default_lite_descriptor_pool",
107+
exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
108+
)
109+
110+
cel_android_library(
111+
name = "default_lite_descriptor_pool_android",
112+
exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool_android"],
113+
)
114+
90115
java_library(
91116
name = "safe_string_formatter",
92117
# used_by_android
@@ -95,6 +120,16 @@ java_library(
95120

96121
cel_android_library(
97122
name = "internal_android",
98-
visibility = ["//:android_allow_list"],
99123
exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
100124
)
125+
126+
java_library(
127+
name = "proto_java_qualified_names",
128+
exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
129+
)
130+
131+
java_library(
132+
name = "reflection_util",
133+
# used_by_android
134+
exports = ["//common/src/main/java/dev/cel/common/internal:reflection_util"],
135+
)

‎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: 77 additions & 2 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

@@ -249,6 +253,19 @@ java_library(
249253
],
250254
)
251255

256+
cel_android_library(
257+
name = "well_known_proto_android",
258+
srcs = ["WellKnownProto.java"],
259+
tags = [
260+
],
261+
deps = [
262+
"//common/annotations",
263+
"@maven//:org_jspecify_jspecify",
264+
"@maven_android//:com_google_guava_guava",
265+
"@maven_android//:com_google_protobuf_protobuf_javalite",
266+
],
267+
)
268+
252269
java_library(
253270
name = "default_message_factory",
254271
srcs = ["DefaultMessageFactory.java"],
@@ -291,6 +308,62 @@ java_library(
291308
],
292309
)
293310

311+
java_library(
312+
name = "cel_lite_descriptor_pool",
313+
srcs = ["CelLiteDescriptorPool.java"],
314+
tags = [
315+
],
316+
deps = [
317+
"//protobuf:cel_lite_descriptor",
318+
"@maven//:com_google_errorprone_error_prone_annotations",
319+
"@maven_android//:com_google_protobuf_protobuf_javalite",
320+
],
321+
)
322+
323+
cel_android_library(
324+
name = "cel_lite_descriptor_pool_android",
325+
srcs = ["CelLiteDescriptorPool.java"],
326+
tags = [
327+
],
328+
deps = [
329+
"//protobuf:cel_lite_descriptor",
330+
"@maven//:com_google_errorprone_error_prone_annotations",
331+
"@maven_android//:com_google_protobuf_protobuf_javalite",
332+
],
333+
)
334+
335+
java_library(
336+
name = "default_lite_descriptor_pool",
337+
srcs = ["DefaultLiteDescriptorPool.java"],
338+
tags = [
339+
],
340+
deps = [
341+
":cel_lite_descriptor_pool",
342+
"//common/annotations",
343+
"//common/internal:well_known_proto",
344+
"//protobuf:cel_lite_descriptor",
345+
"@maven//:com_google_errorprone_error_prone_annotations",
346+
"@maven//:com_google_guava_guava",
347+
"@maven_android//:com_google_protobuf_protobuf_javalite",
348+
],
349+
)
350+
351+
cel_android_library(
352+
name = "default_lite_descriptor_pool_android",
353+
srcs = ["DefaultLiteDescriptorPool.java"],
354+
tags = [
355+
],
356+
deps = [
357+
":cel_lite_descriptor_pool_android",
358+
"//common/annotations",
359+
"//common/internal:well_known_proto_android",
360+
"//protobuf:cel_lite_descriptor",
361+
"@maven//:com_google_errorprone_error_prone_annotations",
362+
"@maven_android//:com_google_guava_guava",
363+
"@maven_android//:com_google_protobuf_protobuf_javalite",
364+
],
365+
)
366+
294367
java_library(
295368
name = "safe_string_formatter",
296369
srcs = ["SafeStringFormatter.java"],
@@ -309,6 +382,7 @@ java_library(
309382
tags = [
310383
],
311384
deps = [
385+
"//common/annotations",
312386
"@maven//:com_google_guava_guava",
313387
"@maven//:com_google_protobuf_protobuf_java",
314388
],
@@ -317,6 +391,7 @@ java_library(
317391
java_library(
318392
name = "reflection_util",
319393
srcs = ["ReflectionUtil.java"],
394+
# used_by_android
320395
deps = [
321396
"//common/annotations",
322397
],

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2025 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
package dev.cel.common.internal;
16+
17+
import com.google.errorprone.annotations.Immutable;
18+
import com.google.protobuf.MessageLite;
19+
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
20+
import java.util.Optional;
21+
22+
/** TODO: Replace with CelLiteDescriptor */
23+
@Immutable
24+
public interface CelLiteDescriptorPool {
25+
Optional<MessageLiteDescriptor> findDescriptorByTypeName(String protoTypeName);
26+
27+
Optional<MessageLiteDescriptor> findDescriptor(MessageLite msg);
28+
}

0 commit comments

Comments
 (0)