diff options
author | yourmary <yourmary@yandex-team.ru> | 2022-02-10 16:50:35 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:50:35 +0300 |
commit | 6c28d571885436fe17efe87ca39884f80852bb8c (patch) | |
tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library | |
parent | ca865f07201ed0ac6e9673b4d6eb2b3fd6d0af02 (diff) | |
download | ydb-6c28d571885436fe17efe87ca39884f80852bb8c.tar.gz |
Restoring authorship annotation for <yourmary@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library')
-rw-r--r-- | library/cpp/protobuf/json/config.h | 22 | ||||
-rw-r--r-- | library/cpp/protobuf/json/proto2json_printer.cpp | 16 | ||||
-rw-r--r-- | library/cpp/protobuf/json/ut/proto2json_ut.cpp | 10 |
3 files changed, 24 insertions, 24 deletions
diff --git a/library/cpp/protobuf/json/config.h b/library/cpp/protobuf/json/config.h index 4ebfa0b639..dc84fb4d5d 100644 --- a/library/cpp/protobuf/json/config.h +++ b/library/cpp/protobuf/json/config.h @@ -55,12 +55,12 @@ namespace NProtobufJson { }; FldNameMode FieldNameMode = FieldNameOriginalCase; - enum ExtFldNameMode { - ExtFldNameFull = 0, // default, field.full_name() - ExtFldNameShort // field.name() - }; - ExtFldNameMode ExtensionFieldNameMode = ExtFldNameFull; - + enum ExtFldNameMode { + ExtFldNameFull = 0, // default, field.full_name() + ExtFldNameShort // field.name() + }; + ExtFldNameMode ExtensionFieldNameMode = ExtFldNameFull; + /// Use 'json_name' protobuf option for field name, mutually exclusive /// with FieldNameMode. bool UseJsonName = false; @@ -125,11 +125,11 @@ namespace NProtobufJson { return *this; } - TSelf& SetExtensionFieldNameMode(ExtFldNameMode mode) { - ExtensionFieldNameMode = mode; - return *this; - } - + TSelf& SetExtensionFieldNameMode(ExtFldNameMode mode) { + ExtensionFieldNameMode = mode; + return *this; + } + TSelf& AddStringTransform(TStringTransformPtr transform) { StringTransforms.push_back(transform); return *this; diff --git a/library/cpp/protobuf/json/proto2json_printer.cpp b/library/cpp/protobuf/json/proto2json_printer.cpp index ab407edeef..6123eab0f2 100644 --- a/library/cpp/protobuf/json/proto2json_printer.cpp +++ b/library/cpp/protobuf/json/proto2json_printer.cpp @@ -471,14 +471,14 @@ namespace NProtobufJson { for (const FieldDescriptor* field : fields) { Y_ASSERT(field); if (field->is_extension()) { - switch (GetConfig().ExtensionFieldNameMode) { - case TProto2JsonConfig::ExtFldNameFull: - PrintField(proto, *field, json, field->full_name()); - break; - case TProto2JsonConfig::ExtFldNameShort: - PrintField(proto, *field, json); - break; - } + switch (GetConfig().ExtensionFieldNameMode) { + case TProto2JsonConfig::ExtFldNameFull: + PrintField(proto, *field, json, field->full_name()); + break; + case TProto2JsonConfig::ExtFldNameShort: + PrintField(proto, *field, json); + break; + } } } diff --git a/library/cpp/protobuf/json/ut/proto2json_ut.cpp b/library/cpp/protobuf/json/ut/proto2json_ut.cpp index 58ac691328..07e52d7f2f 100644 --- a/library/cpp/protobuf/json/ut/proto2json_ut.cpp +++ b/library/cpp/protobuf/json/ut/proto2json_ut.cpp @@ -1012,11 +1012,11 @@ Y_UNIT_TEST(TestExtension) { Y_ASSERT(proto.HasExtension(bar)); UNIT_ASSERT_EQUAL(Proto2Json(proto, TProto2JsonConfig()), "{\"NProtobufJsonTest.bar\":1}"); - - - TProto2JsonConfig cfg; - cfg.SetExtensionFieldNameMode(TProto2JsonConfig::ExtFldNameShort); - UNIT_ASSERT_EQUAL(Proto2Json(proto, cfg), "{\"bar\":1}"); + + + TProto2JsonConfig cfg; + cfg.SetExtensionFieldNameMode(TProto2JsonConfig::ExtFldNameShort); + UNIT_ASSERT_EQUAL(Proto2Json(proto, cfg), "{\"bar\":1}"); } // TestExtension } // TProto2JsonTest |