Fix JSON conversions involving FieldMask and Empty#644

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
Mar 18, 2025
Merged

Fix JSON conversions involving FieldMask and Empty #644

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
31 changes: 31 additions & 0 deletions common/src/main/java/dev/cel/common/CelProtoJsonAdapter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,24 @@

package dev.cel.common;

import com.google.common.base.CaseFormat;
import com.google.common.base.Joiner;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.ListValue;
import com.google.protobuf.NullValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;

/**
Expand DownExpand Up@@ -113,11 +119,36 @@ public static Value adaptValueToJsonValue(Object value) {
String duration = Durations.toString((Duration) value);
return json.setStringValue(duration).build();
}
if (value instanceof FieldMask) {
String fieldMaskStr = toJsonString((FieldMask) value);
return json.setStringValue(fieldMaskStr).build();
}
if (value instanceof Empty) {
// google.protobuf.Empty is just an empty json map {}
return json.setStructValue(Struct.getDefaultInstance()).build();
}

throw new IllegalArgumentException(
String.format("Value %s cannot be adapted to a JSON Value.", value));
}

/**
* Joins the field mask's paths into a single string with commas. This logic is copied from
* Protobuf's FieldMaskUtil.java, which we cannot directly use here due to its dependency to
* descriptors.
*/
private static String toJsonString(FieldMask fieldMask) {
List<String> paths = new ArrayList<>(fieldMask.getPathsCount());

for (String path : fieldMask.getPathsList()) {
if (!path.isEmpty()) {
paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
}
}

return Joiner.on(",").join(paths);
}

