Add ProtoMessageLiteValue and ProtoLiteCelValueConverter#666

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 ProtoMessageLiteValue and ProtoLiteCelValueConverter #666

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 = "cel_lite_descriptor_pool",
exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
)

java_library(
name = "default_lite_descriptor_pool",
exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
Expand Down
26 changes: 26 additions & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,3 +157,29 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
],
)

java_library(
name = "proto_message_lite_value",
srcs = [
"ProtoLiteCelValueConverter.java",
"ProtoMessageLiteValue.java",
],
tags = [
],
deps = [
":base_proto_cel_value_converter",
":cel_value",
":values",
"//:auto_value",
"//common/annotations",
"//common/internal:cel_lite_descriptor_pool",
"//common/internal:well_known_proto",
"//common/types",
"//common/types:type_providers",
"//protobuf:cel_lite_descriptor",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
65 changes: 65 additions & 0 deletions common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
// 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.values;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;

/**
* {@code ProtoLiteCelValueConverter} handles bidirectional conversion between native Java and
* protobuf objects to {@link CelValue}. This converter is specifically designed for use with
* lite-variants of protobuf messages.
*
* <p>Protobuf semantics take precedence for conversion. For example, CEL's TimestampValue will be
* converted into Protobuf's Timestamp instead of java.time.Instant.
*
* <p>CEL Library Internals. Do Not Use.
*/
@Immutable
@Internal
public final class ProtoLiteCelValueConverter extends BaseProtoCelValueConverter {
private final CelLiteDescriptorPool descriptorPool;

public static ProtoLiteCelValueConverter newInstance(
CelLiteDescriptorPool celLiteDescriptorPool) {
return new ProtoLiteCelValueConverter(celLiteDescriptorPool);
}

@Override
public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
checkNotNull(msg);
checkNotNull(protoTypeName);

MessageLiteDescriptor descriptor = descriptorPool.getDescriptorOrThrow(protoTypeName);
WellKnownProto wellKnownProto =
WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

if (wellKnownProto == null) {
return ProtoMessageLiteValue.create(msg, descriptor.getProtoTypeName(), this);
}

return super.fromWellKnownProtoToCelValue(msg, wellKnownProto);
}

private ProtoLiteCelValueConverter(CelLiteDescriptorPool celLiteDescriptorPool) {
this.descriptorPool = celLiteDescriptorPool;
}
}
67 changes: 67 additions & 0 deletions common/src/main/java/dev/cel/common/values/ProtoMessageLiteValue.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
// 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.values;

import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import java.util.Optional;

/**
* ProtoMessageLiteValue is a struct value with protobuf support for {@link MessageLite}.
* Specifically, it does not rely on full message descriptors, thus field selections can be
* performed without the reliance of proto-reflection.
*
* <p>If the codebase has access to full protobuf messages with descriptors, use {@code
* ProtoMessageValue} instead.
*/
@AutoValue
@Immutable
public abstract class ProtoMessageLiteValue extends StructValue<StringValue> {

@Override
public abstract MessageLite value();

@Override
public abstract CelType celType();

abstract ProtoLiteCelValueConverter protoLiteCelValueConverter();

@Override
public boolean isZeroValue() {
return value().getDefaultInstanceForType().equals(value());
}

@Override
public CelValue select(StringValue field) {
throw new UnsupportedOperationException("Not implemented yet");
}

@Override
public Optional<CelValue> find(StringValue field) {
throw new UnsupportedOperationException("Not implemented yet");
}

public static ProtoMessageLiteValue create(
MessageLite value, String typeName, ProtoLiteCelValueConverter protoLiteCelValueConverter) {
Preconditions.checkNotNull(value);
Preconditions.checkNotNull(typeName);
return new AutoValue_ProtoMessageLiteValue(
value, StructTypeReference.create(typeName), protoLiteCelValueConverter);
}
}
6 changes: 6 additions & 0 deletions common/src/test/java/dev/cel/common/values/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,24 @@ java_library(
"//common:options",
"//common:runtime_exception",
"//common/internal:cel_descriptor_pools",
"//common/internal:cel_lite_descriptor_pool",
"//common/internal:default_lite_descriptor_pool",
"//common/internal:default_message_factory",
"//common/internal:dynamic_proto",
"//common/internal:proto_message_factory",
"//common/internal:well_known_proto",
"//common/types",
"//common/types:type_providers",
"//common/values",
"//common/values:cel_byte_string",
"//common/values:cel_value",
"//common/values:cel_value_provider",
"//common/values:proto_message_lite_value",
"//common/values:proto_message_value",
"//common/values:proto_message_value_provider",
"//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",
"@maven//:com_google_guava_guava",
"@maven//:com_google_guava_guava_testlib",
"@maven//:com_google_protobuf_protobuf_java",
Expand Down
110 changes: 110 additions & 0 deletions common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.collect.ImmutableSet;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoLiteCelValueConverterTest {
private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
DefaultLiteDescriptorPool.newInstance(
ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

@Test
public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLiteValue() {
ProtoMessageLiteValue protoMessageLiteValue =
(ProtoMessageLiteValue)
PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
"cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());

assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
}

private enum WellKnownProtoTestCase {
BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
BYTES(
WellKnownProto.BYTES_VALUE,
com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
DOUBLE(
WellKnownProto.DOUBLE_VALUE,
com.google.protobuf.DoubleValue.of(1.0),
DoubleValue.create(1.0)),
INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
STRING(
WellKnownProto.STRING_VALUE,
com.google.protobuf.StringValue.of("test"),
StringValue.create("test")),

DURATION(
WellKnownProto.DURATION,
Duration.newBuilder().setSeconds(10).setNanos(50).build(),
DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
TIMESTAMP(
WellKnownProto.TIMESTAMP,
Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
;

private final WellKnownProto wellKnownProto;
private final MessageLite msg;
private final CelValue celValue;

WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
this.wellKnownProto = wellKnownProto;
this.msg = msg;
this.celValue = celValue;
}
}

@Test
public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
@TestParameter WellKnownProtoTestCase testCase) {
CelValue convertedCelValue =
PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
testCase.wellKnownProto.typeName(), testCase.msg);

assertThat(convertedCelValue).isEqualTo(testCase.celValue);
}
}
61 changes: 61 additions & 0 deletions common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;

import com.google.common.collect.ImmutableSet;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueTest {
private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
DefaultLiteDescriptorPool.newInstance(
ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

@Test
public void create_withEmptyMessage() {
ProtoMessageLiteValue messageLiteValue =
ProtoMessageLiteValue.create(
TestAllTypes.getDefaultInstance(),
"cel.expr.conformance.proto3.TestAllTypes",
PROTO_LITE_CEL_VALUE_CONVERTER);

assertThat(messageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
assertThat(messageLiteValue.isZeroValue()).isTrue();
}

@Test
public void create_withPopulatedMessage() {
ProtoMessageLiteValue messageLiteValue =
ProtoMessageLiteValue.create(
TestAllTypes.newBuilder().setSingleInt64(1L).build(),
"cel.expr.conformance.proto3.TestAllTypes",
PROTO_LITE_CEL_VALUE_CONVERTER);

assertThat(messageLiteValue.value())
.isEqualTo(TestAllTypes.newBuilder().setSingleInt64(1L).build());
assertThat(messageLiteValue.isZeroValue()).isFalse();
}
}
5 changes: 5 additions & 0 deletions common/values/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,3 +40,8 @@ java_library(
name = "proto_message_value",
exports = ["//common/src/main/java/dev/cel/common/values:proto_message_value"],
)

java_library(
name = "proto_message_lite_value",
exports = ["//common/src/main/java/dev/cel/common/values:proto_message_lite_value"],
)
, '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 ProtoMessageLiteValue and ProtoLiteCelValueConverter#666

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 ProtoMessageLiteValue and ProtoLiteCelValueConverter
#666
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 = "cel_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
)

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

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,3 +157,29 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "proto_message_lite_value",
 srcs = [
 "ProtoLiteCelValueConverter.java",
 "ProtoMessageLiteValue.java",
 ],
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common/annotations",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

65 changes: 65 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
// 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.values;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;

/**
 * {@code ProtoLiteCelValueConverter} handles bidirectional conversion between native Java and
 * protobuf objects to {@link CelValue}. This converter is specifically designed for use with
 * lite-variants of protobuf messages.
 *
 * <p>Protobuf semantics take precedence for conversion. For example, CEL's TimestampValue will be
 * converted into Protobuf's Timestamp instead of java.time.Instant.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public final class ProtoLiteCelValueConverter extends BaseProtoCelValueConverter {
 private final CelLiteDescriptorPool descriptorPool;

 public static ProtoLiteCelValueConverter newInstance(
 CelLiteDescriptorPool celLiteDescriptorPool) {
 return new ProtoLiteCelValueConverter(celLiteDescriptorPool);
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor = descriptorPool.getDescriptorOrThrow(protoTypeName);
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

 if (wellKnownProto == null) {
 return ProtoMessageLiteValue.create(msg, descriptor.getProtoTypeName(), this);
 }

 return super.fromWellKnownProtoToCelValue(msg, wellKnownProto);
 }

 private ProtoLiteCelValueConverter(CelLiteDescriptorPool celLiteDescriptorPool) {
 this.descriptorPool = celLiteDescriptorPool;
 }
}

67 changes: 67 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
// 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.values;

import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import java.util.Optional;

/**
 * ProtoMessageLiteValue is a struct value with protobuf support for {@link MessageLite}.
 * Specifically, it does not rely on full message descriptors, thus field selections can be
 * performed without the reliance of proto-reflection.
 *
 * <p>If the codebase has access to full protobuf messages with descriptors, use {@code
 * ProtoMessageValue} instead.
 */
@AutoValue
@Immutable
public abstract class ProtoMessageLiteValue extends StructValue<StringValue> {

 @Override
 public abstract MessageLite value();

 @Override
 public abstract CelType celType();

 abstract ProtoLiteCelValueConverter protoLiteCelValueConverter();

 @Override
 public boolean isZeroValue() {
 return value().getDefaultInstanceForType().equals(value());
 }

 @Override
 public CelValue select(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 @Override
 public Optional<CelValue> find(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 public static ProtoMessageLiteValue create(
 MessageLite value, String typeName, ProtoLiteCelValueConverter protoLiteCelValueConverter) {
 Preconditions.checkNotNull(value);
 Preconditions.checkNotNull(typeName);
 return new AutoValue_ProtoMessageLiteValue(
 value, StructTypeReference.create(typeName), protoLiteCelValueConverter);
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,24 @@ java_library(
 "//common:options",
 "//common:runtime_exception",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//common/values",
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//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",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_guava_guava_testlib",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

110 changes: 110 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.collect.ImmutableSet;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLiteValue() {
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 "cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 this.msg = msg;
 this.celValue = celValue;
 }
 }

 @Test
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
}

61 changes: 61 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;

import com.google.common.collect.ImmutableSet;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void create_withEmptyMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.getDefaultInstance(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 assertThat(messageLiteValue.isZeroValue()).isTrue();
 }

 @Test
 public void create_withPopulatedMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.newBuilder().setSingleInt64(1L).build(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value())
 .isEqualTo(TestAllTypes.newBuilder().setSingleInt64(1L).build());
 assertThat(messageLiteValue.isZeroValue()).isFalse();
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,3 +40,8 @@ java_library(
 name = "proto_message_value",
 exports = ["//common/src/main/java/dev/cel/common/values:proto_message_value"],
)

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

, '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 ProtoMessageLiteValue and ProtoLiteCelValueConverter#666

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 ProtoMessageLiteValue and ProtoLiteCelValueConverter
#666
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 = "cel_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
)

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

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,3 +157,29 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "proto_message_lite_value",
 srcs = [
 "ProtoLiteCelValueConverter.java",
 "ProtoMessageLiteValue.java",
 ],
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common/annotations",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

65 changes: 65 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
// 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.values;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;

/**
 * {@code ProtoLiteCelValueConverter} handles bidirectional conversion between native Java and
 * protobuf objects to {@link CelValue}. This converter is specifically designed for use with
 * lite-variants of protobuf messages.
 *
 * <p>Protobuf semantics take precedence for conversion. For example, CEL's TimestampValue will be
 * converted into Protobuf's Timestamp instead of java.time.Instant.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public final class ProtoLiteCelValueConverter extends BaseProtoCelValueConverter {
 private final CelLiteDescriptorPool descriptorPool;

 public static ProtoLiteCelValueConverter newInstance(
 CelLiteDescriptorPool celLiteDescriptorPool) {
 return new ProtoLiteCelValueConverter(celLiteDescriptorPool);
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor = descriptorPool.getDescriptorOrThrow(protoTypeName);
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

 if (wellKnownProto == null) {
 return ProtoMessageLiteValue.create(msg, descriptor.getProtoTypeName(), this);
 }

 return super.fromWellKnownProtoToCelValue(msg, wellKnownProto);
 }

 private ProtoLiteCelValueConverter(CelLiteDescriptorPool celLiteDescriptorPool) {
 this.descriptorPool = celLiteDescriptorPool;
 }
}

67 changes: 67 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
// 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.values;

import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import java.util.Optional;

/**
 * ProtoMessageLiteValue is a struct value with protobuf support for {@link MessageLite}.
 * Specifically, it does not rely on full message descriptors, thus field selections can be
 * performed without the reliance of proto-reflection.
 *
 * <p>If the codebase has access to full protobuf messages with descriptors, use {@code
 * ProtoMessageValue} instead.
 */
@AutoValue
@Immutable
public abstract class ProtoMessageLiteValue extends StructValue<StringValue> {

 @Override
 public abstract MessageLite value();

 @Override
 public abstract CelType celType();

 abstract ProtoLiteCelValueConverter protoLiteCelValueConverter();

 @Override
 public boolean isZeroValue() {
 return value().getDefaultInstanceForType().equals(value());
 }

 @Override
 public CelValue select(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 @Override
 public Optional<CelValue> find(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 public static ProtoMessageLiteValue create(
 MessageLite value, String typeName, ProtoLiteCelValueConverter protoLiteCelValueConverter) {
 Preconditions.checkNotNull(value);
 Preconditions.checkNotNull(typeName);
 return new AutoValue_ProtoMessageLiteValue(
 value, StructTypeReference.create(typeName), protoLiteCelValueConverter);
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,24 @@ java_library(
 "//common:options",
 "//common:runtime_exception",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//common/values",
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//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",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_guava_guava_testlib",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

110 changes: 110 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.collect.ImmutableSet;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLiteValue() {
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 "cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 this.msg = msg;
 this.celValue = celValue;
 }
 }

 @Test
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
}

61 changes: 61 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;

import com.google.common.collect.ImmutableSet;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void create_withEmptyMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.getDefaultInstance(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 assertThat(messageLiteValue.isZeroValue()).isTrue();
 }

 @Test
 public void create_withPopulatedMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.newBuilder().setSingleInt64(1L).build(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value())
 .isEqualTo(TestAllTypes.newBuilder().setSingleInt64(1L).build());
 assertThat(messageLiteValue.isZeroValue()).isFalse();
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,3 +40,8 @@ java_library(
 name = "proto_message_value",
 exports = ["//common/src/main/java/dev/cel/common/values:proto_message_value"],
)

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

, '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 ProtoMessageLiteValue and ProtoLiteCelValueConverter#666

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 ProtoMessageLiteValue and ProtoLiteCelValueConverter
#666
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 = "cel_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
)

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

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,3 +157,29 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "proto_message_lite_value",
 srcs = [
 "ProtoLiteCelValueConverter.java",
 "ProtoMessageLiteValue.java",
 ],
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common/annotations",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

65 changes: 65 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
// 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.values;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;

/**
 * {@code ProtoLiteCelValueConverter} handles bidirectional conversion between native Java and
 * protobuf objects to {@link CelValue}. This converter is specifically designed for use with
 * lite-variants of protobuf messages.
 *
 * <p>Protobuf semantics take precedence for conversion. For example, CEL's TimestampValue will be
 * converted into Protobuf's Timestamp instead of java.time.Instant.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public final class ProtoLiteCelValueConverter extends BaseProtoCelValueConverter {
 private final CelLiteDescriptorPool descriptorPool;

 public static ProtoLiteCelValueConverter newInstance(
 CelLiteDescriptorPool celLiteDescriptorPool) {
 return new ProtoLiteCelValueConverter(celLiteDescriptorPool);
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor = descriptorPool.getDescriptorOrThrow(protoTypeName);
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

 if (wellKnownProto == null) {
 return ProtoMessageLiteValue.create(msg, descriptor.getProtoTypeName(), this);
 }

 return super.fromWellKnownProtoToCelValue(msg, wellKnownProto);
 }

 private ProtoLiteCelValueConverter(CelLiteDescriptorPool celLiteDescriptorPool) {
 this.descriptorPool = celLiteDescriptorPool;
 }
}

67 changes: 67 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
// 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.values;

import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import java.util.Optional;

/**
 * ProtoMessageLiteValue is a struct value with protobuf support for {@link MessageLite}.
 * Specifically, it does not rely on full message descriptors, thus field selections can be
 * performed without the reliance of proto-reflection.
 *
 * <p>If the codebase has access to full protobuf messages with descriptors, use {@code
 * ProtoMessageValue} instead.
 */
@AutoValue
@Immutable
public abstract class ProtoMessageLiteValue extends StructValue<StringValue> {

 @Override
 public abstract MessageLite value();

 @Override
 public abstract CelType celType();

 abstract ProtoLiteCelValueConverter protoLiteCelValueConverter();

 @Override
 public boolean isZeroValue() {
 return value().getDefaultInstanceForType().equals(value());
 }

 @Override
 public CelValue select(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 @Override
 public Optional<CelValue> find(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 public static ProtoMessageLiteValue create(
 MessageLite value, String typeName, ProtoLiteCelValueConverter protoLiteCelValueConverter) {
 Preconditions.checkNotNull(value);
 Preconditions.checkNotNull(typeName);
 return new AutoValue_ProtoMessageLiteValue(
 value, StructTypeReference.create(typeName), protoLiteCelValueConverter);
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,24 @@ java_library(
 "//common:options",
 "//common:runtime_exception",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//common/values",
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//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",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_guava_guava_testlib",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

110 changes: 110 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.collect.ImmutableSet;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLiteValue() {
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 "cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 this.msg = msg;
 this.celValue = celValue;
 }
 }

 @Test
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
}

61 changes: 61 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;

import com.google.common.collect.ImmutableSet;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void create_withEmptyMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.getDefaultInstance(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 assertThat(messageLiteValue.isZeroValue()).isTrue();
 }

 @Test
 public void create_withPopulatedMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.newBuilder().setSingleInt64(1L).build(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value())
 .isEqualTo(TestAllTypes.newBuilder().setSingleInt64(1L).build());
 assertThat(messageLiteValue.isZeroValue()).isFalse();
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,3 +40,8 @@ java_library(
 name = "proto_message_value",
 exports = ["//common/src/main/java/dev/cel/common/values:proto_message_value"],
)

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

, '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 ProtoMessageLiteValue and ProtoLiteCelValueConverter#666

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 ProtoMessageLiteValue and ProtoLiteCelValueConverter
#666
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 = "cel_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
)

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

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,3 +157,29 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "proto_message_lite_value",
 srcs = [
 "ProtoLiteCelValueConverter.java",
 "ProtoMessageLiteValue.java",
 ],
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common/annotations",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

65 changes: 65 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
// 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.values;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;

/**
 * {@code ProtoLiteCelValueConverter} handles bidirectional conversion between native Java and
 * protobuf objects to {@link CelValue}. This converter is specifically designed for use with
 * lite-variants of protobuf messages.
 *
 * <p>Protobuf semantics take precedence for conversion. For example, CEL's TimestampValue will be
 * converted into Protobuf's Timestamp instead of java.time.Instant.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public final class ProtoLiteCelValueConverter extends BaseProtoCelValueConverter {
 private final CelLiteDescriptorPool descriptorPool;

 public static ProtoLiteCelValueConverter newInstance(
 CelLiteDescriptorPool celLiteDescriptorPool) {
 return new ProtoLiteCelValueConverter(celLiteDescriptorPool);
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor = descriptorPool.getDescriptorOrThrow(protoTypeName);
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

 if (wellKnownProto == null) {
 return ProtoMessageLiteValue.create(msg, descriptor.getProtoTypeName(), this);
 }

 return super.fromWellKnownProtoToCelValue(msg, wellKnownProto);
 }

 private ProtoLiteCelValueConverter(CelLiteDescriptorPool celLiteDescriptorPool) {
 this.descriptorPool = celLiteDescriptorPool;
 }
}

67 changes: 67 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
// 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.values;

import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import java.util.Optional;

/**
 * ProtoMessageLiteValue is a struct value with protobuf support for {@link MessageLite}.
 * Specifically, it does not rely on full message descriptors, thus field selections can be
 * performed without the reliance of proto-reflection.
 *
 * <p>If the codebase has access to full protobuf messages with descriptors, use {@code
 * ProtoMessageValue} instead.
 */
@AutoValue
@Immutable
public abstract class ProtoMessageLiteValue extends StructValue<StringValue> {

 @Override
 public abstract MessageLite value();

 @Override
 public abstract CelType celType();

 abstract ProtoLiteCelValueConverter protoLiteCelValueConverter();

 @Override
 public boolean isZeroValue() {
 return value().getDefaultInstanceForType().equals(value());
 }

 @Override
 public CelValue select(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 @Override
 public Optional<CelValue> find(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 public static ProtoMessageLiteValue create(
 MessageLite value, String typeName, ProtoLiteCelValueConverter protoLiteCelValueConverter) {
 Preconditions.checkNotNull(value);
 Preconditions.checkNotNull(typeName);
 return new AutoValue_ProtoMessageLiteValue(
 value, StructTypeReference.create(typeName), protoLiteCelValueConverter);
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,24 @@ java_library(
 "//common:options",
 "//common:runtime_exception",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//common/values",
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//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",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_guava_guava_testlib",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

110 changes: 110 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.collect.ImmutableSet;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLiteValue() {
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 "cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 this.msg = msg;
 this.celValue = celValue;
 }
 }

 @Test
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
}

61 changes: 61 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;

import com.google.common.collect.ImmutableSet;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void create_withEmptyMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.getDefaultInstance(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 assertThat(messageLiteValue.isZeroValue()).isTrue();
 }

 @Test
 public void create_withPopulatedMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.newBuilder().setSingleInt64(1L).build(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value())
 .isEqualTo(TestAllTypes.newBuilder().setSingleInt64(1L).build());
 assertThat(messageLiteValue.isZeroValue()).isFalse();
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,3 +40,8 @@ java_library(
 name = "proto_message_value",
 exports = ["//common/src/main/java/dev/cel/common/values:proto_message_value"],
)

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

, '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 ProtoMessageLiteValue and ProtoLiteCelValueConverter#666

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 ProtoMessageLiteValue and ProtoLiteCelValueConverter
#666
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 = "cel_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
)

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

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,3 +157,29 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "proto_message_lite_value",
 srcs = [
 "ProtoLiteCelValueConverter.java",
 "ProtoMessageLiteValue.java",
 ],
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common/annotations",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

65 changes: 65 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
// 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.values;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;

/**
 * {@code ProtoLiteCelValueConverter} handles bidirectional conversion between native Java and
 * protobuf objects to {@link CelValue}. This converter is specifically designed for use with
 * lite-variants of protobuf messages.
 *
 * <p>Protobuf semantics take precedence for conversion. For example, CEL's TimestampValue will be
 * converted into Protobuf's Timestamp instead of java.time.Instant.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public final class ProtoLiteCelValueConverter extends BaseProtoCelValueConverter {
 private final CelLiteDescriptorPool descriptorPool;

 public static ProtoLiteCelValueConverter newInstance(
 CelLiteDescriptorPool celLiteDescriptorPool) {
 return new ProtoLiteCelValueConverter(celLiteDescriptorPool);
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor = descriptorPool.getDescriptorOrThrow(protoTypeName);
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

 if (wellKnownProto == null) {
 return ProtoMessageLiteValue.create(msg, descriptor.getProtoTypeName(), this);
 }

 return super.fromWellKnownProtoToCelValue(msg, wellKnownProto);
 }

 private ProtoLiteCelValueConverter(CelLiteDescriptorPool celLiteDescriptorPool) {
 this.descriptorPool = celLiteDescriptorPool;
 }
}

67 changes: 67 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
// 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.values;

import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import java.util.Optional;

/**
 * ProtoMessageLiteValue is a struct value with protobuf support for {@link MessageLite}.
 * Specifically, it does not rely on full message descriptors, thus field selections can be
 * performed without the reliance of proto-reflection.
 *
 * <p>If the codebase has access to full protobuf messages with descriptors, use {@code
 * ProtoMessageValue} instead.
 */
@AutoValue
@Immutable
public abstract class ProtoMessageLiteValue extends StructValue<StringValue> {

 @Override
 public abstract MessageLite value();

 @Override
 public abstract CelType celType();

 abstract ProtoLiteCelValueConverter protoLiteCelValueConverter();

 @Override
 public boolean isZeroValue() {
 return value().getDefaultInstanceForType().equals(value());
 }

 @Override
 public CelValue select(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 @Override
 public Optional<CelValue> find(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 public static ProtoMessageLiteValue create(
 MessageLite value, String typeName, ProtoLiteCelValueConverter protoLiteCelValueConverter) {
 Preconditions.checkNotNull(value);
 Preconditions.checkNotNull(typeName);
 return new AutoValue_ProtoMessageLiteValue(
 value, StructTypeReference.create(typeName), protoLiteCelValueConverter);
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,24 @@ java_library(
 "//common:options",
 "//common:runtime_exception",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//common/values",
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//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",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_guava_guava_testlib",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

110 changes: 110 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.collect.ImmutableSet;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLiteValue() {
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 "cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 this.msg = msg;
 this.celValue = celValue;
 }
 }

 @Test
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
}

61 changes: 61 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;

import com.google.common.collect.ImmutableSet;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void create_withEmptyMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.getDefaultInstance(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 assertThat(messageLiteValue.isZeroValue()).isTrue();
 }

 @Test
 public void create_withPopulatedMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.newBuilder().setSingleInt64(1L).build(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value())
 .isEqualTo(TestAllTypes.newBuilder().setSingleInt64(1L).build());
 assertThat(messageLiteValue.isZeroValue()).isFalse();
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,3 +40,8 @@ java_library(
 name = "proto_message_value",
 exports = ["//common/src/main/java/dev/cel/common/values:proto_message_value"],
)

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

, '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 ProtoMessageLiteValue and ProtoLiteCelValueConverter#666

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 ProtoMessageLiteValue and ProtoLiteCelValueConverter
#666
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 = "cel_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
)

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

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,3 +157,29 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "proto_message_lite_value",
 srcs = [
 "ProtoLiteCelValueConverter.java",
 "ProtoMessageLiteValue.java",
 ],
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common/annotations",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

65 changes: 65 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
// 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.values;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;

/**
 * {@code ProtoLiteCelValueConverter} handles bidirectional conversion between native Java and
 * protobuf objects to {@link CelValue}. This converter is specifically designed for use with
 * lite-variants of protobuf messages.
 *
 * <p>Protobuf semantics take precedence for conversion. For example, CEL's TimestampValue will be
 * converted into Protobuf's Timestamp instead of java.time.Instant.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public final class ProtoLiteCelValueConverter extends BaseProtoCelValueConverter {
 private final CelLiteDescriptorPool descriptorPool;

 public static ProtoLiteCelValueConverter newInstance(
 CelLiteDescriptorPool celLiteDescriptorPool) {
 return new ProtoLiteCelValueConverter(celLiteDescriptorPool);
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor = descriptorPool.getDescriptorOrThrow(protoTypeName);
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

 if (wellKnownProto == null) {
 return ProtoMessageLiteValue.create(msg, descriptor.getProtoTypeName(), this);
 }

 return super.fromWellKnownProtoToCelValue(msg, wellKnownProto);
 }

 private ProtoLiteCelValueConverter(CelLiteDescriptorPool celLiteDescriptorPool) {
 this.descriptorPool = celLiteDescriptorPool;
 }
}

67 changes: 67 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
// 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.values;

import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import java.util.Optional;

/**
 * ProtoMessageLiteValue is a struct value with protobuf support for {@link MessageLite}.
 * Specifically, it does not rely on full message descriptors, thus field selections can be
 * performed without the reliance of proto-reflection.
 *
 * <p>If the codebase has access to full protobuf messages with descriptors, use {@code
 * ProtoMessageValue} instead.
 */
@AutoValue
@Immutable
public abstract class ProtoMessageLiteValue extends StructValue<StringValue> {

 @Override
 public abstract MessageLite value();

 @Override
 public abstract CelType celType();

 abstract ProtoLiteCelValueConverter protoLiteCelValueConverter();

 @Override
 public boolean isZeroValue() {
 return value().getDefaultInstanceForType().equals(value());
 }

 @Override
 public CelValue select(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 @Override
 public Optional<CelValue> find(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 public static ProtoMessageLiteValue create(
 MessageLite value, String typeName, ProtoLiteCelValueConverter protoLiteCelValueConverter) {
 Preconditions.checkNotNull(value);
 Preconditions.checkNotNull(typeName);
 return new AutoValue_ProtoMessageLiteValue(
 value, StructTypeReference.create(typeName), protoLiteCelValueConverter);
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,24 @@ java_library(
 "//common:options",
 "//common:runtime_exception",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//common/values",
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//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",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_guava_guava_testlib",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

110 changes: 110 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.collect.ImmutableSet;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLiteValue() {
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 "cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 this.msg = msg;
 this.celValue = celValue;
 }
 }

 @Test
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
}

61 changes: 61 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;

import com.google.common.collect.ImmutableSet;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void create_withEmptyMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.getDefaultInstance(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 assertThat(messageLiteValue.isZeroValue()).isTrue();
 }

 @Test
 public void create_withPopulatedMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.newBuilder().setSingleInt64(1L).build(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value())
 .isEqualTo(TestAllTypes.newBuilder().setSingleInt64(1L).build());
 assertThat(messageLiteValue.isZeroValue()).isFalse();
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,3 +40,8 @@ java_library(
 name = "proto_message_value",
 exports = ["//common/src/main/java/dev/cel/common/values:proto_message_value"],
)

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

, '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 ProtoMessageLiteValue and ProtoLiteCelValueConverter#666

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 ProtoMessageLiteValue and ProtoLiteCelValueConverter
#666
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 = "cel_lite_descriptor_pool",
 exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
)

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

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -157,3 +157,29 @@ java_library(
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "proto_message_lite_value",
 srcs = [
 "ProtoLiteCelValueConverter.java",
 "ProtoMessageLiteValue.java",
 ],
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common/annotations",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

65 changes: 65 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
// 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.values;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;

/**
 * {@code ProtoLiteCelValueConverter} handles bidirectional conversion between native Java and
 * protobuf objects to {@link CelValue}. This converter is specifically designed for use with
 * lite-variants of protobuf messages.
 *
 * <p>Protobuf semantics take precedence for conversion. For example, CEL's TimestampValue will be
 * converted into Protobuf's Timestamp instead of java.time.Instant.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public final class ProtoLiteCelValueConverter extends BaseProtoCelValueConverter {
 private final CelLiteDescriptorPool descriptorPool;

 public static ProtoLiteCelValueConverter newInstance(
 CelLiteDescriptorPool celLiteDescriptorPool) {
 return new ProtoLiteCelValueConverter(celLiteDescriptorPool);
 }

 @Override
 public CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg) {
 checkNotNull(msg);
 checkNotNull(protoTypeName);

 MessageLiteDescriptor descriptor = descriptorPool.getDescriptorOrThrow(protoTypeName);
 WellKnownProto wellKnownProto =
 WellKnownProto.getByTypeName(descriptor.getProtoTypeName()).orElse(null);

 if (wellKnownProto == null) {
 return ProtoMessageLiteValue.create(msg, descriptor.getProtoTypeName(), this);
 }

 return super.fromWellKnownProtoToCelValue(msg, wellKnownProto);
 }

 private ProtoLiteCelValueConverter(CelLiteDescriptorPool celLiteDescriptorPool) {
 this.descriptorPool = celLiteDescriptorPool;
 }
}

67 changes: 67 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValue.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
// 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.values;

import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.types.CelType;
import dev.cel.common.types.StructTypeReference;
import java.util.Optional;

/**
 * ProtoMessageLiteValue is a struct value with protobuf support for {@link MessageLite}.
 * Specifically, it does not rely on full message descriptors, thus field selections can be
 * performed without the reliance of proto-reflection.
 *
 * <p>If the codebase has access to full protobuf messages with descriptors, use {@code
 * ProtoMessageValue} instead.
 */
@AutoValue
@Immutable
public abstract class ProtoMessageLiteValue extends StructValue<StringValue> {

 @Override
 public abstract MessageLite value();

 @Override
 public abstract CelType celType();

 abstract ProtoLiteCelValueConverter protoLiteCelValueConverter();

 @Override
 public boolean isZeroValue() {
 return value().getDefaultInstanceForType().equals(value());
 }

 @Override
 public CelValue select(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 @Override
 public Optional<CelValue> find(StringValue field) {
 throw new UnsupportedOperationException("Not implemented yet");
 }

 public static ProtoMessageLiteValue create(
 MessageLite value, String typeName, ProtoLiteCelValueConverter protoLiteCelValueConverter) {
 Preconditions.checkNotNull(value);
 Preconditions.checkNotNull(typeName);
 return new AutoValue_ProtoMessageLiteValue(
 value, StructTypeReference.create(typeName), protoLiteCelValueConverter);
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,24 @@ java_library(
 "//common:options",
 "//common:runtime_exception",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:type_providers",
 "//common/values",
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_value",
 "//common/values:proto_message_value_provider",
 "//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",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_guava_guava_testlib",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

110 changes: 110 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoLiteCelValueConverterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;

import com.google.common.collect.ImmutableSet;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import java.time.Instant;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoLiteCelValueConverterTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void fromProtoMessageToCelValue_withTestMessage_convertsToProtoMessageLiteValue() {
 ProtoMessageLiteValue protoMessageLiteValue =
 (ProtoMessageLiteValue)
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 "cel.expr.conformance.proto3.TestAllTypes", TestAllTypes.getDefaultInstance());

 assertThat(protoMessageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 }

 private enum WellKnownProtoTestCase {
 BOOL(WellKnownProto.BOOL_VALUE, com.google.protobuf.BoolValue.of(true), BoolValue.create(true)),
 BYTES(
 WellKnownProto.BYTES_VALUE,
 com.google.protobuf.BytesValue.of(ByteString.copyFromUtf8("test")),
 BytesValue.create(CelByteString.of("test".getBytes(UTF_8)))),
 FLOAT(WellKnownProto.FLOAT_VALUE, FloatValue.of(1.0f), DoubleValue.create(1.0f)),
 DOUBLE(
 WellKnownProto.DOUBLE_VALUE,
 com.google.protobuf.DoubleValue.of(1.0),
 DoubleValue.create(1.0)),
 INT32(WellKnownProto.INT32_VALUE, Int32Value.of(1), IntValue.create(1)),
 INT64(WellKnownProto.INT64_VALUE, Int64Value.of(1L), IntValue.create(1L)),
 STRING(
 WellKnownProto.STRING_VALUE,
 com.google.protobuf.StringValue.of("test"),
 StringValue.create("test")),

 DURATION(
 WellKnownProto.DURATION,
 Duration.newBuilder().setSeconds(10).setNanos(50).build(),
 DurationValue.create(java.time.Duration.ofSeconds(10, 50))),
 TIMESTAMP(
 WellKnownProto.TIMESTAMP,
 Timestamp.newBuilder().setSeconds(1678886400L).setNanos(123000000).build(),
 TimestampValue.create(Instant.ofEpochSecond(1678886400L, 123000000))),
 UINT32(WellKnownProto.UINT32_VALUE, UInt32Value.of(1), UintValue.create(1)),
 UINT64(WellKnownProto.UINT64_VALUE, UInt64Value.of(1L), UintValue.create(1L)),
 ;

 private final WellKnownProto wellKnownProto;
 private final MessageLite msg;
 private final CelValue celValue;

 WellKnownProtoTestCase(WellKnownProto wellKnownProto, MessageLite msg, CelValue celValue) {
 this.wellKnownProto = wellKnownProto;
 this.msg = msg;
 this.celValue = celValue;
 }
 }

 @Test
 public void fromProtoMessageToCelValue_withWellKnownProto_convertsToEquivalentCelValue(
 @TestParameter WellKnownProtoTestCase testCase) {
 CelValue convertedCelValue =
 PROTO_LITE_CEL_VALUE_CONVERTER.fromProtoMessageToCelValue(
 testCase.wellKnownProto.typeName(), testCase.msg);

 assertThat(convertedCelValue).isEqualTo(testCase.celValue);
 }
}

61 changes: 61 additions & 0 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
// 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.values;

import static com.google.common.truth.Truth.assertThat;

import com.google.common.collect.ImmutableSet;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.expr.conformance.proto3.TestAllTypesCelDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(TestParameterInjector.class)
public class ProtoMessageLiteValueTest {
 private static final CelLiteDescriptorPool DESCRIPTOR_POOL =
 DefaultLiteDescriptorPool.newInstance(
 ImmutableSet.of(TestAllTypesCelDescriptor.getDescriptor()));

 private static final ProtoLiteCelValueConverter PROTO_LITE_CEL_VALUE_CONVERTER =
 ProtoLiteCelValueConverter.newInstance(DESCRIPTOR_POOL);

 @Test
 public void create_withEmptyMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.getDefaultInstance(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value()).isEqualTo(TestAllTypes.getDefaultInstance());
 assertThat(messageLiteValue.isZeroValue()).isTrue();
 }

 @Test
 public void create_withPopulatedMessage() {
 ProtoMessageLiteValue messageLiteValue =
 ProtoMessageLiteValue.create(
 TestAllTypes.newBuilder().setSingleInt64(1L).build(),
 "cel.expr.conformance.proto3.TestAllTypes",
 PROTO_LITE_CEL_VALUE_CONVERTER);

 assertThat(messageLiteValue.value())
 .isEqualTo(TestAllTypes.newBuilder().setSingleInt64(1L).build());
 assertThat(messageLiteValue.isZeroValue()).isFalse();
 }
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,3 +40,8 @@ java_library(
 name = "proto_message_value",
 exports = ["//common/src/main/java/dev/cel/common/values:proto_message_value"],
)

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