Skip to content

Commit 1da395e

Browse files
l46kokcopybara-github
l46kok
authored and
copybara-github
committed
Internal Changes
PiperOrigin-RevId: 834975953
1 parent 17ca921 commit 1da395e

File tree

97 files changed

+1806
-618
lines changed

Some content is hidden

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

97 files changed

+1806
-618
lines changed

‎bundle/src/main/java/dev/cel/bundle/CelBuilder.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ public interface CelBuilder {
197197
* provider will be used first before falling back to the built-in {@link
198198
* dev.cel.common.values.ProtoMessageValueProvider} for resolving protobuf messages.
199199
*
200-
* <p>Note that {@link CelOptions#enableCelValue()} must be enabled or this method will be a
201-
* no-op.
200+
* <p>Note that this option is only supported for planner-based runtime.
202201
*/
203202
@CanIgnoreReturnValue
204203
CelBuilder setValueProvider(CelValueProvider celValueProvider);

‎bundle/src/test/java/dev/cel/bundle/CelImplTest.java‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -556,24 +556,6 @@ public void program_withVars() throws Exception {
556556
assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
557557
}
558558

559-
@Test
560-
public void program_withCelValue() throws Exception {
561-
Cel cel =
562-
standardCelBuilderWithMacros()
563-
.setOptions(CelOptions.current().enableCelValue(true).build())
564-
.addDeclarations(
565-
Decl.newBuilder()
566-
.setName("variable")
567-
.setIdent(IdentDecl.newBuilder().setType(CelProtoTypes.STRING))
568-
.build())
569-
.setResultType(SimpleType.BOOL)
570-
.build();
571-
572-
CelRuntime.Program program = cel.createProgram(cel.compile("variable == 'hello'").getAst());
573-
574-
assertThat(program.eval(ImmutableMap.of("variable", "hello"))).isEqualTo(true);
575-
}
576-
577559
@Test
578560
public void program_withProtoVars() throws Exception {
579561
Cel cel =
@@ -1419,26 +1401,6 @@ public void programAdvanceEvaluation_nestedSelect() throws Exception {
14191401
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
14201402
}
14211403

1422-
@Test
1423-
public void programAdvanceEvaluation_nestedSelect_withCelValue() throws Exception {
1424-
Cel cel =
1425-
standardCelBuilderWithMacros()
1426-
.setOptions(
1427-
CelOptions.current().enableUnknownTracking(true).enableCelValue(true).build())
1428-
.addVar("com", MapType.create(SimpleType.STRING, SimpleType.DYN))
1429-
.addFunctionBindings()
1430-
.setResultType(SimpleType.BOOL)
1431-
.build();
1432-
CelRuntime.Program program = cel.createProgram(cel.compile("com.google.a || false").getAst());
1433-
1434-
assertThat(
1435-
program.advanceEvaluation(
1436-
UnknownContext.create(
1437-
fromMap(ImmutableMap.of()),
1438-
ImmutableList.of(CelAttributePattern.fromQualifiedIdentifier("com.google.a")))))
1439-
.isEqualTo(CelUnknownSet.create(CelAttribute.fromQualifiedIdentifier("com.google.a")));
1440-
}
1441-
14421404
@Test
14431405
public void programAdvanceEvaluation_argumentMergeErrorPriority() throws Exception {
14441406
Cel cel =

‎common/BUILD.bazel‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ java_library(
2222
exports = ["//common/src/main/java/dev/cel/common:container"],
2323
)
2424

25+
cel_android_library(
26+
name = "container_android",
27+
exports = ["//common/src/main/java/dev/cel/common:container_android"],
28+
)
29+
2530
java_library(
2631
name = "proto_ast",
2732
exports = ["//common/src/main/java/dev/cel/common:proto_ast"],
@@ -126,3 +131,8 @@ java_library(
126131
name = "operator",
127132
exports = ["//common/src/main/java/dev/cel/common:operator"],
128133
)
134+
135+
cel_android_library(
136+
name = "operator_android",
137+
exports = ["//common/src/main/java/dev/cel/common:operator_android"],
138+
)

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,30 @@ java_library(
353353
],
354354
)
355355

356+
cel_android_library(
357+
name = "container_android",
358+
srcs = ["CelContainer.java"],
359+
tags = [
360+
],
361+
deps = [
362+
"//:auto_value",
363+
"@maven//:com_google_errorprone_error_prone_annotations",
364+
"@maven_android//:com_google_guava_guava",
365+
],
366+
)
367+
356368
java_library(
357369
name = "operator",
358370
srcs = ["Operator.java"],
359371
tags = [
360372
],
361373
deps = ["@maven//:com_google_guava_guava"],
362374
)
375+
376+
cel_android_library(
377+
name = "operator_android",
378+
srcs = ["Operator.java"],
379+
tags = [
380+
],
381+
deps = ["@maven_android//:com_google_guava_guava"],
382+
)

‎common/src/main/java/dev/cel/common/CelOptions.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.google.auto.value.AutoValue;
1818
import com.google.errorprone.annotations.CheckReturnValue;
1919
import com.google.errorprone.annotations.Immutable;
20-
import dev.cel.common.annotations.Beta;
2120

2221
/**
2322
* Options to configure how the CEL parser, type-checker, and evaluator behave.
@@ -105,8 +104,6 @@ public enum ProtoUnsetFieldOptions {
105104

106105
public abstract boolean enableUnknownTracking();
107106

108-
public abstract boolean enableCelValue();
109-
110107
public abstract int comprehensionMaxIterations();
111108

112109
public abstract boolean evaluateCanonicalTypesToNativeValues();
@@ -162,7 +159,6 @@ public static Builder newBuilder() {
162159
.errorOnDuplicateMapKeys(false)
163160
.resolveTypeDependencies(true)
164161
.enableUnknownTracking(false)
165-
.enableCelValue(false)
166162
.comprehensionMaxIterations(-1)
167163
.unwrapWellKnownTypesOnFunctionDispatch(true)
168164
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT)
@@ -432,16 +428,6 @@ public abstract static class Builder {
432428
*/
433429
public abstract Builder enableUnknownTracking(boolean value);
434430

435-
/**
436-
* Enables the usage of {@code CelValue} for the runtime. It is a native value representation of
437-
* CEL that wraps Java native objects, and comes with extended capabilities, such as allowing
438-
* value constructs not understood by CEL (ex: POJOs).
439-
*
440-
* <p>Warning: This option is experimental.
441-
*/
442-
@Beta
443-
public abstract Builder enableCelValue(boolean value);
444-
445431
/**
446432
* Limit the total number of iterations permitted within comprehension loops.
447433
*

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,32 @@ java_library(
183183
],
184184
)
185185

186+
java_library(
187+
name = "message_lite_type_provider",
188+
srcs = [
189+
"ProtoMessageLiteTypeProvider.java",
190+
],
191+
tags = [
192+
],
193+
deps = [
194+
"//common/types",
195+
"//common/types:type_providers",
196+
"//protobuf:cel_lite_descriptor",
197+
"@maven//:com_google_guava_guava",
198+
],
199+
)
200+
201+
cel_android_library(
202+
name = "message_lite_type_provider_android",
203+
srcs = [
204+
"ProtoMessageLiteTypeProvider.java",
205+
],
206+
tags = [
207+
],
208+
deps = [
209+
],
210+
)
211+
186212
java_library(
187213
name = "default_type_provider",
188214
srcs = [
@@ -197,6 +223,20 @@ java_library(
197223
],
198224
)
199225

226+
cel_android_library(
227+
name = "default_type_provider_android",
228+
srcs = [
229+
"DefaultTypeProvider.java",
230+
],
231+
tags = [
232+
],
233+
deps = [
234+
"//common/types:type_providers_android",
235+
"//common/types:types_android",
236+
"@maven_android//:com_google_guava_guava",
237+
],
238+
)
239+
200240
cel_android_library(
201241
name = "cel_types_android",
202242
srcs = ["CelTypes.java"],

‎common/src/main/java/dev/cel/common/types/DefaultTypeProvider.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616

1717
import com.google.common.collect.ImmutableCollection;
1818
import com.google.common.collect.ImmutableMap;
19+
import com.google.errorprone.annotations.Immutable;
1920
import java.util.Optional;
2021

2122
/** {@code DefaultTypeProvider} is a registry of common CEL types. */
23+
@Immutable
2224
public class DefaultTypeProvider implements CelTypeProvider {
2325

2426
private static final DefaultTypeProvider INSTANCE = new DefaultTypeProvider();

‎common/src/main/java/dev/cel/common/types/ProtoMessageLiteTypeProvider.java‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
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.types;
16+
17+
import static com.google.common.collect.ImmutableMap.toImmutableMap;
18+
19+
import com.google.common.collect.ImmutableCollection;
20+
import com.google.common.collect.ImmutableMap;
21+
import com.google.common.collect.ImmutableSet;
22+
import dev.cel.protobuf.CelLiteDescriptor;
23+
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
24+
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
25+
import java.util.Map.Entry;
26+
import java.util.Optional;
27+
import java.util.Set;
28+
import java.util.function.Function;
29+
30+
/** TODO */
31+
public final class ProtoMessageLiteTypeProvider implements CelTypeProvider {
32+
private static final ImmutableMap<FieldLiteDescriptor.Type, CelType> PROTO_TYPE_TO_CEL_TYPE =
33+
ImmutableMap.<FieldLiteDescriptor.Type, CelType>builder()
34+
.put(FieldLiteDescriptor.Type.DOUBLE, SimpleType.DOUBLE)
35+
.put(FieldLiteDescriptor.Type.FLOAT, SimpleType.DOUBLE)
36+
.put(FieldLiteDescriptor.Type.INT64, SimpleType.INT)
37+
.put(FieldLiteDescriptor.Type.INT32, SimpleType.INT)
38+
.put(FieldLiteDescriptor.Type.SFIXED32, SimpleType.INT)
39+
.put(FieldLiteDescriptor.Type.SFIXED64, SimpleType.INT)
40+
.put(FieldLiteDescriptor.Type.SINT32, SimpleType.INT)
41+
.put(FieldLiteDescriptor.Type.SINT64, SimpleType.INT)
42+
.put(FieldLiteDescriptor.Type.BOOL, SimpleType.BOOL)
43+
.put(FieldLiteDescriptor.Type.STRING, SimpleType.STRING)
44+
.put(FieldLiteDescriptor.Type.BYTES, SimpleType.BYTES)
45+
.put(FieldLiteDescriptor.Type.FIXED32, SimpleType.UINT)
46+
.put(FieldLiteDescriptor.Type.FIXED64, SimpleType.UINT)
47+
.put(FieldLiteDescriptor.Type.UINT32, SimpleType.UINT)
48+
.put(FieldLiteDescriptor.Type.UINT64, SimpleType.UINT)
49+
.buildOrThrow();
50+
51+
private final ImmutableMap<String, CelType> allTypes;
52+
53+
@Override
54+
public ImmutableCollection<CelType> types() {
55+
return allTypes.values();
56+
}
57+
58+
@Override
59+
public Optional<CelType> findType(String typeName) {
60+
return Optional.empty();
61+
}
62+
63+
public static ProtoMessageLiteTypeProvider newInstance(CelLiteDescriptor... celLiteDescriptors) {
64+
return newInstance(ImmutableSet.copyOf(celLiteDescriptors));
65+
}
66+
67+
public static ProtoMessageLiteTypeProvider newInstance(
68+
Set<CelLiteDescriptor> celLiteDescriptors) {
69+
return new ProtoMessageLiteTypeProvider(celLiteDescriptors);
70+
}
71+
72+
private ProtoMessageLiteTypeProvider(Set<CelLiteDescriptor> celLiteDescriptors) {
73+
ImmutableMap.Builder<String, CelType> builder = ImmutableMap.builder();
74+
for (CelLiteDescriptor descriptor : celLiteDescriptors) {
75+
for (Entry<String, MessageLiteDescriptor> entry :
76+
descriptor.getProtoTypeNamesToDescriptors().entrySet()) {
77+
builder.put(entry.getKey(), createMessageType(entry.getValue()));
78+
}
79+
}
80+
81+
this.allTypes = builder.buildOrThrow();
82+
}
83+
84+
private static ProtoMessageType createMessageType(MessageLiteDescriptor messageLiteDescriptor) {
85+
ImmutableMap<String, FieldLiteDescriptor> fields =
86+
messageLiteDescriptor.getFieldDescriptors().stream()
87+
.collect(toImmutableMap(FieldLiteDescriptor::getFieldName, Function.identity()));
88+
89+
return new ProtoMessageType(
90+
messageLiteDescriptor.getProtoTypeName(),
91+
fields.keySet(),
92+
new FieldResolver(fields),
93+
extensionFieldName -> {
94+
throw new UnsupportedOperationException(
95+
"Proto extensions are not yet supported in MessageLite.");
96+
});
97+
}
98+
99+
private static class FieldResolver implements StructType.FieldResolver {
100+
private final ImmutableMap<String, FieldLiteDescriptor> fields;
101+
102+
@Override
103+
public Optional<CelType> findField(String fieldName) {
104+
FieldLiteDescriptor fieldDescriptor = fields.get(fieldName);
105+
if (fieldDescriptor == null) {
106+
return Optional.empty();
107+
}
108+
109+
FieldLiteDescriptor.Type fieldType = fieldDescriptor.getProtoFieldType();
110+
switch (fieldDescriptor.getProtoFieldType()) {
111+
default:
112+
return Optional.of(PROTO_TYPE_TO_CEL_TYPE.get(fieldType));
113+
}
114+
}
115+
116+
private FieldResolver(ImmutableMap<String, FieldLiteDescriptor> fields) {
117+
this.fields = fields;
118+
}
119+
}
120+
}

0 commit comments

Comments
 (0)