Add CelLiteDescriptorPool and DefaultLiteDescriptorPool#664

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

Merged
copybara-service merged 1 commit into from
Apr 24, 2025
Merged

Add CelLiteDescriptorPool and DefaultLiteDescriptorPool #664

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
5 changes: 5 additions & 0 deletions common/internal/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ java_library(
exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions"],
)

java_library(
name = "default_lite_descriptor_pool",
exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
)

cel_android_library(
name = "comparison_functions_android",
exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions_android"],
Expand Down
28 changes: 28 additions & 0 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -294,6 +294,34 @@ java_library(
],
)

java_library(
name = "cel_lite_descriptor_pool",
srcs = ["CelLiteDescriptorPool.java"],
tags = [
],
deps = [
"//protobuf:cel_lite_descriptor",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "default_lite_descriptor_pool",
srcs = ["DefaultLiteDescriptorPool.java"],
tags = [
],
deps = [
":cel_lite_descriptor_pool",
"//common/annotations",
"//common/internal:well_known_proto",
"//protobuf:cel_lite_descriptor",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

java_library(
name = "safe_string_formatter",
srcs = ["SafeStringFormatter.java"],
Expand Down
29 changes: 29 additions & 0 deletions common/src/main/java/dev/cel/common/internal/CelLiteDescriptorPool.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.errorprone.annotations.Immutable;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Optional;

/**
* CelLiteDescriptorPool allows lookup of {@link MessageLiteDescriptor} by its fully qualified name.
*/
@Immutable
public interface CelLiteDescriptorPool {
Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName);

MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName);
}
302 changes: 302 additions & 0 deletions common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,302 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.MessageLite;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.function.Supplier;

/** Descriptor pool for {@link CelLiteDescriptor}s. */
@Immutable
@Internal
public final class DefaultLiteDescriptorPool implements CelLiteDescriptorPool {
private final ImmutableMap<String, MessageLiteDescriptor> protoFqnToMessageInfo;

public static DefaultLiteDescriptorPool newInstance(ImmutableSet<CelLiteDescriptor> descriptors) {
return new DefaultLiteDescriptorPool(descriptors);
}

@Override
public Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName) {
return Optional.ofNullable(protoFqnToMessageInfo.get(protoTypeName));
}

@Override
public MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName) {
return findDescriptor(protoTypeName)
.orElseThrow(
() -> new NoSuchElementException("Could not find a descriptor for: " + protoTypeName));
}

private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProto) {
ImmutableList.Builder<FieldLiteDescriptor> fieldDescriptors = ImmutableList.builder();
Supplier<MessageLite.Builder> messageBuilder = null;
switch (wellKnownProto) {
case ANY_VALUE:
messageBuilder = Any::newBuilder;
fieldDescriptors
.add(
newPrimitiveFieldDescriptor(
1,
"type_url",
FieldLiteDescriptor.JavaType.STRING,
FieldLiteDescriptor.Type.STRING))
.add(
newPrimitiveFieldDescriptor(
2,
"value",
FieldLiteDescriptor.JavaType.BYTE_STRING,
FieldLiteDescriptor.Type.BYTES));
break;
case FIELD_MASK:
messageBuilder = FieldMask::newBuilder;
fieldDescriptors.add(
new FieldLiteDescriptor(
/* fieldNumber= */ 1,
/* fieldName= */ "paths",
/* javaType= */ FieldLiteDescriptor.JavaType.STRING,
/* celFieldValueType= */ CelFieldValueType.LIST,
/* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
/* isPacked= */ false,
/* fieldProtoTypeName= */ ""));
break;
case BOOL_VALUE:
messageBuilder = BoolValue::newBuilder;
fieldDescriptors.add(
newPrimitiveFieldDescriptor(
1, "value", FieldLiteDescriptor.JavaType.BOOLEAN, FieldLiteDescriptor.Type.BOOL));
break;
case BYTES_VALUE:
messageBuilder = BytesValue::newBuilder;
fieldDescriptors.add(
newPrimitiveFieldDescriptor(
1,
"value",
FieldLiteDescriptor.JavaType.BYTE_STRING,
FieldLiteDescriptor.Type.BYTES));
break;
case DOUBLE_VALUE:
messageBuilder = DoubleValue::newBuilder;
fieldDescriptors.add(
newPrimitiveFieldDescriptor(
1, "value", FieldLiteDescriptor.JavaType.DOUBLE, FieldLiteDescriptor.Type.DOUBLE));
break;
case FLOAT_VALUE:
messageBuilder = FloatValue::newBuilder;
fieldDescriptors.add(
newPrimitiveFieldDescriptor(
1, "value", FieldLiteDescriptor.JavaType.FLOAT, FieldLiteDescriptor.Type.FLOAT));
break;
case INT32_VALUE:
messageBuilder = Int32Value::newBuilder;
fieldDescriptors.add(
newPrimitiveFieldDescriptor(
1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
break;
case INT64_VALUE:
messageBuilder = Int64Value::newBuilder;
fieldDescriptors.add(
newPrimitiveFieldDescriptor(
1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.INT64));
break;
case STRING_VALUE:
messageBuilder = StringValue::newBuilder;
fieldDescriptors.add(
newPrimitiveFieldDescriptor(
1, "value", FieldLiteDescriptor.JavaType.STRING, FieldLiteDescriptor.Type.STRING));
break;
case UINT32_VALUE:
messageBuilder = UInt32Value::newBuilder;
fieldDescriptors.add(
newPrimitiveFieldDescriptor(
1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.UINT32));
break;
case UINT64_VALUE:
messageBuilder = UInt64Value::newBuilder;
fieldDescriptors.add(
newPrimitiveFieldDescriptor(
1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.UINT64));
break;
case JSON_STRUCT_VALUE:
messageBuilder = Struct::newBuilder;
fieldDescriptors.add(
new FieldLiteDescriptor(
/* fieldNumber= */ 1,
/* fieldName= */ "fields",
/* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
/* celFieldValueType= */ CelFieldValueType.MAP,
/* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
break;
case JSON_VALUE:
messageBuilder = Value::newBuilder;
fieldDescriptors.add(
new FieldLiteDescriptor(
/* fieldNumber= */ 1,
/* fieldName= */ "null_value",
/* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "google.protobuf.NullValue"));
fieldDescriptors.add(
new FieldLiteDescriptor(
/* fieldNumber= */ 2,
/* fieldName= */ "number_value",
/* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
/* isPacked= */ false,
/* fieldProtoTypeName= */ ""));
fieldDescriptors.add(
new FieldLiteDescriptor(
/* fieldNumber= */ 3,
/* fieldName= */ "string_value",
/* javaType= */ FieldLiteDescriptor.JavaType.STRING,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
/* isPacked= */ false,
/* fieldProtoTypeName= */ ""));
fieldDescriptors.add(
new FieldLiteDescriptor(
/* fieldNumber= */ 4,
/* fieldName= */ "bool_value",
/* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
/* isPacked= */ false,
/* fieldProtoTypeName= */ ""));
fieldDescriptors.add(
new FieldLiteDescriptor(
/* fieldNumber= */ 5,
/* fieldName= */ "struct_value",
/* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "google.protobuf.Struct"));
fieldDescriptors.add(
new FieldLiteDescriptor(
/* fieldNumber= */ 6,
/* fieldName= */ "list_value",
/* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "google.protobuf.ListValue"));
break;
case JSON_LIST_VALUE:
messageBuilder = ListValue::newBuilder;
fieldDescriptors.add(
new FieldLiteDescriptor(
/* fieldNumber= */ 1,
/* fieldName= */ "values",
/* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
/* celFieldValueType= */ CelFieldValueType.LIST,
/* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "google.protobuf.Value"));
break;
case DURATION:
messageBuilder = Duration::newBuilder;
fieldDescriptors
.add(
newPrimitiveFieldDescriptor(
1,
"seconds",
FieldLiteDescriptor.JavaType.LONG,
FieldLiteDescriptor.Type.INT64))
.add(
newPrimitiveFieldDescriptor(
2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
break;
case TIMESTAMP:
messageBuilder = Timestamp::newBuilder;
fieldDescriptors
.add(
newPrimitiveFieldDescriptor(
1,
"seconds",
FieldLiteDescriptor.JavaType.LONG,
FieldLiteDescriptor.Type.INT64))
.add(
newPrimitiveFieldDescriptor(
2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
break;
case EMPTY:
messageBuilder = Empty::newBuilder;
}

return new MessageLiteDescriptor(
wellKnownProto.typeName(), fieldDescriptors.build(), messageBuilder);
}

private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
int fieldNumber,
String fieldName,
FieldLiteDescriptor.JavaType javaType,
FieldLiteDescriptor.Type protoFieldType) {
return new FieldLiteDescriptor(
/* fieldNumber= */ fieldNumber,
/* fieldName= */ fieldName,
/* javaType= */ javaType,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* protoFieldType= */ protoFieldType,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "");
}

private DefaultLiteDescriptorPool(ImmutableSet<CelLiteDescriptor> descriptors) {
ImmutableMap.Builder<String, MessageLiteDescriptor> protoFqnMapBuilder = ImmutableMap.builder();
for (WellKnownProto wellKnownProto : WellKnownProto.values()) {
MessageLiteDescriptor wktMessageInfo = newMessageInfo(wellKnownProto);
protoFqnMapBuilder.put(wellKnownProto.typeName(), wktMessageInfo);
}

for (CelLiteDescriptor descriptor : descriptors) {
protoFqnMapBuilder.putAll(descriptor.getProtoTypeNamesToDescriptors());
}

this.protoFqnToMessageInfo = protoFqnMapBuilder.buildOrThrow();
}
}
3 changes: 3 additions & 0 deletions common/src/test/java/dev/cel/common/internal/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ java_library(
"//common/internal:converter",
"//common/internal:default_instance_message_factory",
"//common/internal:default_instance_message_lite_factory",
"//common/internal:default_lite_descriptor_pool",
"//common/internal:default_message_factory",
"//common/internal:dynamic_proto",
"//common/internal:errors",
Expand All@@ -33,6 +34,8 @@ java_library(
"//common/src/test/resources:service_conflicting_name_java_proto",
"//common/src/test/resources:single_file_java_proto",
"//common/testing",
"//protobuf:cel_lite_descriptor",
"//testing:test_all_types_cel_java_proto3",
"@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
"@com_google_googleapis//google/type:type_java_proto",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add CelLiteDescriptorPool and DefaultLiteDescriptorPool#664

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

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Add CelLiteDescriptorPool and DefaultLiteDescriptorPool
#664
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


5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions"],
)

java_library(
 name = "default_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
)

cel_android_library(
 name = "comparison_functions_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions_android"],
Expand Down

28 changes: 28 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -294,6 +294,34 @@ java_library(
 ],
)

java_library(
 name = "cel_lite_descriptor_pool",
 srcs = ["CelLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "default_lite_descriptor_pool",
 srcs = ["DefaultLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 ":cel_lite_descriptor_pool",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "safe_string_formatter",
 srcs = ["SafeStringFormatter.java"],
Expand Down

29 changes: 29 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/CelLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.errorprone.annotations.Immutable;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Optional;

/**
 * CelLiteDescriptorPool allows lookup of {@link MessageLiteDescriptor} by its fully qualified name.
 */
@Immutable
public interface CelLiteDescriptorPool {
 Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName);

 MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName);
}

302 changes: 302 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,302 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.MessageLite;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.function.Supplier;

/** Descriptor pool for {@link CelLiteDescriptor}s. */
@Immutable
@Internal
public final class DefaultLiteDescriptorPool implements CelLiteDescriptorPool {
 private final ImmutableMap<String, MessageLiteDescriptor> protoFqnToMessageInfo;

 public static DefaultLiteDescriptorPool newInstance(ImmutableSet<CelLiteDescriptor> descriptors) {
 return new DefaultLiteDescriptorPool(descriptors);
 }

 @Override
 public Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName) {
 return Optional.ofNullable(protoFqnToMessageInfo.get(protoTypeName));
 }

 @Override
 public MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName) {
 return findDescriptor(protoTypeName)
 .orElseThrow(
 () -> new NoSuchElementException("Could not find a descriptor for: " + protoTypeName));
 }

 private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProto) {
 ImmutableList.Builder<FieldLiteDescriptor> fieldDescriptors = ImmutableList.builder();
 Supplier<MessageLite.Builder> messageBuilder = null;
 switch (wellKnownProto) {
 case ANY_VALUE:
 messageBuilder = Any::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "type_url",
 FieldLiteDescriptor.JavaType.STRING,
 FieldLiteDescriptor.Type.STRING))
 .add(
 newPrimitiveFieldDescriptor(
 2,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case FIELD_MASK:
 messageBuilder = FieldMask::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 break;
 case BOOL_VALUE:
 messageBuilder = BoolValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.BOOLEAN, FieldLiteDescriptor.Type.BOOL));
 break;
 case BYTES_VALUE:
 messageBuilder = BytesValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case DOUBLE_VALUE:
 messageBuilder = DoubleValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.DOUBLE, FieldLiteDescriptor.Type.DOUBLE));
 break;
 case FLOAT_VALUE:
 messageBuilder = FloatValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.FLOAT, FieldLiteDescriptor.Type.FLOAT));
 break;
 case INT32_VALUE:
 messageBuilder = Int32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case INT64_VALUE:
 messageBuilder = Int64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.INT64));
 break;
 case STRING_VALUE:
 messageBuilder = StringValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.STRING, FieldLiteDescriptor.Type.STRING));
 break;
 case UINT32_VALUE:
 messageBuilder = UInt32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.UINT32));
 break;
 case UINT64_VALUE:
 messageBuilder = UInt64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.UINT64));
 break;
 case JSON_STRUCT_VALUE:
 messageBuilder = Struct::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
 break;
 case JSON_VALUE:
 messageBuilder = Value::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
 break;
 case JSON_LIST_VALUE:
 messageBuilder = ListValue::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
 break;
 case DURATION:
 messageBuilder = Duration::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case TIMESTAMP:
 messageBuilder = Timestamp::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case EMPTY:
 messageBuilder = Empty::newBuilder;
 }

 return new MessageLiteDescriptor(
 wellKnownProto.typeName(), fieldDescriptors.build(), messageBuilder);
 }

 private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 int fieldNumber,
 String fieldName,
 FieldLiteDescriptor.JavaType javaType,
 FieldLiteDescriptor.Type protoFieldType) {
 return new FieldLiteDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
 }

 private DefaultLiteDescriptorPool(ImmutableSet<CelLiteDescriptor> descriptors) {
 ImmutableMap.Builder<String, MessageLiteDescriptor> protoFqnMapBuilder = ImmutableMap.builder();
 for (WellKnownProto wellKnownProto : WellKnownProto.values()) {
 MessageLiteDescriptor wktMessageInfo = newMessageInfo(wellKnownProto);
 protoFqnMapBuilder.put(wellKnownProto.typeName(), wktMessageInfo);
 }

 for (CelLiteDescriptor descriptor : descriptors) {
 protoFqnMapBuilder.putAll(descriptor.getProtoTypeNamesToDescriptors());
 }

 this.protoFqnToMessageInfo = protoFqnMapBuilder.buildOrThrow();
 }
}

