diff options
author | Egor Kochetov <[email protected]> | 2022-02-10 16:50:36 +0300 |
---|---|---|
committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:50:36 +0300 |
commit | a1fb24cd1409be21002b3f8d291c3f6cfc113e68 (patch) | |
tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library/cpp/protobuf/json | |
parent | 40896b241c91572ea1369526ee1e6ae0ba340f34 (diff) |
Restoring authorship annotation for Egor Kochetov <[email protected]>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/protobuf/json')
-rw-r--r-- | library/cpp/protobuf/json/json2proto.cpp | 14 | ||||
-rw-r--r-- | library/cpp/protobuf/json/json2proto.h | 16 | ||||
-rw-r--r-- | library/cpp/protobuf/json/ut/json2proto_ut.cpp | 32 |
3 files changed, 31 insertions, 31 deletions
diff --git a/library/cpp/protobuf/json/json2proto.cpp b/library/cpp/protobuf/json/json2proto.cpp index 94cab335c94..640c10f5a51 100644 --- a/library/cpp/protobuf/json/json2proto.cpp +++ b/library/cpp/protobuf/json/json2proto.cpp @@ -356,17 +356,17 @@ Json2RepeatedField(const NJson::TJsonValue& json, if (config.ReplaceRepeatedFields) { reflection->ClearField(&proto, &field); } - if (fieldJson.GetType() == NJson::JSON_ARRAY) { - const NJson::TJsonValue::TArray& jsonArray = fieldJson.GetArray(); - for (const NJson::TJsonValue& jsonValue : jsonArray) { - Json2RepeatedFieldValue(jsonValue, proto, field, config, reflection); - } + if (fieldJson.GetType() == NJson::JSON_ARRAY) { + const NJson::TJsonValue::TArray& jsonArray = fieldJson.GetArray(); + for (const NJson::TJsonValue& jsonValue : jsonArray) { + Json2RepeatedFieldValue(jsonValue, proto, field, config, reflection); + } } else if (config.ValueVectorizer) { for (const NJson::TJsonValue& jsonValue : config.ValueVectorizer(fieldJson)) { Json2RepeatedFieldValue(jsonValue, proto, field, config, reflection); } - } else if (config.VectorizeScalars) { - Json2RepeatedFieldValue(fieldJson, proto, field, config, reflection); + } else if (config.VectorizeScalars) { + Json2RepeatedFieldValue(fieldJson, proto, field, config, reflection); } } } diff --git a/library/cpp/protobuf/json/json2proto.h b/library/cpp/protobuf/json/json2proto.h index 9667bb5c83c..4c33498dfa3 100644 --- a/library/cpp/protobuf/json/json2proto.h +++ b/library/cpp/protobuf/json/json2proto.h @@ -88,11 +88,11 @@ namespace NProtobufJson { return *this; } - TSelf& SetVectorizeScalars(bool vectorizeScalars) { - VectorizeScalars = vectorizeScalars; - return *this; - } - + TSelf& SetVectorizeScalars(bool vectorizeScalars) { + VectorizeScalars = vectorizeScalars; + return *this; + } + TSelf& SetAllowComments(bool value) { AllowComments = value; return *this; @@ -135,9 +135,9 @@ namespace NProtobufJson { /// Enum value parsing mode. EnumValueMode EnumValueMode = EnumCaseSensetive; - - /// Append scalars to repeated fields - bool VectorizeScalars = false; + + /// Append scalars to repeated fields + bool VectorizeScalars = false; /// Custom spliter non array value to repeated fields. TValueVectorizer ValueVectorizer; diff --git a/library/cpp/protobuf/json/ut/json2proto_ut.cpp b/library/cpp/protobuf/json/ut/json2proto_ut.cpp index f313968d311..0dfe57bc7a2 100644 --- a/library/cpp/protobuf/json/ut/json2proto_ut.cpp +++ b/library/cpp/protobuf/json/ut/json2proto_ut.cpp @@ -672,24 +672,24 @@ Y_UNIT_TEST(TestCastRobust) { UNIT_ASSERT_PROTOS_EQUAL(proto, expected); } -Y_UNIT_TEST(TestVectorizeScalars) { - NJson::TJsonValue json; -#define DEFINE_FIELD(name, value) \ - json.InsertValue(#name, value); +Y_UNIT_TEST(TestVectorizeScalars) { + NJson::TJsonValue json; +#define DEFINE_FIELD(name, value) \ + json.InsertValue(#name, value); #include <library/cpp/protobuf/json/ut/fields.incl> -#undef DEFINE_FIELD - - TFlatRepeated proto; - TJson2ProtoConfig config; - config.SetVectorizeScalars(true); - Json2Proto(json, proto, config); - -#define DEFINE_FIELD(name, value) \ - UNIT_ASSERT_VALUES_EQUAL(proto.Get ## name(0), value); +#undef DEFINE_FIELD + + TFlatRepeated proto; + TJson2ProtoConfig config; + config.SetVectorizeScalars(true); + Json2Proto(json, proto, config); + +#define DEFINE_FIELD(name, value) \ + UNIT_ASSERT_VALUES_EQUAL(proto.Get ## name(0), value); #include <library/cpp/protobuf/json/ut/fields.incl> -#undef DEFINE_FIELD -} - +#undef DEFINE_FIELD +} + Y_UNIT_TEST(TestValueVectorizer) { { // No ValueVectorizer |