Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ public DescriptorMessageProvider(ProtoMessageFactory protoMessageFactory, CelOpt
MessageOrBuilder typedMessage = assertFullProtoMessage(message, fieldName);
FieldDescriptor fieldDescriptor = findField(typedMessage.getDescriptorForType(), fieldName);
// check whether the field is a wrapper type, then test has and return null
if (isWrapperType(fieldDescriptor) && !typedMessage.hasField(fieldDescriptor)) {
if (isWrapperType(fieldDescriptor) &&
!fieldDescriptor.isRepeated() &&
!typedMessage.hasField(fieldDescriptor)) {
return NullValue.NULL_VALUE;
}
Object value = typedMessage.getField(fieldDescriptor);
Expand Down
71 changes: 70 additions & 1 deletion runtime/src/test/resources/wrappers.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,75 @@ single_bytes_wrapper {
}
result: true

Source: x.repeated_int32_wrapper == [1,2] && x.repeated_int64_wrapper == [3] && x.repeated_float_wrapper == [1.5, 2.5] && x.repeated_double_wrapper == [3.5, 4.5] && x.repeated_string_wrapper == ['foo', 'bar'] && x.repeated_bool_wrapper == [true] && x.repeated_uint32_wrapper == [1u, 2u] && x.repeated_uint64_wrapper == []
declare x {
value cel.expr.conformance.proto3.TestAllTypes
}
=====>
bindings: {x=single_int64_wrapper {
value: -34
}
single_int32_wrapper {
value: -12
}
single_double_wrapper {
value: -3.0
}
single_float_wrapper {
value: 1.5
}
single_uint64_wrapper {
value: 34
}
single_uint32_wrapper {
value: 12
}
single_string_wrapper {
}
single_bool_wrapper {
}
single_bytes_wrapper {
value: "hi"
}
repeated_int64_wrapper {
value: 3
}
repeated_int32_wrapper {
value: 1
}
repeated_int32_wrapper {
value: 2
}
repeated_double_wrapper {
value: 3.5
}
repeated_double_wrapper {
value: 4.5
}
repeated_float_wrapper {
value: 1.5
}
repeated_float_wrapper {
value: 2.5
}
repeated_uint32_wrapper {
value: 1
}
repeated_uint32_wrapper {
value: 2
}
repeated_string_wrapper {
value: "foo"
}
repeated_string_wrapper {
value: "bar"
}
repeated_bool_wrapper {
value: true
}
}
result: true

Source: x.single_bool_wrapper == null && x.single_bytes_wrapper == null && x.single_double_wrapper == null && x.single_float_wrapper == null && x.single_int32_wrapper == null && x.single_int64_wrapper == null && x.single_string_wrapper == null && x.single_uint32_wrapper == null && x.single_uint64_wrapper == null
declare x {
value cel.expr.conformance.proto3.TestAllTypes
Expand All @@ -88,4 +157,4 @@ result: NULL_VALUE
Source: google.protobuf.Timestamp{ seconds: 253402300800 }
=====>
bindings: {}
result: +10000-01-01T00:00:00Z
result: +10000-01-01T00:00:00Z
25 changes: 25 additions & 0 deletions testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2015,6 +2015,31 @@ public void wrappers() throws Exception {
.setSingleBoolWrapper(BoolValue.getDefaultInstance())
.setSingleStringWrapper(StringValue.getDefaultInstance())));

source =
"x.repeated_int32_wrapper == [1,2] && " +
"x.repeated_int64_wrapper == [3] && " +
"x.repeated_float_wrapper == [1.5, 2.5] && " +
"x.repeated_double_wrapper == [3.5, 4.5] && " +
"x.repeated_string_wrapper == ['foo', 'bar'] && " +
"x.repeated_bool_wrapper == [true] && " +
"x.repeated_uint32_wrapper == [1u, 2u] && " +
"x.repeated_uint64_wrapper == []";

runTest(ImmutableMap.of("x",
wrapperBindings.addRepeatedInt32Wrapper(Int32Value.of(1))
.addRepeatedInt32Wrapper(Int32Value.of(2))
.addRepeatedInt64Wrapper(Int64Value.of(3))
.addRepeatedFloatWrapper(FloatValue.of(1.5f))
.addRepeatedFloatWrapper(FloatValue.of(2.5f))
.addRepeatedDoubleWrapper(DoubleValue.of(3.5f))
.addRepeatedDoubleWrapper(DoubleValue.of(4.5f))
.addRepeatedStringWrapper(StringValue.of("foo"))
.addRepeatedStringWrapper(StringValue.of("bar"))
.addRepeatedBoolWrapper(BoolValue.of(true))
.addRepeatedUint32Wrapper(UInt32Value.of(1))
.addRepeatedUint32Wrapper(UInt32Value.of(2))))
;

source =
"x.single_bool_wrapper == null && "
+ "x.single_bytes_wrapper == null && "
Expand Down
Loading