3 changes: 3 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ java_library(
 "//common/internal:converter",
 "//common/internal:default_instance_message_factory",
 "//common/internal:default_instance_message_lite_factory",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:errors",
Expand All@@ -33,6 +34,8 @@ java_library(
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add CelLiteDescriptorPool and DefaultLiteDescriptorPool#664

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

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Add CelLiteDescriptorPool and DefaultLiteDescriptorPool
#664
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


5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions"],
)

java_library(
 name = "default_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
)

cel_android_library(
 name = "comparison_functions_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions_android"],
Expand Down

28 changes: 28 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -294,6 +294,34 @@ java_library(
 ],
)

java_library(
 name = "cel_lite_descriptor_pool",
 srcs = ["CelLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "default_lite_descriptor_pool",
 srcs = ["DefaultLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 ":cel_lite_descriptor_pool",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "safe_string_formatter",
 srcs = ["SafeStringFormatter.java"],
Expand Down

29 changes: 29 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/CelLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.errorprone.annotations.Immutable;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Optional;

/**
 * CelLiteDescriptorPool allows lookup of {@link MessageLiteDescriptor} by its fully qualified name.
 */
@Immutable
public interface CelLiteDescriptorPool {
 Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName);

 MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName);
}

302 changes: 302 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,302 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.MessageLite;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.function.Supplier;

/** Descriptor pool for {@link CelLiteDescriptor}s. */
@Immutable
@Internal
public final class DefaultLiteDescriptorPool implements CelLiteDescriptorPool {
 private final ImmutableMap<String, MessageLiteDescriptor> protoFqnToMessageInfo;

 public static DefaultLiteDescriptorPool newInstance(ImmutableSet<CelLiteDescriptor> descriptors) {
 return new DefaultLiteDescriptorPool(descriptors);
 }

 @Override
 public Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName) {
 return Optional.ofNullable(protoFqnToMessageInfo.get(protoTypeName));
 }

 @Override
 public MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName) {
 return findDescriptor(protoTypeName)
 .orElseThrow(
 () -> new NoSuchElementException("Could not find a descriptor for: " + protoTypeName));
 }

 private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProto) {
 ImmutableList.Builder<FieldLiteDescriptor> fieldDescriptors = ImmutableList.builder();
 Supplier<MessageLite.Builder> messageBuilder = null;
 switch (wellKnownProto) {
 case ANY_VALUE:
 messageBuilder = Any::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "type_url",
 FieldLiteDescriptor.JavaType.STRING,
 FieldLiteDescriptor.Type.STRING))
 .add(
 newPrimitiveFieldDescriptor(
 2,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case FIELD_MASK:
 messageBuilder = FieldMask::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 break;
 case BOOL_VALUE:
 messageBuilder = BoolValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.BOOLEAN, FieldLiteDescriptor.Type.BOOL));
 break;
 case BYTES_VALUE:
 messageBuilder = BytesValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case DOUBLE_VALUE:
 messageBuilder = DoubleValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.DOUBLE, FieldLiteDescriptor.Type.DOUBLE));
 break;
 case FLOAT_VALUE:
 messageBuilder = FloatValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.FLOAT, FieldLiteDescriptor.Type.FLOAT));
 break;
 case INT32_VALUE:
 messageBuilder = Int32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case INT64_VALUE:
 messageBuilder = Int64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.INT64));
 break;
 case STRING_VALUE:
 messageBuilder = StringValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.STRING, FieldLiteDescriptor.Type.STRING));
 break;
 case UINT32_VALUE:
 messageBuilder = UInt32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.UINT32));
 break;
 case UINT64_VALUE:
 messageBuilder = UInt64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.UINT64));
 break;
 case JSON_STRUCT_VALUE:
 messageBuilder = Struct::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
 break;
 case JSON_VALUE:
 messageBuilder = Value::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
 break;
 case JSON_LIST_VALUE:
 messageBuilder = ListValue::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
 break;
 case DURATION:
 messageBuilder = Duration::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case TIMESTAMP:
 messageBuilder = Timestamp::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case EMPTY:
 messageBuilder = Empty::newBuilder;
 }

 return new MessageLiteDescriptor(
 wellKnownProto.typeName(), fieldDescriptors.build(), messageBuilder);
 }

 private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 int fieldNumber,
 String fieldName,
 FieldLiteDescriptor.JavaType javaType,
 FieldLiteDescriptor.Type protoFieldType) {
 return new FieldLiteDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
 }

 private DefaultLiteDescriptorPool(ImmutableSet<CelLiteDescriptor> descriptors) {
 ImmutableMap.Builder<String, MessageLiteDescriptor> protoFqnMapBuilder = ImmutableMap.builder();
 for (WellKnownProto wellKnownProto : WellKnownProto.values()) {
 MessageLiteDescriptor wktMessageInfo = newMessageInfo(wellKnownProto);
 protoFqnMapBuilder.put(wellKnownProto.typeName(), wktMessageInfo);
 }

 for (CelLiteDescriptor descriptor : descriptors) {
 protoFqnMapBuilder.putAll(descriptor.getProtoTypeNamesToDescriptors());
 }

 this.protoFqnToMessageInfo = protoFqnMapBuilder.buildOrThrow();
 }
}

