Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Remove unnecessary unknown value adaptation in ProtoAdapter #499

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
Nov 22, 2024
Merged

Remove unnecessary unknown value adaptation in ProtoAdapter #499

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
12 changes: 0 additions & 12 deletions 12 common/src/main/java/dev/cel/common/internal/ProtoAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableMap.toImmutableMap;

import dev.cel.expr.ExprValue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.Ints;
Expand Down Expand Up @@ -205,9 +204,6 @@ public Object adaptProtoToValue(MessageOrBuilder proto) {

@SuppressWarnings({"unchecked", "rawtypes"})
public Optional<Object> adaptFieldToValue(FieldDescriptor fieldDescriptor, Object fieldValue) {
if (isUnknown(fieldValue)) {
return Optional.of(fieldValue);
}
if (fieldDescriptor.isMapField()) {
Descriptor entryDescriptor = fieldDescriptor.getMessageType();
FieldDescriptor keyFieldDescriptor = entryDescriptor.findFieldByNumber(1);
Expand Down Expand Up @@ -255,9 +251,6 @@ public Optional<Object> adaptValueToFieldType(
if (isWrapperType(fieldDescriptor) && fieldValue.equals(NullValue.NULL_VALUE)) {
return Optional.empty();
}
if (isUnknown(fieldValue)) {
return Optional.of(fieldValue);
}
if (fieldDescriptor.isMapField()) {
Descriptor entryDescriptor = fieldDescriptor.getMessageType();
FieldDescriptor keyDescriptor = entryDescriptor.findFieldByNumber(1);
Expand Down Expand Up @@ -590,11 +583,6 @@ private static boolean isWrapperType(FieldDescriptor fieldDescriptor) {
return wellKnownProto != null && wellKnownProto.isWrapperType();
}

private static boolean isUnknown(Object object) {
return object instanceof ExprValue
&& ((ExprValue) object).getKindCase() == ExprValue.KindCase.UNKNOWN;
}

private static int intCheckedCast(long value) {
try {
return Ints.checkedCast(value);
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.