qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move the list iterating logic when deserializing message using QProtobufJsonSerializer 

Move the list iterating logic to the deserializeValue method. We
may detect the list type at the point when deserializing the
JSON-encoded repeated field. So it doesn't make sense to hold
this logic in list item deserializer, we may simply iterate over
list value there.

Pick-to: 6.7
Change-Id: I413993aed14971c8a1bc2c7bfd04aed6ad1cacda
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
This commit is contained in:
Alexey Edelev 2024-01-26 18:10:41 +01:00
parent 6ba67dc89e
commit fea7b514a3
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/protobuf/qprotobufjsonserializer.cpp
View File

@ -499,8 +499,34 @@ public:
auto handler = QtProtobufPrivate::findHandler(metaType);
if (handler.deserializer) {
handler.deserializer(qPtr, propertyData);
ok = propertyData.isValid();
if (activeValue.isArray()) {
QJsonArray array = activeValue.toArray();
if (array.isEmpty()) {
ok = true;
activeValue = {};
return propertyData;
}
if (!array.at(0).isObject()) { // Enum array
handler.deserializer(qPtr, propertyData);
ok = propertyData.isValid();
} else {
while (!array.isEmpty() &&
deserializationError == QAbstractProtobufSerializer::NoError) {
activeValue = array.takeAt(0);
handler.deserializer(qPtr, propertyData);
}
ok = propertyData.isValid();
}
} else {
// We should attempt deserializing property while the active value !isNull.
// This is required to deserialize the map fields.
while (!activeValue.isNull()
&& deserializationError == QAbstractProtobufSerializer::NoError) {
handler.deserializer(qPtr, propertyData);
}
ok = propertyData.isValid();
}
} else {
int userType = propertyData.userType();
auto handler = handlers.constFind(userType);
@ -508,7 +534,6 @@ public:
propertyData = handler.value().deserializer(activeValue, ok);
if (!ok)
setInvalidFormatError();
activeValue = {};
} else {
setDeserializationError(QAbstractProtobufSerializer::NoDeserializerError,
QCoreApplication::
@ -559,10 +584,7 @@ public:
QVariant newPropertyValue = message->property(iter->second, true);
bool ok = false;
while (!activeValue.isNull()
&& deserializationError == QAbstractProtobufSerializer::NoError) {
newPropertyValue = deserializeValue(newPropertyValue, ok);
}
newPropertyValue = deserializeValue(newPropertyValue, ok);
activeValue = store;
if (ok)
@ -700,28 +722,7 @@ bool QProtobufJsonSerializer::deserializeObject(QProtobufMessage *message) const
bool QProtobufJsonSerializer::deserializeListObject(QProtobufMessage *message) const
{
QJsonArray array = d_ptr->activeValue.toArray();
if (array.isEmpty()) {
d_ptr->activeValue = {};
return false;
}
auto val = array.takeAt(0);
bool result = false;
if (val.isObject()) {
d_ptr->activeValue = val;
d_ptr->deserializeObject(message);
result = true;
} else {
d_ptr->setInvalidFormatError();
}
if (!array.isEmpty())
d_ptr->activeValue = array;
else
d_ptr->activeValue = {};
return result;
return d_ptr->deserializeObject(message);
}
void QProtobufJsonSerializer::serializeMapPair(const QVariant &key, const QVariant &value,

2
tests/auto/protobuf/json/tst_protobuf_deserialization_json_basictypes.cpp
View File

@ -547,7 +547,7 @@ void QtProtobufTypesJsonDeserializationTest::InvalidTypeTest()
"{\"testFieldInt\":-45,"
"\"testComplexField\":200}"_ba);
QCOMPARE(msg.testFieldInt(), 0);
QCOMPARE(msg.testFieldInt(), -45);
QCOMPARE(msg.testComplexField(), SimpleStringMessage());
QCOMPARE(serializer->deserializationError(),
QAbstractProtobufSerializer::InvalidFormatError);