3 changes: 3 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ java_library(
 "//common/internal:converter",
 "//common/internal:default_instance_message_factory",
 "//common/internal:default_instance_message_lite_factory",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:errors",
Expand All@@ -33,6 +34,8 @@ java_library(
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add CelLiteDescriptorPool and DefaultLiteDescriptorPool#664

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

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Add CelLiteDescriptorPool and DefaultLiteDescriptorPool
#664
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


5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions"],
)

java_library(
 name = "default_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
)

cel_android_library(
 name = "comparison_functions_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions_android"],
Expand Down

28 changes: 28 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -294,6 +294,34 @@ java_library(
 ],
)

java_library(
 name = "cel_lite_descriptor_pool",
 srcs = ["CelLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "default_lite_descriptor_pool",
 srcs = ["DefaultLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 ":cel_lite_descriptor_pool",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "safe_string_formatter",
 srcs = ["SafeStringFormatter.java"],
Expand Down

29 changes: 29 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/CelLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.errorprone.annotations.Immutable;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Optional;

/**
 * CelLiteDescriptorPool allows lookup of {@link MessageLiteDescriptor} by its fully qualified name.
 */
@Immutable
public interface CelLiteDescriptorPool {
 Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName);

 MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName);
}

302 changes: 302 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,302 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.MessageLite;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.function.Supplier;

/** Descriptor pool for {@link CelLiteDescriptor}s. */
@Immutable
@Internal
public final class DefaultLiteDescriptorPool implements CelLiteDescriptorPool {
 private final ImmutableMap<String, MessageLiteDescriptor> protoFqnToMessageInfo;

 public static DefaultLiteDescriptorPool newInstance(ImmutableSet<CelLiteDescriptor> descriptors) {
 return new DefaultLiteDescriptorPool(descriptors);
 }

 @Override
 public Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName) {
 return Optional.ofNullable(protoFqnToMessageInfo.get(protoTypeName));
 }

 @Override
 public MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName) {
 return findDescriptor(protoTypeName)
 .orElseThrow(
 () -> new NoSuchElementException("Could not find a descriptor for: " + protoTypeName));
 }

 private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProto) {
 ImmutableList.Builder<FieldLiteDescriptor> fieldDescriptors = ImmutableList.builder();
 Supplier<MessageLite.Builder> messageBuilder = null;
 switch (wellKnownProto) {
 case ANY_VALUE:
 messageBuilder = Any::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "type_url",
 FieldLiteDescriptor.JavaType.STRING,
 FieldLiteDescriptor.Type.STRING))
 .add(
 newPrimitiveFieldDescriptor(
 2,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case FIELD_MASK:
 messageBuilder = FieldMask::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 break;
 case BOOL_VALUE:
 messageBuilder = BoolValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.BOOLEAN, FieldLiteDescriptor.Type.BOOL));
 break;
 case BYTES_VALUE:
 messageBuilder = BytesValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case DOUBLE_VALUE:
 messageBuilder = DoubleValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.DOUBLE, FieldLiteDescriptor.Type.DOUBLE));
 break;
 case FLOAT_VALUE:
 messageBuilder = FloatValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.FLOAT, FieldLiteDescriptor.Type.FLOAT));
 break;
 case INT32_VALUE:
 messageBuilder = Int32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case INT64_VALUE:
 messageBuilder = Int64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.INT64));
 break;
 case STRING_VALUE:
 messageBuilder = StringValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.STRING, FieldLiteDescriptor.Type.STRING));
 break;
 case UINT32_VALUE:
 messageBuilder = UInt32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.UINT32));
 break;
 case UINT64_VALUE:
 messageBuilder = UInt64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.UINT64));
 break;
 case JSON_STRUCT_VALUE:
 messageBuilder = Struct::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
 break;
 case JSON_VALUE:
 messageBuilder = Value::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
 break;
 case JSON_LIST_VALUE:
 messageBuilder = ListValue::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
 break;
 case DURATION:
 messageBuilder = Duration::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case TIMESTAMP:
 messageBuilder = Timestamp::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case EMPTY:
 messageBuilder = Empty::newBuilder;
 }

 return new MessageLiteDescriptor(
 wellKnownProto.typeName(), fieldDescriptors.build(), messageBuilder);
 }

 private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 int fieldNumber,
 String fieldName,
 FieldLiteDescriptor.JavaType javaType,
 FieldLiteDescriptor.Type protoFieldType) {
 return new FieldLiteDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
 }

 private DefaultLiteDescriptorPool(ImmutableSet<CelLiteDescriptor> descriptors) {
 ImmutableMap.Builder<String, MessageLiteDescriptor> protoFqnMapBuilder = ImmutableMap.builder();
 for (WellKnownProto wellKnownProto : WellKnownProto.values()) {
 MessageLiteDescriptor wktMessageInfo = newMessageInfo(wellKnownProto);
 protoFqnMapBuilder.put(wellKnownProto.typeName(), wktMessageInfo);
 }

 for (CelLiteDescriptor descriptor : descriptors) {
 protoFqnMapBuilder.putAll(descriptor.getProtoTypeNamesToDescriptors());
 }

 this.protoFqnToMessageInfo = protoFqnMapBuilder.buildOrThrow();
 }
}

