Rename CelFieldValueType to EncodingType#684

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
May 3, 2025
Merged

Rename CelFieldValueType to EncodingType #684

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
22 changes: 11 additions & 11 deletions common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
Expand DownExpand Up@@ -98,7 +98,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
/* fieldNumber= */ 1,
/* fieldName= */ "paths",
/* javaType= */ FieldLiteDescriptor.JavaType.STRING,
/* celFieldValueType= */ CelFieldValueType.LIST,
/* encodingType= */ EncodingType.LIST,
/* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
/* isPacked= */ false,
/* fieldProtoTypeName= */ ""));
Expand DownExpand Up@@ -167,7 +167,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
/* fieldNumber= */ 1,
/* fieldName= */ "fields",
/* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
/* celFieldValueType= */ CelFieldValueType.MAP,
/* encodingType= */ EncodingType.MAP,
/* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
Expand All@@ -179,7 +179,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
/* fieldNumber= */ 1,
/* fieldName= */ "null_value",
/* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* encodingType= */ EncodingType.SINGULAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "google.protobuf.NullValue"));
Expand All@@ -188,7 +188,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
/* fieldNumber= */ 2,
/* fieldName= */ "number_value",
/* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* encodingType= */ EncodingType.SINGULAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
/* isPacked= */ false,
/* fieldProtoTypeName= */ ""));
Expand All@@ -197,7 +197,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
/* fieldNumber= */ 3,
/* fieldName= */ "string_value",
/* javaType= */ FieldLiteDescriptor.JavaType.STRING,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* encodingType= */ EncodingType.SINGULAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
/* isPacked= */ false,
/* fieldProtoTypeName= */ ""));
Expand All@@ -206,7 +206,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
/* fieldNumber= */ 4,
/* fieldName= */ "bool_value",
/* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* encodingType= */ EncodingType.SINGULAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
/* isPacked= */ false,
/* fieldProtoTypeName= */ ""));
Expand All@@ -215,7 +215,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
/* fieldNumber= */ 5,
/* fieldName= */ "struct_value",
/* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* encodingType= */ EncodingType.SINGULAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "google.protobuf.Struct"));
Expand All@@ -224,7 +224,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
/* fieldNumber= */ 6,
/* fieldName= */ "list_value",
/* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* encodingType= */ EncodingType.SINGULAR,
/* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "google.protobuf.ListValue"));
Expand All@@ -236,7 +236,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
/* fieldNumber= */ 1,
/* fieldName= */ "values",
/* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
/* celFieldValueType= */ CelFieldValueType.LIST,
/* encodingType= */ EncodingType.LIST,
/* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "google.protobuf.Value"));
Expand DownExpand Up@@ -284,7 +284,7 @@ private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
/* fieldNumber= */ fieldNumber,
/* fieldName= */ fieldName,
/* javaType= */ javaType,
/* celFieldValueType= */ CelFieldValueType.SCALAR,
/* encodingType= */ EncodingType.SINGULAR,
/* protoFieldType= */ protoFieldType,
/* isPacked= */ false,
/* fieldProtoTypeName= */ "");
Expand Down
17 changes: 8 additions & 9 deletions common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.io.IOException;
Expand DownExpand Up@@ -164,17 +164,16 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {
}

