Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers#674

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 29, 2025
Merged

Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers #674

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
63 changes: 58 additions & 5 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@@ -89,6 +89,32 @@ cel_android_library(
],
)

java_library(
name = "combined_cel_value_provider",
srcs = ["CombinedCelValueProvider.java"],
tags = [
],
deps = [
"//common/values:cel_value",
"//common/values:cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

cel_android_library(
name = "combined_cel_value_provider_android",
srcs = ["CombinedCelValueProvider.java"],
tags = [
],
deps = [
":cel_value_android",
"//common/values:cel_value_provider_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "values",
srcs = CEL_VALUES_SOURCES,
Expand DownExpand Up@@ -207,14 +233,13 @@ java_library(
tags = [
],
deps = [
":base_proto_message_value_provider",
":cel_value",
":cel_value_provider",
":proto_message_value",
"//common:error_codes",
"//common:runtime_exception",
"//common/annotations",
"//common/internal:dynamic_proto",
"//common/internal:proto_message_factory",
"//common/values:base_proto_cel_value_converter",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_protobuf_protobuf_java",
],
Expand DownExpand Up@@ -280,11 +305,12 @@ java_library(
tags = [
],
deps = [
":base_proto_message_value_provider",
":cel_value",
":cel_value_provider",
":proto_message_lite_value",
"//common/internal:cel_lite_descriptor_pool",
"//common/internal:default_lite_descriptor_pool",
"//common/values:base_proto_cel_value_converter",
"//protobuf:cel_lite_descriptor",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -298,14 +324,41 @@ cel_android_library(
tags = [
],
deps = [
":base_proto_message_value_provider_android",
":cel_value_android",
":cel_value_provider_android",
":proto_message_lite_value_android",
"//common/internal:cel_lite_descriptor_pool_android",
"//common/internal:default_lite_descriptor_pool_android",
"//common/values:base_proto_cel_value_converter_android",
"//protobuf:cel_lite_descriptor",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

java_library(
name = "base_proto_message_value_provider",
srcs = ["BaseProtoMessageValueProvider.java"],
tags = [
],
deps = [
"//common/annotations",
"//common/values:base_proto_cel_value_converter",
"//common/values:cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

cel_android_library(
name = "base_proto_message_value_provider_android",
srcs = ["BaseProtoMessageValueProvider.java"],
tags = [
],
deps = [
"//common/annotations",
"//common/values:base_proto_cel_value_converter_android",
"//common/values:cel_value_provider_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
31 changes: 31 additions & 0 deletions common/src/main/java/dev/cel/common/values/BaseProtoMessageValueProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// 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.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;

/**
* {@code BaseProtoMessageValueProvider} is a common parent to {@code ProtoMessageValueProvider} and
* {@code ProtoMessageLiteValueProvider}.
*
* <p>CEL-Java internals. Do not use. Use one of the inherited variants mentioned above.
*/
@Internal
@Immutable
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

public abstract BaseProtoCelValueConverter protoCelValueConverter();
}
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/values/CelValueConverter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -31,6 +32,7 @@
*/
@SuppressWarnings("unchecked") // Unchecked cast of generics due to type-erasure (ex: MapValue).
@Internal
@Immutable
abstract class CelValueConverter {

/** Adapts a {@link CelValue} to a plain old Java Object. */
Expand Down
30 changes: 0 additions & 30 deletions common/src/main/java/dev/cel/common/values/CelValueProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,6 @@

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;
Expand All@@ -31,32 +29,4 @@ public interface CelValueProvider {
* special cases such as wrappers where its primitive is returned.
*/
Optional<CelValue> newValue(String structType, Map<String, Object> fields);

/**
* The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
* attempts to create a {@link CelValue} instance for a given struct type name by calling each
* value provider in the order that they are provided to the constructor.
*/
@Immutable
final class CombinedCelValueProvider implements CelValueProvider {
private final ImmutableList<CelValueProvider> celValueProviders;

public CombinedCelValueProvider(CelValueProvider first, CelValueProvider second) {
Preconditions.checkNotNull(first);
Preconditions.checkNotNull(second);
celValueProviders = ImmutableList.of(first, second);
}

@Override
public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
for (CelValueProvider provider : celValueProviders) {
Optional<CelValue> newValue = provider.newValue(structType, fields);
if (newValue.isPresent()) {
return newValue;
}
}

return Optional.empty();
}
}
}
60 changes: 60 additions & 0 deletions common/src/main/java/dev/cel/common/values/CombinedCelValueProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
// 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.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;

/**
* The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
* attempts to create a {@link CelValue} instance for a given struct type name by calling each value
* provider in the order that they are provided to the constructor.
*/
@Immutable
public final class CombinedCelValueProvider implements CelValueProvider {
private final ImmutableList<CelValueProvider> celValueProviders;

/** Combines the provided first and second {@link CelValueProvider}. */
public static CombinedCelValueProvider combine(CelValueProvider... providers) {
checkArgument(providers.length >= 2, "You must provide two or more providers");
return new CombinedCelValueProvider(ImmutableList.copyOf(providers));
}

@Override
public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
for (CelValueProvider provider : celValueProviders) {
Optional<CelValue> newValue = provider.newValue(structType, fields);
if (newValue.isPresent()) {
return newValue;
}
}

return Optional.empty();
}

/** Returns the underlying {@link CelValueProvider}s in order. */
public ImmutableList<CelValueProvider> valueProviders() {
return celValueProviders;
}

private CombinedCelValueProvider(ImmutableList<CelValueProvider> providers) {
celValueProviders = checkNotNull(providers);
}
}
5 changes: 3 additions & 2 deletions common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
* fully qualified name and its fields to populate.
*/
@Immutable
public class ProtoMessageLiteValueProvider implements CelValueProvider {
public class ProtoMessageLiteValueProvider extends BaseProtoMessageValueProvider {
private final CelLiteDescriptorPool descriptorPool;
private final ProtoLiteCelValueConverter protoLiteCelValueConverter;

public ProtoLiteCelValueConverter getProtoLiteCelValueConverter() {
@Override
public BaseProtoCelValueConverter protoCelValueConverter() {
return protoLiteCelValueConverter;
}

Expand Down
23 changes: 7 additions & 16 deletions common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.Message;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoAdapter;
Expand All@@ -35,19 +33,23 @@
*/
@Immutable
@Internal
public class ProtoMessageValueProvider implements CelValueProvider {
public class ProtoMessageValueProvider extends BaseProtoMessageValueProvider {
private final ProtoAdapter protoAdapter;
private final ProtoMessageFactory protoMessageFactory;
private final ProtoCelValueConverter protoCelValueConverter;

public ProtoCelValueConverter getProtoCelValueConverter() {
@Override
public BaseProtoCelValueConverter protoCelValueConverter() {
return protoCelValueConverter;
}

@Override
public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
Message.Builder builder = protoMessageFactory.newBuilder(structType).orElse(null);
if (builder == null) {
return Optional.empty();
}
try {
Message.Builder builder = getMessageBuilderOrThrow(structType);
Descriptor descriptor = builder.getDescriptorForType();
for (Map.Entry<String, Object> entry : fields.entrySet()) {
FieldDescriptor fieldDescriptor = findField(descriptor, entry.getKey());
Expand All@@ -63,17 +65,6 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
}
}

private Message.Builder getMessageBuilderOrThrow(String messageName) {
return protoMessageFactory
.newBuilder(messageName)
.orElseThrow(
() ->
new CelRuntimeException(
new IllegalArgumentException(
String.format("cannot resolve '%s' as a message", messageName)),
CelErrorCode.ATTRIBUTE_NOT_FOUND));
}

private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
if (fieldDescriptor != null) {
Expand Down
1 change: 1 addition & 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@@ -28,6 +28,7 @@ java_library(
"//common/values:cel_byte_string",
"//common/values:cel_value",
"//common/values:cel_value_provider",
"//common/values:combined_cel_value_provider",
"//common/values:proto_message_lite_value",
"//common/values:proto_message_lite_value_provider",
"//common/values:proto_message_value",
Expand Down
2 changes: 1 addition & 1 deletion common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,6 @@ public void newValue_emptyFields_success() {

@Test
public void getProtoLiteCelValueConverter() {
assertThat(VALUE_PROVIDER.getProtoLiteCelValueConverter()).isNotNull();
assertThat(VALUE_PROVIDER.protoCelValueConverter()).isNotNull();
}
}
15 changes: 3 additions & 12 deletions common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,14 +22,12 @@
import com.google.common.primitives.UnsignedLong;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.internal.CelDescriptorPool;
import dev.cel.common.internal.DefaultDescriptorPool;
import dev.cel.common.internal.DefaultMessageFactory;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoMessageFactory;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.values.CelValueProvider.CombinedCelValueProvider;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import java.time.Duration;
Expand DownExpand Up@@ -206,18 +204,11 @@ public void newValue_createProtoMessage_extensionFieldsPopulated() {
}

@Test
public void newValue_invalidMessageName_throws() {
public void newValue_invalidMessageName_returnsEmpty() {
ProtoMessageValueProvider protoMessageValueProvider =
ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);

CelRuntimeException e =
assertThrows(
CelRuntimeException.class,
() -> protoMessageValueProvider.newValue("bogus", ImmutableMap.of()));

assertThat(e)
.hasMessageThat()
.isEqualTo("java.lang.IllegalArgumentException: cannot resolve 'bogus' as a message");
assertThat(protoMessageValueProvider.newValue("bogus", ImmutableMap.of())).isEmpty();
}

@Test
Expand DownExpand Up@@ -245,7 +236,7 @@ public void newValue_onCombinedProvider() {
ProtoMessageValueProvider protoMessageValueProvider =
ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
CelValueProvider combinedProvider =
new CombinedCelValueProvider(celValueProvider, protoMessageValueProvider);
CombinedCelValueProvider.combine(celValueProvider, protoMessageValueProvider);

ProtoMessageValue protoMessageValue =
(ProtoMessageValue)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers#674

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 29, 2025
 Merged


Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers
#674
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


63 changes: 58 additions & 5 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@@ -89,6 +89,32 @@ cel_android_library(
 ],
)

java_library(
 name = "combined_cel_value_provider",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "combined_cel_value_provider_android",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 ":cel_value_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand DownExpand Up@@ -207,14 +233,13 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_value",
 "//common:error_codes",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/values:base_proto_cel_value_converter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand DownExpand Up@@ -280,11 +305,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_lite_value",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/values:base_proto_cel_value_converter",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
Expand All@@ -298,14 +324,41 @@ cel_android_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider_android",
 ":cel_value_android",
 ":cel_value_provider_android",
 ":proto_message_lite_value_android",
 "//common/internal:cel_lite_descriptor_pool_android",
 "//common/internal:default_lite_descriptor_pool_android",
 "//common/values:base_proto_cel_value_converter_android",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "base_proto_message_value_provider",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

cel_android_library(
 name = "base_proto_message_value_provider_android",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

31 changes: 31 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// 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.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;

/**
 * {@code BaseProtoMessageValueProvider} is a common parent to {@code ProtoMessageValueProvider} and
 * {@code ProtoMessageLiteValueProvider}.
 *
 * <p>CEL-Java internals. Do not use. Use one of the inherited variants mentioned above.
 */
@Internal
@Immutable
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

 public abstract BaseProtoCelValueConverter protoCelValueConverter();
}

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -31,6 +32,7 @@
 */
@SuppressWarnings("unchecked") // Unchecked cast of generics due to type-erasure (ex: MapValue).
@Internal
@Immutable
abstract class CelValueConverter {

 /** Adapts a {@link CelValue} to a plain old Java Object. */
Expand Down

30 changes: 0 additions & 30 deletions
common/src/main/java/dev/cel/common/values/CelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,6 @@

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;
Expand All@@ -31,32 +29,4 @@ public interface CelValueProvider {
 * special cases such as wrappers where its primitive is returned.
 */
 Optional<CelValue> newValue(String structType, Map<String, Object> fields);

 /**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each
 * value provider in the order that they are provided to the constructor.
 */
 @Immutable
 final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 public CombinedCelValueProvider(CelValueProvider first, CelValueProvider second) {
 Preconditions.checkNotNull(first);
 Preconditions.checkNotNull(second);
 celValueProviders = ImmutableList.of(first, second);
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }
 }
}

60 changes: 60 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CombinedCelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
// 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.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;

/**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each value
 * provider in the order that they are provided to the constructor.
 */
@Immutable
public final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 /** Combines the provided first and second {@link CelValueProvider}. */
 public static CombinedCelValueProvider combine(CelValueProvider... providers) {
 checkArgument(providers.length >= 2, "You must provide two or more providers");
 return new CombinedCelValueProvider(ImmutableList.copyOf(providers));
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }

 /** Returns the underlying {@link CelValueProvider}s in order. */
 public ImmutableList<CelValueProvider> valueProviders() {
 return celValueProviders;
 }

 private CombinedCelValueProvider(ImmutableList<CelValueProvider> providers) {
 celValueProviders = checkNotNull(providers);
 }
}

5 changes: 3 additions & 2 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
 * fully qualified name and its fields to populate.
 */
@Immutable
public class ProtoMessageLiteValueProvider implements CelValueProvider {
public class ProtoMessageLiteValueProvider extends BaseProtoMessageValueProvider {
 private final CelLiteDescriptorPool descriptorPool;
 private final ProtoLiteCelValueConverter protoLiteCelValueConverter;

 public ProtoLiteCelValueConverter getProtoLiteCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoLiteCelValueConverter;
 }

Expand Down

23 changes: 7 additions & 16 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.Message;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoAdapter;
Expand All@@ -35,19 +33,23 @@
 */
@Immutable
@Internal
public class ProtoMessageValueProvider implements CelValueProvider {
public class ProtoMessageValueProvider extends BaseProtoMessageValueProvider {
 private final ProtoAdapter protoAdapter;
 private final ProtoMessageFactory protoMessageFactory;
 private final ProtoCelValueConverter protoCelValueConverter;

 public ProtoCelValueConverter getProtoCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoCelValueConverter;
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 Message.Builder builder = protoMessageFactory.newBuilder(structType).orElse(null);
 if (builder == null) {
 return Optional.empty();
 }
 try {
 Message.Builder builder = getMessageBuilderOrThrow(structType);
 Descriptor descriptor = builder.getDescriptorForType();
 for (Map.Entry<String, Object> entry : fields.entrySet()) {
 FieldDescriptor fieldDescriptor = findField(descriptor, entry.getKey());
Expand All@@ -63,17 +65,6 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }
 }

 private Message.Builder getMessageBuilderOrThrow(String messageName) {
 return protoMessageFactory
 .newBuilder(messageName)
 .orElseThrow(
 () ->
 new CelRuntimeException(
 new IllegalArgumentException(
 String.format("cannot resolve '%s' as a message", messageName)),
 CelErrorCode.ATTRIBUTE_NOT_FOUND));
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
Expand Down

1 change: 1 addition & 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@@ -28,6 +28,7 @@ java_library(
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:combined_cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,6 @@ public void newValue_emptyFields_success() {

 @Test
 public void getProtoLiteCelValueConverter() {
 assertThat(VALUE_PROVIDER.getProtoLiteCelValueConverter()).isNotNull();
 assertThat(VALUE_PROVIDER.protoCelValueConverter()).isNotNull();
 }
}

15 changes: 3 additions & 12 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,14 +22,12 @@
import com.google.common.primitives.UnsignedLong;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.internal.CelDescriptorPool;
import dev.cel.common.internal.DefaultDescriptorPool;
import dev.cel.common.internal.DefaultMessageFactory;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoMessageFactory;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.values.CelValueProvider.CombinedCelValueProvider;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import java.time.Duration;
Expand DownExpand Up@@ -206,18 +204,11 @@ public void newValue_createProtoMessage_extensionFieldsPopulated() {
 }

 @Test
 public void newValue_invalidMessageName_throws() {
 public void newValue_invalidMessageName_returnsEmpty() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);

 CelRuntimeException e =
 assertThrows(
 CelRuntimeException.class,
 () -> protoMessageValueProvider.newValue("bogus", ImmutableMap.of()));

 assertThat(e)
 .hasMessageThat()
 .isEqualTo("java.lang.IllegalArgumentException: cannot resolve 'bogus' as a message");
 assertThat(protoMessageValueProvider.newValue("bogus", ImmutableMap.of())).isEmpty();
 }

 @Test
Expand DownExpand Up@@ -245,7 +236,7 @@ public void newValue_onCombinedProvider() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 CelValueProvider combinedProvider =
new CombinedCelValueProvider(celValueProvider, protoMessageValueProvider);
 CombinedCelValueProvider.combine(celValueProvider, protoMessageValueProvider);

 ProtoMessageValue protoMessageValue =
 (ProtoMessageValue)
Expand Down
Loading

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

Skip to content
Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers#674

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 29, 2025
 Merged


Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers
#674
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


63 changes: 58 additions & 5 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@@ -89,6 +89,32 @@ cel_android_library(
 ],
)

java_library(
 name = "combined_cel_value_provider",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "combined_cel_value_provider_android",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 ":cel_value_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand DownExpand Up@@ -207,14 +233,13 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_value",
 "//common:error_codes",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/values:base_proto_cel_value_converter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand DownExpand Up@@ -280,11 +305,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_lite_value",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/values:base_proto_cel_value_converter",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
Expand All@@ -298,14 +324,41 @@ cel_android_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider_android",
 ":cel_value_android",
 ":cel_value_provider_android",
 ":proto_message_lite_value_android",
 "//common/internal:cel_lite_descriptor_pool_android",
 "//common/internal:default_lite_descriptor_pool_android",
 "//common/values:base_proto_cel_value_converter_android",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "base_proto_message_value_provider",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

cel_android_library(
 name = "base_proto_message_value_provider_android",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

31 changes: 31 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// 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.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;

/**
 * {@code BaseProtoMessageValueProvider} is a common parent to {@code ProtoMessageValueProvider} and
 * {@code ProtoMessageLiteValueProvider}.
 *
 * <p>CEL-Java internals. Do not use. Use one of the inherited variants mentioned above.
 */
@Internal
@Immutable
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

 public abstract BaseProtoCelValueConverter protoCelValueConverter();
}

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -31,6 +32,7 @@
 */
@SuppressWarnings("unchecked") // Unchecked cast of generics due to type-erasure (ex: MapValue).
@Internal
@Immutable
abstract class CelValueConverter {

 /** Adapts a {@link CelValue} to a plain old Java Object. */
Expand Down

30 changes: 0 additions & 30 deletions
common/src/main/java/dev/cel/common/values/CelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,6 @@

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;
Expand All@@ -31,32 +29,4 @@ public interface CelValueProvider {
 * special cases such as wrappers where its primitive is returned.
 */
 Optional<CelValue> newValue(String structType, Map<String, Object> fields);

 /**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each
 * value provider in the order that they are provided to the constructor.
 */
 @Immutable
 final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 public CombinedCelValueProvider(CelValueProvider first, CelValueProvider second) {
 Preconditions.checkNotNull(first);
 Preconditions.checkNotNull(second);
 celValueProviders = ImmutableList.of(first, second);
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }
 }
}

60 changes: 60 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CombinedCelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
// 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.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;

/**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each value
 * provider in the order that they are provided to the constructor.
 */
@Immutable
public final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 /** Combines the provided first and second {@link CelValueProvider}. */
 public static CombinedCelValueProvider combine(CelValueProvider... providers) {
 checkArgument(providers.length >= 2, "You must provide two or more providers");
 return new CombinedCelValueProvider(ImmutableList.copyOf(providers));
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }

 /** Returns the underlying {@link CelValueProvider}s in order. */
 public ImmutableList<CelValueProvider> valueProviders() {
 return celValueProviders;
 }

 private CombinedCelValueProvider(ImmutableList<CelValueProvider> providers) {
 celValueProviders = checkNotNull(providers);
 }
}

5 changes: 3 additions & 2 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
 * fully qualified name and its fields to populate.
 */
@Immutable
public class ProtoMessageLiteValueProvider implements CelValueProvider {
public class ProtoMessageLiteValueProvider extends BaseProtoMessageValueProvider {
 private final CelLiteDescriptorPool descriptorPool;
 private final ProtoLiteCelValueConverter protoLiteCelValueConverter;

 public ProtoLiteCelValueConverter getProtoLiteCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoLiteCelValueConverter;
 }

Expand Down

23 changes: 7 additions & 16 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.Message;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoAdapter;
Expand All@@ -35,19 +33,23 @@
 */
@Immutable
@Internal
public class ProtoMessageValueProvider implements CelValueProvider {
public class ProtoMessageValueProvider extends BaseProtoMessageValueProvider {
 private final ProtoAdapter protoAdapter;
 private final ProtoMessageFactory protoMessageFactory;
 private final ProtoCelValueConverter protoCelValueConverter;

 public ProtoCelValueConverter getProtoCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoCelValueConverter;
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 Message.Builder builder = protoMessageFactory.newBuilder(structType).orElse(null);
 if (builder == null) {
 return Optional.empty();
 }
 try {
 Message.Builder builder = getMessageBuilderOrThrow(structType);
 Descriptor descriptor = builder.getDescriptorForType();
 for (Map.Entry<String, Object> entry : fields.entrySet()) {
 FieldDescriptor fieldDescriptor = findField(descriptor, entry.getKey());
Expand All@@ -63,17 +65,6 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }
 }

 private Message.Builder getMessageBuilderOrThrow(String messageName) {
 return protoMessageFactory
 .newBuilder(messageName)
 .orElseThrow(
 () ->
 new CelRuntimeException(
 new IllegalArgumentException(
 String.format("cannot resolve '%s' as a message", messageName)),
 CelErrorCode.ATTRIBUTE_NOT_FOUND));
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
Expand Down

1 change: 1 addition & 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@@ -28,6 +28,7 @@ java_library(
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:combined_cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,6 @@ public void newValue_emptyFields_success() {

 @Test
 public void getProtoLiteCelValueConverter() {
 assertThat(VALUE_PROVIDER.getProtoLiteCelValueConverter()).isNotNull();
 assertThat(VALUE_PROVIDER.protoCelValueConverter()).isNotNull();
 }
}

15 changes: 3 additions & 12 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,14 +22,12 @@
import com.google.common.primitives.UnsignedLong;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.internal.CelDescriptorPool;
import dev.cel.common.internal.DefaultDescriptorPool;
import dev.cel.common.internal.DefaultMessageFactory;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoMessageFactory;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.values.CelValueProvider.CombinedCelValueProvider;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import java.time.Duration;
Expand DownExpand Up@@ -206,18 +204,11 @@ public void newValue_createProtoMessage_extensionFieldsPopulated() {
 }

 @Test
 public void newValue_invalidMessageName_throws() {
 public void newValue_invalidMessageName_returnsEmpty() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);

 CelRuntimeException e =
 assertThrows(
 CelRuntimeException.class,
 () -> protoMessageValueProvider.newValue("bogus", ImmutableMap.of()));

 assertThat(e)
 .hasMessageThat()
 .isEqualTo("java.lang.IllegalArgumentException: cannot resolve 'bogus' as a message");
 assertThat(protoMessageValueProvider.newValue("bogus", ImmutableMap.of())).isEmpty();
 }

 @Test
Expand DownExpand Up@@ -245,7 +236,7 @@ public void newValue_onCombinedProvider() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 CelValueProvider combinedProvider =
new CombinedCelValueProvider(celValueProvider, protoMessageValueProvider);
 CombinedCelValueProvider.combine(celValueProvider, protoMessageValueProvider);

 ProtoMessageValue protoMessageValue =
 (ProtoMessageValue)
Expand Down
Loading

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

Skip to content
Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers#674

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 29, 2025
 Merged


Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers
#674
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


63 changes: 58 additions & 5 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@@ -89,6 +89,32 @@ cel_android_library(
 ],
)

java_library(
 name = "combined_cel_value_provider",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "combined_cel_value_provider_android",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 ":cel_value_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand DownExpand Up@@ -207,14 +233,13 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_value",
 "//common:error_codes",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/values:base_proto_cel_value_converter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand DownExpand Up@@ -280,11 +305,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_lite_value",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/values:base_proto_cel_value_converter",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
Expand All@@ -298,14 +324,41 @@ cel_android_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider_android",
 ":cel_value_android",
 ":cel_value_provider_android",
 ":proto_message_lite_value_android",
 "//common/internal:cel_lite_descriptor_pool_android",
 "//common/internal:default_lite_descriptor_pool_android",
 "//common/values:base_proto_cel_value_converter_android",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "base_proto_message_value_provider",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

cel_android_library(
 name = "base_proto_message_value_provider_android",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

31 changes: 31 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// 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.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;

/**
 * {@code BaseProtoMessageValueProvider} is a common parent to {@code ProtoMessageValueProvider} and
 * {@code ProtoMessageLiteValueProvider}.
 *
 * <p>CEL-Java internals. Do not use. Use one of the inherited variants mentioned above.
 */
@Internal
@Immutable
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

 public abstract BaseProtoCelValueConverter protoCelValueConverter();
}

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -31,6 +32,7 @@
 */
@SuppressWarnings("unchecked") // Unchecked cast of generics due to type-erasure (ex: MapValue).
@Internal
@Immutable
abstract class CelValueConverter {

 /** Adapts a {@link CelValue} to a plain old Java Object. */
Expand Down

30 changes: 0 additions & 30 deletions
common/src/main/java/dev/cel/common/values/CelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,6 @@

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;
Expand All@@ -31,32 +29,4 @@ public interface CelValueProvider {
 * special cases such as wrappers where its primitive is returned.
 */
 Optional<CelValue> newValue(String structType, Map<String, Object> fields);

 /**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each
 * value provider in the order that they are provided to the constructor.
 */
 @Immutable
 final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 public CombinedCelValueProvider(CelValueProvider first, CelValueProvider second) {
 Preconditions.checkNotNull(first);
 Preconditions.checkNotNull(second);
 celValueProviders = ImmutableList.of(first, second);
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }
 }
}

60 changes: 60 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CombinedCelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
// 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.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;

/**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each value
 * provider in the order that they are provided to the constructor.
 */
@Immutable
public final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 /** Combines the provided first and second {@link CelValueProvider}. */
 public static CombinedCelValueProvider combine(CelValueProvider... providers) {
 checkArgument(providers.length >= 2, "You must provide two or more providers");
 return new CombinedCelValueProvider(ImmutableList.copyOf(providers));
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }

 /** Returns the underlying {@link CelValueProvider}s in order. */
 public ImmutableList<CelValueProvider> valueProviders() {
 return celValueProviders;
 }

 private CombinedCelValueProvider(ImmutableList<CelValueProvider> providers) {
 celValueProviders = checkNotNull(providers);
 }
}

5 changes: 3 additions & 2 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
 * fully qualified name and its fields to populate.
 */
@Immutable
public class ProtoMessageLiteValueProvider implements CelValueProvider {
public class ProtoMessageLiteValueProvider extends BaseProtoMessageValueProvider {
 private final CelLiteDescriptorPool descriptorPool;
 private final ProtoLiteCelValueConverter protoLiteCelValueConverter;

 public ProtoLiteCelValueConverter getProtoLiteCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoLiteCelValueConverter;
 }

Expand Down

23 changes: 7 additions & 16 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.Message;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoAdapter;
Expand All@@ -35,19 +33,23 @@
 */
@Immutable
@Internal
public class ProtoMessageValueProvider implements CelValueProvider {
public class ProtoMessageValueProvider extends BaseProtoMessageValueProvider {
 private final ProtoAdapter protoAdapter;
 private final ProtoMessageFactory protoMessageFactory;
 private final ProtoCelValueConverter protoCelValueConverter;

 public ProtoCelValueConverter getProtoCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoCelValueConverter;
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 Message.Builder builder = protoMessageFactory.newBuilder(structType).orElse(null);
 if (builder == null) {
 return Optional.empty();
 }
 try {
 Message.Builder builder = getMessageBuilderOrThrow(structType);
 Descriptor descriptor = builder.getDescriptorForType();
 for (Map.Entry<String, Object> entry : fields.entrySet()) {
 FieldDescriptor fieldDescriptor = findField(descriptor, entry.getKey());
Expand All@@ -63,17 +65,6 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }
 }

 private Message.Builder getMessageBuilderOrThrow(String messageName) {
 return protoMessageFactory
 .newBuilder(messageName)
 .orElseThrow(
 () ->
 new CelRuntimeException(
 new IllegalArgumentException(
 String.format("cannot resolve '%s' as a message", messageName)),
 CelErrorCode.ATTRIBUTE_NOT_FOUND));
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
Expand Down

1 change: 1 addition & 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@@ -28,6 +28,7 @@ java_library(
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:combined_cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,6 @@ public void newValue_emptyFields_success() {

 @Test
 public void getProtoLiteCelValueConverter() {
 assertThat(VALUE_PROVIDER.getProtoLiteCelValueConverter()).isNotNull();
 assertThat(VALUE_PROVIDER.protoCelValueConverter()).isNotNull();
 }
}

15 changes: 3 additions & 12 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,14 +22,12 @@
import com.google.common.primitives.UnsignedLong;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.internal.CelDescriptorPool;
import dev.cel.common.internal.DefaultDescriptorPool;
import dev.cel.common.internal.DefaultMessageFactory;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoMessageFactory;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.values.CelValueProvider.CombinedCelValueProvider;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import java.time.Duration;
Expand DownExpand Up@@ -206,18 +204,11 @@ public void newValue_createProtoMessage_extensionFieldsPopulated() {
 }

 @Test
 public void newValue_invalidMessageName_throws() {
 public void newValue_invalidMessageName_returnsEmpty() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);

 CelRuntimeException e =
 assertThrows(
 CelRuntimeException.class,
 () -> protoMessageValueProvider.newValue("bogus", ImmutableMap.of()));

 assertThat(e)
 .hasMessageThat()
 .isEqualTo("java.lang.IllegalArgumentException: cannot resolve 'bogus' as a message");
 assertThat(protoMessageValueProvider.newValue("bogus", ImmutableMap.of())).isEmpty();
 }

 @Test
Expand DownExpand Up@@ -245,7 +236,7 @@ public void newValue_onCombinedProvider() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 CelValueProvider combinedProvider =
new CombinedCelValueProvider(celValueProvider, protoMessageValueProvider);
 CombinedCelValueProvider.combine(celValueProvider, protoMessageValueProvider);

 ProtoMessageValue protoMessageValue =
 (ProtoMessageValue)
Expand Down
Loading

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

Skip to content
Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers#674

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 29, 2025
 Merged


Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers
#674
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


63 changes: 58 additions & 5 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@@ -89,6 +89,32 @@ cel_android_library(
 ],
)

java_library(
 name = "combined_cel_value_provider",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "combined_cel_value_provider_android",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 ":cel_value_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand DownExpand Up@@ -207,14 +233,13 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_value",
 "//common:error_codes",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/values:base_proto_cel_value_converter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand DownExpand Up@@ -280,11 +305,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_lite_value",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/values:base_proto_cel_value_converter",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
Expand All@@ -298,14 +324,41 @@ cel_android_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider_android",
 ":cel_value_android",
 ":cel_value_provider_android",
 ":proto_message_lite_value_android",
 "//common/internal:cel_lite_descriptor_pool_android",
 "//common/internal:default_lite_descriptor_pool_android",
 "//common/values:base_proto_cel_value_converter_android",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "base_proto_message_value_provider",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

cel_android_library(
 name = "base_proto_message_value_provider_android",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

31 changes: 31 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// 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.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;

/**
 * {@code BaseProtoMessageValueProvider} is a common parent to {@code ProtoMessageValueProvider} and
 * {@code ProtoMessageLiteValueProvider}.
 *
 * <p>CEL-Java internals. Do not use. Use one of the inherited variants mentioned above.
 */
@Internal
@Immutable
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

 public abstract BaseProtoCelValueConverter protoCelValueConverter();
}

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -31,6 +32,7 @@
 */
@SuppressWarnings("unchecked") // Unchecked cast of generics due to type-erasure (ex: MapValue).
@Internal
@Immutable
abstract class CelValueConverter {

 /** Adapts a {@link CelValue} to a plain old Java Object. */
Expand Down

30 changes: 0 additions & 30 deletions
common/src/main/java/dev/cel/common/values/CelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,6 @@

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;
Expand All@@ -31,32 +29,4 @@ public interface CelValueProvider {
 * special cases such as wrappers where its primitive is returned.
 */
 Optional<CelValue> newValue(String structType, Map<String, Object> fields);

 /**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each
 * value provider in the order that they are provided to the constructor.
 */
 @Immutable
 final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 public CombinedCelValueProvider(CelValueProvider first, CelValueProvider second) {
 Preconditions.checkNotNull(first);
 Preconditions.checkNotNull(second);
 celValueProviders = ImmutableList.of(first, second);
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }
 }
}

60 changes: 60 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CombinedCelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
// 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.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;

/**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each value
 * provider in the order that they are provided to the constructor.
 */
@Immutable
public final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 /** Combines the provided first and second {@link CelValueProvider}. */
 public static CombinedCelValueProvider combine(CelValueProvider... providers) {
 checkArgument(providers.length >= 2, "You must provide two or more providers");
 return new CombinedCelValueProvider(ImmutableList.copyOf(providers));
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }

 /** Returns the underlying {@link CelValueProvider}s in order. */
 public ImmutableList<CelValueProvider> valueProviders() {
 return celValueProviders;
 }

 private CombinedCelValueProvider(ImmutableList<CelValueProvider> providers) {
 celValueProviders = checkNotNull(providers);
 }
}

5 changes: 3 additions & 2 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
 * fully qualified name and its fields to populate.
 */
@Immutable
public class ProtoMessageLiteValueProvider implements CelValueProvider {
public class ProtoMessageLiteValueProvider extends BaseProtoMessageValueProvider {
 private final CelLiteDescriptorPool descriptorPool;
 private final ProtoLiteCelValueConverter protoLiteCelValueConverter;

 public ProtoLiteCelValueConverter getProtoLiteCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoLiteCelValueConverter;
 }

Expand Down

23 changes: 7 additions & 16 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.Message;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoAdapter;
Expand All@@ -35,19 +33,23 @@
 */
@Immutable
@Internal
public class ProtoMessageValueProvider implements CelValueProvider {
public class ProtoMessageValueProvider extends BaseProtoMessageValueProvider {
 private final ProtoAdapter protoAdapter;
 private final ProtoMessageFactory protoMessageFactory;
 private final ProtoCelValueConverter protoCelValueConverter;

 public ProtoCelValueConverter getProtoCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoCelValueConverter;
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 Message.Builder builder = protoMessageFactory.newBuilder(structType).orElse(null);
 if (builder == null) {
 return Optional.empty();
 }
 try {
 Message.Builder builder = getMessageBuilderOrThrow(structType);
 Descriptor descriptor = builder.getDescriptorForType();
 for (Map.Entry<String, Object> entry : fields.entrySet()) {
 FieldDescriptor fieldDescriptor = findField(descriptor, entry.getKey());
Expand All@@ -63,17 +65,6 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }
 }

 private Message.Builder getMessageBuilderOrThrow(String messageName) {
 return protoMessageFactory
 .newBuilder(messageName)
 .orElseThrow(
 () ->
 new CelRuntimeException(
 new IllegalArgumentException(
 String.format("cannot resolve '%s' as a message", messageName)),
 CelErrorCode.ATTRIBUTE_NOT_FOUND));
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
Expand Down

1 change: 1 addition & 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@@ -28,6 +28,7 @@ java_library(
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:combined_cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,6 @@ public void newValue_emptyFields_success() {

 @Test
 public void getProtoLiteCelValueConverter() {
 assertThat(VALUE_PROVIDER.getProtoLiteCelValueConverter()).isNotNull();
 assertThat(VALUE_PROVIDER.protoCelValueConverter()).isNotNull();
 }
}

15 changes: 3 additions & 12 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,14 +22,12 @@
import com.google.common.primitives.UnsignedLong;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.internal.CelDescriptorPool;
import dev.cel.common.internal.DefaultDescriptorPool;
import dev.cel.common.internal.DefaultMessageFactory;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoMessageFactory;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.values.CelValueProvider.CombinedCelValueProvider;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import java.time.Duration;
Expand DownExpand Up@@ -206,18 +204,11 @@ public void newValue_createProtoMessage_extensionFieldsPopulated() {
 }

 @Test
 public void newValue_invalidMessageName_throws() {
 public void newValue_invalidMessageName_returnsEmpty() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);

 CelRuntimeException e =
 assertThrows(
 CelRuntimeException.class,
 () -> protoMessageValueProvider.newValue("bogus", ImmutableMap.of()));

 assertThat(e)
 .hasMessageThat()
 .isEqualTo("java.lang.IllegalArgumentException: cannot resolve 'bogus' as a message");
 assertThat(protoMessageValueProvider.newValue("bogus", ImmutableMap.of())).isEmpty();
 }

 @Test
Expand DownExpand Up@@ -245,7 +236,7 @@ public void newValue_onCombinedProvider() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 CelValueProvider combinedProvider =
new CombinedCelValueProvider(celValueProvider, protoMessageValueProvider);
 CombinedCelValueProvider.combine(celValueProvider, protoMessageValueProvider);

 ProtoMessageValue protoMessageValue =
 (ProtoMessageValue)
Expand Down
Loading

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

Skip to content
Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers#674

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 29, 2025
 Merged


Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers
#674
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


63 changes: 58 additions & 5 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@@ -89,6 +89,32 @@ cel_android_library(
 ],
)

java_library(
 name = "combined_cel_value_provider",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "combined_cel_value_provider_android",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 ":cel_value_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand DownExpand Up@@ -207,14 +233,13 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_value",
 "//common:error_codes",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/values:base_proto_cel_value_converter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand DownExpand Up@@ -280,11 +305,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_lite_value",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/values:base_proto_cel_value_converter",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
Expand All@@ -298,14 +324,41 @@ cel_android_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider_android",
 ":cel_value_android",
 ":cel_value_provider_android",
 ":proto_message_lite_value_android",
 "//common/internal:cel_lite_descriptor_pool_android",
 "//common/internal:default_lite_descriptor_pool_android",
 "//common/values:base_proto_cel_value_converter_android",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "base_proto_message_value_provider",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

cel_android_library(
 name = "base_proto_message_value_provider_android",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

31 changes: 31 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// 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.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;

/**
 * {@code BaseProtoMessageValueProvider} is a common parent to {@code ProtoMessageValueProvider} and
 * {@code ProtoMessageLiteValueProvider}.
 *
 * <p>CEL-Java internals. Do not use. Use one of the inherited variants mentioned above.
 */
@Internal
@Immutable
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

 public abstract BaseProtoCelValueConverter protoCelValueConverter();
}

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -31,6 +32,7 @@
 */
@SuppressWarnings("unchecked") // Unchecked cast of generics due to type-erasure (ex: MapValue).
@Internal
@Immutable
abstract class CelValueConverter {

 /** Adapts a {@link CelValue} to a plain old Java Object. */
Expand Down

30 changes: 0 additions & 30 deletions
common/src/main/java/dev/cel/common/values/CelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,6 @@

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;
Expand All@@ -31,32 +29,4 @@ public interface CelValueProvider {
 * special cases such as wrappers where its primitive is returned.
 */
 Optional<CelValue> newValue(String structType, Map<String, Object> fields);

 /**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each
 * value provider in the order that they are provided to the constructor.
 */
 @Immutable
 final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 public CombinedCelValueProvider(CelValueProvider first, CelValueProvider second) {
 Preconditions.checkNotNull(first);
 Preconditions.checkNotNull(second);
 celValueProviders = ImmutableList.of(first, second);
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }
 }
}

60 changes: 60 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CombinedCelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
// 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.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;

/**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each value
 * provider in the order that they are provided to the constructor.
 */
@Immutable
public final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 /** Combines the provided first and second {@link CelValueProvider}. */
 public static CombinedCelValueProvider combine(CelValueProvider... providers) {
 checkArgument(providers.length >= 2, "You must provide two or more providers");
 return new CombinedCelValueProvider(ImmutableList.copyOf(providers));
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }

 /** Returns the underlying {@link CelValueProvider}s in order. */
 public ImmutableList<CelValueProvider> valueProviders() {
 return celValueProviders;
 }

 private CombinedCelValueProvider(ImmutableList<CelValueProvider> providers) {
 celValueProviders = checkNotNull(providers);
 }
}

5 changes: 3 additions & 2 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
 * fully qualified name and its fields to populate.
 */
@Immutable
public class ProtoMessageLiteValueProvider implements CelValueProvider {
public class ProtoMessageLiteValueProvider extends BaseProtoMessageValueProvider {
 private final CelLiteDescriptorPool descriptorPool;
 private final ProtoLiteCelValueConverter protoLiteCelValueConverter;

 public ProtoLiteCelValueConverter getProtoLiteCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoLiteCelValueConverter;
 }

Expand Down

23 changes: 7 additions & 16 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.Message;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoAdapter;
Expand All@@ -35,19 +33,23 @@
 */
@Immutable
@Internal
public class ProtoMessageValueProvider implements CelValueProvider {
public class ProtoMessageValueProvider extends BaseProtoMessageValueProvider {
 private final ProtoAdapter protoAdapter;
 private final ProtoMessageFactory protoMessageFactory;
 private final ProtoCelValueConverter protoCelValueConverter;

 public ProtoCelValueConverter getProtoCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoCelValueConverter;
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 Message.Builder builder = protoMessageFactory.newBuilder(structType).orElse(null);
 if (builder == null) {
 return Optional.empty();
 }
 try {
 Message.Builder builder = getMessageBuilderOrThrow(structType);
 Descriptor descriptor = builder.getDescriptorForType();
 for (Map.Entry<String, Object> entry : fields.entrySet()) {
 FieldDescriptor fieldDescriptor = findField(descriptor, entry.getKey());
Expand All@@ -63,17 +65,6 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }
 }

 private Message.Builder getMessageBuilderOrThrow(String messageName) {
 return protoMessageFactory
 .newBuilder(messageName)
 .orElseThrow(
 () ->
 new CelRuntimeException(
 new IllegalArgumentException(
 String.format("cannot resolve '%s' as a message", messageName)),
 CelErrorCode.ATTRIBUTE_NOT_FOUND));
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
Expand Down

1 change: 1 addition & 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@@ -28,6 +28,7 @@ java_library(
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:combined_cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,6 @@ public void newValue_emptyFields_success() {

 @Test
 public void getProtoLiteCelValueConverter() {
 assertThat(VALUE_PROVIDER.getProtoLiteCelValueConverter()).isNotNull();
 assertThat(VALUE_PROVIDER.protoCelValueConverter()).isNotNull();
 }
}

15 changes: 3 additions & 12 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,14 +22,12 @@
import com.google.common.primitives.UnsignedLong;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.internal.CelDescriptorPool;
import dev.cel.common.internal.DefaultDescriptorPool;
import dev.cel.common.internal.DefaultMessageFactory;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoMessageFactory;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.values.CelValueProvider.CombinedCelValueProvider;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import java.time.Duration;
Expand DownExpand Up@@ -206,18 +204,11 @@ public void newValue_createProtoMessage_extensionFieldsPopulated() {
 }

 @Test
 public void newValue_invalidMessageName_throws() {
 public void newValue_invalidMessageName_returnsEmpty() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);

 CelRuntimeException e =
 assertThrows(
 CelRuntimeException.class,
 () -> protoMessageValueProvider.newValue("bogus", ImmutableMap.of()));

 assertThat(e)
 .hasMessageThat()
 .isEqualTo("java.lang.IllegalArgumentException: cannot resolve 'bogus' as a message");
 assertThat(protoMessageValueProvider.newValue("bogus", ImmutableMap.of())).isEmpty();
 }

 @Test
Expand DownExpand Up@@ -245,7 +236,7 @@ public void newValue_onCombinedProvider() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 CelValueProvider combinedProvider =
new CombinedCelValueProvider(celValueProvider, protoMessageValueProvider);
 CombinedCelValueProvider.combine(celValueProvider, protoMessageValueProvider);

 ProtoMessageValue protoMessageValue =
 (ProtoMessageValue)
Expand Down
Loading

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

Skip to content
Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers#674

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 29, 2025
 Merged


Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers
#674
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


63 changes: 58 additions & 5 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@@ -89,6 +89,32 @@ cel_android_library(
 ],
)

java_library(
 name = "combined_cel_value_provider",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "combined_cel_value_provider_android",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 ":cel_value_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand DownExpand Up@@ -207,14 +233,13 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_value",
 "//common:error_codes",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/values:base_proto_cel_value_converter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand DownExpand Up@@ -280,11 +305,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_lite_value",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/values:base_proto_cel_value_converter",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
Expand All@@ -298,14 +324,41 @@ cel_android_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider_android",
 ":cel_value_android",
 ":cel_value_provider_android",
 ":proto_message_lite_value_android",
 "//common/internal:cel_lite_descriptor_pool_android",
 "//common/internal:default_lite_descriptor_pool_android",
 "//common/values:base_proto_cel_value_converter_android",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "base_proto_message_value_provider",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

cel_android_library(
 name = "base_proto_message_value_provider_android",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

31 changes: 31 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// 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.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;

/**
 * {@code BaseProtoMessageValueProvider} is a common parent to {@code ProtoMessageValueProvider} and
 * {@code ProtoMessageLiteValueProvider}.
 *
 * <p>CEL-Java internals. Do not use. Use one of the inherited variants mentioned above.
 */
@Internal
@Immutable
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

 public abstract BaseProtoCelValueConverter protoCelValueConverter();
}

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -31,6 +32,7 @@
 */
@SuppressWarnings("unchecked") // Unchecked cast of generics due to type-erasure (ex: MapValue).
@Internal
@Immutable
abstract class CelValueConverter {

 /** Adapts a {@link CelValue} to a plain old Java Object. */
Expand Down

30 changes: 0 additions & 30 deletions
common/src/main/java/dev/cel/common/values/CelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,6 @@

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;
Expand All@@ -31,32 +29,4 @@ public interface CelValueProvider {
 * special cases such as wrappers where its primitive is returned.
 */
 Optional<CelValue> newValue(String structType, Map<String, Object> fields);

 /**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each
 * value provider in the order that they are provided to the constructor.
 */
 @Immutable
 final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 public CombinedCelValueProvider(CelValueProvider first, CelValueProvider second) {
 Preconditions.checkNotNull(first);
 Preconditions.checkNotNull(second);
 celValueProviders = ImmutableList.of(first, second);
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }
 }
}

60 changes: 60 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CombinedCelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
// 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.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;

/**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each value
 * provider in the order that they are provided to the constructor.
 */
@Immutable
public final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 /** Combines the provided first and second {@link CelValueProvider}. */
 public static CombinedCelValueProvider combine(CelValueProvider... providers) {
 checkArgument(providers.length >= 2, "You must provide two or more providers");
 return new CombinedCelValueProvider(ImmutableList.copyOf(providers));
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }

 /** Returns the underlying {@link CelValueProvider}s in order. */
 public ImmutableList<CelValueProvider> valueProviders() {
 return celValueProviders;
 }

 private CombinedCelValueProvider(ImmutableList<CelValueProvider> providers) {
 celValueProviders = checkNotNull(providers);
 }
}

5 changes: 3 additions & 2 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
 * fully qualified name and its fields to populate.
 */
@Immutable
public class ProtoMessageLiteValueProvider implements CelValueProvider {
public class ProtoMessageLiteValueProvider extends BaseProtoMessageValueProvider {
 private final CelLiteDescriptorPool descriptorPool;
 private final ProtoLiteCelValueConverter protoLiteCelValueConverter;

 public ProtoLiteCelValueConverter getProtoLiteCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoLiteCelValueConverter;
 }

Expand Down

23 changes: 7 additions & 16 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.Message;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoAdapter;
Expand All@@ -35,19 +33,23 @@
 */
@Immutable
@Internal
public class ProtoMessageValueProvider implements CelValueProvider {
public class ProtoMessageValueProvider extends BaseProtoMessageValueProvider {
 private final ProtoAdapter protoAdapter;
 private final ProtoMessageFactory protoMessageFactory;
 private final ProtoCelValueConverter protoCelValueConverter;

 public ProtoCelValueConverter getProtoCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoCelValueConverter;
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 Message.Builder builder = protoMessageFactory.newBuilder(structType).orElse(null);
 if (builder == null) {
 return Optional.empty();
 }
 try {
 Message.Builder builder = getMessageBuilderOrThrow(structType);
 Descriptor descriptor = builder.getDescriptorForType();
 for (Map.Entry<String, Object> entry : fields.entrySet()) {
 FieldDescriptor fieldDescriptor = findField(descriptor, entry.getKey());
Expand All@@ -63,17 +65,6 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }
 }

 private Message.Builder getMessageBuilderOrThrow(String messageName) {
 return protoMessageFactory
 .newBuilder(messageName)
 .orElseThrow(
 () ->
 new CelRuntimeException(
 new IllegalArgumentException(
 String.format("cannot resolve '%s' as a message", messageName)),
 CelErrorCode.ATTRIBUTE_NOT_FOUND));
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
Expand Down

1 change: 1 addition & 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@@ -28,6 +28,7 @@ java_library(
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:combined_cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,6 @@ public void newValue_emptyFields_success() {

 @Test
 public void getProtoLiteCelValueConverter() {
 assertThat(VALUE_PROVIDER.getProtoLiteCelValueConverter()).isNotNull();
 assertThat(VALUE_PROVIDER.protoCelValueConverter()).isNotNull();
 }
}

15 changes: 3 additions & 12 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,14 +22,12 @@
import com.google.common.primitives.UnsignedLong;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.internal.CelDescriptorPool;
import dev.cel.common.internal.DefaultDescriptorPool;
import dev.cel.common.internal.DefaultMessageFactory;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoMessageFactory;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.values.CelValueProvider.CombinedCelValueProvider;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import java.time.Duration;
Expand DownExpand Up@@ -206,18 +204,11 @@ public void newValue_createProtoMessage_extensionFieldsPopulated() {
 }

 @Test
 public void newValue_invalidMessageName_throws() {
 public void newValue_invalidMessageName_returnsEmpty() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);

 CelRuntimeException e =
 assertThrows(
 CelRuntimeException.class,
 () -> protoMessageValueProvider.newValue("bogus", ImmutableMap.of()));

 assertThat(e)
 .hasMessageThat()
 .isEqualTo("java.lang.IllegalArgumentException: cannot resolve 'bogus' as a message");
 assertThat(protoMessageValueProvider.newValue("bogus", ImmutableMap.of())).isEmpty();
 }

 @Test
Expand DownExpand Up@@ -245,7 +236,7 @@ public void newValue_onCombinedProvider() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 CelValueProvider combinedProvider =
new CombinedCelValueProvider(celValueProvider, protoMessageValueProvider);
 CombinedCelValueProvider.combine(celValueProvider, protoMessageValueProvider);

 ProtoMessageValue protoMessageValue =
 (ProtoMessageValue)
Expand Down
Loading

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

Skip to content
Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers#674

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 29, 2025
 Merged


Add BaseProtoMessageValueProvider to decouple full/lite protobuf value providers
#674
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


63 changes: 58 additions & 5 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@@ -89,6 +89,32 @@ cel_android_library(
 ],
)

java_library(
 name = "combined_cel_value_provider",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

cel_android_library(
 name = "combined_cel_value_provider_android",
 srcs = ["CombinedCelValueProvider.java"],
 tags = [
 ],
 deps = [
 ":cel_value_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand DownExpand Up@@ -207,14 +233,13 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_value",
 "//common:error_codes",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
 "//common/values:base_proto_cel_value_converter",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
Expand DownExpand Up@@ -280,11 +305,12 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider",
 ":cel_value",
 ":cel_value_provider",
 ":proto_message_lite_value",
 "//common/internal:cel_lite_descriptor_pool",
 "//common/internal:default_lite_descriptor_pool",
 "//common/values:base_proto_cel_value_converter",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
Expand All@@ -298,14 +324,41 @@ cel_android_library(
 tags = [
 ],
 deps = [
 ":base_proto_message_value_provider_android",
 ":cel_value_android",
 ":cel_value_provider_android",
 ":proto_message_lite_value_android",
 "//common/internal:cel_lite_descriptor_pool_android",
 "//common/internal:default_lite_descriptor_pool_android",
 "//common/values:base_proto_cel_value_converter_android",
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

java_library(
 name = "base_proto_message_value_provider",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter",
 "//common/values:cel_value_provider",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

cel_android_library(
 name = "base_proto_message_value_provider_android",
 srcs = ["BaseProtoMessageValueProvider.java"],
 tags = [
 ],
 deps = [
 "//common/annotations",
 "//common/values:base_proto_cel_value_converter_android",
 "//common/values:cel_value_provider_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

31 changes: 31 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// 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.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;

/**
 * {@code BaseProtoMessageValueProvider} is a common parent to {@code ProtoMessageValueProvider} and
 * {@code ProtoMessageLiteValueProvider}.
 *
 * <p>CEL-Java internals. Do not use. Use one of the inherited variants mentioned above.
 */
@Internal
@Immutable
public abstract class BaseProtoMessageValueProvider implements CelValueProvider {

 public abstract BaseProtoCelValueConverter protoCelValueConverter();
}

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -31,6 +32,7 @@
 */
@SuppressWarnings("unchecked") // Unchecked cast of generics due to type-erasure (ex: MapValue).
@Internal
@Immutable
abstract class CelValueConverter {

 /** Adapts a {@link CelValue} to a plain old Java Object. */
Expand Down

30 changes: 0 additions & 30 deletions
common/src/main/java/dev/cel/common/values/CelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,6 @@

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;
Expand All@@ -31,32 +29,4 @@ public interface CelValueProvider {
 * special cases such as wrappers where its primitive is returned.
 */
 Optional<CelValue> newValue(String structType, Map<String, Object> fields);

 /**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each
 * value provider in the order that they are provided to the constructor.
 */
 @Immutable
 final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 public CombinedCelValueProvider(CelValueProvider first, CelValueProvider second) {
 Preconditions.checkNotNull(first);
 Preconditions.checkNotNull(second);
 celValueProviders = ImmutableList.of(first, second);
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }
 }
}

60 changes: 60 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CombinedCelValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
// 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.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import java.util.Map;
import java.util.Optional;

/**
 * The {@link CombinedCelValueProvider} takes one or more {@link CelValueProvider} instances and
 * attempts to create a {@link CelValue} instance for a given struct type name by calling each value
 * provider in the order that they are provided to the constructor.
 */
@Immutable
public final class CombinedCelValueProvider implements CelValueProvider {
 private final ImmutableList<CelValueProvider> celValueProviders;

 /** Combines the provided first and second {@link CelValueProvider}. */
 public static CombinedCelValueProvider combine(CelValueProvider... providers) {
 checkArgument(providers.length >= 2, "You must provide two or more providers");
 return new CombinedCelValueProvider(ImmutableList.copyOf(providers));
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 for (CelValueProvider provider : celValueProviders) {
 Optional<CelValue> newValue = provider.newValue(structType, fields);
 if (newValue.isPresent()) {
 return newValue;
 }
 }

 return Optional.empty();
 }

 /** Returns the underlying {@link CelValueProvider}s in order. */
 public ImmutableList<CelValueProvider> valueProviders() {
 return celValueProviders;
 }

 private CombinedCelValueProvider(ImmutableList<CelValueProvider> providers) {
 celValueProviders = checkNotNull(providers);
 }
}

5 changes: 3 additions & 2 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageLiteValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
 * fully qualified name and its fields to populate.
 */
@Immutable
public class ProtoMessageLiteValueProvider implements CelValueProvider {
public class ProtoMessageLiteValueProvider extends BaseProtoMessageValueProvider {
 private final CelLiteDescriptorPool descriptorPool;
 private final ProtoLiteCelValueConverter protoLiteCelValueConverter;

 public ProtoLiteCelValueConverter getProtoLiteCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoLiteCelValueConverter;
 }

Expand Down

23 changes: 7 additions & 16 deletions
common/src/main/java/dev/cel/common/values/ProtoMessageValueProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.Message;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoAdapter;
Expand All@@ -35,19 +33,23 @@
 */
@Immutable
@Internal
public class ProtoMessageValueProvider implements CelValueProvider {
public class ProtoMessageValueProvider extends BaseProtoMessageValueProvider {
 private final ProtoAdapter protoAdapter;
 private final ProtoMessageFactory protoMessageFactory;
 private final ProtoCelValueConverter protoCelValueConverter;

 public ProtoCelValueConverter getProtoCelValueConverter() {
 @Override
 public BaseProtoCelValueConverter protoCelValueConverter() {
 return protoCelValueConverter;
 }

 @Override
 public Optional<CelValue> newValue(String structType, Map<String, Object> fields) {
 Message.Builder builder = protoMessageFactory.newBuilder(structType).orElse(null);
 if (builder == null) {
 return Optional.empty();
 }
 try {
 Message.Builder builder = getMessageBuilderOrThrow(structType);
 Descriptor descriptor = builder.getDescriptorForType();
 for (Map.Entry<String, Object> entry : fields.entrySet()) {
 FieldDescriptor fieldDescriptor = findField(descriptor, entry.getKey());
Expand All@@ -63,17 +65,6 @@ public Optional<CelValue> newValue(String structType, Map<String, Object> fields
 }
 }

 private Message.Builder getMessageBuilderOrThrow(String messageName) {
 return protoMessageFactory
 .newBuilder(messageName)
 .orElseThrow(
 () ->
 new CelRuntimeException(
 new IllegalArgumentException(
 String.format("cannot resolve '%s' as a message", messageName)),
 CelErrorCode.ATTRIBUTE_NOT_FOUND));
 }

 private FieldDescriptor findField(Descriptor descriptor, String fieldName) {
 FieldDescriptor fieldDescriptor = descriptor.findFieldByName(fieldName);
 if (fieldDescriptor != null) {
Expand Down

1 change: 1 addition & 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@@ -28,6 +28,7 @@ java_library(
 "//common/values:cel_byte_string",
 "//common/values:cel_value",
 "//common/values:cel_value_provider",
 "//common/values:combined_cel_value_provider",
 "//common/values:proto_message_lite_value",
 "//common/values:proto_message_lite_value_provider",
 "//common/values:proto_message_value",
Expand Down

2 changes: 1 addition & 1 deletion
common/src/test/java/dev/cel/common/values/ProtoMessageLiteValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,6 @@ public void newValue_emptyFields_success() {

 @Test
 public void getProtoLiteCelValueConverter() {
 assertThat(VALUE_PROVIDER.getProtoLiteCelValueConverter()).isNotNull();
 assertThat(VALUE_PROVIDER.protoCelValueConverter()).isNotNull();
 }
}

15 changes: 3 additions & 12 deletions
common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,14 +22,12 @@
import com.google.common.primitives.UnsignedLong;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelRuntimeException;
import dev.cel.common.internal.CelDescriptorPool;
import dev.cel.common.internal.DefaultDescriptorPool;
import dev.cel.common.internal.DefaultMessageFactory;
import dev.cel.common.internal.DynamicProto;
import dev.cel.common.internal.ProtoMessageFactory;
import dev.cel.common.internal.ProtoTimeUtils;
import dev.cel.common.values.CelValueProvider.CombinedCelValueProvider;
import dev.cel.expr.conformance.proto2.TestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import java.time.Duration;
Expand DownExpand Up@@ -206,18 +204,11 @@ public void newValue_createProtoMessage_extensionFieldsPopulated() {
 }

 @Test
 public void newValue_invalidMessageName_throws() {
 public void newValue_invalidMessageName_returnsEmpty() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);

 CelRuntimeException e =
 assertThrows(
 CelRuntimeException.class,
 () -> protoMessageValueProvider.newValue("bogus", ImmutableMap.of()));

 assertThat(e)
 .hasMessageThat()
 .isEqualTo("java.lang.IllegalArgumentException: cannot resolve 'bogus' as a message");
 assertThat(protoMessageValueProvider.newValue("bogus", ImmutableMap.of())).isEmpty();
 }

 @Test
Expand DownExpand Up@@ -245,7 +236,7 @@ public void newValue_onCombinedProvider() {
 ProtoMessageValueProvider protoMessageValueProvider =
 ProtoMessageValueProvider.newInstance(DYNAMIC_PROTO);
 CelValueProvider combinedProvider =
new CombinedCelValueProvider(celValueProvider, protoMessageValueProvider);
 CombinedCelValueProvider.combine(celValueProvider, protoMessageValueProvider);

 ProtoMessageValue protoMessageValue =
 (ProtoMessageValue)
Expand Down
Loading