3 changes: 3 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ java_library(
 "//common/internal:converter",
 "//common/internal:default_instance_message_factory",
 "//common/internal:default_instance_message_lite_factory",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:errors",
Expand All@@ -33,6 +34,8 @@ java_library(
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add CelLiteDescriptorPool and DefaultLiteDescriptorPool#664

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

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Add CelLiteDescriptorPool and DefaultLiteDescriptorPool
#664
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


5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions"],
)

java_library(
 name = "default_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
)

cel_android_library(
 name = "comparison_functions_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions_android"],
Expand Down

28 changes: 28 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -294,6 +294,34 @@ java_library(
 ],
)

java_library(
 name = "cel_lite_descriptor_pool",
 srcs = ["CelLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "default_lite_descriptor_pool",
 srcs = ["DefaultLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 ":cel_lite_descriptor_pool",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "safe_string_formatter",
 srcs = ["SafeStringFormatter.java"],
Expand Down

29 changes: 29 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/CelLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.errorprone.annotations.Immutable;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Optional;

/**
 * CelLiteDescriptorPool allows lookup of {@link MessageLiteDescriptor} by its fully qualified name.
 */
@Immutable
public interface CelLiteDescriptorPool {
 Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName);

 MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName);
}

302 changes: 302 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,302 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.MessageLite;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.function.Supplier;

/** Descriptor pool for {@link CelLiteDescriptor}s. */
@Immutable
@Internal
public final class DefaultLiteDescriptorPool implements CelLiteDescriptorPool {
 private final ImmutableMap<String, MessageLiteDescriptor> protoFqnToMessageInfo;

 public static DefaultLiteDescriptorPool newInstance(ImmutableSet<CelLiteDescriptor> descriptors) {
 return new DefaultLiteDescriptorPool(descriptors);
 }

 @Override
 public Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName) {
 return Optional.ofNullable(protoFqnToMessageInfo.get(protoTypeName));
 }

 @Override
 public MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName) {
 return findDescriptor(protoTypeName)
 .orElseThrow(
 () -> new NoSuchElementException("Could not find a descriptor for: " + protoTypeName));
 }

 private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProto) {
 ImmutableList.Builder<FieldLiteDescriptor> fieldDescriptors = ImmutableList.builder();
 Supplier<MessageLite.Builder> messageBuilder = null;
 switch (wellKnownProto) {
 case ANY_VALUE:
 messageBuilder = Any::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "type_url",
 FieldLiteDescriptor.JavaType.STRING,
 FieldLiteDescriptor.Type.STRING))
 .add(
 newPrimitiveFieldDescriptor(
 2,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case FIELD_MASK:
 messageBuilder = FieldMask::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 break;
 case BOOL_VALUE:
 messageBuilder = BoolValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.BOOLEAN, FieldLiteDescriptor.Type.BOOL));
 break;
 case BYTES_VALUE:
 messageBuilder = BytesValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case DOUBLE_VALUE:
 messageBuilder = DoubleValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.DOUBLE, FieldLiteDescriptor.Type.DOUBLE));
 break;
 case FLOAT_VALUE:
 messageBuilder = FloatValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.FLOAT, FieldLiteDescriptor.Type.FLOAT));
 break;
 case INT32_VALUE:
 messageBuilder = Int32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case INT64_VALUE:
 messageBuilder = Int64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.INT64));
 break;
 case STRING_VALUE:
 messageBuilder = StringValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.STRING, FieldLiteDescriptor.Type.STRING));
 break;
 case UINT32_VALUE:
 messageBuilder = UInt32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.UINT32));
 break;
 case UINT64_VALUE:
 messageBuilder = UInt64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.UINT64));
 break;
 case JSON_STRUCT_VALUE:
 messageBuilder = Struct::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
 break;
 case JSON_VALUE:
 messageBuilder = Value::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
 break;
 case JSON_LIST_VALUE:
 messageBuilder = ListValue::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
 break;
 case DURATION:
 messageBuilder = Duration::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case TIMESTAMP:
 messageBuilder = Timestamp::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case EMPTY:
 messageBuilder = Empty::newBuilder;
 }

 return new MessageLiteDescriptor(
 wellKnownProto.typeName(), fieldDescriptors.build(), messageBuilder);
 }

 private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 int fieldNumber,
 String fieldName,
 FieldLiteDescriptor.JavaType javaType,
 FieldLiteDescriptor.Type protoFieldType) {
 return new FieldLiteDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
 }

 private DefaultLiteDescriptorPool(ImmutableSet<CelLiteDescriptor> descriptors) {
 ImmutableMap.Builder<String, MessageLiteDescriptor> protoFqnMapBuilder = ImmutableMap.builder();
 for (WellKnownProto wellKnownProto : WellKnownProto.values()) {
 MessageLiteDescriptor wktMessageInfo = newMessageInfo(wellKnownProto);
 protoFqnMapBuilder.put(wellKnownProto.typeName(), wktMessageInfo);
 }

 for (CelLiteDescriptor descriptor : descriptors) {
 protoFqnMapBuilder.putAll(descriptor.getProtoTypeNamesToDescriptors());
 }

 this.protoFqnToMessageInfo = protoFqnMapBuilder.buildOrThrow();
 }
}