/**
* Adapts an iterable to a JSON list value.
*
Expand Down
5 changes: 0 additions & 5 deletions common/src/main/java/dev/cel/common/internal/ProtoAdapter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,11 +290,6 @@ public Message adaptValueToProto(Object value, String protoTypeName) {
}

switch (wellKnownProto) {
// TODO: These should be converted properly to their primitive types. This is
// here to retain compatibility for time being.
case FIELD_MASK:
case EMPTY:
return (Message) value;
case ANY_VALUE:
if (value instanceof Message) {
protoTypeName = ((Message) value).getDescriptorForType().getFullName();
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ public static String getJavaPackageName(FileDescriptor fileDescriptor) {
FileOptions options = fileDescriptor.getFile().getOptions();
StringBuilder javaPackageName = new StringBuilder();
if (options.hasJavaPackage()) {
javaPackageName.append(fileDescriptor.getFile().getOptions().getJavaPackage());
javaPackageName.append(options.getJavaPackage());
} else {
javaPackageName
// CEL-Internal-1
Expand Down
9 changes: 8 additions & 1 deletion common/src/main/java/dev/cel/common/internal/ProtoLiteAdapter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,8 +95,15 @@ public MessageLite adaptValueToWellKnownProto(Object value, WellKnownProto wellK
return (Duration) value;
case TIMESTAMP:
return (Timestamp) value;
case EMPTY:
case FIELD_MASK:
// These two WKTs are typically used in context of JSON conversions, in which they are
// automatically unwrapped into equivalent primitive types.
// In other cases, just return the original message itself.
return (MessageLite) value;
default:
throw new IllegalArgumentException("Unexpceted wellKnownProto kind: " + wellKnownProto);
throw new IllegalArgumentException(
"Unexpected wellKnownProto kind: " + wellKnownProto + " for value: " + value);
}
}

Expand Down
8 changes: 7 additions & 1 deletion common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
Expand DownExpand Up@@ -134,9 +136,13 @@ public static List<Object[]> data() {
Timestamp.newBuilder().setSeconds(123).build(),
Any.pack(Timestamp.newBuilder().setSeconds(123).build()),
},
// Adaption support for the most current CelOptions.
{UnsignedLong.valueOf(1L), UInt64Value.of(1L)},
{UnsignedLong.valueOf(1L), Any.pack(UInt64Value.of(1L))},
{Empty.getDefaultInstance(), Empty.getDefaultInstance()},
{
FieldMask.newBuilder().addPaths("foo").build(),
FieldMask.newBuilder().addPaths("foo").build()
}
});
}

Expand Down
4 changes: 0 additions & 4 deletions conformance/src/test/java/dev/cel/conformance/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,10 +91,6 @@ _TESTS_TO_SKIP = [
"timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

# Skip until fixed.
"wrappers/field_mask/to_json",
"wrappers/empty/to_json",
"wrappers/duration/to_json",
"wrappers/timestamp/to_json",
"fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous",
# TODO: Add strings.format and strings.quote.
"string_ext/quote",
Expand Down
, '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
Fix JSON conversions involving FieldMask and Empty#644

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

Mar 18, 2025
 Merged


Fix JSON conversions involving FieldMask and Empty
#644
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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,24 @@

package dev.cel.common;

import com.google.common.base.CaseFormat;
import com.google.common.base.Joiner;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.ListValue;
import com.google.protobuf.NullValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;

/**
Expand DownExpand Up@@ -113,11 +119,36 @@ public static Value adaptValueToJsonValue(Object value) {
 String duration = Durations.toString((Duration) value);
 return json.setStringValue(duration).build();
 }
 if (value instanceof FieldMask) {
 String fieldMaskStr = toJsonString((FieldMask) value);
 return json.setStringValue(fieldMaskStr).build();
 }
 if (value instanceof Empty) {
 // google.protobuf.Empty is just an empty json map {}
 return json.setStructValue(Struct.getDefaultInstance()).build();
 }

 throw new IllegalArgumentException(
 String.format("Value %s cannot be adapted to a JSON Value.", value));
 }

 /**
 * Joins the field mask's paths into a single string with commas. This logic is copied from
 * Protobuf's FieldMaskUtil.java, which we cannot directly use here due to its dependency to
 * descriptors.
 */
 private static String toJsonString(FieldMask fieldMask) {
 List<String> paths = new ArrayList<>(fieldMask.getPathsCount());

 for (String path : fieldMask.getPathsList()) {
 if (!path.isEmpty()) {
 paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
 }
 }

 return Joiner.on(",").join(paths);
 }

 /**
 * Adapts an iterable to a JSON list value.
 *
Expand Down

5 changes: 0 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,11 +290,6 @@ public Message adaptValueToProto(Object value, String protoTypeName) {
 }

 switch (wellKnownProto) {
 // TODO: These should be converted properly to their primitive types. This is
 // here to retain compatibility for time being.
 case FIELD_MASK:
 case EMPTY:
 return (Message) value;
 case ANY_VALUE:
 if (value instanceof Message) {
 protoTypeName = ((Message) value).getDescriptorForType().getFullName();
Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ public static String getJavaPackageName(FileDescriptor fileDescriptor) {
 FileOptions options = fileDescriptor.getFile().getOptions();
 StringBuilder javaPackageName = new StringBuilder();
 if (options.hasJavaPackage()) {
 javaPackageName.append(fileDescriptor.getFile().getOptions().getJavaPackage());
 javaPackageName.append(options.getJavaPackage());
 } else {
 javaPackageName
 // CEL-Internal-1
Expand Down

9 changes: 8 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoLiteAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,8 +95,15 @@ public MessageLite adaptValueToWellKnownProto(Object value, WellKnownProto wellK
 return (Duration) value;
 case TIMESTAMP:
 return (Timestamp) value;
 case EMPTY:
 case FIELD_MASK:
 // These two WKTs are typically used in context of JSON conversions, in which they are
 // automatically unwrapped into equivalent primitive types.
 // In other cases, just return the original message itself.
 return (MessageLite) value;
 default:
 throw new IllegalArgumentException("Unexpceted wellKnownProto kind: " + wellKnownProto);
 throw new IllegalArgumentException(
 "Unexpected wellKnownProto kind: " + wellKnownProto + " for value: " + value);
 }
 }

Expand Down

8 changes: 7 additions & 1 deletion
common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
Expand DownExpand Up@@ -134,9 +136,13 @@ public static List<Object[]> data() {
 Timestamp.newBuilder().setSeconds(123).build(),
 Any.pack(Timestamp.newBuilder().setSeconds(123).build()),
 },
 // Adaption support for the most current CelOptions.
 {UnsignedLong.valueOf(1L), UInt64Value.of(1L)},
 {UnsignedLong.valueOf(1L), Any.pack(UInt64Value.of(1L))},
 {Empty.getDefaultInstance(), Empty.getDefaultInstance()},
 {
 FieldMask.newBuilder().addPaths("foo").build(),
 FieldMask.newBuilder().addPaths("foo").build()
 }
 });
 }

Expand Down

4 changes: 0 additions & 4 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,10 +91,6 @@ _TESTS_TO_SKIP = [
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

 # Skip until fixed.
 "wrappers/field_mask/to_json",
 "wrappers/empty/to_json",
 "wrappers/duration/to_json",
 "wrappers/timestamp/to_json",
 "fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous",
 # TODO: Add strings.format and strings.quote.
 "string_ext/quote",
Expand Down

, '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
Fix JSON conversions involving FieldMask and Empty#644

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

Mar 18, 2025
 Merged


Fix JSON conversions involving FieldMask and Empty
#644
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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,24 @@

package dev.cel.common;

import com.google.common.base.CaseFormat;
import com.google.common.base.Joiner;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.ListValue;
import com.google.protobuf.NullValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;

/**
Expand DownExpand Up@@ -113,11 +119,36 @@ public static Value adaptValueToJsonValue(Object value) {
 String duration = Durations.toString((Duration) value);
 return json.setStringValue(duration).build();
 }
 if (value instanceof FieldMask) {
 String fieldMaskStr = toJsonString((FieldMask) value);
 return json.setStringValue(fieldMaskStr).build();
 }
 if (value instanceof Empty) {
 // google.protobuf.Empty is just an empty json map {}
 return json.setStructValue(Struct.getDefaultInstance()).build();
 }

 throw new IllegalArgumentException(
 String.format("Value %s cannot be adapted to a JSON Value.", value));
 }

 /**
 * Joins the field mask's paths into a single string with commas. This logic is copied from
 * Protobuf's FieldMaskUtil.java, which we cannot directly use here due to its dependency to
 * descriptors.
 */
 private static String toJsonString(FieldMask fieldMask) {
 List<String> paths = new ArrayList<>(fieldMask.getPathsCount());

 for (String path : fieldMask.getPathsList()) {
 if (!path.isEmpty()) {
 paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
 }
 }

 return Joiner.on(",").join(paths);
 }

 /**
 * Adapts an iterable to a JSON list value.
 *
Expand Down

5 changes: 0 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,11 +290,6 @@ public Message adaptValueToProto(Object value, String protoTypeName) {
 }

 switch (wellKnownProto) {
 // TODO: These should be converted properly to their primitive types. This is
 // here to retain compatibility for time being.
 case FIELD_MASK:
 case EMPTY:
 return (Message) value;
 case ANY_VALUE:
 if (value instanceof Message) {
 protoTypeName = ((Message) value).getDescriptorForType().getFullName();
Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ public static String getJavaPackageName(FileDescriptor fileDescriptor) {
 FileOptions options = fileDescriptor.getFile().getOptions();
 StringBuilder javaPackageName = new StringBuilder();
 if (options.hasJavaPackage()) {
 javaPackageName.append(fileDescriptor.getFile().getOptions().getJavaPackage());
 javaPackageName.append(options.getJavaPackage());
 } else {
 javaPackageName
 // CEL-Internal-1
Expand Down

9 changes: 8 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoLiteAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,8 +95,15 @@ public MessageLite adaptValueToWellKnownProto(Object value, WellKnownProto wellK
 return (Duration) value;
 case TIMESTAMP:
 return (Timestamp) value;
 case EMPTY:
 case FIELD_MASK:
 // These two WKTs are typically used in context of JSON conversions, in which they are
 // automatically unwrapped into equivalent primitive types.
 // In other cases, just return the original message itself.
 return (MessageLite) value;
 default:
 throw new IllegalArgumentException("Unexpceted wellKnownProto kind: " + wellKnownProto);
 throw new IllegalArgumentException(
 "Unexpected wellKnownProto kind: " + wellKnownProto + " for value: " + value);
 }
 }

Expand Down

8 changes: 7 additions & 1 deletion
common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
Expand DownExpand Up@@ -134,9 +136,13 @@ public static List<Object[]> data() {
 Timestamp.newBuilder().setSeconds(123).build(),
 Any.pack(Timestamp.newBuilder().setSeconds(123).build()),
 },
 // Adaption support for the most current CelOptions.
 {UnsignedLong.valueOf(1L), UInt64Value.of(1L)},
 {UnsignedLong.valueOf(1L), Any.pack(UInt64Value.of(1L))},
 {Empty.getDefaultInstance(), Empty.getDefaultInstance()},
 {
 FieldMask.newBuilder().addPaths("foo").build(),
 FieldMask.newBuilder().addPaths("foo").build()
 }
 });
 }

Expand Down

4 changes: 0 additions & 4 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,10 +91,6 @@ _TESTS_TO_SKIP = [
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

 # Skip until fixed.
 "wrappers/field_mask/to_json",
 "wrappers/empty/to_json",
 "wrappers/duration/to_json",
 "wrappers/timestamp/to_json",
 "fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous",
 # TODO: Add strings.format and strings.quote.
 "string_ext/quote",
Expand Down

, '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
Fix JSON conversions involving FieldMask and Empty#644

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

Mar 18, 2025
 Merged


Fix JSON conversions involving FieldMask and Empty
#644
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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,24 @@

package dev.cel.common;

import com.google.common.base.CaseFormat;
import com.google.common.base.Joiner;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.ListValue;
import com.google.protobuf.NullValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;

/**
Expand DownExpand Up@@ -113,11 +119,36 @@ public static Value adaptValueToJsonValue(Object value) {
 String duration = Durations.toString((Duration) value);
 return json.setStringValue(duration).build();
 }
 if (value instanceof FieldMask) {
 String fieldMaskStr = toJsonString((FieldMask) value);
 return json.setStringValue(fieldMaskStr).build();
 }
 if (value instanceof Empty) {
 // google.protobuf.Empty is just an empty json map {}
 return json.setStructValue(Struct.getDefaultInstance()).build();
 }

 throw new IllegalArgumentException(
 String.format("Value %s cannot be adapted to a JSON Value.", value));
 }

 /**
 * Joins the field mask's paths into a single string with commas. This logic is copied from
 * Protobuf's FieldMaskUtil.java, which we cannot directly use here due to its dependency to
 * descriptors.
 */
 private static String toJsonString(FieldMask fieldMask) {
 List<String> paths = new ArrayList<>(fieldMask.getPathsCount());

 for (String path : fieldMask.getPathsList()) {
 if (!path.isEmpty()) {
 paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
 }
 }

 return Joiner.on(",").join(paths);
 }

 /**
 * Adapts an iterable to a JSON list value.
 *
Expand Down

5 changes: 0 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,11 +290,6 @@ public Message adaptValueToProto(Object value, String protoTypeName) {
 }

 switch (wellKnownProto) {
 // TODO: These should be converted properly to their primitive types. This is
 // here to retain compatibility for time being.
 case FIELD_MASK:
 case EMPTY:
 return (Message) value;
 case ANY_VALUE:
 if (value instanceof Message) {
 protoTypeName = ((Message) value).getDescriptorForType().getFullName();
Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ public static String getJavaPackageName(FileDescriptor fileDescriptor) {
 FileOptions options = fileDescriptor.getFile().getOptions();
 StringBuilder javaPackageName = new StringBuilder();
 if (options.hasJavaPackage()) {
 javaPackageName.append(fileDescriptor.getFile().getOptions().getJavaPackage());
 javaPackageName.append(options.getJavaPackage());
 } else {
 javaPackageName
 // CEL-Internal-1
Expand Down

9 changes: 8 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoLiteAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,8 +95,15 @@ public MessageLite adaptValueToWellKnownProto(Object value, WellKnownProto wellK
 return (Duration) value;
 case TIMESTAMP:
 return (Timestamp) value;
 case EMPTY:
 case FIELD_MASK:
 // These two WKTs are typically used in context of JSON conversions, in which they are
 // automatically unwrapped into equivalent primitive types.
 // In other cases, just return the original message itself.
 return (MessageLite) value;
 default:
 throw new IllegalArgumentException("Unexpceted wellKnownProto kind: " + wellKnownProto);
 throw new IllegalArgumentException(
 "Unexpected wellKnownProto kind: " + wellKnownProto + " for value: " + value);
 }
 }

Expand Down

8 changes: 7 additions & 1 deletion
common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
Expand DownExpand Up@@ -134,9 +136,13 @@ public static List<Object[]> data() {
 Timestamp.newBuilder().setSeconds(123).build(),
 Any.pack(Timestamp.newBuilder().setSeconds(123).build()),
 },
 // Adaption support for the most current CelOptions.
 {UnsignedLong.valueOf(1L), UInt64Value.of(1L)},
 {UnsignedLong.valueOf(1L), Any.pack(UInt64Value.of(1L))},
 {Empty.getDefaultInstance(), Empty.getDefaultInstance()},
 {
 FieldMask.newBuilder().addPaths("foo").build(),
 FieldMask.newBuilder().addPaths("foo").build()
 }
 });
 }

Expand Down

4 changes: 0 additions & 4 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,10 +91,6 @@ _TESTS_TO_SKIP = [
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

 # Skip until fixed.
 "wrappers/field_mask/to_json",
 "wrappers/empty/to_json",
 "wrappers/duration/to_json",
 "wrappers/timestamp/to_json",
 "fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous",
 # TODO: Add strings.format and strings.quote.
 "string_ext/quote",
Expand Down

, '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
Fix JSON conversions involving FieldMask and Empty#644

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

Mar 18, 2025
 Merged


Fix JSON conversions involving FieldMask and Empty
#644
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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,24 @@

package dev.cel.common;

import com.google.common.base.CaseFormat;
import com.google.common.base.Joiner;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.ListValue;
import com.google.protobuf.NullValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;

/**
Expand DownExpand Up@@ -113,11 +119,36 @@ public static Value adaptValueToJsonValue(Object value) {
 String duration = Durations.toString((Duration) value);
 return json.setStringValue(duration).build();
 }
 if (value instanceof FieldMask) {
 String fieldMaskStr = toJsonString((FieldMask) value);
 return json.setStringValue(fieldMaskStr).build();
 }
 if (value instanceof Empty) {
 // google.protobuf.Empty is just an empty json map {}
 return json.setStructValue(Struct.getDefaultInstance()).build();
 }

 throw new IllegalArgumentException(
 String.format("Value %s cannot be adapted to a JSON Value.", value));
 }

 /**
 * Joins the field mask's paths into a single string with commas. This logic is copied from
 * Protobuf's FieldMaskUtil.java, which we cannot directly use here due to its dependency to
 * descriptors.
 */
 private static String toJsonString(FieldMask fieldMask) {
 List<String> paths = new ArrayList<>(fieldMask.getPathsCount());

 for (String path : fieldMask.getPathsList()) {
 if (!path.isEmpty()) {
 paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
 }
 }

 return Joiner.on(",").join(paths);
 }

 /**
 * Adapts an iterable to a JSON list value.
 *
Expand Down

5 changes: 0 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,11 +290,6 @@ public Message adaptValueToProto(Object value, String protoTypeName) {
 }

 switch (wellKnownProto) {
 // TODO: These should be converted properly to their primitive types. This is
 // here to retain compatibility for time being.
 case FIELD_MASK:
 case EMPTY:
 return (Message) value;
 case ANY_VALUE:
 if (value instanceof Message) {
 protoTypeName = ((Message) value).getDescriptorForType().getFullName();
Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ public static String getJavaPackageName(FileDescriptor fileDescriptor) {
 FileOptions options = fileDescriptor.getFile().getOptions();
 StringBuilder javaPackageName = new StringBuilder();
 if (options.hasJavaPackage()) {
 javaPackageName.append(fileDescriptor.getFile().getOptions().getJavaPackage());
 javaPackageName.append(options.getJavaPackage());
 } else {
 javaPackageName
 // CEL-Internal-1
Expand Down

9 changes: 8 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoLiteAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,8 +95,15 @@ public MessageLite adaptValueToWellKnownProto(Object value, WellKnownProto wellK
 return (Duration) value;
 case TIMESTAMP:
 return (Timestamp) value;
 case EMPTY:
 case FIELD_MASK:
 // These two WKTs are typically used in context of JSON conversions, in which they are
 // automatically unwrapped into equivalent primitive types.
 // In other cases, just return the original message itself.
 return (MessageLite) value;
 default:
 throw new IllegalArgumentException("Unexpceted wellKnownProto kind: " + wellKnownProto);
 throw new IllegalArgumentException(
 "Unexpected wellKnownProto kind: " + wellKnownProto + " for value: " + value);
 }
 }

Expand Down

8 changes: 7 additions & 1 deletion
common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
Expand DownExpand Up@@ -134,9 +136,13 @@ public static List<Object[]> data() {
 Timestamp.newBuilder().setSeconds(123).build(),
 Any.pack(Timestamp.newBuilder().setSeconds(123).build()),
 },
 // Adaption support for the most current CelOptions.
 {UnsignedLong.valueOf(1L), UInt64Value.of(1L)},
 {UnsignedLong.valueOf(1L), Any.pack(UInt64Value.of(1L))},
 {Empty.getDefaultInstance(), Empty.getDefaultInstance()},
 {
 FieldMask.newBuilder().addPaths("foo").build(),
 FieldMask.newBuilder().addPaths("foo").build()
 }
 });
 }

Expand Down

4 changes: 0 additions & 4 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,10 +91,6 @@ _TESTS_TO_SKIP = [
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

 # Skip until fixed.
 "wrappers/field_mask/to_json",
 "wrappers/empty/to_json",
 "wrappers/duration/to_json",
 "wrappers/timestamp/to_json",
 "fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous",
 # TODO: Add strings.format and strings.quote.
 "string_ext/quote",
Expand Down

, '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
Fix JSON conversions involving FieldMask and Empty#644

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

Mar 18, 2025
 Merged


Fix JSON conversions involving FieldMask and Empty
#644
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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,24 @@

package dev.cel.common;

import com.google.common.base.CaseFormat;
import com.google.common.base.Joiner;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.ListValue;
import com.google.protobuf.NullValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;

/**
Expand DownExpand Up@@ -113,11 +119,36 @@ public static Value adaptValueToJsonValue(Object value) {
 String duration = Durations.toString((Duration) value);
 return json.setStringValue(duration).build();
 }
 if (value instanceof FieldMask) {
 String fieldMaskStr = toJsonString((FieldMask) value);
 return json.setStringValue(fieldMaskStr).build();
 }
 if (value instanceof Empty) {
 // google.protobuf.Empty is just an empty json map {}
 return json.setStructValue(Struct.getDefaultInstance()).build();
 }

 throw new IllegalArgumentException(
 String.format("Value %s cannot be adapted to a JSON Value.", value));
 }

 /**
 * Joins the field mask's paths into a single string with commas. This logic is copied from
 * Protobuf's FieldMaskUtil.java, which we cannot directly use here due to its dependency to
 * descriptors.
 */
 private static String toJsonString(FieldMask fieldMask) {
 List<String> paths = new ArrayList<>(fieldMask.getPathsCount());

 for (String path : fieldMask.getPathsList()) {
 if (!path.isEmpty()) {
 paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
 }
 }

 return Joiner.on(",").join(paths);
 }

 /**
 * Adapts an iterable to a JSON list value.
 *
Expand Down

5 changes: 0 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,11 +290,6 @@ public Message adaptValueToProto(Object value, String protoTypeName) {
 }

 switch (wellKnownProto) {
 // TODO: These should be converted properly to their primitive types. This is
 // here to retain compatibility for time being.
 case FIELD_MASK:
 case EMPTY:
 return (Message) value;
 case ANY_VALUE:
 if (value instanceof Message) {
 protoTypeName = ((Message) value).getDescriptorForType().getFullName();
Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ public static String getJavaPackageName(FileDescriptor fileDescriptor) {
 FileOptions options = fileDescriptor.getFile().getOptions();
 StringBuilder javaPackageName = new StringBuilder();
 if (options.hasJavaPackage()) {
 javaPackageName.append(fileDescriptor.getFile().getOptions().getJavaPackage());
 javaPackageName.append(options.getJavaPackage());
 } else {
 javaPackageName
 // CEL-Internal-1
Expand Down

9 changes: 8 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoLiteAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,8 +95,15 @@ public MessageLite adaptValueToWellKnownProto(Object value, WellKnownProto wellK
 return (Duration) value;
 case TIMESTAMP:
 return (Timestamp) value;
 case EMPTY:
 case FIELD_MASK:
 // These two WKTs are typically used in context of JSON conversions, in which they are
 // automatically unwrapped into equivalent primitive types.
 // In other cases, just return the original message itself.
 return (MessageLite) value;
 default:
 throw new IllegalArgumentException("Unexpceted wellKnownProto kind: " + wellKnownProto);
 throw new IllegalArgumentException(
 "Unexpected wellKnownProto kind: " + wellKnownProto + " for value: " + value);
 }
 }

Expand Down

8 changes: 7 additions & 1 deletion
common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
Expand DownExpand Up@@ -134,9 +136,13 @@ public static List<Object[]> data() {
 Timestamp.newBuilder().setSeconds(123).build(),
 Any.pack(Timestamp.newBuilder().setSeconds(123).build()),
 },
 // Adaption support for the most current CelOptions.
 {UnsignedLong.valueOf(1L), UInt64Value.of(1L)},
 {UnsignedLong.valueOf(1L), Any.pack(UInt64Value.of(1L))},
 {Empty.getDefaultInstance(), Empty.getDefaultInstance()},
 {
 FieldMask.newBuilder().addPaths("foo").build(),
 FieldMask.newBuilder().addPaths("foo").build()
 }
 });
 }

Expand Down

4 changes: 0 additions & 4 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,10 +91,6 @@ _TESTS_TO_SKIP = [
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

 # Skip until fixed.
 "wrappers/field_mask/to_json",
 "wrappers/empty/to_json",
 "wrappers/duration/to_json",
 "wrappers/timestamp/to_json",
 "fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous",
 # TODO: Add strings.format and strings.quote.
 "string_ext/quote",
Expand Down

, '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
Fix JSON conversions involving FieldMask and Empty#644

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

Mar 18, 2025
 Merged


Fix JSON conversions involving FieldMask and Empty
#644
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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,24 @@

package dev.cel.common;

import com.google.common.base.CaseFormat;
import com.google.common.base.Joiner;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.ListValue;
import com.google.protobuf.NullValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;

/**
Expand DownExpand Up@@ -113,11 +119,36 @@ public static Value adaptValueToJsonValue(Object value) {
 String duration = Durations.toString((Duration) value);
 return json.setStringValue(duration).build();
 }
 if (value instanceof FieldMask) {
 String fieldMaskStr = toJsonString((FieldMask) value);
 return json.setStringValue(fieldMaskStr).build();
 }
 if (value instanceof Empty) {
 // google.protobuf.Empty is just an empty json map {}
 return json.setStructValue(Struct.getDefaultInstance()).build();
 }

 throw new IllegalArgumentException(
 String.format("Value %s cannot be adapted to a JSON Value.", value));
 }

 /**
 * Joins the field mask's paths into a single string with commas. This logic is copied from
 * Protobuf's FieldMaskUtil.java, which we cannot directly use here due to its dependency to
 * descriptors.
 */
 private static String toJsonString(FieldMask fieldMask) {
 List<String> paths = new ArrayList<>(fieldMask.getPathsCount());

 for (String path : fieldMask.getPathsList()) {
 if (!path.isEmpty()) {
 paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
 }
 }

 return Joiner.on(",").join(paths);
 }

 /**
 * Adapts an iterable to a JSON list value.
 *
Expand Down

5 changes: 0 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,11 +290,6 @@ public Message adaptValueToProto(Object value, String protoTypeName) {
 }

 switch (wellKnownProto) {
 // TODO: These should be converted properly to their primitive types. This is
 // here to retain compatibility for time being.
 case FIELD_MASK:
 case EMPTY:
 return (Message) value;
 case ANY_VALUE:
 if (value instanceof Message) {
 protoTypeName = ((Message) value).getDescriptorForType().getFullName();
Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ public static String getJavaPackageName(FileDescriptor fileDescriptor) {
 FileOptions options = fileDescriptor.getFile().getOptions();
 StringBuilder javaPackageName = new StringBuilder();
 if (options.hasJavaPackage()) {
 javaPackageName.append(fileDescriptor.getFile().getOptions().getJavaPackage());
 javaPackageName.append(options.getJavaPackage());
 } else {
 javaPackageName
 // CEL-Internal-1
Expand Down

9 changes: 8 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoLiteAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,8 +95,15 @@ public MessageLite adaptValueToWellKnownProto(Object value, WellKnownProto wellK
 return (Duration) value;
 case TIMESTAMP:
 return (Timestamp) value;
 case EMPTY:
 case FIELD_MASK:
 // These two WKTs are typically used in context of JSON conversions, in which they are
 // automatically unwrapped into equivalent primitive types.
 // In other cases, just return the original message itself.
 return (MessageLite) value;
 default:
 throw new IllegalArgumentException("Unexpceted wellKnownProto kind: " + wellKnownProto);
 throw new IllegalArgumentException(
 "Unexpected wellKnownProto kind: " + wellKnownProto + " for value: " + value);
 }
 }

Expand Down

8 changes: 7 additions & 1 deletion
common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
Expand DownExpand Up@@ -134,9 +136,13 @@ public static List<Object[]> data() {
 Timestamp.newBuilder().setSeconds(123).build(),
 Any.pack(Timestamp.newBuilder().setSeconds(123).build()),
 },
 // Adaption support for the most current CelOptions.
 {UnsignedLong.valueOf(1L), UInt64Value.of(1L)},
 {UnsignedLong.valueOf(1L), Any.pack(UInt64Value.of(1L))},
 {Empty.getDefaultInstance(), Empty.getDefaultInstance()},
 {
 FieldMask.newBuilder().addPaths("foo").build(),
 FieldMask.newBuilder().addPaths("foo").build()
 }
 });
 }

Expand Down

4 changes: 0 additions & 4 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,10 +91,6 @@ _TESTS_TO_SKIP = [
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

 # Skip until fixed.
 "wrappers/field_mask/to_json",
 "wrappers/empty/to_json",
 "wrappers/duration/to_json",
 "wrappers/timestamp/to_json",
 "fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous",
 # TODO: Add strings.format and strings.quote.
 "string_ext/quote",
Expand Down

, '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
Fix JSON conversions involving FieldMask and Empty#644

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

Mar 18, 2025
 Merged


Fix JSON conversions involving FieldMask and Empty
#644
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


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,24 @@

package dev.cel.common;

import com.google.common.base.CaseFormat;
import com.google.common.base.Joiner;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.ListValue;
import com.google.protobuf.NullValue;
import com.google.protobuf.Struct;
import com.google.protobuf.Timestamp;
import com.google.protobuf.Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;

/**
Expand DownExpand Up@@ -113,11 +119,36 @@ public static Value adaptValueToJsonValue(Object value) {
 String duration = Durations.toString((Duration) value);
 return json.setStringValue(duration).build();
 }
 if (value instanceof FieldMask) {
 String fieldMaskStr = toJsonString((FieldMask) value);
 return json.setStringValue(fieldMaskStr).build();
 }
 if (value instanceof Empty) {
 // google.protobuf.Empty is just an empty json map {}
 return json.setStructValue(Struct.getDefaultInstance()).build();
 }

 throw new IllegalArgumentException(
 String.format("Value %s cannot be adapted to a JSON Value.", value));
 }

 /**
 * Joins the field mask's paths into a single string with commas. This logic is copied from
 * Protobuf's FieldMaskUtil.java, which we cannot directly use here due to its dependency to
 * descriptors.
 */
 private static String toJsonString(FieldMask fieldMask) {
 List<String> paths = new ArrayList<>(fieldMask.getPathsCount());

 for (String path : fieldMask.getPathsList()) {
 if (!path.isEmpty()) {
 paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
 }
 }

 return Joiner.on(",").join(paths);
 }

 /**
 * Adapts an iterable to a JSON list value.
 *
Expand Down

5 changes: 0 additions & 5 deletions
common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,11 +290,6 @@ public Message adaptValueToProto(Object value, String protoTypeName) {
 }

 switch (wellKnownProto) {
 // TODO: These should be converted properly to their primitive types. This is
 // here to retain compatibility for time being.
 case FIELD_MASK:
 case EMPTY:
 return (Message) value;
 case ANY_VALUE:
 if (value instanceof Message) {
 protoTypeName = ((Message) value).getDescriptorForType().getFullName();
Expand Down

2 changes: 1 addition & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ public static String getJavaPackageName(FileDescriptor fileDescriptor) {
 FileOptions options = fileDescriptor.getFile().getOptions();
 StringBuilder javaPackageName = new StringBuilder();
 if (options.hasJavaPackage()) {
 javaPackageName.append(fileDescriptor.getFile().getOptions().getJavaPackage());
 javaPackageName.append(options.getJavaPackage());
 } else {
 javaPackageName
 // CEL-Internal-1
Expand Down

9 changes: 8 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/ProtoLiteAdapter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,8 +95,15 @@ public MessageLite adaptValueToWellKnownProto(Object value, WellKnownProto wellK
 return (Duration) value;
 case TIMESTAMP:
 return (Timestamp) value;
 case EMPTY:
 case FIELD_MASK:
 // These two WKTs are typically used in context of JSON conversions, in which they are
 // automatically unwrapped into equivalent primitive types.
 // In other cases, just return the original message itself.
 return (MessageLite) value;
 default:
 throw new IllegalArgumentException("Unexpceted wellKnownProto kind: " + wellKnownProto);
 throw new IllegalArgumentException(
 "Unexpected wellKnownProto kind: " + wellKnownProto + " for value: " + value);
 }
 }

Expand Down

8 changes: 7 additions & 1 deletion
common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@
import com.google.protobuf.BytesValue;
import com.google.protobuf.DoubleValue;
import com.google.protobuf.Duration;
import com.google.protobuf.Empty;
import com.google.protobuf.FieldMask;
import com.google.protobuf.FloatValue;
import com.google.protobuf.Int64Value;
import com.google.protobuf.ListValue;
Expand DownExpand Up@@ -134,9 +136,13 @@ public static List<Object[]> data() {
 Timestamp.newBuilder().setSeconds(123).build(),
 Any.pack(Timestamp.newBuilder().setSeconds(123).build()),
 },
 // Adaption support for the most current CelOptions.
 {UnsignedLong.valueOf(1L), UInt64Value.of(1L)},
 {UnsignedLong.valueOf(1L), Any.pack(UInt64Value.of(1L))},
 {Empty.getDefaultInstance(), Empty.getDefaultInstance()},
 {
 FieldMask.newBuilder().addPaths("foo").build(),
 FieldMask.newBuilder().addPaths("foo").build()
 }
 });
 }

Expand Down

4 changes: 0 additions & 4 deletions
conformance/src/test/java/dev/cel/conformance/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,10 +91,6 @@ _TESTS_TO_SKIP = [
 "timestamps/timestamp_arithmetic/add_time_to_duration_nanos_negative",

 # Skip until fixed.
 "wrappers/field_mask/to_json",
 "wrappers/empty/to_json",
 "wrappers/duration/to_json",
 "wrappers/timestamp/to_json",
 "fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous",
 # TODO: Add strings.format and strings.quote.
 "string_ext/quote",
Expand Down