Decouple ProtoCelValueConverter into BaseProtoCelValueConverter#660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Decouple ProtoCelValueConverter into BaseProtoCelValueConverter #660

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
24 changes: 19 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@@ -76,7 +76,6 @@ java_library(
":cel_value",
"//:auto_value",
"//common:error_codes",
"//common:options",
"//common:runtime_exception",
"//common/annotations",
"//common/types",
Expand All@@ -94,7 +93,25 @@ java_library(
],
deps = [
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "base_proto_cel_value_converter",
srcs = ["BaseProtoCelValueConverter.java"],
tags = [
],
deps = [
":cel_byte_string",
":cel_value",
":values",
"//common/annotations",
"//common/internal:well_known_proto",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -104,22 +121,19 @@ java_library(
tags = [
],
deps = [
":base_proto_cel_value_converter",
":cel_value",
":values",
"//:auto_value",
"//common:options",
"//common/annotations",
"//common/internal:cel_descriptor_pools",
"//common/internal:dynamic_proto",
"//common/internal:well_known_proto",
"//common/types",
"//common/types:cel_types",
"//common/types:type_providers",
"//common/values:cel_byte_string",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
Expand Down
231 changes: 231 additions & 0 deletions common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
// 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.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.math.LongMath.checkedAdd;
import static com.google.common.math.LongMath.checkedSubtract;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.BoolValue;
import com.google.protobuf.ByteString;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.WellKnownProto;
import java.time.Duration;
import java.time.Instant;
import java.util.Optional;

/**
* {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
* and protobuf objects to {@link CelValue}. This base class is inherited by {@code
* ProtoCelValueConverter} and {@code ProtoLiteCelValueConverter} to perform the conversion using
* full and lite variants of protobuf messages respectively.
*
* <p>CEL Library Internals. Do Not Use.
*/
@Immutable
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);

/**
* Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
* when an equivalent exists.
*/
@Override
public Object fromCelValueToJavaObject(CelValue celValue) {
Preconditions.checkNotNull(celValue);

if (celValue instanceof TimestampValue) {
return TimeUtils.toProtoTimestamp(((TimestampValue) celValue).value());
} else if (celValue instanceof DurationValue) {
return TimeUtils.toProtoDuration(((DurationValue) celValue).value());
} else if (celValue instanceof BytesValue) {
return ByteString.copyFrom(((BytesValue) celValue).value().toByteArray());
} else if (celValue.equals(NullValue.NULL_VALUE)) {
return com.google.protobuf.NullValue.NULL_VALUE;
}

return super.fromCelValueToJavaObject(celValue);
}

/** {@inheritDoc} Protobuf semantics take precedence for conversion. */
@Override
public CelValue fromJavaObjectToCelValue(Object value) {
Preconditions.checkNotNull(value);

Optional<WellKnownProto> wellKnownProto = WellKnownProto.getByClass(value.getClass());
if (wellKnownProto.isPresent()) {
return fromWellKnownProtoToCelValue((MessageLiteOrBuilder) value, wellKnownProto.get());
}

if (value instanceof ByteString) {
return BytesValue.create(CelByteString.of(((ByteString) value).toByteArray()));
} else if (value instanceof com.google.protobuf.NullValue) {
return NullValue.NULL_VALUE;
}

return super.fromJavaObjectToCelValue(value);
}

protected CelValue fromWellKnownProtoToCelValue(
MessageLiteOrBuilder message, WellKnownProto wellKnownProto) {
switch (wellKnownProto) {
case JSON_VALUE:
return adaptJsonValueToCelValue((Value) message);
case JSON_STRUCT_VALUE:
return adaptJsonStructToCelValue((Struct) message);
case JSON_LIST_VALUE:
return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
case DURATION:
return DurationValue.create(
TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
case TIMESTAMP:
return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
case BOOL_VALUE:
return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
case BYTES_VALUE:
return fromJavaPrimitiveToCelValue(
((com.google.protobuf.BytesValue) message).getValue().toByteArray());
case DOUBLE_VALUE:
return fromJavaPrimitiveToCelValue(((DoubleValue) message).getValue());
case FLOAT_VALUE:
return fromJavaPrimitiveToCelValue(((FloatValue) message).getValue());
case INT32_VALUE:
return fromJavaPrimitiveToCelValue(((Int32Value) message).getValue());
case INT64_VALUE:
return fromJavaPrimitiveToCelValue(((Int64Value) message).getValue());
case STRING_VALUE:
return fromJavaPrimitiveToCelValue(((StringValue) message).getValue());
case UINT32_VALUE:
return UintValue.create(((UInt32Value) message).getValue(), true);
case UINT64_VALUE:
return UintValue.create(((UInt64Value) message).getValue(), true);
default:
throw new UnsupportedOperationException(
"Unsupported message to CelValue conversion - " + message);
}
}

private CelValue adaptJsonValueToCelValue(Value value) {
switch (value.getKindCase()) {
case BOOL_VALUE:
return fromJavaPrimitiveToCelValue(value.getBoolValue());
case NUMBER_VALUE:
return fromJavaPrimitiveToCelValue(value.getNumberValue());
case STRING_VALUE:
return fromJavaPrimitiveToCelValue(value.getStringValue());
case LIST_VALUE:
return adaptJsonListToCelValue(value.getListValue());
case STRUCT_VALUE:
return adaptJsonStructToCelValue(value.getStructValue());
case NULL_VALUE:
case KIND_NOT_SET: // Fall-through is intended
return NullValue.NULL_VALUE;
}
throw new UnsupportedOperationException(
"Unsupported Json to CelValue conversion: " + value.getKindCase());
}

private ListValue<CelValue> adaptJsonListToCelValue(com.google.protobuf.ListValue listValue) {
return ImmutableListValue.create(
listValue.getValuesList().stream()
.map(this::adaptJsonValueToCelValue)
.collect(toImmutableList()));
}

// TODO: Investigate changing MapValue key to StringValue
private MapValue<CelValue, CelValue> adaptJsonStructToCelValue(Struct struct) {
return ImmutableMapValue.create(
struct.getFieldsMap().entrySet().stream()
.collect(
toImmutableMap(
e -> fromJavaObjectToCelValue(e.getKey()),
e -> adaptJsonValueToCelValue(e.getValue()))));
}

/** Helper to convert between java.util.time and protobuf duration/timestamp. */
private static class TimeUtils {
private static final int NANOS_PER_SECOND = 1000000000;

private static Instant toJavaInstant(Timestamp timestamp) {
timestamp = normalizedTimestamp(timestamp.getSeconds(), timestamp.getNanos());
return Instant.ofEpochSecond(timestamp.getSeconds(), timestamp.getNanos());
}

private static Duration toJavaDuration(com.google.protobuf.Duration duration) {
duration = normalizedDuration(duration.getSeconds(), duration.getNanos());
return java.time.Duration.ofSeconds(duration.getSeconds(), duration.getNanos());
}

private static Timestamp toProtoTimestamp(Instant instant) {
return normalizedTimestamp(instant.getEpochSecond(), instant.getNano());
}

private static com.google.protobuf.Duration toProtoDuration(Duration duration) {
return normalizedDuration(duration.getSeconds(), duration.getNano());
}

private static Timestamp normalizedTimestamp(long seconds, int nanos) {
if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
nanos = nanos % NANOS_PER_SECOND;
}
if (nanos < 0) {
nanos = nanos + NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
seconds = checkedSubtract(seconds, 1);
}
Timestamp timestamp = Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();
return Timestamps.checkValid(timestamp);
}

private static com.google.protobuf.Duration normalizedDuration(long seconds, int nanos) {
if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
nanos %= NANOS_PER_SECOND;
}
if (seconds > 0 && nanos < 0) {
nanos += NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
seconds--; // no overflow since seconds is positive (and we're decrementing)
}
if (seconds < 0 && nanos > 0) {
nanos -= NANOS_PER_SECOND; // no overflow since nanos is positive (and we're subtracting)
seconds++; // no overflow since seconds is negative (and we're incrementing)
}
com.google.protobuf.Duration duration =
com.google.protobuf.Duration.newBuilder().setSeconds(seconds).setNanos(nanos).build();
return Durations.checkValid(duration);
}
}

protected BaseProtoCelValueConverter() {}
}
5 changes: 3 additions & 2 deletions common/src/main/java/dev/cel/common/values/CelByteString.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import java.util.Arrays;

Expand All@@ -30,7 +29,9 @@ public final class CelByteString {
private volatile int hash = 0;

public static CelByteString of(byte[] buffer) {
Preconditions.checkNotNull(buffer);
if (buffer == null) {
throw new NullPointerException("buffer cannot be null");
}
if (buffer.length == 0) {
return EMPTY;
}
Expand Down
10 changes: 2 additions & 8 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,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import dev.cel.common.CelOptions;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -34,8 +33,6 @@
@Internal
abstract class CelValueConverter {

protected final CelOptions celOptions;

/** Adapts a {@link CelValue} to a plain old Java Object. */
public Object fromCelValueToJavaObject(CelValue celValue) {
Preconditions.checkNotNull(celValue);
Expand DownExpand Up@@ -112,7 +109,7 @@ protected CelValue fromJavaPrimitiveToCelValue(Object value) {
} else if (value instanceof Float) {
return DoubleValue.create(Double.valueOf((Float) value));
} else if (value instanceof UnsignedLong) {
return UintValue.create(((UnsignedLong) value).longValue(), celOptions.enableUnsignedLongs());
return UintValue.create(((UnsignedLong) value).longValue(), /* enableUnsignedLongs= */ true);
}

// Fall back to an Opaque value, as a custom class was supplied in the runtime. The legacy
Expand DownExpand Up@@ -145,8 +142,5 @@ private MapValue<CelValue, CelValue> toMapValue(Map<Object, Object> map) {
return ImmutableMapValue.create(mapBuilder.buildOrThrow());
}

protected CelValueConverter(CelOptions celOptions) {
Preconditions.checkNotNull(celOptions);
this.celOptions = celOptions;
}
protected CelValueConverter() {}
}
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
Decouple ProtoCelValueConverter into BaseProtoCelValueConverter#660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Decouple ProtoCelValueConverter into BaseProtoCelValueConverter
#660
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


24 changes: 19 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@@ -76,7 +76,6 @@ java_library(
 ":cel_value",
 "//:auto_value",
 "//common:error_codes",
 "//common:options",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/types",
Expand All@@ -94,7 +93,25 @@ java_library(
 ],
 deps = [
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "base_proto_cel_value_converter",
 srcs = ["BaseProtoCelValueConverter.java"],
 tags = [
 ],
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":values",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -104,22 +121,19 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:dynamic_proto",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//common/values:cel_byte_string",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

231 changes: 231 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
// 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.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.math.LongMath.checkedAdd;
import static com.google.common.math.LongMath.checkedSubtract;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.BoolValue;
import com.google.protobuf.ByteString;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.WellKnownProto;
import java.time.Duration;
import java.time.Instant;
import java.util.Optional;

/**
 * {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
 * and protobuf objects to {@link CelValue}. This base class is inherited by {@code
 * ProtoCelValueConverter} and {@code ProtoLiteCelValueConverter} to perform the conversion using
 * full and lite variants of protobuf messages respectively.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
 * when an equivalent exists.
 */
 @Override
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);

 if (celValue instanceof TimestampValue) {
 return TimeUtils.toProtoTimestamp(((TimestampValue) celValue).value());
 } else if (celValue instanceof DurationValue) {
 return TimeUtils.toProtoDuration(((DurationValue) celValue).value());
 } else if (celValue instanceof BytesValue) {
 return ByteString.copyFrom(((BytesValue) celValue).value().toByteArray());
 } else if (celValue.equals(NullValue.NULL_VALUE)) {
 return com.google.protobuf.NullValue.NULL_VALUE;
 }

 return super.fromCelValueToJavaObject(celValue);
 }

 /** {@inheritDoc} Protobuf semantics take precedence for conversion. */
 @Override
 public CelValue fromJavaObjectToCelValue(Object value) {
 Preconditions.checkNotNull(value);

 Optional<WellKnownProto> wellKnownProto = WellKnownProto.getByClass(value.getClass());
 if (wellKnownProto.isPresent()) {
 return fromWellKnownProtoToCelValue((MessageLiteOrBuilder) value, wellKnownProto.get());
 }

 if (value instanceof ByteString) {
 return BytesValue.create(CelByteString.of(((ByteString) value).toByteArray()));
 } else if (value instanceof com.google.protobuf.NullValue) {
 return NullValue.NULL_VALUE;
 }

 return super.fromJavaObjectToCelValue(value);
 }

 protected CelValue fromWellKnownProtoToCelValue(
 MessageLiteOrBuilder message, WellKnownProto wellKnownProto) {
 switch (wellKnownProto) {
 case JSON_VALUE:
 return adaptJsonValueToCelValue((Value) message);
 case JSON_STRUCT_VALUE:
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
 case BYTES_VALUE:
 return fromJavaPrimitiveToCelValue(
 ((com.google.protobuf.BytesValue) message).getValue().toByteArray());
 case DOUBLE_VALUE:
 return fromJavaPrimitiveToCelValue(((DoubleValue) message).getValue());
 case FLOAT_VALUE:
 return fromJavaPrimitiveToCelValue(((FloatValue) message).getValue());
 case INT32_VALUE:
 return fromJavaPrimitiveToCelValue(((Int32Value) message).getValue());
 case INT64_VALUE:
 return fromJavaPrimitiveToCelValue(((Int64Value) message).getValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(((StringValue) message).getValue());
 case UINT32_VALUE:
 return UintValue.create(((UInt32Value) message).getValue(), true);
 case UINT64_VALUE:
 return UintValue.create(((UInt64Value) message).getValue(), true);
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }
 }

 private CelValue adaptJsonValueToCelValue(Value value) {
 switch (value.getKindCase()) {
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(value.getBoolValue());
 case NUMBER_VALUE:
 return fromJavaPrimitiveToCelValue(value.getNumberValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(value.getStringValue());
 case LIST_VALUE:
 return adaptJsonListToCelValue(value.getListValue());
 case STRUCT_VALUE:
 return adaptJsonStructToCelValue(value.getStructValue());
 case NULL_VALUE:
 case KIND_NOT_SET: // Fall-through is intended
 return NullValue.NULL_VALUE;
 }
 throw new UnsupportedOperationException(
 "Unsupported Json to CelValue conversion: " + value.getKindCase());
 }

 private ListValue<CelValue> adaptJsonListToCelValue(com.google.protobuf.ListValue listValue) {
 return ImmutableListValue.create(
 listValue.getValuesList().stream()
 .map(this::adaptJsonValueToCelValue)
 .collect(toImmutableList()));
 }

 // TODO: Investigate changing MapValue key to StringValue
 private MapValue<CelValue, CelValue> adaptJsonStructToCelValue(Struct struct) {
 return ImmutableMapValue.create(
 struct.getFieldsMap().entrySet().stream()
 .collect(
 toImmutableMap(
 e -> fromJavaObjectToCelValue(e.getKey()),
 e -> adaptJsonValueToCelValue(e.getValue()))));
 }

 /** Helper to convert between java.util.time and protobuf duration/timestamp. */
 private static class TimeUtils {
 private static final int NANOS_PER_SECOND = 1000000000;

 private static Instant toJavaInstant(Timestamp timestamp) {
 timestamp = normalizedTimestamp(timestamp.getSeconds(), timestamp.getNanos());
 return Instant.ofEpochSecond(timestamp.getSeconds(), timestamp.getNanos());
 }

 private static Duration toJavaDuration(com.google.protobuf.Duration duration) {
 duration = normalizedDuration(duration.getSeconds(), duration.getNanos());
 return java.time.Duration.ofSeconds(duration.getSeconds(), duration.getNanos());
 }

 private static Timestamp toProtoTimestamp(Instant instant) {
 return normalizedTimestamp(instant.getEpochSecond(), instant.getNano());
 }

 private static com.google.protobuf.Duration toProtoDuration(Duration duration) {
 return normalizedDuration(duration.getSeconds(), duration.getNano());
 }

 private static Timestamp normalizedTimestamp(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos = nanos % NANOS_PER_SECOND;
 }
 if (nanos < 0) {
 nanos = nanos + NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds = checkedSubtract(seconds, 1);
 }
 Timestamp timestamp = Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Timestamps.checkValid(timestamp);
 }

 private static com.google.protobuf.Duration normalizedDuration(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos %= NANOS_PER_SECOND;
 }
 if (seconds > 0 && nanos < 0) {
 nanos += NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds--; // no overflow since seconds is positive (and we're decrementing)
 }
 if (seconds < 0 && nanos > 0) {
 nanos -= NANOS_PER_SECOND; // no overflow since nanos is positive (and we're subtracting)
 seconds++; // no overflow since seconds is negative (and we're incrementing)
 }
 com.google.protobuf.Duration duration =
 com.google.protobuf.Duration.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Durations.checkValid(duration);
 }
 }

 protected BaseProtoCelValueConverter() {}
}

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

View file


Open in desktop

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

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import java.util.Arrays;

Expand All@@ -30,7 +29,9 @@ public final class CelByteString {
 private volatile int hash = 0;

 public static CelByteString of(byte[] buffer) {
 Preconditions.checkNotNull(buffer);
 if (buffer == null) {
 throw new NullPointerException("buffer cannot be null");
 }
 if (buffer.length == 0) {
 return EMPTY;
 }
Expand Down

10 changes: 2 additions & 8 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,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import dev.cel.common.CelOptions;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -34,8 +33,6 @@
@Internal
abstract class CelValueConverter {

 protected final CelOptions celOptions;

 /** Adapts a {@link CelValue} to a plain old Java Object. */
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);
Expand DownExpand Up@@ -112,7 +109,7 @@ protected CelValue fromJavaPrimitiveToCelValue(Object value) {
 } else if (value instanceof Float) {
 return DoubleValue.create(Double.valueOf((Float) value));
 } else if (value instanceof UnsignedLong) {
 return UintValue.create(((UnsignedLong) value).longValue(), celOptions.enableUnsignedLongs());
 return UintValue.create(((UnsignedLong) value).longValue(), /* enableUnsignedLongs= */ true);
 }

 // Fall back to an Opaque value, as a custom class was supplied in the runtime. The legacy
Expand DownExpand Up@@ -145,8 +142,5 @@ private MapValue<CelValue, CelValue> toMapValue(Map<Object, Object> map) {
 return ImmutableMapValue.create(mapBuilder.buildOrThrow());
 }

 protected CelValueConverter(CelOptions celOptions) {
 Preconditions.checkNotNull(celOptions);
 this.celOptions = celOptions;
 }
 protected CelValueConverter() {}
}
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
Decouple ProtoCelValueConverter into BaseProtoCelValueConverter#660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Decouple ProtoCelValueConverter into BaseProtoCelValueConverter
#660
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


24 changes: 19 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@@ -76,7 +76,6 @@ java_library(
 ":cel_value",
 "//:auto_value",
 "//common:error_codes",
 "//common:options",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/types",
Expand All@@ -94,7 +93,25 @@ java_library(
 ],
 deps = [
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "base_proto_cel_value_converter",
 srcs = ["BaseProtoCelValueConverter.java"],
 tags = [
 ],
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":values",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -104,22 +121,19 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:dynamic_proto",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//common/values:cel_byte_string",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

231 changes: 231 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
// 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.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.math.LongMath.checkedAdd;
import static com.google.common.math.LongMath.checkedSubtract;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.BoolValue;
import com.google.protobuf.ByteString;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.WellKnownProto;
import java.time.Duration;
import java.time.Instant;
import java.util.Optional;

/**
 * {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
 * and protobuf objects to {@link CelValue}. This base class is inherited by {@code
 * ProtoCelValueConverter} and {@code ProtoLiteCelValueConverter} to perform the conversion using
 * full and lite variants of protobuf messages respectively.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
 * when an equivalent exists.
 */
 @Override
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);

 if (celValue instanceof TimestampValue) {
 return TimeUtils.toProtoTimestamp(((TimestampValue) celValue).value());
 } else if (celValue instanceof DurationValue) {
 return TimeUtils.toProtoDuration(((DurationValue) celValue).value());
 } else if (celValue instanceof BytesValue) {
 return ByteString.copyFrom(((BytesValue) celValue).value().toByteArray());
 } else if (celValue.equals(NullValue.NULL_VALUE)) {
 return com.google.protobuf.NullValue.NULL_VALUE;
 }

 return super.fromCelValueToJavaObject(celValue);
 }

 /** {@inheritDoc} Protobuf semantics take precedence for conversion. */
 @Override
 public CelValue fromJavaObjectToCelValue(Object value) {
 Preconditions.checkNotNull(value);

 Optional<WellKnownProto> wellKnownProto = WellKnownProto.getByClass(value.getClass());
 if (wellKnownProto.isPresent()) {
 return fromWellKnownProtoToCelValue((MessageLiteOrBuilder) value, wellKnownProto.get());
 }

 if (value instanceof ByteString) {
 return BytesValue.create(CelByteString.of(((ByteString) value).toByteArray()));
 } else if (value instanceof com.google.protobuf.NullValue) {
 return NullValue.NULL_VALUE;
 }

 return super.fromJavaObjectToCelValue(value);
 }

 protected CelValue fromWellKnownProtoToCelValue(
 MessageLiteOrBuilder message, WellKnownProto wellKnownProto) {
 switch (wellKnownProto) {
 case JSON_VALUE:
 return adaptJsonValueToCelValue((Value) message);
 case JSON_STRUCT_VALUE:
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
 case BYTES_VALUE:
 return fromJavaPrimitiveToCelValue(
 ((com.google.protobuf.BytesValue) message).getValue().toByteArray());
 case DOUBLE_VALUE:
 return fromJavaPrimitiveToCelValue(((DoubleValue) message).getValue());
 case FLOAT_VALUE:
 return fromJavaPrimitiveToCelValue(((FloatValue) message).getValue());
 case INT32_VALUE:
 return fromJavaPrimitiveToCelValue(((Int32Value) message).getValue());
 case INT64_VALUE:
 return fromJavaPrimitiveToCelValue(((Int64Value) message).getValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(((StringValue) message).getValue());
 case UINT32_VALUE:
 return UintValue.create(((UInt32Value) message).getValue(), true);
 case UINT64_VALUE:
 return UintValue.create(((UInt64Value) message).getValue(), true);
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }
 }

 private CelValue adaptJsonValueToCelValue(Value value) {
 switch (value.getKindCase()) {
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(value.getBoolValue());
 case NUMBER_VALUE:
 return fromJavaPrimitiveToCelValue(value.getNumberValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(value.getStringValue());
 case LIST_VALUE:
 return adaptJsonListToCelValue(value.getListValue());
 case STRUCT_VALUE:
 return adaptJsonStructToCelValue(value.getStructValue());
 case NULL_VALUE:
 case KIND_NOT_SET: // Fall-through is intended
 return NullValue.NULL_VALUE;
 }
 throw new UnsupportedOperationException(
 "Unsupported Json to CelValue conversion: " + value.getKindCase());
 }

 private ListValue<CelValue> adaptJsonListToCelValue(com.google.protobuf.ListValue listValue) {
 return ImmutableListValue.create(
 listValue.getValuesList().stream()
 .map(this::adaptJsonValueToCelValue)
 .collect(toImmutableList()));
 }

 // TODO: Investigate changing MapValue key to StringValue
 private MapValue<CelValue, CelValue> adaptJsonStructToCelValue(Struct struct) {
 return ImmutableMapValue.create(
 struct.getFieldsMap().entrySet().stream()
 .collect(
 toImmutableMap(
 e -> fromJavaObjectToCelValue(e.getKey()),
 e -> adaptJsonValueToCelValue(e.getValue()))));
 }

 /** Helper to convert between java.util.time and protobuf duration/timestamp. */
 private static class TimeUtils {
 private static final int NANOS_PER_SECOND = 1000000000;

 private static Instant toJavaInstant(Timestamp timestamp) {
 timestamp = normalizedTimestamp(timestamp.getSeconds(), timestamp.getNanos());
 return Instant.ofEpochSecond(timestamp.getSeconds(), timestamp.getNanos());
 }

 private static Duration toJavaDuration(com.google.protobuf.Duration duration) {
 duration = normalizedDuration(duration.getSeconds(), duration.getNanos());
 return java.time.Duration.ofSeconds(duration.getSeconds(), duration.getNanos());
 }

 private static Timestamp toProtoTimestamp(Instant instant) {
 return normalizedTimestamp(instant.getEpochSecond(), instant.getNano());
 }

 private static com.google.protobuf.Duration toProtoDuration(Duration duration) {
 return normalizedDuration(duration.getSeconds(), duration.getNano());
 }

 private static Timestamp normalizedTimestamp(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos = nanos % NANOS_PER_SECOND;
 }
 if (nanos < 0) {
 nanos = nanos + NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds = checkedSubtract(seconds, 1);
 }
 Timestamp timestamp = Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Timestamps.checkValid(timestamp);
 }

 private static com.google.protobuf.Duration normalizedDuration(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos %= NANOS_PER_SECOND;
 }
 if (seconds > 0 && nanos < 0) {
 nanos += NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds--; // no overflow since seconds is positive (and we're decrementing)
 }
 if (seconds < 0 && nanos > 0) {
 nanos -= NANOS_PER_SECOND; // no overflow since nanos is positive (and we're subtracting)
 seconds++; // no overflow since seconds is negative (and we're incrementing)
 }
 com.google.protobuf.Duration duration =
 com.google.protobuf.Duration.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Durations.checkValid(duration);
 }
 }

 protected BaseProtoCelValueConverter() {}
}

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

View file


Open in desktop

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

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import java.util.Arrays;

Expand All@@ -30,7 +29,9 @@ public final class CelByteString {
 private volatile int hash = 0;

 public static CelByteString of(byte[] buffer) {
 Preconditions.checkNotNull(buffer);
 if (buffer == null) {
 throw new NullPointerException("buffer cannot be null");
 }
 if (buffer.length == 0) {
 return EMPTY;
 }
Expand Down

10 changes: 2 additions & 8 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,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import dev.cel.common.CelOptions;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -34,8 +33,6 @@
@Internal
abstract class CelValueConverter {

 protected final CelOptions celOptions;

 /** Adapts a {@link CelValue} to a plain old Java Object. */
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);
Expand DownExpand Up@@ -112,7 +109,7 @@ protected CelValue fromJavaPrimitiveToCelValue(Object value) {
 } else if (value instanceof Float) {
 return DoubleValue.create(Double.valueOf((Float) value));
 } else if (value instanceof UnsignedLong) {
 return UintValue.create(((UnsignedLong) value).longValue(), celOptions.enableUnsignedLongs());
 return UintValue.create(((UnsignedLong) value).longValue(), /* enableUnsignedLongs= */ true);
 }

 // Fall back to an Opaque value, as a custom class was supplied in the runtime. The legacy
Expand DownExpand Up@@ -145,8 +142,5 @@ private MapValue<CelValue, CelValue> toMapValue(Map<Object, Object> map) {
 return ImmutableMapValue.create(mapBuilder.buildOrThrow());
 }

 protected CelValueConverter(CelOptions celOptions) {
 Preconditions.checkNotNull(celOptions);
 this.celOptions = celOptions;
 }
 protected CelValueConverter() {}
}
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
Decouple ProtoCelValueConverter into BaseProtoCelValueConverter#660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Decouple ProtoCelValueConverter into BaseProtoCelValueConverter
#660
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


24 changes: 19 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@@ -76,7 +76,6 @@ java_library(
 ":cel_value",
 "//:auto_value",
 "//common:error_codes",
 "//common:options",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/types",
Expand All@@ -94,7 +93,25 @@ java_library(
 ],
 deps = [
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "base_proto_cel_value_converter",
 srcs = ["BaseProtoCelValueConverter.java"],
 tags = [
 ],
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":values",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -104,22 +121,19 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:dynamic_proto",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//common/values:cel_byte_string",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

231 changes: 231 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
// 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.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.math.LongMath.checkedAdd;
import static com.google.common.math.LongMath.checkedSubtract;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.BoolValue;
import com.google.protobuf.ByteString;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.WellKnownProto;
import java.time.Duration;
import java.time.Instant;
import java.util.Optional;

/**
 * {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
 * and protobuf objects to {@link CelValue}. This base class is inherited by {@code
 * ProtoCelValueConverter} and {@code ProtoLiteCelValueConverter} to perform the conversion using
 * full and lite variants of protobuf messages respectively.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
 * when an equivalent exists.
 */
 @Override
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);

 if (celValue instanceof TimestampValue) {
 return TimeUtils.toProtoTimestamp(((TimestampValue) celValue).value());
 } else if (celValue instanceof DurationValue) {
 return TimeUtils.toProtoDuration(((DurationValue) celValue).value());
 } else if (celValue instanceof BytesValue) {
 return ByteString.copyFrom(((BytesValue) celValue).value().toByteArray());
 } else if (celValue.equals(NullValue.NULL_VALUE)) {
 return com.google.protobuf.NullValue.NULL_VALUE;
 }

 return super.fromCelValueToJavaObject(celValue);
 }

 /** {@inheritDoc} Protobuf semantics take precedence for conversion. */
 @Override
 public CelValue fromJavaObjectToCelValue(Object value) {
 Preconditions.checkNotNull(value);

 Optional<WellKnownProto> wellKnownProto = WellKnownProto.getByClass(value.getClass());
 if (wellKnownProto.isPresent()) {
 return fromWellKnownProtoToCelValue((MessageLiteOrBuilder) value, wellKnownProto.get());
 }

 if (value instanceof ByteString) {
 return BytesValue.create(CelByteString.of(((ByteString) value).toByteArray()));
 } else if (value instanceof com.google.protobuf.NullValue) {
 return NullValue.NULL_VALUE;
 }

 return super.fromJavaObjectToCelValue(value);
 }

 protected CelValue fromWellKnownProtoToCelValue(
 MessageLiteOrBuilder message, WellKnownProto wellKnownProto) {
 switch (wellKnownProto) {
 case JSON_VALUE:
 return adaptJsonValueToCelValue((Value) message);
 case JSON_STRUCT_VALUE:
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
 case BYTES_VALUE:
 return fromJavaPrimitiveToCelValue(
 ((com.google.protobuf.BytesValue) message).getValue().toByteArray());
 case DOUBLE_VALUE:
 return fromJavaPrimitiveToCelValue(((DoubleValue) message).getValue());
 case FLOAT_VALUE:
 return fromJavaPrimitiveToCelValue(((FloatValue) message).getValue());
 case INT32_VALUE:
 return fromJavaPrimitiveToCelValue(((Int32Value) message).getValue());
 case INT64_VALUE:
 return fromJavaPrimitiveToCelValue(((Int64Value) message).getValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(((StringValue) message).getValue());
 case UINT32_VALUE:
 return UintValue.create(((UInt32Value) message).getValue(), true);
 case UINT64_VALUE:
 return UintValue.create(((UInt64Value) message).getValue(), true);
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }
 }

 private CelValue adaptJsonValueToCelValue(Value value) {
 switch (value.getKindCase()) {
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(value.getBoolValue());
 case NUMBER_VALUE:
 return fromJavaPrimitiveToCelValue(value.getNumberValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(value.getStringValue());
 case LIST_VALUE:
 return adaptJsonListToCelValue(value.getListValue());
 case STRUCT_VALUE:
 return adaptJsonStructToCelValue(value.getStructValue());
 case NULL_VALUE:
 case KIND_NOT_SET: // Fall-through is intended
 return NullValue.NULL_VALUE;
 }
 throw new UnsupportedOperationException(
 "Unsupported Json to CelValue conversion: " + value.getKindCase());
 }

 private ListValue<CelValue> adaptJsonListToCelValue(com.google.protobuf.ListValue listValue) {
 return ImmutableListValue.create(
 listValue.getValuesList().stream()
 .map(this::adaptJsonValueToCelValue)
 .collect(toImmutableList()));
 }

 // TODO: Investigate changing MapValue key to StringValue
 private MapValue<CelValue, CelValue> adaptJsonStructToCelValue(Struct struct) {
 return ImmutableMapValue.create(
 struct.getFieldsMap().entrySet().stream()
 .collect(
 toImmutableMap(
 e -> fromJavaObjectToCelValue(e.getKey()),
 e -> adaptJsonValueToCelValue(e.getValue()))));
 }

 /** Helper to convert between java.util.time and protobuf duration/timestamp. */
 private static class TimeUtils {
 private static final int NANOS_PER_SECOND = 1000000000;

 private static Instant toJavaInstant(Timestamp timestamp) {
 timestamp = normalizedTimestamp(timestamp.getSeconds(), timestamp.getNanos());
 return Instant.ofEpochSecond(timestamp.getSeconds(), timestamp.getNanos());
 }

 private static Duration toJavaDuration(com.google.protobuf.Duration duration) {
 duration = normalizedDuration(duration.getSeconds(), duration.getNanos());
 return java.time.Duration.ofSeconds(duration.getSeconds(), duration.getNanos());
 }

 private static Timestamp toProtoTimestamp(Instant instant) {
 return normalizedTimestamp(instant.getEpochSecond(), instant.getNano());
 }

 private static com.google.protobuf.Duration toProtoDuration(Duration duration) {
 return normalizedDuration(duration.getSeconds(), duration.getNano());
 }

 private static Timestamp normalizedTimestamp(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos = nanos % NANOS_PER_SECOND;
 }
 if (nanos < 0) {
 nanos = nanos + NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds = checkedSubtract(seconds, 1);
 }
 Timestamp timestamp = Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Timestamps.checkValid(timestamp);
 }

 private static com.google.protobuf.Duration normalizedDuration(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos %= NANOS_PER_SECOND;
 }
 if (seconds > 0 && nanos < 0) {
 nanos += NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds--; // no overflow since seconds is positive (and we're decrementing)
 }
 if (seconds < 0 && nanos > 0) {
 nanos -= NANOS_PER_SECOND; // no overflow since nanos is positive (and we're subtracting)
 seconds++; // no overflow since seconds is negative (and we're incrementing)
 }
 com.google.protobuf.Duration duration =
 com.google.protobuf.Duration.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Durations.checkValid(duration);
 }
 }

 protected BaseProtoCelValueConverter() {}
}

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

View file


Open in desktop

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

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import java.util.Arrays;

Expand All@@ -30,7 +29,9 @@ public final class CelByteString {
 private volatile int hash = 0;

 public static CelByteString of(byte[] buffer) {
 Preconditions.checkNotNull(buffer);
 if (buffer == null) {
 throw new NullPointerException("buffer cannot be null");
 }
 if (buffer.length == 0) {
 return EMPTY;
 }
Expand Down

10 changes: 2 additions & 8 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,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import dev.cel.common.CelOptions;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -34,8 +33,6 @@
@Internal
abstract class CelValueConverter {

 protected final CelOptions celOptions;

 /** Adapts a {@link CelValue} to a plain old Java Object. */
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);
Expand DownExpand Up@@ -112,7 +109,7 @@ protected CelValue fromJavaPrimitiveToCelValue(Object value) {
 } else if (value instanceof Float) {
 return DoubleValue.create(Double.valueOf((Float) value));
 } else if (value instanceof UnsignedLong) {
 return UintValue.create(((UnsignedLong) value).longValue(), celOptions.enableUnsignedLongs());
 return UintValue.create(((UnsignedLong) value).longValue(), /* enableUnsignedLongs= */ true);
 }

 // Fall back to an Opaque value, as a custom class was supplied in the runtime. The legacy
Expand DownExpand Up@@ -145,8 +142,5 @@ private MapValue<CelValue, CelValue> toMapValue(Map<Object, Object> map) {
 return ImmutableMapValue.create(mapBuilder.buildOrThrow());
 }

 protected CelValueConverter(CelOptions celOptions) {
 Preconditions.checkNotNull(celOptions);
 this.celOptions = celOptions;
 }
 protected CelValueConverter() {}
}
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
Decouple ProtoCelValueConverter into BaseProtoCelValueConverter#660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Decouple ProtoCelValueConverter into BaseProtoCelValueConverter
#660
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


24 changes: 19 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@@ -76,7 +76,6 @@ java_library(
 ":cel_value",
 "//:auto_value",
 "//common:error_codes",
 "//common:options",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/types",
Expand All@@ -94,7 +93,25 @@ java_library(
 ],
 deps = [
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "base_proto_cel_value_converter",
 srcs = ["BaseProtoCelValueConverter.java"],
 tags = [
 ],
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":values",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -104,22 +121,19 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:dynamic_proto",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//common/values:cel_byte_string",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

231 changes: 231 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
// 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.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.math.LongMath.checkedAdd;
import static com.google.common.math.LongMath.checkedSubtract;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.BoolValue;
import com.google.protobuf.ByteString;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.WellKnownProto;
import java.time.Duration;
import java.time.Instant;
import java.util.Optional;

/**
 * {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
 * and protobuf objects to {@link CelValue}. This base class is inherited by {@code
 * ProtoCelValueConverter} and {@code ProtoLiteCelValueConverter} to perform the conversion using
 * full and lite variants of protobuf messages respectively.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
 * when an equivalent exists.
 */
 @Override
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);

 if (celValue instanceof TimestampValue) {
 return TimeUtils.toProtoTimestamp(((TimestampValue) celValue).value());
 } else if (celValue instanceof DurationValue) {
 return TimeUtils.toProtoDuration(((DurationValue) celValue).value());
 } else if (celValue instanceof BytesValue) {
 return ByteString.copyFrom(((BytesValue) celValue).value().toByteArray());
 } else if (celValue.equals(NullValue.NULL_VALUE)) {
 return com.google.protobuf.NullValue.NULL_VALUE;
 }

 return super.fromCelValueToJavaObject(celValue);
 }

 /** {@inheritDoc} Protobuf semantics take precedence for conversion. */
 @Override
 public CelValue fromJavaObjectToCelValue(Object value) {
 Preconditions.checkNotNull(value);

 Optional<WellKnownProto> wellKnownProto = WellKnownProto.getByClass(value.getClass());
 if (wellKnownProto.isPresent()) {
 return fromWellKnownProtoToCelValue((MessageLiteOrBuilder) value, wellKnownProto.get());
 }

 if (value instanceof ByteString) {
 return BytesValue.create(CelByteString.of(((ByteString) value).toByteArray()));
 } else if (value instanceof com.google.protobuf.NullValue) {
 return NullValue.NULL_VALUE;
 }

 return super.fromJavaObjectToCelValue(value);
 }

 protected CelValue fromWellKnownProtoToCelValue(
 MessageLiteOrBuilder message, WellKnownProto wellKnownProto) {
 switch (wellKnownProto) {
 case JSON_VALUE:
 return adaptJsonValueToCelValue((Value) message);
 case JSON_STRUCT_VALUE:
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
 case BYTES_VALUE:
 return fromJavaPrimitiveToCelValue(
 ((com.google.protobuf.BytesValue) message).getValue().toByteArray());
 case DOUBLE_VALUE:
 return fromJavaPrimitiveToCelValue(((DoubleValue) message).getValue());
 case FLOAT_VALUE:
 return fromJavaPrimitiveToCelValue(((FloatValue) message).getValue());
 case INT32_VALUE:
 return fromJavaPrimitiveToCelValue(((Int32Value) message).getValue());
 case INT64_VALUE:
 return fromJavaPrimitiveToCelValue(((Int64Value) message).getValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(((StringValue) message).getValue());
 case UINT32_VALUE:
 return UintValue.create(((UInt32Value) message).getValue(), true);
 case UINT64_VALUE:
 return UintValue.create(((UInt64Value) message).getValue(), true);
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }
 }

 private CelValue adaptJsonValueToCelValue(Value value) {
 switch (value.getKindCase()) {
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(value.getBoolValue());
 case NUMBER_VALUE:
 return fromJavaPrimitiveToCelValue(value.getNumberValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(value.getStringValue());
 case LIST_VALUE:
 return adaptJsonListToCelValue(value.getListValue());
 case STRUCT_VALUE:
 return adaptJsonStructToCelValue(value.getStructValue());
 case NULL_VALUE:
 case KIND_NOT_SET: // Fall-through is intended
 return NullValue.NULL_VALUE;
 }
 throw new UnsupportedOperationException(
 "Unsupported Json to CelValue conversion: " + value.getKindCase());
 }

 private ListValue<CelValue> adaptJsonListToCelValue(com.google.protobuf.ListValue listValue) {
 return ImmutableListValue.create(
 listValue.getValuesList().stream()
 .map(this::adaptJsonValueToCelValue)
 .collect(toImmutableList()));
 }

 // TODO: Investigate changing MapValue key to StringValue
 private MapValue<CelValue, CelValue> adaptJsonStructToCelValue(Struct struct) {
 return ImmutableMapValue.create(
 struct.getFieldsMap().entrySet().stream()
 .collect(
 toImmutableMap(
 e -> fromJavaObjectToCelValue(e.getKey()),
 e -> adaptJsonValueToCelValue(e.getValue()))));
 }

 /** Helper to convert between java.util.time and protobuf duration/timestamp. */
 private static class TimeUtils {
 private static final int NANOS_PER_SECOND = 1000000000;

 private static Instant toJavaInstant(Timestamp timestamp) {
 timestamp = normalizedTimestamp(timestamp.getSeconds(), timestamp.getNanos());
 return Instant.ofEpochSecond(timestamp.getSeconds(), timestamp.getNanos());
 }

 private static Duration toJavaDuration(com.google.protobuf.Duration duration) {
 duration = normalizedDuration(duration.getSeconds(), duration.getNanos());
 return java.time.Duration.ofSeconds(duration.getSeconds(), duration.getNanos());
 }

 private static Timestamp toProtoTimestamp(Instant instant) {
 return normalizedTimestamp(instant.getEpochSecond(), instant.getNano());
 }

 private static com.google.protobuf.Duration toProtoDuration(Duration duration) {
 return normalizedDuration(duration.getSeconds(), duration.getNano());
 }

 private static Timestamp normalizedTimestamp(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos = nanos % NANOS_PER_SECOND;
 }
 if (nanos < 0) {
 nanos = nanos + NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds = checkedSubtract(seconds, 1);
 }
 Timestamp timestamp = Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Timestamps.checkValid(timestamp);
 }

 private static com.google.protobuf.Duration normalizedDuration(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos %= NANOS_PER_SECOND;
 }
 if (seconds > 0 && nanos < 0) {
 nanos += NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds--; // no overflow since seconds is positive (and we're decrementing)
 }
 if (seconds < 0 && nanos > 0) {
 nanos -= NANOS_PER_SECOND; // no overflow since nanos is positive (and we're subtracting)
 seconds++; // no overflow since seconds is negative (and we're incrementing)
 }
 com.google.protobuf.Duration duration =
 com.google.protobuf.Duration.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Durations.checkValid(duration);
 }
 }

 protected BaseProtoCelValueConverter() {}
}

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

View file


Open in desktop

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

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import java.util.Arrays;

Expand All@@ -30,7 +29,9 @@ public final class CelByteString {
 private volatile int hash = 0;

 public static CelByteString of(byte[] buffer) {
 Preconditions.checkNotNull(buffer);
 if (buffer == null) {
 throw new NullPointerException("buffer cannot be null");
 }
 if (buffer.length == 0) {
 return EMPTY;
 }
Expand Down

10 changes: 2 additions & 8 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,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import dev.cel.common.CelOptions;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -34,8 +33,6 @@
@Internal
abstract class CelValueConverter {

 protected final CelOptions celOptions;

 /** Adapts a {@link CelValue} to a plain old Java Object. */
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);
Expand DownExpand Up@@ -112,7 +109,7 @@ protected CelValue fromJavaPrimitiveToCelValue(Object value) {
 } else if (value instanceof Float) {
 return DoubleValue.create(Double.valueOf((Float) value));
 } else if (value instanceof UnsignedLong) {
 return UintValue.create(((UnsignedLong) value).longValue(), celOptions.enableUnsignedLongs());
 return UintValue.create(((UnsignedLong) value).longValue(), /* enableUnsignedLongs= */ true);
 }

 // Fall back to an Opaque value, as a custom class was supplied in the runtime. The legacy
Expand DownExpand Up@@ -145,8 +142,5 @@ private MapValue<CelValue, CelValue> toMapValue(Map<Object, Object> map) {
 return ImmutableMapValue.create(mapBuilder.buildOrThrow());
 }

 protected CelValueConverter(CelOptions celOptions) {
 Preconditions.checkNotNull(celOptions);
 this.celOptions = celOptions;
 }
 protected CelValueConverter() {}
}
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
Decouple ProtoCelValueConverter into BaseProtoCelValueConverter#660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Decouple ProtoCelValueConverter into BaseProtoCelValueConverter
#660
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


24 changes: 19 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@@ -76,7 +76,6 @@ java_library(
 ":cel_value",
 "//:auto_value",
 "//common:error_codes",
 "//common:options",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/types",
Expand All@@ -94,7 +93,25 @@ java_library(
 ],
 deps = [
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "base_proto_cel_value_converter",
 srcs = ["BaseProtoCelValueConverter.java"],
 tags = [
 ],
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":values",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -104,22 +121,19 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:dynamic_proto",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//common/values:cel_byte_string",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

231 changes: 231 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
// 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.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.math.LongMath.checkedAdd;
import static com.google.common.math.LongMath.checkedSubtract;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.BoolValue;
import com.google.protobuf.ByteString;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.WellKnownProto;
import java.time.Duration;
import java.time.Instant;
import java.util.Optional;

/**
 * {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
 * and protobuf objects to {@link CelValue}. This base class is inherited by {@code
 * ProtoCelValueConverter} and {@code ProtoLiteCelValueConverter} to perform the conversion using
 * full and lite variants of protobuf messages respectively.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
 * when an equivalent exists.
 */
 @Override
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);

 if (celValue instanceof TimestampValue) {
 return TimeUtils.toProtoTimestamp(((TimestampValue) celValue).value());
 } else if (celValue instanceof DurationValue) {
 return TimeUtils.toProtoDuration(((DurationValue) celValue).value());
 } else if (celValue instanceof BytesValue) {
 return ByteString.copyFrom(((BytesValue) celValue).value().toByteArray());
 } else if (celValue.equals(NullValue.NULL_VALUE)) {
 return com.google.protobuf.NullValue.NULL_VALUE;
 }

 return super.fromCelValueToJavaObject(celValue);
 }

 /** {@inheritDoc} Protobuf semantics take precedence for conversion. */
 @Override
 public CelValue fromJavaObjectToCelValue(Object value) {
 Preconditions.checkNotNull(value);

 Optional<WellKnownProto> wellKnownProto = WellKnownProto.getByClass(value.getClass());
 if (wellKnownProto.isPresent()) {
 return fromWellKnownProtoToCelValue((MessageLiteOrBuilder) value, wellKnownProto.get());
 }

 if (value instanceof ByteString) {
 return BytesValue.create(CelByteString.of(((ByteString) value).toByteArray()));
 } else if (value instanceof com.google.protobuf.NullValue) {
 return NullValue.NULL_VALUE;
 }

 return super.fromJavaObjectToCelValue(value);
 }

 protected CelValue fromWellKnownProtoToCelValue(
 MessageLiteOrBuilder message, WellKnownProto wellKnownProto) {
 switch (wellKnownProto) {
 case JSON_VALUE:
 return adaptJsonValueToCelValue((Value) message);
 case JSON_STRUCT_VALUE:
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
 case BYTES_VALUE:
 return fromJavaPrimitiveToCelValue(
 ((com.google.protobuf.BytesValue) message).getValue().toByteArray());
 case DOUBLE_VALUE:
 return fromJavaPrimitiveToCelValue(((DoubleValue) message).getValue());
 case FLOAT_VALUE:
 return fromJavaPrimitiveToCelValue(((FloatValue) message).getValue());
 case INT32_VALUE:
 return fromJavaPrimitiveToCelValue(((Int32Value) message).getValue());
 case INT64_VALUE:
 return fromJavaPrimitiveToCelValue(((Int64Value) message).getValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(((StringValue) message).getValue());
 case UINT32_VALUE:
 return UintValue.create(((UInt32Value) message).getValue(), true);
 case UINT64_VALUE:
 return UintValue.create(((UInt64Value) message).getValue(), true);
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }
 }

 private CelValue adaptJsonValueToCelValue(Value value) {
 switch (value.getKindCase()) {
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(value.getBoolValue());
 case NUMBER_VALUE:
 return fromJavaPrimitiveToCelValue(value.getNumberValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(value.getStringValue());
 case LIST_VALUE:
 return adaptJsonListToCelValue(value.getListValue());
 case STRUCT_VALUE:
 return adaptJsonStructToCelValue(value.getStructValue());
 case NULL_VALUE:
 case KIND_NOT_SET: // Fall-through is intended
 return NullValue.NULL_VALUE;
 }
 throw new UnsupportedOperationException(
 "Unsupported Json to CelValue conversion: " + value.getKindCase());
 }

 private ListValue<CelValue> adaptJsonListToCelValue(com.google.protobuf.ListValue listValue) {
 return ImmutableListValue.create(
 listValue.getValuesList().stream()
 .map(this::adaptJsonValueToCelValue)
 .collect(toImmutableList()));
 }

 // TODO: Investigate changing MapValue key to StringValue
 private MapValue<CelValue, CelValue> adaptJsonStructToCelValue(Struct struct) {
 return ImmutableMapValue.create(
 struct.getFieldsMap().entrySet().stream()
 .collect(
 toImmutableMap(
 e -> fromJavaObjectToCelValue(e.getKey()),
 e -> adaptJsonValueToCelValue(e.getValue()))));
 }

 /** Helper to convert between java.util.time and protobuf duration/timestamp. */
 private static class TimeUtils {
 private static final int NANOS_PER_SECOND = 1000000000;

 private static Instant toJavaInstant(Timestamp timestamp) {
 timestamp = normalizedTimestamp(timestamp.getSeconds(), timestamp.getNanos());
 return Instant.ofEpochSecond(timestamp.getSeconds(), timestamp.getNanos());
 }

 private static Duration toJavaDuration(com.google.protobuf.Duration duration) {
 duration = normalizedDuration(duration.getSeconds(), duration.getNanos());
 return java.time.Duration.ofSeconds(duration.getSeconds(), duration.getNanos());
 }

 private static Timestamp toProtoTimestamp(Instant instant) {
 return normalizedTimestamp(instant.getEpochSecond(), instant.getNano());
 }

 private static com.google.protobuf.Duration toProtoDuration(Duration duration) {
 return normalizedDuration(duration.getSeconds(), duration.getNano());
 }

 private static Timestamp normalizedTimestamp(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos = nanos % NANOS_PER_SECOND;
 }
 if (nanos < 0) {
 nanos = nanos + NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds = checkedSubtract(seconds, 1);
 }
 Timestamp timestamp = Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Timestamps.checkValid(timestamp);
 }

 private static com.google.protobuf.Duration normalizedDuration(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos %= NANOS_PER_SECOND;
 }
 if (seconds > 0 && nanos < 0) {
 nanos += NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds--; // no overflow since seconds is positive (and we're decrementing)
 }
 if (seconds < 0 && nanos > 0) {
 nanos -= NANOS_PER_SECOND; // no overflow since nanos is positive (and we're subtracting)
 seconds++; // no overflow since seconds is negative (and we're incrementing)
 }
 com.google.protobuf.Duration duration =
 com.google.protobuf.Duration.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Durations.checkValid(duration);
 }
 }

 protected BaseProtoCelValueConverter() {}
}

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

View file


Open in desktop

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

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import java.util.Arrays;

Expand All@@ -30,7 +29,9 @@ public final class CelByteString {
 private volatile int hash = 0;

 public static CelByteString of(byte[] buffer) {
 Preconditions.checkNotNull(buffer);
 if (buffer == null) {
 throw new NullPointerException("buffer cannot be null");
 }
 if (buffer.length == 0) {
 return EMPTY;
 }
Expand Down

10 changes: 2 additions & 8 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,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import dev.cel.common.CelOptions;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -34,8 +33,6 @@
@Internal
abstract class CelValueConverter {

 protected final CelOptions celOptions;

 /** Adapts a {@link CelValue} to a plain old Java Object. */
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);
Expand DownExpand Up@@ -112,7 +109,7 @@ protected CelValue fromJavaPrimitiveToCelValue(Object value) {
 } else if (value instanceof Float) {
 return DoubleValue.create(Double.valueOf((Float) value));
 } else if (value instanceof UnsignedLong) {
 return UintValue.create(((UnsignedLong) value).longValue(), celOptions.enableUnsignedLongs());
 return UintValue.create(((UnsignedLong) value).longValue(), /* enableUnsignedLongs= */ true);
 }

 // Fall back to an Opaque value, as a custom class was supplied in the runtime. The legacy
Expand DownExpand Up@@ -145,8 +142,5 @@ private MapValue<CelValue, CelValue> toMapValue(Map<Object, Object> map) {
 return ImmutableMapValue.create(mapBuilder.buildOrThrow());
 }

 protected CelValueConverter(CelOptions celOptions) {
 Preconditions.checkNotNull(celOptions);
 this.celOptions = celOptions;
 }
 protected CelValueConverter() {}
}
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
Decouple ProtoCelValueConverter into BaseProtoCelValueConverter#660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Decouple ProtoCelValueConverter into BaseProtoCelValueConverter
#660
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


24 changes: 19 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@@ -76,7 +76,6 @@ java_library(
 ":cel_value",
 "//:auto_value",
 "//common:error_codes",
 "//common:options",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/types",
Expand All@@ -94,7 +93,25 @@ java_library(
 ],
 deps = [
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "base_proto_cel_value_converter",
 srcs = ["BaseProtoCelValueConverter.java"],
 tags = [
 ],
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":values",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -104,22 +121,19 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:dynamic_proto",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//common/values:cel_byte_string",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

231 changes: 231 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
// 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.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.math.LongMath.checkedAdd;
import static com.google.common.math.LongMath.checkedSubtract;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.BoolValue;
import com.google.protobuf.ByteString;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.WellKnownProto;
import java.time.Duration;
import java.time.Instant;
import java.util.Optional;

/**
 * {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
 * and protobuf objects to {@link CelValue}. This base class is inherited by {@code
 * ProtoCelValueConverter} and {@code ProtoLiteCelValueConverter} to perform the conversion using
 * full and lite variants of protobuf messages respectively.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
 * when an equivalent exists.
 */
 @Override
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);

 if (celValue instanceof TimestampValue) {
 return TimeUtils.toProtoTimestamp(((TimestampValue) celValue).value());
 } else if (celValue instanceof DurationValue) {
 return TimeUtils.toProtoDuration(((DurationValue) celValue).value());
 } else if (celValue instanceof BytesValue) {
 return ByteString.copyFrom(((BytesValue) celValue).value().toByteArray());
 } else if (celValue.equals(NullValue.NULL_VALUE)) {
 return com.google.protobuf.NullValue.NULL_VALUE;
 }

 return super.fromCelValueToJavaObject(celValue);
 }

 /** {@inheritDoc} Protobuf semantics take precedence for conversion. */
 @Override
 public CelValue fromJavaObjectToCelValue(Object value) {
 Preconditions.checkNotNull(value);

 Optional<WellKnownProto> wellKnownProto = WellKnownProto.getByClass(value.getClass());
 if (wellKnownProto.isPresent()) {
 return fromWellKnownProtoToCelValue((MessageLiteOrBuilder) value, wellKnownProto.get());
 }

 if (value instanceof ByteString) {
 return BytesValue.create(CelByteString.of(((ByteString) value).toByteArray()));
 } else if (value instanceof com.google.protobuf.NullValue) {
 return NullValue.NULL_VALUE;
 }

 return super.fromJavaObjectToCelValue(value);
 }

 protected CelValue fromWellKnownProtoToCelValue(
 MessageLiteOrBuilder message, WellKnownProto wellKnownProto) {
 switch (wellKnownProto) {
 case JSON_VALUE:
 return adaptJsonValueToCelValue((Value) message);
 case JSON_STRUCT_VALUE:
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
 case BYTES_VALUE:
 return fromJavaPrimitiveToCelValue(
 ((com.google.protobuf.BytesValue) message).getValue().toByteArray());
 case DOUBLE_VALUE:
 return fromJavaPrimitiveToCelValue(((DoubleValue) message).getValue());
 case FLOAT_VALUE:
 return fromJavaPrimitiveToCelValue(((FloatValue) message).getValue());
 case INT32_VALUE:
 return fromJavaPrimitiveToCelValue(((Int32Value) message).getValue());
 case INT64_VALUE:
 return fromJavaPrimitiveToCelValue(((Int64Value) message).getValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(((StringValue) message).getValue());
 case UINT32_VALUE:
 return UintValue.create(((UInt32Value) message).getValue(), true);
 case UINT64_VALUE:
 return UintValue.create(((UInt64Value) message).getValue(), true);
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }
 }

 private CelValue adaptJsonValueToCelValue(Value value) {
 switch (value.getKindCase()) {
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(value.getBoolValue());
 case NUMBER_VALUE:
 return fromJavaPrimitiveToCelValue(value.getNumberValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(value.getStringValue());
 case LIST_VALUE:
 return adaptJsonListToCelValue(value.getListValue());
 case STRUCT_VALUE:
 return adaptJsonStructToCelValue(value.getStructValue());
 case NULL_VALUE:
 case KIND_NOT_SET: // Fall-through is intended
 return NullValue.NULL_VALUE;
 }
 throw new UnsupportedOperationException(
 "Unsupported Json to CelValue conversion: " + value.getKindCase());
 }

 private ListValue<CelValue> adaptJsonListToCelValue(com.google.protobuf.ListValue listValue) {
 return ImmutableListValue.create(
 listValue.getValuesList().stream()
 .map(this::adaptJsonValueToCelValue)
 .collect(toImmutableList()));
 }

 // TODO: Investigate changing MapValue key to StringValue
 private MapValue<CelValue, CelValue> adaptJsonStructToCelValue(Struct struct) {
 return ImmutableMapValue.create(
 struct.getFieldsMap().entrySet().stream()
 .collect(
 toImmutableMap(
 e -> fromJavaObjectToCelValue(e.getKey()),
 e -> adaptJsonValueToCelValue(e.getValue()))));
 }

 /** Helper to convert between java.util.time and protobuf duration/timestamp. */
 private static class TimeUtils {
 private static final int NANOS_PER_SECOND = 1000000000;

 private static Instant toJavaInstant(Timestamp timestamp) {
 timestamp = normalizedTimestamp(timestamp.getSeconds(), timestamp.getNanos());
 return Instant.ofEpochSecond(timestamp.getSeconds(), timestamp.getNanos());
 }

 private static Duration toJavaDuration(com.google.protobuf.Duration duration) {
 duration = normalizedDuration(duration.getSeconds(), duration.getNanos());
 return java.time.Duration.ofSeconds(duration.getSeconds(), duration.getNanos());
 }

 private static Timestamp toProtoTimestamp(Instant instant) {
 return normalizedTimestamp(instant.getEpochSecond(), instant.getNano());
 }

 private static com.google.protobuf.Duration toProtoDuration(Duration duration) {
 return normalizedDuration(duration.getSeconds(), duration.getNano());
 }

 private static Timestamp normalizedTimestamp(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos = nanos % NANOS_PER_SECOND;
 }
 if (nanos < 0) {
 nanos = nanos + NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds = checkedSubtract(seconds, 1);
 }
 Timestamp timestamp = Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Timestamps.checkValid(timestamp);
 }

 private static com.google.protobuf.Duration normalizedDuration(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos %= NANOS_PER_SECOND;
 }
 if (seconds > 0 && nanos < 0) {
 nanos += NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds--; // no overflow since seconds is positive (and we're decrementing)
 }
 if (seconds < 0 && nanos > 0) {
 nanos -= NANOS_PER_SECOND; // no overflow since nanos is positive (and we're subtracting)
 seconds++; // no overflow since seconds is negative (and we're incrementing)
 }
 com.google.protobuf.Duration duration =
 com.google.protobuf.Duration.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Durations.checkValid(duration);
 }
 }

 protected BaseProtoCelValueConverter() {}
}

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

View file


Open in desktop

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

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import java.util.Arrays;

Expand All@@ -30,7 +29,9 @@ public final class CelByteString {
 private volatile int hash = 0;

 public static CelByteString of(byte[] buffer) {
 Preconditions.checkNotNull(buffer);
 if (buffer == null) {
 throw new NullPointerException("buffer cannot be null");
 }
 if (buffer.length == 0) {
 return EMPTY;
 }
Expand Down

10 changes: 2 additions & 8 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,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import dev.cel.common.CelOptions;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -34,8 +33,6 @@
@Internal
abstract class CelValueConverter {

 protected final CelOptions celOptions;

 /** Adapts a {@link CelValue} to a plain old Java Object. */
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);
Expand DownExpand Up@@ -112,7 +109,7 @@ protected CelValue fromJavaPrimitiveToCelValue(Object value) {
 } else if (value instanceof Float) {
 return DoubleValue.create(Double.valueOf((Float) value));
 } else if (value instanceof UnsignedLong) {
 return UintValue.create(((UnsignedLong) value).longValue(), celOptions.enableUnsignedLongs());
 return UintValue.create(((UnsignedLong) value).longValue(), /* enableUnsignedLongs= */ true);
 }

 // Fall back to an Opaque value, as a custom class was supplied in the runtime. The legacy
Expand DownExpand Up@@ -145,8 +142,5 @@ private MapValue<CelValue, CelValue> toMapValue(Map<Object, Object> map) {
 return ImmutableMapValue.create(mapBuilder.buildOrThrow());
 }

 protected CelValueConverter(CelOptions celOptions) {
 Preconditions.checkNotNull(celOptions);
 this.celOptions = celOptions;
 }
 protected CelValueConverter() {}
}
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
Decouple ProtoCelValueConverter into BaseProtoCelValueConverter#660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Apr 24, 2025
 Merged


Decouple ProtoCelValueConverter into BaseProtoCelValueConverter
#660
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


24 changes: 19 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@@ -76,7 +76,6 @@ java_library(
 ":cel_value",
 "//:auto_value",
 "//common:error_codes",
 "//common:options",
 "//common:runtime_exception",
 "//common/annotations",
 "//common/types",
Expand All@@ -94,7 +93,25 @@ java_library(
 ],
 deps = [
 "@maven//:com_google_errorprone_error_prone_annotations",
 ],
)

java_library(
 name = "base_proto_cel_value_converter",
 srcs = ["BaseProtoCelValueConverter.java"],
 tags = [
 ],
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":values",
 "//common/annotations",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)

Expand All@@ -104,22 +121,19 @@ java_library(
 tags = [
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":cel_value",
 ":values",
 "//:auto_value",
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:dynamic_proto",
 "//common/internal:well_known_proto",
 "//common/types",
 "//common/types:cel_types",
 "//common/types:type_providers",
 "//common/values:cel_byte_string",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

231 changes: 231 additions & 0 deletions
common/src/main/java/dev/cel/common/values/BaseProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
// 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.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.math.LongMath.checkedAdd;
import static com.google.common.math.LongMath.checkedSubtract;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.BoolValue;
import com.google.protobuf.ByteString;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int32Value;
import com.google.protobuf.Int64Value;
import com.google.protobuf.MessageLite;
import com.google.protobuf.MessageLiteOrBuilder;
import com.google.protobuf.StringValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.UInt32Value;
import com.google.protobuf.UInt64Value;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import dev.cel.common.annotations.Internal;
import dev.cel.common.internal.WellKnownProto;
import java.time.Duration;
import java.time.Instant;
import java.util.Optional;

/**
 * {@code BaseProtoCelValueConverter} contains the common logic for converting between native Java
 * and protobuf objects to {@link CelValue}. This base class is inherited by {@code
 * ProtoCelValueConverter} and {@code ProtoLiteCelValueConverter} to perform the conversion using
 * full and lite variants of protobuf messages respectively.
 *
 * <p>CEL Library Internals. Do Not Use.
 */
@Immutable
@Internal
public abstract class BaseProtoCelValueConverter extends CelValueConverter {

 public abstract CelValue fromProtoMessageToCelValue(String protoTypeName, MessageLite msg);

 /**
 * Adapts a {@link CelValue} to a native Java object. The CelValue is adapted into protobuf object
 * when an equivalent exists.
 */
 @Override
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);

 if (celValue instanceof TimestampValue) {
 return TimeUtils.toProtoTimestamp(((TimestampValue) celValue).value());
 } else if (celValue instanceof DurationValue) {
 return TimeUtils.toProtoDuration(((DurationValue) celValue).value());
 } else if (celValue instanceof BytesValue) {
 return ByteString.copyFrom(((BytesValue) celValue).value().toByteArray());
 } else if (celValue.equals(NullValue.NULL_VALUE)) {
 return com.google.protobuf.NullValue.NULL_VALUE;
 }

 return super.fromCelValueToJavaObject(celValue);
 }

 /** {@inheritDoc} Protobuf semantics take precedence for conversion. */
 @Override
 public CelValue fromJavaObjectToCelValue(Object value) {
 Preconditions.checkNotNull(value);

 Optional<WellKnownProto> wellKnownProto = WellKnownProto.getByClass(value.getClass());
 if (wellKnownProto.isPresent()) {
 return fromWellKnownProtoToCelValue((MessageLiteOrBuilder) value, wellKnownProto.get());
 }

 if (value instanceof ByteString) {
 return BytesValue.create(CelByteString.of(((ByteString) value).toByteArray()));
 } else if (value instanceof com.google.protobuf.NullValue) {
 return NullValue.NULL_VALUE;
 }

 return super.fromJavaObjectToCelValue(value);
 }

 protected CelValue fromWellKnownProtoToCelValue(
 MessageLiteOrBuilder message, WellKnownProto wellKnownProto) {
 switch (wellKnownProto) {
 case JSON_VALUE:
 return adaptJsonValueToCelValue((Value) message);
 case JSON_STRUCT_VALUE:
 return adaptJsonStructToCelValue((Struct) message);
 case JSON_LIST_VALUE:
 return adaptJsonListToCelValue((com.google.protobuf.ListValue) message);
 case DURATION:
 return DurationValue.create(
 TimeUtils.toJavaDuration((com.google.protobuf.Duration) message));
 case TIMESTAMP:
 return TimestampValue.create(TimeUtils.toJavaInstant((Timestamp) message));
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(((BoolValue) message).getValue());
 case BYTES_VALUE:
 return fromJavaPrimitiveToCelValue(
 ((com.google.protobuf.BytesValue) message).getValue().toByteArray());
 case DOUBLE_VALUE:
 return fromJavaPrimitiveToCelValue(((DoubleValue) message).getValue());
 case FLOAT_VALUE:
 return fromJavaPrimitiveToCelValue(((FloatValue) message).getValue());
 case INT32_VALUE:
 return fromJavaPrimitiveToCelValue(((Int32Value) message).getValue());
 case INT64_VALUE:
 return fromJavaPrimitiveToCelValue(((Int64Value) message).getValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(((StringValue) message).getValue());
 case UINT32_VALUE:
 return UintValue.create(((UInt32Value) message).getValue(), true);
 case UINT64_VALUE:
 return UintValue.create(((UInt64Value) message).getValue(), true);
 default:
 throw new UnsupportedOperationException(
 "Unsupported message to CelValue conversion - " + message);
 }
 }

 private CelValue adaptJsonValueToCelValue(Value value) {
 switch (value.getKindCase()) {
 case BOOL_VALUE:
 return fromJavaPrimitiveToCelValue(value.getBoolValue());
 case NUMBER_VALUE:
 return fromJavaPrimitiveToCelValue(value.getNumberValue());
 case STRING_VALUE:
 return fromJavaPrimitiveToCelValue(value.getStringValue());
 case LIST_VALUE:
 return adaptJsonListToCelValue(value.getListValue());
 case STRUCT_VALUE:
 return adaptJsonStructToCelValue(value.getStructValue());
 case NULL_VALUE:
 case KIND_NOT_SET: // Fall-through is intended
 return NullValue.NULL_VALUE;
 }
 throw new UnsupportedOperationException(
 "Unsupported Json to CelValue conversion: " + value.getKindCase());
 }

 private ListValue<CelValue> adaptJsonListToCelValue(com.google.protobuf.ListValue listValue) {
 return ImmutableListValue.create(
 listValue.getValuesList().stream()
 .map(this::adaptJsonValueToCelValue)
 .collect(toImmutableList()));
 }

 // TODO: Investigate changing MapValue key to StringValue
 private MapValue<CelValue, CelValue> adaptJsonStructToCelValue(Struct struct) {
 return ImmutableMapValue.create(
 struct.getFieldsMap().entrySet().stream()
 .collect(
 toImmutableMap(
 e -> fromJavaObjectToCelValue(e.getKey()),
 e -> adaptJsonValueToCelValue(e.getValue()))));
 }

 /** Helper to convert between java.util.time and protobuf duration/timestamp. */
 private static class TimeUtils {
 private static final int NANOS_PER_SECOND = 1000000000;

 private static Instant toJavaInstant(Timestamp timestamp) {
 timestamp = normalizedTimestamp(timestamp.getSeconds(), timestamp.getNanos());
 return Instant.ofEpochSecond(timestamp.getSeconds(), timestamp.getNanos());
 }

 private static Duration toJavaDuration(com.google.protobuf.Duration duration) {
 duration = normalizedDuration(duration.getSeconds(), duration.getNanos());
 return java.time.Duration.ofSeconds(duration.getSeconds(), duration.getNanos());
 }

 private static Timestamp toProtoTimestamp(Instant instant) {
 return normalizedTimestamp(instant.getEpochSecond(), instant.getNano());
 }

 private static com.google.protobuf.Duration toProtoDuration(Duration duration) {
 return normalizedDuration(duration.getSeconds(), duration.getNano());
 }

 private static Timestamp normalizedTimestamp(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos = nanos % NANOS_PER_SECOND;
 }
 if (nanos < 0) {
 nanos = nanos + NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds = checkedSubtract(seconds, 1);
 }
 Timestamp timestamp = Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Timestamps.checkValid(timestamp);
 }

 private static com.google.protobuf.Duration normalizedDuration(long seconds, int nanos) {
 if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
 seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
 nanos %= NANOS_PER_SECOND;
 }
 if (seconds > 0 && nanos < 0) {
 nanos += NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
 seconds--; // no overflow since seconds is positive (and we're decrementing)
 }
 if (seconds < 0 && nanos > 0) {
 nanos -= NANOS_PER_SECOND; // no overflow since nanos is positive (and we're subtracting)
 seconds++; // no overflow since seconds is negative (and we're incrementing)
 }
 com.google.protobuf.Duration duration =
 com.google.protobuf.Duration.newBuilder().setSeconds(seconds).setNanos(nanos).build();
 return Durations.checkValid(duration);
 }
 }

 protected BaseProtoCelValueConverter() {}
}

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

View file


Open in desktop

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

package dev.cel.common.values;

import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import java.util.Arrays;

Expand All@@ -30,7 +29,9 @@ public final class CelByteString {
 private volatile int hash = 0;

 public static CelByteString of(byte[] buffer) {
 Preconditions.checkNotNull(buffer);
 if (buffer == null) {
 throw new NullPointerException("buffer cannot be null");
 }
 if (buffer.length == 0) {
 return EMPTY;
 }
Expand Down

10 changes: 2 additions & 8 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,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.UnsignedLong;
import dev.cel.common.CelOptions;
import dev.cel.common.annotations.Internal;
import java.util.Map;
import java.util.Map.Entry;
Expand All@@ -34,8 +33,6 @@
@Internal
abstract class CelValueConverter {

 protected final CelOptions celOptions;

 /** Adapts a {@link CelValue} to a plain old Java Object. */
 public Object fromCelValueToJavaObject(CelValue celValue) {
 Preconditions.checkNotNull(celValue);
Expand DownExpand Up@@ -112,7 +109,7 @@ protected CelValue fromJavaPrimitiveToCelValue(Object value) {
 } else if (value instanceof Float) {
 return DoubleValue.create(Double.valueOf((Float) value));
 } else if (value instanceof UnsignedLong) {
 return UintValue.create(((UnsignedLong) value).longValue(), celOptions.enableUnsignedLongs());
 return UintValue.create(((UnsignedLong) value).longValue(), /* enableUnsignedLongs= */ true);
 }

 // Fall back to an Opaque value, as a custom class was supplied in the runtime. The legacy
Expand DownExpand Up@@ -145,8 +142,5 @@ private MapValue<CelValue, CelValue> toMapValue(Map<Object, Object> map) {
 return ImmutableMapValue.create(mapBuilder.buildOrThrow());
 }

 protected CelValueConverter(CelOptions celOptions) {
 Preconditions.checkNotNull(celOptions);
 this.celOptions = celOptions;
 }
 protected CelValueConverter() {}
}
Loading