3 changes: 3 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ java_library(
 "//common/internal:converter",
 "//common/internal:default_instance_message_factory",
 "//common/internal:default_instance_message_lite_factory",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:errors",
Expand All@@ -33,6 +34,8 @@ java_library(
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add CelLiteDescriptorPool and DefaultLiteDescriptorPool#664

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

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Add CelLiteDescriptorPool and DefaultLiteDescriptorPool
#664
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


5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions"],
)

java_library(
 name = "default_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
)

cel_android_library(
 name = "comparison_functions_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions_android"],
Expand Down

28 changes: 28 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -294,6 +294,34 @@ java_library(
 ],
)

java_library(
 name = "cel_lite_descriptor_pool",
 srcs = ["CelLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "default_lite_descriptor_pool",
 srcs = ["DefaultLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 ":cel_lite_descriptor_pool",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "safe_string_formatter",
 srcs = ["SafeStringFormatter.java"],
Expand Down

29 changes: 29 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/CelLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.errorprone.annotations.Immutable;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Optional;

/**
 * CelLiteDescriptorPool allows lookup of {@link MessageLiteDescriptor} by its fully qualified name.
 */
@Immutable
public interface CelLiteDescriptorPool {
 Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName);

 MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName);
}

302 changes: 302 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,302 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.MessageLite;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.function.Supplier;

/** Descriptor pool for {@link CelLiteDescriptor}s. */
@Immutable
@Internal
public final class DefaultLiteDescriptorPool implements CelLiteDescriptorPool {
 private final ImmutableMap<String, MessageLiteDescriptor> protoFqnToMessageInfo;

 public static DefaultLiteDescriptorPool newInstance(ImmutableSet<CelLiteDescriptor> descriptors) {
 return new DefaultLiteDescriptorPool(descriptors);
 }

 @Override
 public Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName) {
 return Optional.ofNullable(protoFqnToMessageInfo.get(protoTypeName));
 }

 @Override
 public MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName) {
 return findDescriptor(protoTypeName)
 .orElseThrow(
 () -> new NoSuchElementException("Could not find a descriptor for: " + protoTypeName));
 }

 private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProto) {
 ImmutableList.Builder<FieldLiteDescriptor> fieldDescriptors = ImmutableList.builder();
 Supplier<MessageLite.Builder> messageBuilder = null;
 switch (wellKnownProto) {
 case ANY_VALUE:
 messageBuilder = Any::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "type_url",
 FieldLiteDescriptor.JavaType.STRING,
 FieldLiteDescriptor.Type.STRING))
 .add(
 newPrimitiveFieldDescriptor(
 2,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case FIELD_MASK:
 messageBuilder = FieldMask::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 break;
 case BOOL_VALUE:
 messageBuilder = BoolValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.BOOLEAN, FieldLiteDescriptor.Type.BOOL));
 break;
 case BYTES_VALUE:
 messageBuilder = BytesValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case DOUBLE_VALUE:
 messageBuilder = DoubleValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.DOUBLE, FieldLiteDescriptor.Type.DOUBLE));
 break;
 case FLOAT_VALUE:
 messageBuilder = FloatValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.FLOAT, FieldLiteDescriptor.Type.FLOAT));
 break;
 case INT32_VALUE:
 messageBuilder = Int32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case INT64_VALUE:
 messageBuilder = Int64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.INT64));
 break;
 case STRING_VALUE:
 messageBuilder = StringValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.STRING, FieldLiteDescriptor.Type.STRING));
 break;
 case UINT32_VALUE:
 messageBuilder = UInt32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.UINT32));
 break;
 case UINT64_VALUE:
 messageBuilder = UInt64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.UINT64));
 break;
 case JSON_STRUCT_VALUE:
 messageBuilder = Struct::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
 break;
 case JSON_VALUE:
 messageBuilder = Value::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
 break;
 case JSON_LIST_VALUE:
 messageBuilder = ListValue::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
 break;
 case DURATION:
 messageBuilder = Duration::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case TIMESTAMP:
 messageBuilder = Timestamp::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case EMPTY:
 messageBuilder = Empty::newBuilder;
 }

 return new MessageLiteDescriptor(
 wellKnownProto.typeName(), fieldDescriptors.build(), messageBuilder);
 }

 private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 int fieldNumber,
 String fieldName,
 FieldLiteDescriptor.JavaType javaType,
 FieldLiteDescriptor.Type protoFieldType) {
 return new FieldLiteDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
 }

 private DefaultLiteDescriptorPool(ImmutableSet<CelLiteDescriptor> descriptors) {
 ImmutableMap.Builder<String, MessageLiteDescriptor> protoFqnMapBuilder = ImmutableMap.builder();
 for (WellKnownProto wellKnownProto : WellKnownProto.values()) {
 MessageLiteDescriptor wktMessageInfo = newMessageInfo(wellKnownProto);
 protoFqnMapBuilder.put(wellKnownProto.typeName(), wktMessageInfo);
 }

 for (CelLiteDescriptor descriptor : descriptors) {
 protoFqnMapBuilder.putAll(descriptor.getProtoTypeNamesToDescriptors());
 }

 this.protoFqnToMessageInfo = protoFqnMapBuilder.buildOrThrow();
 }
}