private Object getDefaultValue(FieldLiteDescriptor fieldDescriptor) {
FieldLiteDescriptor.CelFieldValueType celFieldValueType =
fieldDescriptor.getCelFieldValueType();
switch (celFieldValueType) {
EncodingType encodingType = fieldDescriptor.getEncodingType();
switch (encodingType) {
case LIST:
return ImmutableList.of();
case MAP:
return ImmutableMap.of();
case SCALAR:
case SINGULAR:
return getScalarDefaultValue(fieldDescriptor);
}
throw new IllegalStateException("Unexpected cel field value type: " + celFieldValueType);
throw new IllegalStateException("Unexpected encoding type: " + encodingType);
}

private Object getScalarDefaultValue(FieldLiteDescriptor fieldDescriptor) {
Expand DownExpand Up@@ -265,8 +264,8 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
payload = readFixed64BitField(inputStream, fieldDescriptor);
break;
case WireFormat.WIRETYPE_LENGTH_DELIMITED:
CelFieldValueType celFieldValueType = fieldDescriptor.getCelFieldValueType();
switch (celFieldValueType) {
EncodingType encodingType = fieldDescriptor.getEncodingType();
switch (encodingType) {
case LIST:
if (fieldDescriptor.getIsPacked()) {
payload = readPackedRepeatedFields(inputStream, fieldDescriptor);
Expand DownExpand Up@@ -305,7 +304,7 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
throw new IllegalArgumentException("Unexpected wire type: " + tagWireType);
}

if (fieldDescriptor.getCelFieldValueType().equals(CelFieldValueType.LIST)) {
if (fieldDescriptor.getEncodingType().equals(EncodingType.LIST)) {
String fieldName = fieldDescriptor.getFieldName();
List<Object> repeatedValues =
repeatedFieldValues.computeIfAbsent(
Expand Down
10 changes: 4 additions & 6 deletions common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import org.junit.Rule;
Expand DownExpand Up@@ -74,13 +74,11 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
.isEqualTo(fullFieldDescriptor.isPacked());
expect
.withMessage(expectMessageTitle)
.that(fieldLiteDescriptor.getCelFieldValueType())
.that(fieldLiteDescriptor.getEncodingType())
.isEqualTo(
fullFieldDescriptor.isMapField()
? CelFieldValueType.MAP
: fullFieldDescriptor.isRepeated()
? CelFieldValueType.LIST
: CelFieldValueType.SCALAR);
? EncodingType.MAP
: fullFieldDescriptor.isRepeated() ? EncodingType.LIST : EncodingType.SINGULAR);
// Note: enums such as JavaType are semantically equal, but their instances differ.
expect
.withMessage(expectMessageTitle)
Expand Down
23 changes: 12 additions & 11 deletions protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,21 +141,22 @@ public static final class FieldLiteDescriptor {
private final JavaType javaType;
private final String fieldProtoTypeName;
private final Type protoFieldType;
private final CelFieldValueType celFieldValueType;
private final EncodingType encodingType;
private final boolean isPacked;

/**
* Enumeration of the CEL field value type. This is analogous to the following from field
* Enumeration of encoding type. This describes how CEL should deserialize the encoded message
* bytes using protobuf's wire format. This is analogous to the following from field
* descriptors:
*
* <ul>
* <li>LIST: Repeated Field
* <li>MAP: Map Field
* <li>SCALAR: Neither of above (scalars, messages)
* <li>SINGULAR: Neither of above (scalars, messages)
* </ul>
*/
public enum CelFieldValueType {
SCALAR,
public enum EncodingType {
SINGULAR,
LIST,
MAP
}
Expand DownExpand Up@@ -216,8 +217,8 @@ public JavaType getJavaType() {
return javaType;
}

public CelFieldValueType getCelFieldValueType() {
return celFieldValueType;
public EncodingType getEncodingType() {
return encodingType;
}

/**
Expand DownExpand Up@@ -250,8 +251,8 @@ public String getFieldProtoTypeName() {
* @param fieldName Name of the field
* @param javaType Canonical Java type name (ex: Long, Double, Float, Message... see
* com.google.protobuf.Descriptors#JavaType)
* @param celFieldValueType Describes whether the field is a scalar, list or a map with respect
* to CEL.
* @param encodingType Describes whether the field is a singular (primitives or messages), list
* or a map with respect to CEL.
* @param protoFieldType Protobuf Field Type (ex: INT32, SINT32, GROUP, MESSAGE... see
* com.google.protobuf.Descriptors#Type)
* @param fieldProtoTypeName Fully qualified protobuf type name for the field. Empty if the
Expand All@@ -262,14 +263,14 @@ public FieldLiteDescriptor(
int fieldNumber,
String fieldName,
JavaType javaType,
CelFieldValueType celFieldValueType, // LIST, MAP, SCALAR
EncodingType encodingType, // LIST, MAP, SINGULAR
Type protoFieldType, // INT32, SINT32, GROUP, MESSAGE... (See Descriptors#Type)
boolean isPacked,
String fieldProtoTypeName) {
this.fieldNumber = fieldNumber;
this.fieldName = Objects.requireNonNull(fieldName);
this.javaType = javaType;
this.celFieldValueType = celFieldValueType;
this.encodingType = encodingType;
this.protoFieldType = protoFieldType;
this.isPacked = isPacked;
this.fieldProtoTypeName = Objects.requireNonNull(fieldProtoTypeName);
Expand Down
14 changes: 7 additions & 7 deletions protobuf/src/main/java/dev/cel/protobuf/LiteDescriptorCodegenMetadata.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import org.jspecify.annotations.Nullable;

/**
Expand DownExpand Up@@ -86,10 +87,10 @@ public String getJavaTypeEnumName() {
return getFullyQualifiedEnumName(getJavaType());
}

// Fully-qualified name to the CelFieldValueType enumeration (ex:
// dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SCALAR)
public String getCelFieldValueTypeEnumName() {
return getFullyQualifiedEnumName(getCelFieldValueType());
// Fully-qualified name to the EncodingType enumeration (ex:
// dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SINGULAR)
public String getEncodingTypeEnumName() {
return getFullyQualifiedEnumName(getEncodingType());
}

// Fully-qualified name to the Proto Type enumeration (ex:
Expand All@@ -106,7 +107,7 @@ public String getProtoFieldTypeEnumName() {

abstract FieldLiteDescriptor.Type getProtoFieldType();

abstract FieldLiteDescriptor.CelFieldValueType getCelFieldValueType();
abstract EncodingType getEncodingType();

private static String getFullyQualifiedEnumName(Object enumValue) {
String enumClassName = enumValue.getClass().getName();
Expand All@@ -122,8 +123,7 @@ abstract static class Builder {

abstract Builder setJavaType(FieldLiteDescriptor.JavaType javaTypeEnum);

abstract Builder setCelFieldValueType(
FieldLiteDescriptor.CelFieldValueType celFieldValueTypeEnum);
abstract Builder setEncodingType(EncodingType encodingTypeEnum);

abstract Builder setProtoFieldType(FieldLiteDescriptor.Type protoFieldTypeEnum);

Expand Down
8 changes: 4 additions & 4 deletions protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
import dev.cel.common.internal.ProtoJavaQualifiedNames;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.LiteDescriptorCodegenMetadata.FieldLiteDescriptorMetadata;
import java.util.ArrayDeque;

Expand DownExpand Up@@ -79,15 +79,15 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
}

if (fieldDescriptor.isMapField()) {
fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.MAP);
fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.MAP);
// Maps are treated as messages in proto.
// TODO: Directly embed key/value information within the field descriptor.
// This will further reduce descriptor binary size.
descriptorQueue.push(fieldDescriptor.getMessageType());
} else if (fieldDescriptor.isRepeated()) {
fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.LIST);
fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.LIST);
} else {
fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.SCALAR);
fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.SINGULAR);
}

descriptorCodegenBuilder.addFieldDescriptor(fieldDescriptorCodegenBuilder.build());
Expand Down
2 changes: 1 addition & 1 deletion protobuf/src/main/java/dev/cel/protobuf/templates/cel_lite_descriptor_template.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public final class ${descriptor_class_name} extends CelLiteDescriptor {
${field_descriptor.fieldNumber},
"${field_descriptor.fieldName}",
${field_descriptor.javaTypeEnumName},
${field_descriptor.celFieldValueTypeEnumName},
${field_descriptor.encodingTypeEnumName},
${field_descriptor.protoFieldTypeEnumName},
${field_descriptor.isPacked},
"${field_descriptor.fieldProtoTypeName}"
Expand Down
10 changes: 5 additions & 5 deletions protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3LiteCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Map;
Expand DownExpand Up@@ -86,7 +86,7 @@ public void fieldDescriptor_scalarField() {
FieldLiteDescriptor fieldLiteDescriptor =
testAllTypesDescriptor.getByFieldNameOrThrow("single_string");

assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.STRING);
assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.STRING);
}
Expand All@@ -112,7 +112,7 @@ public void fieldDescriptor_mapField() {
FieldLiteDescriptor fieldLiteDescriptor =
testAllTypesDescriptor.getByFieldNameOrThrow("map_bool_string");

assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.MAP);
assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.MAP);
assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
}
Expand All@@ -126,7 +126,7 @@ public void fieldDescriptor_repeatedField() {
FieldLiteDescriptor fieldLiteDescriptor =
testAllTypesDescriptor.getByFieldNameOrThrow("repeated_int64");

assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.LIST);
assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.LIST);
assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.LONG);
assertThat(fieldLiteDescriptor.getIsPacked()).isTrue();
assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.INT64);
Expand All@@ -141,7 +141,7 @@ public void fieldDescriptor_nestedMessage() {
FieldLiteDescriptor fieldLiteDescriptor =
testAllTypesDescriptor.getByFieldNameOrThrow("standalone_message");

assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
}
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
Rename CelFieldValueType to EncodingType#684

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

May 3, 2025
 Merged


Rename CelFieldValueType to EncodingType
#684
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


22 changes: 11 additions & 11 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
Expand DownExpand Up@@ -98,7 +98,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand DownExpand Up@@ -167,7 +167,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* encodingType= */ EncodingType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
Expand All@@ -179,7 +179,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
Expand All@@ -188,7 +188,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -197,7 +197,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -206,7 +206,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -215,7 +215,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
Expand All@@ -224,7 +224,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
Expand All@@ -236,7 +236,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
Expand DownExpand Up@@ -284,7 +284,7 @@ private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
Expand Down

17 changes: 8 additions & 9 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.io.IOException;
Expand DownExpand Up@@ -164,17 +164,16 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {
 }

 private Object getDefaultValue(FieldLiteDescriptor fieldDescriptor) {
 FieldLiteDescriptor.CelFieldValueType celFieldValueType =
 fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
 EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 return ImmutableList.of();
 case MAP:
 return ImmutableMap.of();
 case SCALAR:
 case SINGULAR:
 return getScalarDefaultValue(fieldDescriptor);
 }
 throw new IllegalStateException("Unexpected cel field value type: " + celFieldValueType);
 throw new IllegalStateException("Unexpected encoding type: " + encodingType);
 }

 private Object getScalarDefaultValue(FieldLiteDescriptor fieldDescriptor) {
Expand DownExpand Up@@ -265,8 +264,8 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 payload = readFixed64BitField(inputStream, fieldDescriptor);
 break;
 case WireFormat.WIRETYPE_LENGTH_DELIMITED:
CelFieldValueType celFieldValueType = fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 if (fieldDescriptor.getIsPacked()) {
 payload = readPackedRepeatedFields(inputStream, fieldDescriptor);
Expand DownExpand Up@@ -305,7 +304,7 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 throw new IllegalArgumentException("Unexpected wire type: " + tagWireType);
 }

 if (fieldDescriptor.getCelFieldValueType().equals(CelFieldValueType.LIST)) {
 if (fieldDescriptor.getEncodingType().equals(EncodingType.LIST)) {
 String fieldName = fieldDescriptor.getFieldName();
 List<Object> repeatedValues =
 repeatedFieldValues.computeIfAbsent(
Expand Down

10 changes: 4 additions & 6 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import org.junit.Rule;
Expand DownExpand Up@@ -74,13 +74,11 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 .isEqualTo(fullFieldDescriptor.isPacked());
 expect
 .withMessage(expectMessageTitle)
 .that(fieldLiteDescriptor.getCelFieldValueType())
 .that(fieldLiteDescriptor.getEncodingType())
 .isEqualTo(
 fullFieldDescriptor.isMapField()
 ? CelFieldValueType.MAP
 : fullFieldDescriptor.isRepeated()
 ? CelFieldValueType.LIST
 : CelFieldValueType.SCALAR);
 ? EncodingType.MAP
 : fullFieldDescriptor.isRepeated() ? EncodingType.LIST : EncodingType.SINGULAR);
 // Note: enums such as JavaType are semantically equal, but their instances differ.
 expect
 .withMessage(expectMessageTitle)
Expand Down

23 changes: 12 additions & 11 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,21 +141,22 @@ public static final class FieldLiteDescriptor {
 private final JavaType javaType;
 private final String fieldProtoTypeName;
 private final Type protoFieldType;
 private final CelFieldValueType celFieldValueType;
 private final EncodingType encodingType;
 private final boolean isPacked;

 /**
 * Enumeration of the CEL field value type. This is analogous to the following from field
 * Enumeration of encoding type. This describes how CEL should deserialize the encoded message
 * bytes using protobuf's wire format. This is analogous to the following from field
 * descriptors:
 *
 * <ul>
 * <li>LIST: Repeated Field
 * <li>MAP: Map Field
 * <li>SCALAR: Neither of above (scalars, messages)
 * <li>SINGULAR: Neither of above (scalars, messages)
 * </ul>
 */
 public enum CelFieldValueType {
SCALAR,
 public enum EncodingType {
SINGULAR,
 LIST,
 MAP
 }
Expand DownExpand Up@@ -216,8 +217,8 @@ public JavaType getJavaType() {
 return javaType;
 }

 public CelFieldValueType getCelFieldValueType() {
 return celFieldValueType;
 public EncodingType getEncodingType() {
 return encodingType;
 }

 /**
Expand DownExpand Up@@ -250,8 +251,8 @@ public String getFieldProtoTypeName() {
 * @param fieldName Name of the field
 * @param javaType Canonical Java type name (ex: Long, Double, Float, Message... see
 * com.google.protobuf.Descriptors#JavaType)
 * @param celFieldValueType Describes whether the field is a scalar, list or a map with respect
 * to CEL.
 * @param encodingType Describes whether the field is a singular (primitives or messages), list
 * or a map with respect to CEL.
 * @param protoFieldType Protobuf Field Type (ex: INT32, SINT32, GROUP, MESSAGE... see
 * com.google.protobuf.Descriptors#Type)
 * @param fieldProtoTypeName Fully qualified protobuf type name for the field. Empty if the
Expand All@@ -262,14 +263,14 @@ public FieldLiteDescriptor(
 int fieldNumber,
 String fieldName,
 JavaType javaType,
CelFieldValueType celFieldValueType, // LIST, MAP, SCALAR
EncodingType encodingType, // LIST, MAP, SINGULAR
 Type protoFieldType, // INT32, SINT32, GROUP, MESSAGE... (See Descriptors#Type)
 boolean isPacked,
 String fieldProtoTypeName) {
 this.fieldNumber = fieldNumber;
 this.fieldName = Objects.requireNonNull(fieldName);
 this.javaType = javaType;
 this.celFieldValueType = celFieldValueType;
 this.encodingType = encodingType;
 this.protoFieldType = protoFieldType;
 this.isPacked = isPacked;
 this.fieldProtoTypeName = Objects.requireNonNull(fieldProtoTypeName);
Expand Down

14 changes: 7 additions & 7 deletions
protobuf/src/main/java/dev/cel/protobuf/LiteDescriptorCodegenMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import org.jspecify.annotations.Nullable;

/**
Expand DownExpand Up@@ -86,10 +87,10 @@ public String getJavaTypeEnumName() {
 return getFullyQualifiedEnumName(getJavaType());
 }

 // Fully-qualified name to the CelFieldValueType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SCALAR)
 public String getCelFieldValueTypeEnumName() {
 return getFullyQualifiedEnumName(getCelFieldValueType());
 // Fully-qualified name to the EncodingType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SINGULAR)
 public String getEncodingTypeEnumName() {
 return getFullyQualifiedEnumName(getEncodingType());
 }

 // Fully-qualified name to the Proto Type enumeration (ex:
Expand All@@ -106,7 +107,7 @@ public String getProtoFieldTypeEnumName() {

 abstract FieldLiteDescriptor.Type getProtoFieldType();

 abstract FieldLiteDescriptor.CelFieldValueType getCelFieldValueType();
 abstract EncodingType getEncodingType();

 private static String getFullyQualifiedEnumName(Object enumValue) {
 String enumClassName = enumValue.getClass().getName();
Expand All@@ -122,8 +123,7 @@ abstract static class Builder {

 abstract Builder setJavaType(FieldLiteDescriptor.JavaType javaTypeEnum);

 abstract Builder setCelFieldValueType(
 FieldLiteDescriptor.CelFieldValueType celFieldValueTypeEnum);
 abstract Builder setEncodingType(EncodingType encodingTypeEnum);

 abstract Builder setProtoFieldType(FieldLiteDescriptor.Type protoFieldTypeEnum);

Expand Down

8 changes: 4 additions & 4 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
import dev.cel.common.internal.ProtoJavaQualifiedNames;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.LiteDescriptorCodegenMetadata.FieldLiteDescriptorMetadata;
import java.util.ArrayDeque;

Expand DownExpand Up@@ -79,15 +79,15 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 }

 if (fieldDescriptor.isMapField()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.MAP);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.MAP);
 // Maps are treated as messages in proto.
 // TODO: Directly embed key/value information within the field descriptor.
 // This will further reduce descriptor binary size.
 descriptorQueue.push(fieldDescriptor.getMessageType());
 } else if (fieldDescriptor.isRepeated()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.LIST);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.LIST);
 } else {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.SCALAR);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.SINGULAR);
 }

 descriptorCodegenBuilder.addFieldDescriptor(fieldDescriptorCodegenBuilder.build());
Expand Down

2 changes: 1 addition & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/templates/cel_lite_descriptor_template.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public final class ${descriptor_class_name} extends CelLiteDescriptor {
 ${field_descriptor.fieldNumber},
 "${field_descriptor.fieldName}",
 ${field_descriptor.javaTypeEnumName},
 ${field_descriptor.celFieldValueTypeEnumName},
 ${field_descriptor.encodingTypeEnumName},
 ${field_descriptor.protoFieldTypeEnumName},
 ${field_descriptor.isPacked},
 "${field_descriptor.fieldProtoTypeName}"
Expand Down

10 changes: 5 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3LiteCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Map;
Expand DownExpand Up@@ -86,7 +86,7 @@ public void fieldDescriptor_scalarField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("single_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.STRING);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.STRING);
 }
Expand All@@ -112,7 +112,7 @@ public void fieldDescriptor_mapField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("map_bool_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.MAP);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.MAP);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
Expand All@@ -126,7 +126,7 @@ public void fieldDescriptor_repeatedField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("repeated_int64");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.LIST);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.LIST);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.LONG);
 assertThat(fieldLiteDescriptor.getIsPacked()).isTrue();
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.INT64);
Expand All@@ -141,7 +141,7 @@ public void fieldDescriptor_nestedMessage() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("standalone_message");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
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
Rename CelFieldValueType to EncodingType#684

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

May 3, 2025
 Merged


Rename CelFieldValueType to EncodingType
#684
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


22 changes: 11 additions & 11 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
Expand DownExpand Up@@ -98,7 +98,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand DownExpand Up@@ -167,7 +167,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* encodingType= */ EncodingType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
Expand All@@ -179,7 +179,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
Expand All@@ -188,7 +188,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -197,7 +197,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -206,7 +206,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -215,7 +215,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
Expand All@@ -224,7 +224,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
Expand All@@ -236,7 +236,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
Expand DownExpand Up@@ -284,7 +284,7 @@ private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
Expand Down

17 changes: 8 additions & 9 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.io.IOException;
Expand DownExpand Up@@ -164,17 +164,16 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {
 }

 private Object getDefaultValue(FieldLiteDescriptor fieldDescriptor) {
 FieldLiteDescriptor.CelFieldValueType celFieldValueType =
 fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
 EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 return ImmutableList.of();
 case MAP:
 return ImmutableMap.of();
 case SCALAR:
 case SINGULAR:
 return getScalarDefaultValue(fieldDescriptor);
 }
 throw new IllegalStateException("Unexpected cel field value type: " + celFieldValueType);
 throw new IllegalStateException("Unexpected encoding type: " + encodingType);
 }

 private Object getScalarDefaultValue(FieldLiteDescriptor fieldDescriptor) {
Expand DownExpand Up@@ -265,8 +264,8 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 payload = readFixed64BitField(inputStream, fieldDescriptor);
 break;
 case WireFormat.WIRETYPE_LENGTH_DELIMITED:
CelFieldValueType celFieldValueType = fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 if (fieldDescriptor.getIsPacked()) {
 payload = readPackedRepeatedFields(inputStream, fieldDescriptor);
Expand DownExpand Up@@ -305,7 +304,7 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 throw new IllegalArgumentException("Unexpected wire type: " + tagWireType);
 }

 if (fieldDescriptor.getCelFieldValueType().equals(CelFieldValueType.LIST)) {
 if (fieldDescriptor.getEncodingType().equals(EncodingType.LIST)) {
 String fieldName = fieldDescriptor.getFieldName();
 List<Object> repeatedValues =
 repeatedFieldValues.computeIfAbsent(
Expand Down

10 changes: 4 additions & 6 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import org.junit.Rule;
Expand DownExpand Up@@ -74,13 +74,11 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 .isEqualTo(fullFieldDescriptor.isPacked());
 expect
 .withMessage(expectMessageTitle)
 .that(fieldLiteDescriptor.getCelFieldValueType())
 .that(fieldLiteDescriptor.getEncodingType())
 .isEqualTo(
 fullFieldDescriptor.isMapField()
 ? CelFieldValueType.MAP
 : fullFieldDescriptor.isRepeated()
 ? CelFieldValueType.LIST
 : CelFieldValueType.SCALAR);
 ? EncodingType.MAP
 : fullFieldDescriptor.isRepeated() ? EncodingType.LIST : EncodingType.SINGULAR);
 // Note: enums such as JavaType are semantically equal, but their instances differ.
 expect
 .withMessage(expectMessageTitle)
Expand Down

23 changes: 12 additions & 11 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,21 +141,22 @@ public static final class FieldLiteDescriptor {
 private final JavaType javaType;
 private final String fieldProtoTypeName;
 private final Type protoFieldType;
 private final CelFieldValueType celFieldValueType;
 private final EncodingType encodingType;
 private final boolean isPacked;

 /**
 * Enumeration of the CEL field value type. This is analogous to the following from field
 * Enumeration of encoding type. This describes how CEL should deserialize the encoded message
 * bytes using protobuf's wire format. This is analogous to the following from field
 * descriptors:
 *
 * <ul>
 * <li>LIST: Repeated Field
 * <li>MAP: Map Field
 * <li>SCALAR: Neither of above (scalars, messages)
 * <li>SINGULAR: Neither of above (scalars, messages)
 * </ul>
 */
 public enum CelFieldValueType {
SCALAR,
 public enum EncodingType {
SINGULAR,
 LIST,
 MAP
 }
Expand DownExpand Up@@ -216,8 +217,8 @@ public JavaType getJavaType() {
 return javaType;
 }

 public CelFieldValueType getCelFieldValueType() {
 return celFieldValueType;
 public EncodingType getEncodingType() {
 return encodingType;
 }

 /**
Expand DownExpand Up@@ -250,8 +251,8 @@ public String getFieldProtoTypeName() {
 * @param fieldName Name of the field
 * @param javaType Canonical Java type name (ex: Long, Double, Float, Message... see
 * com.google.protobuf.Descriptors#JavaType)
 * @param celFieldValueType Describes whether the field is a scalar, list or a map with respect
 * to CEL.
 * @param encodingType Describes whether the field is a singular (primitives or messages), list
 * or a map with respect to CEL.
 * @param protoFieldType Protobuf Field Type (ex: INT32, SINT32, GROUP, MESSAGE... see
 * com.google.protobuf.Descriptors#Type)
 * @param fieldProtoTypeName Fully qualified protobuf type name for the field. Empty if the
Expand All@@ -262,14 +263,14 @@ public FieldLiteDescriptor(
 int fieldNumber,
 String fieldName,
 JavaType javaType,
CelFieldValueType celFieldValueType, // LIST, MAP, SCALAR
EncodingType encodingType, // LIST, MAP, SINGULAR
 Type protoFieldType, // INT32, SINT32, GROUP, MESSAGE... (See Descriptors#Type)
 boolean isPacked,
 String fieldProtoTypeName) {
 this.fieldNumber = fieldNumber;
 this.fieldName = Objects.requireNonNull(fieldName);
 this.javaType = javaType;
 this.celFieldValueType = celFieldValueType;
 this.encodingType = encodingType;
 this.protoFieldType = protoFieldType;
 this.isPacked = isPacked;
 this.fieldProtoTypeName = Objects.requireNonNull(fieldProtoTypeName);
Expand Down

14 changes: 7 additions & 7 deletions
protobuf/src/main/java/dev/cel/protobuf/LiteDescriptorCodegenMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import org.jspecify.annotations.Nullable;

/**
Expand DownExpand Up@@ -86,10 +87,10 @@ public String getJavaTypeEnumName() {
 return getFullyQualifiedEnumName(getJavaType());
 }

 // Fully-qualified name to the CelFieldValueType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SCALAR)
 public String getCelFieldValueTypeEnumName() {
 return getFullyQualifiedEnumName(getCelFieldValueType());
 // Fully-qualified name to the EncodingType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SINGULAR)
 public String getEncodingTypeEnumName() {
 return getFullyQualifiedEnumName(getEncodingType());
 }

 // Fully-qualified name to the Proto Type enumeration (ex:
Expand All@@ -106,7 +107,7 @@ public String getProtoFieldTypeEnumName() {

 abstract FieldLiteDescriptor.Type getProtoFieldType();

 abstract FieldLiteDescriptor.CelFieldValueType getCelFieldValueType();
 abstract EncodingType getEncodingType();

 private static String getFullyQualifiedEnumName(Object enumValue) {
 String enumClassName = enumValue.getClass().getName();
Expand All@@ -122,8 +123,7 @@ abstract static class Builder {

 abstract Builder setJavaType(FieldLiteDescriptor.JavaType javaTypeEnum);

 abstract Builder setCelFieldValueType(
 FieldLiteDescriptor.CelFieldValueType celFieldValueTypeEnum);
 abstract Builder setEncodingType(EncodingType encodingTypeEnum);

 abstract Builder setProtoFieldType(FieldLiteDescriptor.Type protoFieldTypeEnum);

Expand Down

8 changes: 4 additions & 4 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
import dev.cel.common.internal.ProtoJavaQualifiedNames;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.LiteDescriptorCodegenMetadata.FieldLiteDescriptorMetadata;
import java.util.ArrayDeque;

Expand DownExpand Up@@ -79,15 +79,15 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 }

 if (fieldDescriptor.isMapField()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.MAP);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.MAP);
 // Maps are treated as messages in proto.
 // TODO: Directly embed key/value information within the field descriptor.
 // This will further reduce descriptor binary size.
 descriptorQueue.push(fieldDescriptor.getMessageType());
 } else if (fieldDescriptor.isRepeated()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.LIST);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.LIST);
 } else {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.SCALAR);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.SINGULAR);
 }

 descriptorCodegenBuilder.addFieldDescriptor(fieldDescriptorCodegenBuilder.build());
Expand Down

2 changes: 1 addition & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/templates/cel_lite_descriptor_template.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public final class ${descriptor_class_name} extends CelLiteDescriptor {
 ${field_descriptor.fieldNumber},
 "${field_descriptor.fieldName}",
 ${field_descriptor.javaTypeEnumName},
 ${field_descriptor.celFieldValueTypeEnumName},
 ${field_descriptor.encodingTypeEnumName},
 ${field_descriptor.protoFieldTypeEnumName},
 ${field_descriptor.isPacked},
 "${field_descriptor.fieldProtoTypeName}"
Expand Down

10 changes: 5 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3LiteCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Map;
Expand DownExpand Up@@ -86,7 +86,7 @@ public void fieldDescriptor_scalarField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("single_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.STRING);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.STRING);
 }
Expand All@@ -112,7 +112,7 @@ public void fieldDescriptor_mapField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("map_bool_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.MAP);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.MAP);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
Expand All@@ -126,7 +126,7 @@ public void fieldDescriptor_repeatedField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("repeated_int64");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.LIST);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.LIST);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.LONG);
 assertThat(fieldLiteDescriptor.getIsPacked()).isTrue();
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.INT64);
Expand All@@ -141,7 +141,7 @@ public void fieldDescriptor_nestedMessage() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("standalone_message");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
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
Rename CelFieldValueType to EncodingType#684

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

May 3, 2025
 Merged


Rename CelFieldValueType to EncodingType
#684
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


22 changes: 11 additions & 11 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
Expand DownExpand Up@@ -98,7 +98,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand DownExpand Up@@ -167,7 +167,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* encodingType= */ EncodingType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
Expand All@@ -179,7 +179,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
Expand All@@ -188,7 +188,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -197,7 +197,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -206,7 +206,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -215,7 +215,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
Expand All@@ -224,7 +224,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
Expand All@@ -236,7 +236,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
Expand DownExpand Up@@ -284,7 +284,7 @@ private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
Expand Down

17 changes: 8 additions & 9 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.io.IOException;
Expand DownExpand Up@@ -164,17 +164,16 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {
 }

 private Object getDefaultValue(FieldLiteDescriptor fieldDescriptor) {
 FieldLiteDescriptor.CelFieldValueType celFieldValueType =
 fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
 EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 return ImmutableList.of();
 case MAP:
 return ImmutableMap.of();
 case SCALAR:
 case SINGULAR:
 return getScalarDefaultValue(fieldDescriptor);
 }
 throw new IllegalStateException("Unexpected cel field value type: " + celFieldValueType);
 throw new IllegalStateException("Unexpected encoding type: " + encodingType);
 }

 private Object getScalarDefaultValue(FieldLiteDescriptor fieldDescriptor) {
Expand DownExpand Up@@ -265,8 +264,8 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 payload = readFixed64BitField(inputStream, fieldDescriptor);
 break;
 case WireFormat.WIRETYPE_LENGTH_DELIMITED:
CelFieldValueType celFieldValueType = fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 if (fieldDescriptor.getIsPacked()) {
 payload = readPackedRepeatedFields(inputStream, fieldDescriptor);
Expand DownExpand Up@@ -305,7 +304,7 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 throw new IllegalArgumentException("Unexpected wire type: " + tagWireType);
 }

 if (fieldDescriptor.getCelFieldValueType().equals(CelFieldValueType.LIST)) {
 if (fieldDescriptor.getEncodingType().equals(EncodingType.LIST)) {
 String fieldName = fieldDescriptor.getFieldName();
 List<Object> repeatedValues =
 repeatedFieldValues.computeIfAbsent(
Expand Down

10 changes: 4 additions & 6 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import org.junit.Rule;
Expand DownExpand Up@@ -74,13 +74,11 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 .isEqualTo(fullFieldDescriptor.isPacked());
 expect
 .withMessage(expectMessageTitle)
 .that(fieldLiteDescriptor.getCelFieldValueType())
 .that(fieldLiteDescriptor.getEncodingType())
 .isEqualTo(
 fullFieldDescriptor.isMapField()
 ? CelFieldValueType.MAP
 : fullFieldDescriptor.isRepeated()
 ? CelFieldValueType.LIST
 : CelFieldValueType.SCALAR);
 ? EncodingType.MAP
 : fullFieldDescriptor.isRepeated() ? EncodingType.LIST : EncodingType.SINGULAR);
 // Note: enums such as JavaType are semantically equal, but their instances differ.
 expect
 .withMessage(expectMessageTitle)
Expand Down

23 changes: 12 additions & 11 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,21 +141,22 @@ public static final class FieldLiteDescriptor {
 private final JavaType javaType;
 private final String fieldProtoTypeName;
 private final Type protoFieldType;
 private final CelFieldValueType celFieldValueType;
 private final EncodingType encodingType;
 private final boolean isPacked;

 /**
 * Enumeration of the CEL field value type. This is analogous to the following from field
 * Enumeration of encoding type. This describes how CEL should deserialize the encoded message
 * bytes using protobuf's wire format. This is analogous to the following from field
 * descriptors:
 *
 * <ul>
 * <li>LIST: Repeated Field
 * <li>MAP: Map Field
 * <li>SCALAR: Neither of above (scalars, messages)
 * <li>SINGULAR: Neither of above (scalars, messages)
 * </ul>
 */
 public enum CelFieldValueType {
SCALAR,
 public enum EncodingType {
SINGULAR,
 LIST,
 MAP
 }
Expand DownExpand Up@@ -216,8 +217,8 @@ public JavaType getJavaType() {
 return javaType;
 }

 public CelFieldValueType getCelFieldValueType() {
 return celFieldValueType;
 public EncodingType getEncodingType() {
 return encodingType;
 }

 /**
Expand DownExpand Up@@ -250,8 +251,8 @@ public String getFieldProtoTypeName() {
 * @param fieldName Name of the field
 * @param javaType Canonical Java type name (ex: Long, Double, Float, Message... see
 * com.google.protobuf.Descriptors#JavaType)
 * @param celFieldValueType Describes whether the field is a scalar, list or a map with respect
 * to CEL.
 * @param encodingType Describes whether the field is a singular (primitives or messages), list
 * or a map with respect to CEL.
 * @param protoFieldType Protobuf Field Type (ex: INT32, SINT32, GROUP, MESSAGE... see
 * com.google.protobuf.Descriptors#Type)
 * @param fieldProtoTypeName Fully qualified protobuf type name for the field. Empty if the
Expand All@@ -262,14 +263,14 @@ public FieldLiteDescriptor(
 int fieldNumber,
 String fieldName,
 JavaType javaType,
CelFieldValueType celFieldValueType, // LIST, MAP, SCALAR
EncodingType encodingType, // LIST, MAP, SINGULAR
 Type protoFieldType, // INT32, SINT32, GROUP, MESSAGE... (See Descriptors#Type)
 boolean isPacked,
 String fieldProtoTypeName) {
 this.fieldNumber = fieldNumber;
 this.fieldName = Objects.requireNonNull(fieldName);
 this.javaType = javaType;
 this.celFieldValueType = celFieldValueType;
 this.encodingType = encodingType;
 this.protoFieldType = protoFieldType;
 this.isPacked = isPacked;
 this.fieldProtoTypeName = Objects.requireNonNull(fieldProtoTypeName);
Expand Down

14 changes: 7 additions & 7 deletions
protobuf/src/main/java/dev/cel/protobuf/LiteDescriptorCodegenMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import org.jspecify.annotations.Nullable;

/**
Expand DownExpand Up@@ -86,10 +87,10 @@ public String getJavaTypeEnumName() {
 return getFullyQualifiedEnumName(getJavaType());
 }

 // Fully-qualified name to the CelFieldValueType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SCALAR)
 public String getCelFieldValueTypeEnumName() {
 return getFullyQualifiedEnumName(getCelFieldValueType());
 // Fully-qualified name to the EncodingType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SINGULAR)
 public String getEncodingTypeEnumName() {
 return getFullyQualifiedEnumName(getEncodingType());
 }

 // Fully-qualified name to the Proto Type enumeration (ex:
Expand All@@ -106,7 +107,7 @@ public String getProtoFieldTypeEnumName() {

 abstract FieldLiteDescriptor.Type getProtoFieldType();

 abstract FieldLiteDescriptor.CelFieldValueType getCelFieldValueType();
 abstract EncodingType getEncodingType();

 private static String getFullyQualifiedEnumName(Object enumValue) {
 String enumClassName = enumValue.getClass().getName();
Expand All@@ -122,8 +123,7 @@ abstract static class Builder {

 abstract Builder setJavaType(FieldLiteDescriptor.JavaType javaTypeEnum);

 abstract Builder setCelFieldValueType(
 FieldLiteDescriptor.CelFieldValueType celFieldValueTypeEnum);
 abstract Builder setEncodingType(EncodingType encodingTypeEnum);

 abstract Builder setProtoFieldType(FieldLiteDescriptor.Type protoFieldTypeEnum);

Expand Down

8 changes: 4 additions & 4 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
import dev.cel.common.internal.ProtoJavaQualifiedNames;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.LiteDescriptorCodegenMetadata.FieldLiteDescriptorMetadata;
import java.util.ArrayDeque;

Expand DownExpand Up@@ -79,15 +79,15 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 }

 if (fieldDescriptor.isMapField()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.MAP);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.MAP);
 // Maps are treated as messages in proto.
 // TODO: Directly embed key/value information within the field descriptor.
 // This will further reduce descriptor binary size.
 descriptorQueue.push(fieldDescriptor.getMessageType());
 } else if (fieldDescriptor.isRepeated()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.LIST);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.LIST);
 } else {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.SCALAR);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.SINGULAR);
 }

 descriptorCodegenBuilder.addFieldDescriptor(fieldDescriptorCodegenBuilder.build());
Expand Down

2 changes: 1 addition & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/templates/cel_lite_descriptor_template.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public final class ${descriptor_class_name} extends CelLiteDescriptor {
 ${field_descriptor.fieldNumber},
 "${field_descriptor.fieldName}",
 ${field_descriptor.javaTypeEnumName},
 ${field_descriptor.celFieldValueTypeEnumName},
 ${field_descriptor.encodingTypeEnumName},
 ${field_descriptor.protoFieldTypeEnumName},
 ${field_descriptor.isPacked},
 "${field_descriptor.fieldProtoTypeName}"
Expand Down

10 changes: 5 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3LiteCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Map;
Expand DownExpand Up@@ -86,7 +86,7 @@ public void fieldDescriptor_scalarField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("single_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.STRING);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.STRING);
 }
Expand All@@ -112,7 +112,7 @@ public void fieldDescriptor_mapField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("map_bool_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.MAP);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.MAP);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
Expand All@@ -126,7 +126,7 @@ public void fieldDescriptor_repeatedField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("repeated_int64");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.LIST);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.LIST);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.LONG);
 assertThat(fieldLiteDescriptor.getIsPacked()).isTrue();
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.INT64);
Expand All@@ -141,7 +141,7 @@ public void fieldDescriptor_nestedMessage() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("standalone_message");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
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
Rename CelFieldValueType to EncodingType#684

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

May 3, 2025
 Merged


Rename CelFieldValueType to EncodingType
#684
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


22 changes: 11 additions & 11 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
Expand DownExpand Up@@ -98,7 +98,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand DownExpand Up@@ -167,7 +167,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* encodingType= */ EncodingType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
Expand All@@ -179,7 +179,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
Expand All@@ -188,7 +188,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -197,7 +197,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -206,7 +206,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -215,7 +215,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
Expand All@@ -224,7 +224,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
Expand All@@ -236,7 +236,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
Expand DownExpand Up@@ -284,7 +284,7 @@ private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
Expand Down

17 changes: 8 additions & 9 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.io.IOException;
Expand DownExpand Up@@ -164,17 +164,16 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {
 }

 private Object getDefaultValue(FieldLiteDescriptor fieldDescriptor) {
 FieldLiteDescriptor.CelFieldValueType celFieldValueType =
 fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
 EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 return ImmutableList.of();
 case MAP:
 return ImmutableMap.of();
 case SCALAR:
 case SINGULAR:
 return getScalarDefaultValue(fieldDescriptor);
 }
 throw new IllegalStateException("Unexpected cel field value type: " + celFieldValueType);
 throw new IllegalStateException("Unexpected encoding type: " + encodingType);
 }

 private Object getScalarDefaultValue(FieldLiteDescriptor fieldDescriptor) {
Expand DownExpand Up@@ -265,8 +264,8 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 payload = readFixed64BitField(inputStream, fieldDescriptor);
 break;
 case WireFormat.WIRETYPE_LENGTH_DELIMITED:
CelFieldValueType celFieldValueType = fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 if (fieldDescriptor.getIsPacked()) {
 payload = readPackedRepeatedFields(inputStream, fieldDescriptor);
Expand DownExpand Up@@ -305,7 +304,7 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 throw new IllegalArgumentException("Unexpected wire type: " + tagWireType);
 }

 if (fieldDescriptor.getCelFieldValueType().equals(CelFieldValueType.LIST)) {
 if (fieldDescriptor.getEncodingType().equals(EncodingType.LIST)) {
 String fieldName = fieldDescriptor.getFieldName();
 List<Object> repeatedValues =
 repeatedFieldValues.computeIfAbsent(
Expand Down

10 changes: 4 additions & 6 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import org.junit.Rule;
Expand DownExpand Up@@ -74,13 +74,11 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 .isEqualTo(fullFieldDescriptor.isPacked());
 expect
 .withMessage(expectMessageTitle)
 .that(fieldLiteDescriptor.getCelFieldValueType())
 .that(fieldLiteDescriptor.getEncodingType())
 .isEqualTo(
 fullFieldDescriptor.isMapField()
 ? CelFieldValueType.MAP
 : fullFieldDescriptor.isRepeated()
 ? CelFieldValueType.LIST
 : CelFieldValueType.SCALAR);
 ? EncodingType.MAP
 : fullFieldDescriptor.isRepeated() ? EncodingType.LIST : EncodingType.SINGULAR);
 // Note: enums such as JavaType are semantically equal, but their instances differ.
 expect
 .withMessage(expectMessageTitle)
Expand Down

23 changes: 12 additions & 11 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,21 +141,22 @@ public static final class FieldLiteDescriptor {
 private final JavaType javaType;
 private final String fieldProtoTypeName;
 private final Type protoFieldType;
 private final CelFieldValueType celFieldValueType;
 private final EncodingType encodingType;
 private final boolean isPacked;

 /**
 * Enumeration of the CEL field value type. This is analogous to the following from field
 * Enumeration of encoding type. This describes how CEL should deserialize the encoded message
 * bytes using protobuf's wire format. This is analogous to the following from field
 * descriptors:
 *
 * <ul>
 * <li>LIST: Repeated Field
 * <li>MAP: Map Field
 * <li>SCALAR: Neither of above (scalars, messages)
 * <li>SINGULAR: Neither of above (scalars, messages)
 * </ul>
 */
 public enum CelFieldValueType {
SCALAR,
 public enum EncodingType {
SINGULAR,
 LIST,
 MAP
 }
Expand DownExpand Up@@ -216,8 +217,8 @@ public JavaType getJavaType() {
 return javaType;
 }

 public CelFieldValueType getCelFieldValueType() {
 return celFieldValueType;
 public EncodingType getEncodingType() {
 return encodingType;
 }

 /**
Expand DownExpand Up@@ -250,8 +251,8 @@ public String getFieldProtoTypeName() {
 * @param fieldName Name of the field
 * @param javaType Canonical Java type name (ex: Long, Double, Float, Message... see
 * com.google.protobuf.Descriptors#JavaType)
 * @param celFieldValueType Describes whether the field is a scalar, list or a map with respect
 * to CEL.
 * @param encodingType Describes whether the field is a singular (primitives or messages), list
 * or a map with respect to CEL.
 * @param protoFieldType Protobuf Field Type (ex: INT32, SINT32, GROUP, MESSAGE... see
 * com.google.protobuf.Descriptors#Type)
 * @param fieldProtoTypeName Fully qualified protobuf type name for the field. Empty if the
Expand All@@ -262,14 +263,14 @@ public FieldLiteDescriptor(
 int fieldNumber,
 String fieldName,
 JavaType javaType,
CelFieldValueType celFieldValueType, // LIST, MAP, SCALAR
EncodingType encodingType, // LIST, MAP, SINGULAR
 Type protoFieldType, // INT32, SINT32, GROUP, MESSAGE... (See Descriptors#Type)
 boolean isPacked,
 String fieldProtoTypeName) {
 this.fieldNumber = fieldNumber;
 this.fieldName = Objects.requireNonNull(fieldName);
 this.javaType = javaType;
 this.celFieldValueType = celFieldValueType;
 this.encodingType = encodingType;
 this.protoFieldType = protoFieldType;
 this.isPacked = isPacked;
 this.fieldProtoTypeName = Objects.requireNonNull(fieldProtoTypeName);
Expand Down

14 changes: 7 additions & 7 deletions
protobuf/src/main/java/dev/cel/protobuf/LiteDescriptorCodegenMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import org.jspecify.annotations.Nullable;

/**
Expand DownExpand Up@@ -86,10 +87,10 @@ public String getJavaTypeEnumName() {
 return getFullyQualifiedEnumName(getJavaType());
 }

 // Fully-qualified name to the CelFieldValueType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SCALAR)
 public String getCelFieldValueTypeEnumName() {
 return getFullyQualifiedEnumName(getCelFieldValueType());
 // Fully-qualified name to the EncodingType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SINGULAR)
 public String getEncodingTypeEnumName() {
 return getFullyQualifiedEnumName(getEncodingType());
 }

 // Fully-qualified name to the Proto Type enumeration (ex:
Expand All@@ -106,7 +107,7 @@ public String getProtoFieldTypeEnumName() {

 abstract FieldLiteDescriptor.Type getProtoFieldType();

 abstract FieldLiteDescriptor.CelFieldValueType getCelFieldValueType();
 abstract EncodingType getEncodingType();

 private static String getFullyQualifiedEnumName(Object enumValue) {
 String enumClassName = enumValue.getClass().getName();
Expand All@@ -122,8 +123,7 @@ abstract static class Builder {

 abstract Builder setJavaType(FieldLiteDescriptor.JavaType javaTypeEnum);

 abstract Builder setCelFieldValueType(
 FieldLiteDescriptor.CelFieldValueType celFieldValueTypeEnum);
 abstract Builder setEncodingType(EncodingType encodingTypeEnum);

 abstract Builder setProtoFieldType(FieldLiteDescriptor.Type protoFieldTypeEnum);

Expand Down

8 changes: 4 additions & 4 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
import dev.cel.common.internal.ProtoJavaQualifiedNames;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.LiteDescriptorCodegenMetadata.FieldLiteDescriptorMetadata;
import java.util.ArrayDeque;

Expand DownExpand Up@@ -79,15 +79,15 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 }

 if (fieldDescriptor.isMapField()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.MAP);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.MAP);
 // Maps are treated as messages in proto.
 // TODO: Directly embed key/value information within the field descriptor.
 // This will further reduce descriptor binary size.
 descriptorQueue.push(fieldDescriptor.getMessageType());
 } else if (fieldDescriptor.isRepeated()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.LIST);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.LIST);
 } else {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.SCALAR);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.SINGULAR);
 }

 descriptorCodegenBuilder.addFieldDescriptor(fieldDescriptorCodegenBuilder.build());
Expand Down

2 changes: 1 addition & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/templates/cel_lite_descriptor_template.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public final class ${descriptor_class_name} extends CelLiteDescriptor {
 ${field_descriptor.fieldNumber},
 "${field_descriptor.fieldName}",
 ${field_descriptor.javaTypeEnumName},
 ${field_descriptor.celFieldValueTypeEnumName},
 ${field_descriptor.encodingTypeEnumName},
 ${field_descriptor.protoFieldTypeEnumName},
 ${field_descriptor.isPacked},
 "${field_descriptor.fieldProtoTypeName}"
Expand Down

10 changes: 5 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3LiteCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Map;
Expand DownExpand Up@@ -86,7 +86,7 @@ public void fieldDescriptor_scalarField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("single_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.STRING);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.STRING);
 }
Expand All@@ -112,7 +112,7 @@ public void fieldDescriptor_mapField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("map_bool_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.MAP);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.MAP);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
Expand All@@ -126,7 +126,7 @@ public void fieldDescriptor_repeatedField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("repeated_int64");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.LIST);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.LIST);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.LONG);
 assertThat(fieldLiteDescriptor.getIsPacked()).isTrue();
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.INT64);
Expand All@@ -141,7 +141,7 @@ public void fieldDescriptor_nestedMessage() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("standalone_message");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
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
Rename CelFieldValueType to EncodingType#684

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

May 3, 2025
 Merged


Rename CelFieldValueType to EncodingType
#684
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


22 changes: 11 additions & 11 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
Expand DownExpand Up@@ -98,7 +98,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand DownExpand Up@@ -167,7 +167,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* encodingType= */ EncodingType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
Expand All@@ -179,7 +179,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
Expand All@@ -188,7 +188,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -197,7 +197,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -206,7 +206,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -215,7 +215,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
Expand All@@ -224,7 +224,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
Expand All@@ -236,7 +236,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
Expand DownExpand Up@@ -284,7 +284,7 @@ private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
Expand Down

17 changes: 8 additions & 9 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.io.IOException;
Expand DownExpand Up@@ -164,17 +164,16 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {
 }

 private Object getDefaultValue(FieldLiteDescriptor fieldDescriptor) {
 FieldLiteDescriptor.CelFieldValueType celFieldValueType =
 fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
 EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 return ImmutableList.of();
 case MAP:
 return ImmutableMap.of();
 case SCALAR:
 case SINGULAR:
 return getScalarDefaultValue(fieldDescriptor);
 }
 throw new IllegalStateException("Unexpected cel field value type: " + celFieldValueType);
 throw new IllegalStateException("Unexpected encoding type: " + encodingType);
 }

 private Object getScalarDefaultValue(FieldLiteDescriptor fieldDescriptor) {
Expand DownExpand Up@@ -265,8 +264,8 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 payload = readFixed64BitField(inputStream, fieldDescriptor);
 break;
 case WireFormat.WIRETYPE_LENGTH_DELIMITED:
CelFieldValueType celFieldValueType = fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 if (fieldDescriptor.getIsPacked()) {
 payload = readPackedRepeatedFields(inputStream, fieldDescriptor);
Expand DownExpand Up@@ -305,7 +304,7 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 throw new IllegalArgumentException("Unexpected wire type: " + tagWireType);
 }

 if (fieldDescriptor.getCelFieldValueType().equals(CelFieldValueType.LIST)) {
 if (fieldDescriptor.getEncodingType().equals(EncodingType.LIST)) {
 String fieldName = fieldDescriptor.getFieldName();
 List<Object> repeatedValues =
 repeatedFieldValues.computeIfAbsent(
Expand Down

10 changes: 4 additions & 6 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import org.junit.Rule;
Expand DownExpand Up@@ -74,13 +74,11 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 .isEqualTo(fullFieldDescriptor.isPacked());
 expect
 .withMessage(expectMessageTitle)
 .that(fieldLiteDescriptor.getCelFieldValueType())
 .that(fieldLiteDescriptor.getEncodingType())
 .isEqualTo(
 fullFieldDescriptor.isMapField()
 ? CelFieldValueType.MAP
 : fullFieldDescriptor.isRepeated()
 ? CelFieldValueType.LIST
 : CelFieldValueType.SCALAR);
 ? EncodingType.MAP
 : fullFieldDescriptor.isRepeated() ? EncodingType.LIST : EncodingType.SINGULAR);
 // Note: enums such as JavaType are semantically equal, but their instances differ.
 expect
 .withMessage(expectMessageTitle)
Expand Down

23 changes: 12 additions & 11 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,21 +141,22 @@ public static final class FieldLiteDescriptor {
 private final JavaType javaType;
 private final String fieldProtoTypeName;
 private final Type protoFieldType;
 private final CelFieldValueType celFieldValueType;
 private final EncodingType encodingType;
 private final boolean isPacked;

 /**
 * Enumeration of the CEL field value type. This is analogous to the following from field
 * Enumeration of encoding type. This describes how CEL should deserialize the encoded message
 * bytes using protobuf's wire format. This is analogous to the following from field
 * descriptors:
 *
 * <ul>
 * <li>LIST: Repeated Field
 * <li>MAP: Map Field
 * <li>SCALAR: Neither of above (scalars, messages)
 * <li>SINGULAR: Neither of above (scalars, messages)
 * </ul>
 */
 public enum CelFieldValueType {
SCALAR,
 public enum EncodingType {
SINGULAR,
 LIST,
 MAP
 }
Expand DownExpand Up@@ -216,8 +217,8 @@ public JavaType getJavaType() {
 return javaType;
 }

 public CelFieldValueType getCelFieldValueType() {
 return celFieldValueType;
 public EncodingType getEncodingType() {
 return encodingType;
 }

 /**
Expand DownExpand Up@@ -250,8 +251,8 @@ public String getFieldProtoTypeName() {
 * @param fieldName Name of the field
 * @param javaType Canonical Java type name (ex: Long, Double, Float, Message... see
 * com.google.protobuf.Descriptors#JavaType)
 * @param celFieldValueType Describes whether the field is a scalar, list or a map with respect
 * to CEL.
 * @param encodingType Describes whether the field is a singular (primitives or messages), list
 * or a map with respect to CEL.
 * @param protoFieldType Protobuf Field Type (ex: INT32, SINT32, GROUP, MESSAGE... see
 * com.google.protobuf.Descriptors#Type)
 * @param fieldProtoTypeName Fully qualified protobuf type name for the field. Empty if the
Expand All@@ -262,14 +263,14 @@ public FieldLiteDescriptor(
 int fieldNumber,
 String fieldName,
 JavaType javaType,
CelFieldValueType celFieldValueType, // LIST, MAP, SCALAR
EncodingType encodingType, // LIST, MAP, SINGULAR
 Type protoFieldType, // INT32, SINT32, GROUP, MESSAGE... (See Descriptors#Type)
 boolean isPacked,
 String fieldProtoTypeName) {
 this.fieldNumber = fieldNumber;
 this.fieldName = Objects.requireNonNull(fieldName);
 this.javaType = javaType;
 this.celFieldValueType = celFieldValueType;
 this.encodingType = encodingType;
 this.protoFieldType = protoFieldType;
 this.isPacked = isPacked;
 this.fieldProtoTypeName = Objects.requireNonNull(fieldProtoTypeName);
Expand Down

14 changes: 7 additions & 7 deletions
protobuf/src/main/java/dev/cel/protobuf/LiteDescriptorCodegenMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import org.jspecify.annotations.Nullable;

/**
Expand DownExpand Up@@ -86,10 +87,10 @@ public String getJavaTypeEnumName() {
 return getFullyQualifiedEnumName(getJavaType());
 }

 // Fully-qualified name to the CelFieldValueType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SCALAR)
 public String getCelFieldValueTypeEnumName() {
 return getFullyQualifiedEnumName(getCelFieldValueType());
 // Fully-qualified name to the EncodingType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SINGULAR)
 public String getEncodingTypeEnumName() {
 return getFullyQualifiedEnumName(getEncodingType());
 }

 // Fully-qualified name to the Proto Type enumeration (ex:
Expand All@@ -106,7 +107,7 @@ public String getProtoFieldTypeEnumName() {

 abstract FieldLiteDescriptor.Type getProtoFieldType();

 abstract FieldLiteDescriptor.CelFieldValueType getCelFieldValueType();
 abstract EncodingType getEncodingType();

 private static String getFullyQualifiedEnumName(Object enumValue) {
 String enumClassName = enumValue.getClass().getName();
Expand All@@ -122,8 +123,7 @@ abstract static class Builder {

 abstract Builder setJavaType(FieldLiteDescriptor.JavaType javaTypeEnum);

 abstract Builder setCelFieldValueType(
 FieldLiteDescriptor.CelFieldValueType celFieldValueTypeEnum);
 abstract Builder setEncodingType(EncodingType encodingTypeEnum);

 abstract Builder setProtoFieldType(FieldLiteDescriptor.Type protoFieldTypeEnum);

Expand Down

8 changes: 4 additions & 4 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
import dev.cel.common.internal.ProtoJavaQualifiedNames;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.LiteDescriptorCodegenMetadata.FieldLiteDescriptorMetadata;
import java.util.ArrayDeque;

Expand DownExpand Up@@ -79,15 +79,15 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 }

 if (fieldDescriptor.isMapField()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.MAP);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.MAP);
 // Maps are treated as messages in proto.
 // TODO: Directly embed key/value information within the field descriptor.
 // This will further reduce descriptor binary size.
 descriptorQueue.push(fieldDescriptor.getMessageType());
 } else if (fieldDescriptor.isRepeated()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.LIST);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.LIST);
 } else {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.SCALAR);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.SINGULAR);
 }

 descriptorCodegenBuilder.addFieldDescriptor(fieldDescriptorCodegenBuilder.build());
Expand Down

2 changes: 1 addition & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/templates/cel_lite_descriptor_template.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public final class ${descriptor_class_name} extends CelLiteDescriptor {
 ${field_descriptor.fieldNumber},
 "${field_descriptor.fieldName}",
 ${field_descriptor.javaTypeEnumName},
 ${field_descriptor.celFieldValueTypeEnumName},
 ${field_descriptor.encodingTypeEnumName},
 ${field_descriptor.protoFieldTypeEnumName},
 ${field_descriptor.isPacked},
 "${field_descriptor.fieldProtoTypeName}"
Expand Down

10 changes: 5 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3LiteCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Map;
Expand DownExpand Up@@ -86,7 +86,7 @@ public void fieldDescriptor_scalarField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("single_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.STRING);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.STRING);
 }
Expand All@@ -112,7 +112,7 @@ public void fieldDescriptor_mapField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("map_bool_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.MAP);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.MAP);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
Expand All@@ -126,7 +126,7 @@ public void fieldDescriptor_repeatedField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("repeated_int64");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.LIST);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.LIST);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.LONG);
 assertThat(fieldLiteDescriptor.getIsPacked()).isTrue();
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.INT64);
Expand All@@ -141,7 +141,7 @@ public void fieldDescriptor_nestedMessage() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("standalone_message");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
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
Rename CelFieldValueType to EncodingType#684

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

May 3, 2025
 Merged


Rename CelFieldValueType to EncodingType
#684
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


22 changes: 11 additions & 11 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
Expand DownExpand Up@@ -98,7 +98,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand DownExpand Up@@ -167,7 +167,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* encodingType= */ EncodingType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
Expand All@@ -179,7 +179,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
Expand All@@ -188,7 +188,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -197,7 +197,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -206,7 +206,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -215,7 +215,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
Expand All@@ -224,7 +224,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
Expand All@@ -236,7 +236,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
Expand DownExpand Up@@ -284,7 +284,7 @@ private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
Expand Down

17 changes: 8 additions & 9 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.io.IOException;
Expand DownExpand Up@@ -164,17 +164,16 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {
 }

 private Object getDefaultValue(FieldLiteDescriptor fieldDescriptor) {
 FieldLiteDescriptor.CelFieldValueType celFieldValueType =
 fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
 EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 return ImmutableList.of();
 case MAP:
 return ImmutableMap.of();
 case SCALAR:
 case SINGULAR:
 return getScalarDefaultValue(fieldDescriptor);
 }
 throw new IllegalStateException("Unexpected cel field value type: " + celFieldValueType);
 throw new IllegalStateException("Unexpected encoding type: " + encodingType);
 }

 private Object getScalarDefaultValue(FieldLiteDescriptor fieldDescriptor) {
Expand DownExpand Up@@ -265,8 +264,8 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 payload = readFixed64BitField(inputStream, fieldDescriptor);
 break;
 case WireFormat.WIRETYPE_LENGTH_DELIMITED:
CelFieldValueType celFieldValueType = fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 if (fieldDescriptor.getIsPacked()) {
 payload = readPackedRepeatedFields(inputStream, fieldDescriptor);
Expand DownExpand Up@@ -305,7 +304,7 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 throw new IllegalArgumentException("Unexpected wire type: " + tagWireType);
 }

 if (fieldDescriptor.getCelFieldValueType().equals(CelFieldValueType.LIST)) {
 if (fieldDescriptor.getEncodingType().equals(EncodingType.LIST)) {
 String fieldName = fieldDescriptor.getFieldName();
 List<Object> repeatedValues =
 repeatedFieldValues.computeIfAbsent(
Expand Down

10 changes: 4 additions & 6 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import org.junit.Rule;
Expand DownExpand Up@@ -74,13 +74,11 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 .isEqualTo(fullFieldDescriptor.isPacked());
 expect
 .withMessage(expectMessageTitle)
 .that(fieldLiteDescriptor.getCelFieldValueType())
 .that(fieldLiteDescriptor.getEncodingType())
 .isEqualTo(
 fullFieldDescriptor.isMapField()
 ? CelFieldValueType.MAP
 : fullFieldDescriptor.isRepeated()
 ? CelFieldValueType.LIST
 : CelFieldValueType.SCALAR);
 ? EncodingType.MAP
 : fullFieldDescriptor.isRepeated() ? EncodingType.LIST : EncodingType.SINGULAR);
 // Note: enums such as JavaType are semantically equal, but their instances differ.
 expect
 .withMessage(expectMessageTitle)
Expand Down

23 changes: 12 additions & 11 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,21 +141,22 @@ public static final class FieldLiteDescriptor {
 private final JavaType javaType;
 private final String fieldProtoTypeName;
 private final Type protoFieldType;
 private final CelFieldValueType celFieldValueType;
 private final EncodingType encodingType;
 private final boolean isPacked;

 /**
 * Enumeration of the CEL field value type. This is analogous to the following from field
 * Enumeration of encoding type. This describes how CEL should deserialize the encoded message
 * bytes using protobuf's wire format. This is analogous to the following from field
 * descriptors:
 *
 * <ul>
 * <li>LIST: Repeated Field
 * <li>MAP: Map Field
 * <li>SCALAR: Neither of above (scalars, messages)
 * <li>SINGULAR: Neither of above (scalars, messages)
 * </ul>
 */
 public enum CelFieldValueType {
SCALAR,
 public enum EncodingType {
SINGULAR,
 LIST,
 MAP
 }
Expand DownExpand Up@@ -216,8 +217,8 @@ public JavaType getJavaType() {
 return javaType;
 }

 public CelFieldValueType getCelFieldValueType() {
 return celFieldValueType;
 public EncodingType getEncodingType() {
 return encodingType;
 }

 /**
Expand DownExpand Up@@ -250,8 +251,8 @@ public String getFieldProtoTypeName() {
 * @param fieldName Name of the field
 * @param javaType Canonical Java type name (ex: Long, Double, Float, Message... see
 * com.google.protobuf.Descriptors#JavaType)
 * @param celFieldValueType Describes whether the field is a scalar, list or a map with respect
 * to CEL.
 * @param encodingType Describes whether the field is a singular (primitives or messages), list
 * or a map with respect to CEL.
 * @param protoFieldType Protobuf Field Type (ex: INT32, SINT32, GROUP, MESSAGE... see
 * com.google.protobuf.Descriptors#Type)
 * @param fieldProtoTypeName Fully qualified protobuf type name for the field. Empty if the
Expand All@@ -262,14 +263,14 @@ public FieldLiteDescriptor(
 int fieldNumber,
 String fieldName,
 JavaType javaType,
CelFieldValueType celFieldValueType, // LIST, MAP, SCALAR
EncodingType encodingType, // LIST, MAP, SINGULAR
 Type protoFieldType, // INT32, SINT32, GROUP, MESSAGE... (See Descriptors#Type)
 boolean isPacked,
 String fieldProtoTypeName) {
 this.fieldNumber = fieldNumber;
 this.fieldName = Objects.requireNonNull(fieldName);
 this.javaType = javaType;
 this.celFieldValueType = celFieldValueType;
 this.encodingType = encodingType;
 this.protoFieldType = protoFieldType;
 this.isPacked = isPacked;
 this.fieldProtoTypeName = Objects.requireNonNull(fieldProtoTypeName);
Expand Down

14 changes: 7 additions & 7 deletions
protobuf/src/main/java/dev/cel/protobuf/LiteDescriptorCodegenMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import org.jspecify.annotations.Nullable;

/**
Expand DownExpand Up@@ -86,10 +87,10 @@ public String getJavaTypeEnumName() {
 return getFullyQualifiedEnumName(getJavaType());
 }

 // Fully-qualified name to the CelFieldValueType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SCALAR)
 public String getCelFieldValueTypeEnumName() {
 return getFullyQualifiedEnumName(getCelFieldValueType());
 // Fully-qualified name to the EncodingType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SINGULAR)
 public String getEncodingTypeEnumName() {
 return getFullyQualifiedEnumName(getEncodingType());
 }

 // Fully-qualified name to the Proto Type enumeration (ex:
Expand All@@ -106,7 +107,7 @@ public String getProtoFieldTypeEnumName() {

 abstract FieldLiteDescriptor.Type getProtoFieldType();

 abstract FieldLiteDescriptor.CelFieldValueType getCelFieldValueType();
 abstract EncodingType getEncodingType();

 private static String getFullyQualifiedEnumName(Object enumValue) {
 String enumClassName = enumValue.getClass().getName();
Expand All@@ -122,8 +123,7 @@ abstract static class Builder {

 abstract Builder setJavaType(FieldLiteDescriptor.JavaType javaTypeEnum);

 abstract Builder setCelFieldValueType(
 FieldLiteDescriptor.CelFieldValueType celFieldValueTypeEnum);
 abstract Builder setEncodingType(EncodingType encodingTypeEnum);

 abstract Builder setProtoFieldType(FieldLiteDescriptor.Type protoFieldTypeEnum);

Expand Down

8 changes: 4 additions & 4 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
import dev.cel.common.internal.ProtoJavaQualifiedNames;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.LiteDescriptorCodegenMetadata.FieldLiteDescriptorMetadata;
import java.util.ArrayDeque;

Expand DownExpand Up@@ -79,15 +79,15 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 }

 if (fieldDescriptor.isMapField()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.MAP);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.MAP);
 // Maps are treated as messages in proto.
 // TODO: Directly embed key/value information within the field descriptor.
 // This will further reduce descriptor binary size.
 descriptorQueue.push(fieldDescriptor.getMessageType());
 } else if (fieldDescriptor.isRepeated()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.LIST);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.LIST);
 } else {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.SCALAR);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.SINGULAR);
 }

 descriptorCodegenBuilder.addFieldDescriptor(fieldDescriptorCodegenBuilder.build());
Expand Down

2 changes: 1 addition & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/templates/cel_lite_descriptor_template.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public final class ${descriptor_class_name} extends CelLiteDescriptor {
 ${field_descriptor.fieldNumber},
 "${field_descriptor.fieldName}",
 ${field_descriptor.javaTypeEnumName},
 ${field_descriptor.celFieldValueTypeEnumName},
 ${field_descriptor.encodingTypeEnumName},
 ${field_descriptor.protoFieldTypeEnumName},
 ${field_descriptor.isPacked},
 "${field_descriptor.fieldProtoTypeName}"
Expand Down

10 changes: 5 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3LiteCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Map;
Expand DownExpand Up@@ -86,7 +86,7 @@ public void fieldDescriptor_scalarField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("single_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.STRING);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.STRING);
 }
Expand All@@ -112,7 +112,7 @@ public void fieldDescriptor_mapField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("map_bool_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.MAP);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.MAP);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
Expand All@@ -126,7 +126,7 @@ public void fieldDescriptor_repeatedField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("repeated_int64");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.LIST);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.LIST);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.LONG);
 assertThat(fieldLiteDescriptor.getIsPacked()).isTrue();
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.INT64);
Expand All@@ -141,7 +141,7 @@ public void fieldDescriptor_nestedMessage() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("standalone_message");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
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
Rename CelFieldValueType to EncodingType#684

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

May 3, 2025
 Merged


Rename CelFieldValueType to EncodingType
#684
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


22 changes: 11 additions & 11 deletions
common/src/main/java/dev/cel/common/internal/DefaultLiteDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import java.util.Optional;
Expand DownExpand Up@@ -98,7 +98,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "paths",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand DownExpand Up@@ -167,7 +167,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "fields",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.MAP,
 /* encodingType= */ EncodingType.MAP,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct.FieldsEntry"));
Expand All@@ -179,7 +179,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "null_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.ENUM,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.ENUM,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.NullValue"));
Expand All@@ -188,7 +188,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 2,
 /* fieldName= */ "number_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.DOUBLE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.DOUBLE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -197,7 +197,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 3,
 /* fieldName= */ "string_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.STRING,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.STRING,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -206,7 +206,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 4,
 /* fieldName= */ "bool_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.BOOLEAN,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.BOOL,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ ""));
Expand All@@ -215,7 +215,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 5,
 /* fieldName= */ "struct_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Struct"));
Expand All@@ -224,7 +224,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 6,
 /* fieldName= */ "list_value",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.ListValue"));
Expand All@@ -236,7 +236,7 @@ private static MessageLiteDescriptor newMessageInfo(WellKnownProto wellKnownProt
 /* fieldNumber= */ 1,
 /* fieldName= */ "values",
 /* javaType= */ FieldLiteDescriptor.JavaType.MESSAGE,
 /* celFieldValueType= */ CelFieldValueType.LIST,
 /* encodingType= */ EncodingType.LIST,
 /* protoFieldType= */ FieldLiteDescriptor.Type.MESSAGE,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "google.protobuf.Value"));
Expand DownExpand Up@@ -284,7 +284,7 @@ private static FieldLiteDescriptor newPrimitiveFieldDescriptor(
 /* fieldNumber= */ fieldNumber,
 /* fieldName= */ fieldName,
 /* javaType= */ javaType,
 /* celFieldValueType= */ CelFieldValueType.SCALAR,
 /* encodingType= */ EncodingType.SINGULAR,
 /* protoFieldType= */ protoFieldType,
 /* isPacked= */ false,
 /* fieldProtoTypeName= */ "");
Expand Down

17 changes: 8 additions & 9 deletions
common/src/main/java/dev/cel/common/values/ProtoLiteCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.io.IOException;
Expand DownExpand Up@@ -164,17 +164,16 @@ CelValue getDefaultCelValue(String protoTypeName, String fieldName) {
 }

 private Object getDefaultValue(FieldLiteDescriptor fieldDescriptor) {
 FieldLiteDescriptor.CelFieldValueType celFieldValueType =
 fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
 EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 return ImmutableList.of();
 case MAP:
 return ImmutableMap.of();
 case SCALAR:
 case SINGULAR:
 return getScalarDefaultValue(fieldDescriptor);
 }
 throw new IllegalStateException("Unexpected cel field value type: " + celFieldValueType);
 throw new IllegalStateException("Unexpected encoding type: " + encodingType);
 }

 private Object getScalarDefaultValue(FieldLiteDescriptor fieldDescriptor) {
Expand DownExpand Up@@ -265,8 +264,8 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 payload = readFixed64BitField(inputStream, fieldDescriptor);
 break;
 case WireFormat.WIRETYPE_LENGTH_DELIMITED:
CelFieldValueType celFieldValueType = fieldDescriptor.getCelFieldValueType();
 switch (celFieldValueType) {
EncodingType encodingType = fieldDescriptor.getEncodingType();
 switch (encodingType) {
 case LIST:
 if (fieldDescriptor.getIsPacked()) {
 payload = readPackedRepeatedFields(inputStream, fieldDescriptor);
Expand DownExpand Up@@ -305,7 +304,7 @@ MessageFields readAllFields(byte[] bytes, String protoTypeName) throws IOExcepti
 throw new IllegalArgumentException("Unexpected wire type: " + tagWireType);
 }

 if (fieldDescriptor.getCelFieldValueType().equals(CelFieldValueType.LIST)) {
 if (fieldDescriptor.getEncodingType().equals(EncodingType.LIST)) {
 String fieldName = fieldDescriptor.getFieldName();
 List<Object> repeatedValues =
 repeatedFieldValues.computeIfAbsent(
Expand Down

10 changes: 4 additions & 6 deletions
common/src/test/java/dev/cel/common/internal/DefaultLiteDescriptorPoolTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3CelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.NoSuchElementException;
import org.junit.Rule;
Expand DownExpand Up@@ -74,13 +74,11 @@ public void wellKnownProto_compareAgainstFullDescriptors_allFieldPropertiesAreEq
 .isEqualTo(fullFieldDescriptor.isPacked());
 expect
 .withMessage(expectMessageTitle)
 .that(fieldLiteDescriptor.getCelFieldValueType())
 .that(fieldLiteDescriptor.getEncodingType())
 .isEqualTo(
 fullFieldDescriptor.isMapField()
 ? CelFieldValueType.MAP
 : fullFieldDescriptor.isRepeated()
 ? CelFieldValueType.LIST
 : CelFieldValueType.SCALAR);
 ? EncodingType.MAP
 : fullFieldDescriptor.isRepeated() ? EncodingType.LIST : EncodingType.SINGULAR);
 // Note: enums such as JavaType are semantically equal, but their instances differ.
 expect
 .withMessage(expectMessageTitle)
Expand Down

23 changes: 12 additions & 11 deletions
protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,21 +141,22 @@ public static final class FieldLiteDescriptor {
 private final JavaType javaType;
 private final String fieldProtoTypeName;
 private final Type protoFieldType;
 private final CelFieldValueType celFieldValueType;
 private final EncodingType encodingType;
 private final boolean isPacked;

 /**
 * Enumeration of the CEL field value type. This is analogous to the following from field
 * Enumeration of encoding type. This describes how CEL should deserialize the encoded message
 * bytes using protobuf's wire format. This is analogous to the following from field
 * descriptors:
 *
 * <ul>
 * <li>LIST: Repeated Field
 * <li>MAP: Map Field
 * <li>SCALAR: Neither of above (scalars, messages)
 * <li>SINGULAR: Neither of above (scalars, messages)
 * </ul>
 */
 public enum CelFieldValueType {
SCALAR,
 public enum EncodingType {
SINGULAR,
 LIST,
 MAP
 }
Expand DownExpand Up@@ -216,8 +217,8 @@ public JavaType getJavaType() {
 return javaType;
 }

 public CelFieldValueType getCelFieldValueType() {
 return celFieldValueType;
 public EncodingType getEncodingType() {
 return encodingType;
 }

 /**
Expand DownExpand Up@@ -250,8 +251,8 @@ public String getFieldProtoTypeName() {
 * @param fieldName Name of the field
 * @param javaType Canonical Java type name (ex: Long, Double, Float, Message... see
 * com.google.protobuf.Descriptors#JavaType)
 * @param celFieldValueType Describes whether the field is a scalar, list or a map with respect
 * to CEL.
 * @param encodingType Describes whether the field is a singular (primitives or messages), list
 * or a map with respect to CEL.
 * @param protoFieldType Protobuf Field Type (ex: INT32, SINT32, GROUP, MESSAGE... see
 * com.google.protobuf.Descriptors#Type)
 * @param fieldProtoTypeName Fully qualified protobuf type name for the field. Empty if the
Expand All@@ -262,14 +263,14 @@ public FieldLiteDescriptor(
 int fieldNumber,
 String fieldName,
 JavaType javaType,
CelFieldValueType celFieldValueType, // LIST, MAP, SCALAR
EncodingType encodingType, // LIST, MAP, SINGULAR
 Type protoFieldType, // INT32, SINT32, GROUP, MESSAGE... (See Descriptors#Type)
 boolean isPacked,
 String fieldProtoTypeName) {
 this.fieldNumber = fieldNumber;
 this.fieldName = Objects.requireNonNull(fieldName);
 this.javaType = javaType;
 this.celFieldValueType = celFieldValueType;
 this.encodingType = encodingType;
 this.protoFieldType = protoFieldType;
 this.isPacked = isPacked;
 this.fieldProtoTypeName = Objects.requireNonNull(fieldProtoTypeName);
Expand Down

14 changes: 7 additions & 7 deletions
protobuf/src/main/java/dev/cel/protobuf/LiteDescriptorCodegenMetadata.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import dev.cel.common.annotations.Internal;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import org.jspecify.annotations.Nullable;

/**
Expand DownExpand Up@@ -86,10 +87,10 @@ public String getJavaTypeEnumName() {
 return getFullyQualifiedEnumName(getJavaType());
 }

 // Fully-qualified name to the CelFieldValueType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SCALAR)
 public String getCelFieldValueTypeEnumName() {
 return getFullyQualifiedEnumName(getCelFieldValueType());
 // Fully-qualified name to the EncodingType enumeration (ex:
 // dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.SINGULAR)
 public String getEncodingTypeEnumName() {
 return getFullyQualifiedEnumName(getEncodingType());
 }

 // Fully-qualified name to the Proto Type enumeration (ex:
Expand All@@ -106,7 +107,7 @@ public String getProtoFieldTypeEnumName() {

 abstract FieldLiteDescriptor.Type getProtoFieldType();

 abstract FieldLiteDescriptor.CelFieldValueType getCelFieldValueType();
 abstract EncodingType getEncodingType();

 private static String getFullyQualifiedEnumName(Object enumValue) {
 String enumClassName = enumValue.getClass().getName();
Expand All@@ -122,8 +123,7 @@ abstract static class Builder {

 abstract Builder setJavaType(FieldLiteDescriptor.JavaType javaTypeEnum);

 abstract Builder setCelFieldValueType(
 FieldLiteDescriptor.CelFieldValueType celFieldValueTypeEnum);
 abstract Builder setEncodingType(EncodingType encodingTypeEnum);

 abstract Builder setProtoFieldType(FieldLiteDescriptor.Type protoFieldTypeEnum);

Expand Down

8 changes: 4 additions & 4 deletions
protobuf/src/main/java/dev/cel/protobuf/ProtoDescriptorCollector.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
import dev.cel.common.internal.ProtoJavaQualifiedNames;
import dev.cel.common.internal.WellKnownProto;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.LiteDescriptorCodegenMetadata.FieldLiteDescriptorMetadata;
import java.util.ArrayDeque;

Expand DownExpand Up@@ -79,15 +79,15 @@ ImmutableList<LiteDescriptorCodegenMetadata> collectCodegenMetadata(
 }

 if (fieldDescriptor.isMapField()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.MAP);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.MAP);
 // Maps are treated as messages in proto.
 // TODO: Directly embed key/value information within the field descriptor.
 // This will further reduce descriptor binary size.
 descriptorQueue.push(fieldDescriptor.getMessageType());
 } else if (fieldDescriptor.isRepeated()) {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.LIST);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.LIST);
 } else {
 fieldDescriptorCodegenBuilder.setCelFieldValueType(CelFieldValueType.SCALAR);
 fieldDescriptorCodegenBuilder.setEncodingType(EncodingType.SINGULAR);
 }

 descriptorCodegenBuilder.addFieldDescriptor(fieldDescriptorCodegenBuilder.build());
Expand Down

2 changes: 1 addition & 1 deletion
protobuf/src/main/java/dev/cel/protobuf/templates/cel_lite_descriptor_template.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public final class ${descriptor_class_name} extends CelLiteDescriptor {
 ${field_descriptor.fieldNumber},
 "${field_descriptor.fieldName}",
 ${field_descriptor.javaTypeEnumName},
 ${field_descriptor.celFieldValueTypeEnumName},
 ${field_descriptor.encodingTypeEnumName},
 ${field_descriptor.protoFieldTypeEnumName},
 ${field_descriptor.isPacked},
 "${field_descriptor.fieldProtoTypeName}"
Expand Down

10 changes: 5 additions & 5 deletions
protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesProto3LiteCelDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.CelFieldValueType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.EncodingType;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor.JavaType;
import dev.cel.protobuf.CelLiteDescriptor.MessageLiteDescriptor;
import java.util.Map;
Expand DownExpand Up@@ -86,7 +86,7 @@ public void fieldDescriptor_scalarField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("single_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.STRING);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.STRING);
 }
Expand All@@ -112,7 +112,7 @@ public void fieldDescriptor_mapField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("map_bool_string");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.MAP);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.MAP);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
Expand All@@ -126,7 +126,7 @@ public void fieldDescriptor_repeatedField() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("repeated_int64");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.LIST);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.LIST);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.LONG);
 assertThat(fieldLiteDescriptor.getIsPacked()).isTrue();
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.INT64);
Expand All@@ -141,7 +141,7 @@ public void fieldDescriptor_nestedMessage() {
 FieldLiteDescriptor fieldLiteDescriptor =
 testAllTypesDescriptor.getByFieldNameOrThrow("standalone_message");

 assertThat(fieldLiteDescriptor.getCelFieldValueType()).isEqualTo(CelFieldValueType.SCALAR);
 assertThat(fieldLiteDescriptor.getEncodingType()).isEqualTo(EncodingType.SINGULAR);
 assertThat(fieldLiteDescriptor.getJavaType()).isEqualTo(JavaType.MESSAGE);
 assertThat(fieldLiteDescriptor.getProtoFieldType()).isEqualTo(FieldLiteDescriptor.Type.MESSAGE);
 }
Expand Down