diff options
| author | emazhukin <emazhukin@yandex-team.ru> | 2022-02-10 16:48:57 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:48:57 +0300 |
| commit | b53be0c12e1650189ff223aa1f3a646222a86057 (patch) | |
| tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library/cpp/protobuf/json | |
| parent | 39c9b256341fc68d2d9f8e561ac985709f65f164 (diff) | |
| download | ydb-b53be0c12e1650189ff223aa1f3a646222a86057.tar.gz | |
Restoring authorship annotation for <emazhukin@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/protobuf/json')
| -rw-r--r-- | library/cpp/protobuf/json/json2proto.cpp | 16 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ut/json2proto_ut.cpp | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/library/cpp/protobuf/json/json2proto.cpp b/library/cpp/protobuf/json/json2proto.cpp index fc602e990f..640c10f5a5 100644 --- a/library/cpp/protobuf/json/json2proto.cpp +++ b/library/cpp/protobuf/json/json2proto.cpp @@ -292,11 +292,11 @@ Json2RepeatedFieldValue(const NJson::TJsonValue& jsonValue, Y_ASSERT(!!innerProto); if (key.Defined()) { const FieldDescriptor* keyField = innerProto->GetDescriptor()->FindFieldByName("key"); - Y_ENSURE(keyField, "Map entry key field not found: " << field.name()); + Y_ENSURE(keyField, "Map entry key field not found: " << field.name()); SetKey(*innerProto, *keyField, *key); const FieldDescriptor* valueField = innerProto->GetDescriptor()->FindFieldByName("value"); - Y_ENSURE(valueField, "Map entry value field not found."); + Y_ENSURE(valueField, "Map entry value field not found."); Json2SingleField(jsonValue, *innerProto, *valueField, config, /*isMapValue=*/true); } else { NProtobufJson::MergeJson2Proto(jsonValue, *innerProto, config); @@ -327,12 +327,12 @@ Json2RepeatedField(const NJson::TJsonValue& json, return; bool isMap = fieldJson.GetType() == NJson::JSON_MAP; - if (isMap) { - if (!config.MapAsObject) { - ythrow yexception() << "Map as object representation is not allowed, field: " << field.name(); - } else if (!field.is_map() && !fieldJson.GetMap().empty()) { - ythrow yexception() << "Field " << field.name() << " is not a map."; - } + if (isMap) { + if (!config.MapAsObject) { + ythrow yexception() << "Map as object representation is not allowed, field: " << field.name(); + } else if (!field.is_map() && !fieldJson.GetMap().empty()) { + ythrow yexception() << "Field " << field.name() << " is not a map."; + } } if (fieldJson.GetType() != NJson::JSON_ARRAY && !config.MapAsObject && !config.VectorizeScalars && !config.ValueVectorizer) { diff --git a/library/cpp/protobuf/json/ut/json2proto_ut.cpp b/library/cpp/protobuf/json/ut/json2proto_ut.cpp index 5da7b7bf1f..0dfe57bc7a 100644 --- a/library/cpp/protobuf/json/ut/json2proto_ut.cpp +++ b/library/cpp/protobuf/json/ut/json2proto_ut.cpp @@ -520,13 +520,13 @@ Y_UNIT_TEST(TestInvalidJson) { UNIT_ASSERT_EXCEPTION(Json2Proto(val, proto), yexception); } -Y_UNIT_TEST(TestInvalidRepeatedFieldWithMapAsObject) { - TCompositeRepeated proto; - TJson2ProtoConfig config; - config.MapAsObject = true; +Y_UNIT_TEST(TestInvalidRepeatedFieldWithMapAsObject) { + TCompositeRepeated proto; + TJson2ProtoConfig config; + config.MapAsObject = true; UNIT_ASSERT_EXCEPTION(Json2Proto(TStringBuf(R"({"Part":{"Boo":{}}})"), proto, config), yexception); -} - +} + Y_UNIT_TEST(TestStringTransforms) { // Check that strings and bytes are transformed { |