3 changes: 3 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ java_library(
 "//common/internal:converter",
 "//common/internal:default_instance_message_factory",
 "//common/internal:default_instance_message_lite_factory",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:errors",
Expand All@@ -33,6 +34,8 @@ java_library(
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add CelLiteDescriptorPool and DefaultLiteDescriptorPool#664

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

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Add CelLiteDescriptorPool and DefaultLiteDescriptorPool
#664
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


5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions"],
)

java_library(
 name = "default_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
)

cel_android_library(
 name = "comparison_functions_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions_android"],
Expand Down

28 changes: 28 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -294,6 +294,34 @@ java_library(
 ],
)

java_library(
 name = "cel_lite_descriptor_pool",
 srcs = ["CelLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "default_lite_descriptor_pool",
 srcs = ["DefaultLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 ":cel_lite_descriptor_pool",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "safe_string_formatter",
 srcs = ["SafeStringFormatter.java"],
Expand Down

29 changes: 29 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/CelLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.errorprone.annotations.Immutable;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Optional;

/**
 * CelLiteDescriptorPool allows lookup of {@link MessageLiteDescriptor} by its fully qualified name.
 */
@Immutable
public interface CelLiteDescriptorPool {
 Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName);

 MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName);
}

302 changes: 302 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,302 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.MessageLite;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.function.Supplier;

/** Descriptor pool for {@link CelLiteDescriptor}s. */
@Immutable
@Internal
public final class DefaultLiteDescriptorPool implements CelLiteDescriptorPool {
 private final ImmutableMap<String, MessageLiteDescriptor> protoFqnToMessageInfo;

 public static DefaultLiteDescriptorPool newInstance(ImmutableSet<CelLiteDescriptor> descriptors) {
 return new DefaultLiteDescriptorPool(descriptors);
 }

 @Override
 public Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName) {
 return Optional.ofNullable(protoFqnToMessageInfo.get(protoTypeName));
 }

 @Override
 public MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName) {
 return findDescriptor(protoTypeName)
 .orElseThrow(
 () -> new NoSuchElementException("Could not find a descriptor for: " + protoTypeName));
 }

 private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProto) {
 ImmutableList.Builder<FieldLiteDescriptor> fieldDescriptors = ImmutableList.builder();
 Supplier<MessageLite.Builder> messageBuilder = null;
 switch (wellKnownProto) {
 case ANY_VALUE:
 messageBuilder = Any::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "type_url",
 FieldLiteDescriptor.JavaType.STRING,
 FieldLiteDescriptor.Type.STRING))
 .add(
 newPrimitiveFieldDescriptor(
 2,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case FIELD_MASK:
 messageBuilder = FieldMask::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 break;
 case BOOL_VALUE:
 messageBuilder = BoolValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.BOOLEAN, FieldLiteDescriptor.Type.BOOL));
 break;
 case BYTES_VALUE:
 messageBuilder = BytesValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case DOUBLE_VALUE:
 messageBuilder = DoubleValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.DOUBLE, FieldLiteDescriptor.Type.DOUBLE));
 break;
 case FLOAT_VALUE:
 messageBuilder = FloatValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.FLOAT, FieldLiteDescriptor.Type.FLOAT));
 break;
 case INT32_VALUE:
 messageBuilder = Int32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case INT64_VALUE:
 messageBuilder = Int64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.INT64));
 break;
 case STRING_VALUE:
 messageBuilder = StringValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.STRING, FieldLiteDescriptor.Type.STRING));
 break;
 case UINT32_VALUE:
 messageBuilder = UInt32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.UINT32));
 break;
 case UINT64_VALUE:
 messageBuilder = UInt64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.UINT64));
 break;
 case JSON_STRUCT_VALUE:
 messageBuilder = Struct::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
 break;
 case JSON_VALUE:
 messageBuilder = Value::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
 break;
 case JSON_LIST_VALUE:
 messageBuilder = ListValue::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
 break;
 case DURATION:
 messageBuilder = Duration::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case TIMESTAMP:
 messageBuilder = Timestamp::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case EMPTY:
 messageBuilder = Empty::newBuilder;
 }

 return new MessageLiteDescriptor(
 wellKnownProto.typeName(), fieldDescriptors.build(), messageBuilder);
 }

 private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 int fieldNumber,
 String fieldName,
 FieldLiteDescriptor.JavaType javaType,
 FieldLiteDescriptor.Type protoFieldType) {
 return new FieldLiteDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
 }

 private DefaultLiteDescriptorPool(ImmutableSet<CelLiteDescriptor> descriptors) {
 ImmutableMap.Builder<String, MessageLiteDescriptor> protoFqnMapBuilder = ImmutableMap.builder();
 for (WellKnownProto wellKnownProto : WellKnownProto.values()) {
 MessageLiteDescriptor wktMessageInfo = newMessageInfo(wellKnownProto);
 protoFqnMapBuilder.put(wellKnownProto.typeName(), wktMessageInfo);
 }

 for (CelLiteDescriptor descriptor : descriptors) {
 protoFqnMapBuilder.putAll(descriptor.getProtoTypeNamesToDescriptors());
 }

 this.protoFqnToMessageInfo = protoFqnMapBuilder.buildOrThrow();
 }
}

