Skip to content

Commit a42244c

Browse files
l46kokcopybara-github
authored andcommitted
Add protolite tests for Android
PiperOrigin-RevId: 749966327
1 parent 2062875 commit a42244c

37 files changed

+2785
-240
lines changed

common/internal/BUILD.bazel

Lines changed: 25 additions & 0 deletions
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

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

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,18 @@ java_library(
252252
],
253253
)
254254

255+
cel_android_library(
256+
name = "well_known_proto_android",
257+
srcs = ["WellKnownProto.java"],
258+
tags = [
259+
],
260+
deps = [
261+
"//common/annotations",
262+
"@maven_android//:com_google_guava_guava",
263+
"@maven_android//:com_google_protobuf_protobuf_javalite",
264+
],
265+
)
266+
255267
java_library(
256268
name = "default_message_factory",
257269
srcs = ["DefaultMessageFactory.java"],
@@ -294,6 +306,61 @@ java_library(
294306
],
295307
)
296308

309+
java_library(
310+
name = "cel_lite_descriptor_pool",
311+
srcs = ["CelLiteDescriptorPool.java"],
312+
tags = [
313+
],
314+
deps = [
315+
"//protobuf:cel_lite_descriptor",
316+
"@maven//:com_google_errorprone_error_prone_annotations",
317+
],
318+
)
319+
320+
cel_android_library(
321+
name = "cel_lite_descriptor_pool_android",
322+
srcs = ["CelLiteDescriptorPool.java"],
323+
tags = [
324+
],
325+
deps = [
326+
"//protobuf:cel_lite_descriptor",
327+
"@maven//:com_google_errorprone_error_prone_annotations",
328+
],
329+
)
330+
331+
java_library(
332+
name = "default_lite_descriptor_pool",
333+
srcs = ["DefaultLiteDescriptorPool.java"],
334+
tags = [
335+
],
336+
deps = [
337+
":cel_lite_descriptor_pool",
338+
":well_known_proto",
339+
"//common/annotations",
340+
"//protobuf:cel_lite_descriptor",
341+
"@maven//:com_google_errorprone_error_prone_annotations",
342+
"@maven//:com_google_guava_guava",
343+
"@maven//:com_google_protobuf_protobuf_java",
344+
"@maven_android//:com_google_protobuf_protobuf_javalite",
345+
],
346+
)
347+
348+
cel_android_library(
349+
name = "default_lite_descriptor_pool_android",
350+
srcs = ["DefaultLiteDescriptorPool.java"],
351+
tags = [
352+
],
353+
deps = [
354+
":cel_lite_descriptor_pool_android",
355+
":well_known_proto_android",
356+
"//common/annotations",
357+
"//protobuf:cel_lite_descriptor",
358+
"@maven//:com_google_errorprone_error_prone_annotations",
359+
"@maven_android//:com_google_guava_guava",
360+
"@maven_android//:com_google_protobuf_protobuf_javalite",
361+
],
362+
)
363+
297364
java_library(
298365
name = "safe_string_formatter",
299366
srcs = ["SafeStringFormatter.java"],
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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 dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
19+
import java.util.Optional;
20+
21+
/**
22+
* CelLiteDescriptorPool allows lookup of {@link MessageLiteDescriptor} by its fully qualified name.
23+
*/
24+
@Immutable
25+
public interface CelLiteDescriptorPool {
26+
Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName);
27+
28+
MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName);
29+
}

0 commit comments

Comments
 (0)