3 changes: 3 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ java_library(
 "//common/internal:converter",
 "//common/internal:default_instance_message_factory",
 "//common/internal:default_instance_message_lite_factory",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:errors",
Expand All@@ -33,6 +34,8 @@ java_library(
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add CelLiteDescriptorPool and DefaultLiteDescriptorPool#664

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

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Add CelLiteDescriptorPool and DefaultLiteDescriptorPool
#664
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


5 changes: 5 additions & 0 deletions
common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ java_library(
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions"],
)

java_library(
 name = "default_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
)

cel_android_library(
 name = "comparison_functions_android",
 exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions_android"],
Expand Down

28 changes: 28 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -294,6 +294,34 @@ java_library(
 ],
)

java_library(
 name = "cel_lite_descriptor_pool",
 srcs = ["CelLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "default_lite_descriptor_pool",
 srcs = ["DefaultLiteDescriptorPool.java"],
 tags = [
 ],
 deps = [
 ":cel_lite_descriptor_pool",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "safe_string_formatter",
 srcs = ["SafeStringFormatter.java"],
Expand Down

29 changes: 29 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/CelLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.errorprone.annotations.Immutable;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Optional;

/**
 * CelLiteDescriptorPool allows lookup of {@link MessageLiteDescriptor} by its fully qualified name.
 */
@Immutable
public interface CelLiteDescriptorPool {
 Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName);

 MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName);
}

302 changes: 302 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,302 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.internal;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
import com.google.protobuf.MessageLite;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.function.Supplier;

/** Descriptor pool for {@link CelLiteDescriptor}s. */
@Immutable
@Internal
public final class DefaultLiteDescriptorPool implements CelLiteDescriptorPool {
 private final ImmutableMap<String, MessageLiteDescriptor> protoFqnToMessageInfo;

 public static DefaultLiteDescriptorPool newInstance(ImmutableSet<CelLiteDescriptor> descriptors) {
 return new DefaultLiteDescriptorPool(descriptors);
 }

 @Override
 public Optional<MessageLiteDescriptor> findDescriptor(String protoTypeName) {
 return Optional.ofNullable(protoFqnToMessageInfo.get(protoTypeName));
 }

 @Override
 public MessageLiteDescriptor getDescriptorOrThrow(String protoTypeName) {
 return findDescriptor(protoTypeName)
 .orElseThrow(
 () -> new NoSuchElementException("Could not find a descriptor for: " + protoTypeName));
 }

 private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProto) {
 ImmutableList.Builder<FieldLiteDescriptor> fieldDescriptors = ImmutableList.builder();
 Supplier<MessageLite.Builder> messageBuilder = null;
 switch (wellKnownProto) {
 case ANY_VALUE:
 messageBuilder = Any::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "type_url",
 FieldLiteDescriptor.JavaType.STRING,
 FieldLiteDescriptor.Type.STRING))
 .add(
 newPrimitiveFieldDescriptor(
 2,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case FIELD_MASK:
 messageBuilder = FieldMask::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 break;
 case BOOL_VALUE:
 messageBuilder = BoolValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.BOOLEAN, FieldLiteDescriptor.Type.BOOL));
 break;
 case BYTES_VALUE:
 messageBuilder = BytesValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1,
 "value",
 FieldLiteDescriptor.JavaType.BYTE_STRING,
 FieldLiteDescriptor.Type.BYTES));
 break;
 case DOUBLE_VALUE:
 messageBuilder = DoubleValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.DOUBLE, FieldLiteDescriptor.Type.DOUBLE));
 break;
 case FLOAT_VALUE:
 messageBuilder = FloatValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.FLOAT, FieldLiteDescriptor.Type.FLOAT));
 break;
 case INT32_VALUE:
 messageBuilder = Int32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case INT64_VALUE:
 messageBuilder = Int64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.INT64));
 break;
 case STRING_VALUE:
 messageBuilder = StringValue::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.STRING, FieldLiteDescriptor.Type.STRING));
 break;
 case UINT32_VALUE:
 messageBuilder = UInt32Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.UINT32));
 break;
 case UINT64_VALUE:
 messageBuilder = UInt64Value::newBuilder;
 fieldDescriptors.add(
 newPrimitiveFieldDescriptor(
 1, "value", FieldLiteDescriptor.JavaType.LONG, FieldLiteDescriptor.Type.UINT64));
 break;
 case JSON_STRUCT_VALUE:
 messageBuilder = Struct::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
 break;
 case JSON_VALUE:
 messageBuilder = Value::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
 break;
 case JSON_LIST_VALUE:
 messageBuilder = ListValue::newBuilder;
 fieldDescriptors.add(
 new FieldLiteDescriptor(
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
 break;
 case DURATION:
 messageBuilder = Duration::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case TIMESTAMP:
 messageBuilder = Timestamp::newBuilder;
 fieldDescriptors
 .add(
 newPrimitiveFieldDescriptor(
 1,
 "seconds",
 FieldLiteDescriptor.JavaType.LONG,
 FieldLiteDescriptor.Type.INT64))
 .add(
 newPrimitiveFieldDescriptor(
 2, "nanos", FieldLiteDescriptor.JavaType.INT, FieldLiteDescriptor.Type.INT32));
 break;
 case EMPTY:
 messageBuilder = Empty::newBuilder;
 }

 return new MessageLiteDescriptor(
 wellKnownProto.typeName(), fieldDescriptors.build(), messageBuilder);
 }

 private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 int fieldNumber,
 String fieldName,
 FieldLiteDescriptor.JavaType javaType,
 FieldLiteDescriptor.Type protoFieldType) {
 return new FieldLiteDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
 }

 private DefaultLiteDescriptorPool(ImmutableSet<CelLiteDescriptor> descriptors) {
 ImmutableMap.Builder<String, MessageLiteDescriptor> protoFqnMapBuilder = ImmutableMap.builder();
 for (WellKnownProto wellKnownProto : WellKnownProto.values()) {
 MessageLiteDescriptor wktMessageInfo = newMessageInfo(wellKnownProto);
 protoFqnMapBuilder.put(wellKnownProto.typeName(), wktMessageInfo);
 }

 for (CelLiteDescriptor descriptor : descriptors) {
 protoFqnMapBuilder.putAll(descriptor.getProtoTypeNamesToDescriptors());
 }

 this.protoFqnToMessageInfo = protoFqnMapBuilder.buildOrThrow();
 }
}

3 changes: 3 additions & 0 deletions
common/src/test/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ java_library(
 "//common/internal:converter",
 "//common/internal:default_instance_message_factory",
 "//common/internal:default_instance_message_lite_factory",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:errors",
Expand All@@ -33,6 +34,8 @@ java_library(
 "//common/src/test/resources:service_conflicting_name_java_proto",
 "//common/src/test/resources:single_file_java_proto",
 "//common/testing",
 "//protobuf:cel_lite_descriptor",
 "//testing:test_all_types_cel_java_proto3",
 "@cel_spec//proto/cel/expr/conformance/proto2:test_all_types_java_proto",
 "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
 "@com_google_googleapis//google/type:type_java_proto",
Expand Down
Loading