diff options
| author | cerevra <[email protected]> | 2022-02-10 16:45:59 +0300 | 
|---|---|---|
| committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:45:59 +0300 | 
| commit | 4f292c7e2fd0a41da93fda51b2d440c979a330b7 (patch) | |
| tree | 1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c /library/cpp/protobuf/json | |
| parent | bf41dd01f6c920583e9faae7cd55ed25e547e052 (diff) | |
Restoring authorship annotation for <[email protected]>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/protobuf/json')
| -rw-r--r-- | library/cpp/protobuf/json/inline.h | 2 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/json2proto.cpp | 2 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/json2proto.h | 4 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/json_value_output.cpp | 2 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/json_value_output.h | 2 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/json_writer_output.h | 2 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/proto2json.cpp | 6 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ut/filter_ut.cpp | 8 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ut/inline_ut.cpp | 8 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ut/json.h | 4 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ut/json2proto_ut.cpp | 34 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ut/proto.h | 4 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ut/proto2json_ut.cpp | 28 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ut/string_transform_ut.cpp | 2 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ut/ya.make | 4 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ya.make | 4 | 
16 files changed, 58 insertions, 58 deletions
diff --git a/library/cpp/protobuf/json/inline.h b/library/cpp/protobuf/json/inline.h index bd62bb96350..e2d7bb6ef04 100644 --- a/library/cpp/protobuf/json/inline.h +++ b/library/cpp/protobuf/json/inline.h @@ -39,7 +39,7 @@  #include "proto2json_printer.h"  #include "json_output_create.h" -#include <library/cpp/protobuf/util/simple_reflection.h>  +#include <library/cpp/protobuf/util/simple_reflection.h>  #include <util/generic/maybe.h>  #include <util/generic/yexception.h> diff --git a/library/cpp/protobuf/json/json2proto.cpp b/library/cpp/protobuf/json/json2proto.cpp index 2284b6fb125..640c10f5a51 100644 --- a/library/cpp/protobuf/json/json2proto.cpp +++ b/library/cpp/protobuf/json/json2proto.cpp @@ -1,7 +1,7 @@  #include "json2proto.h"  #include "util.h" -#include <library/cpp/json/json_value.h>  +#include <library/cpp/json/json_value.h>  #include <google/protobuf/message.h>  #include <google/protobuf/descriptor.h> diff --git a/library/cpp/protobuf/json/json2proto.h b/library/cpp/protobuf/json/json2proto.h index 90f09eb53ad..4c33498dfa3 100644 --- a/library/cpp/protobuf/json/json2proto.h +++ b/library/cpp/protobuf/json/json2proto.h @@ -3,8 +3,8 @@  #include "string_transform.h"  #include "name_generator.h" -#include <library/cpp/json/json_reader.h>  -#include <library/cpp/json/json_value.h>  +#include <library/cpp/json/json_reader.h> +#include <library/cpp/json/json_value.h>  #include <util/stream/input.h>  #include <util/stream/str.h> diff --git a/library/cpp/protobuf/json/json_value_output.cpp b/library/cpp/protobuf/json/json_value_output.cpp index b74b37bb4fa..d845cc1c74a 100644 --- a/library/cpp/protobuf/json/json_value_output.cpp +++ b/library/cpp/protobuf/json/json_value_output.cpp @@ -1,6 +1,6 @@  #include "json_value_output.h" -#include <library/cpp/json/json_reader.h>  +#include <library/cpp/json/json_reader.h>  namespace NProtobufJson {      template <typename T> diff --git a/library/cpp/protobuf/json/json_value_output.h b/library/cpp/protobuf/json/json_value_output.h index 73fe502ba8e..3fc6ff2ab0f 100644 --- a/library/cpp/protobuf/json/json_value_output.h +++ b/library/cpp/protobuf/json/json_value_output.h @@ -2,7 +2,7 @@  #include "json_output.h" -#include <library/cpp/json/writer/json_value.h>  +#include <library/cpp/json/writer/json_value.h>  #include <util/generic/stack.h> diff --git a/library/cpp/protobuf/json/json_writer_output.h b/library/cpp/protobuf/json/json_writer_output.h index d36fcb987d9..3d8a2daa56c 100644 --- a/library/cpp/protobuf/json/json_writer_output.h +++ b/library/cpp/protobuf/json/json_writer_output.h @@ -3,7 +3,7 @@  #include "json_output.h"  #include "config.h" -#include <library/cpp/json/json_writer.h>  +#include <library/cpp/json/json_writer.h>  #include <util/string/builder.h>  #include <util/generic/store_policy.h> diff --git a/library/cpp/protobuf/json/proto2json.cpp b/library/cpp/protobuf/json/proto2json.cpp index 4254968fead..3d76a916867 100644 --- a/library/cpp/protobuf/json/proto2json.cpp +++ b/library/cpp/protobuf/json/proto2json.cpp @@ -3,9 +3,9 @@  #include "json_output_create.h"  #include "proto2json_printer.h" -#include <library/cpp/json/json_reader.h>  -#include <library/cpp/json/json_value.h>  -#include <library/cpp/json/json_writer.h>  +#include <library/cpp/json/json_reader.h> +#include <library/cpp/json/json_value.h> +#include <library/cpp/json/json_writer.h>  #include <util/generic/ptr.h>  #include <util/generic/strbuf.h> diff --git a/library/cpp/protobuf/json/ut/filter_ut.cpp b/library/cpp/protobuf/json/ut/filter_ut.cpp index 9c8893dfae8..95c227666fb 100644 --- a/library/cpp/protobuf/json/ut/filter_ut.cpp +++ b/library/cpp/protobuf/json/ut/filter_ut.cpp @@ -1,8 +1,8 @@ -#include <library/cpp/protobuf/json/ut/filter_ut.pb.h>  +#include <library/cpp/protobuf/json/ut/filter_ut.pb.h> -#include <library/cpp/protobuf/json/filter.h>  -#include <library/cpp/protobuf/json/field_option.h>  -#include <library/cpp/protobuf/json/proto2json.h>  +#include <library/cpp/protobuf/json/filter.h> +#include <library/cpp/protobuf/json/field_option.h> +#include <library/cpp/protobuf/json/proto2json.h>  #include <library/cpp/testing/unittest/registar.h>  using namespace NProtobufJson; diff --git a/library/cpp/protobuf/json/ut/inline_ut.cpp b/library/cpp/protobuf/json/ut/inline_ut.cpp index aabf79451d6..c29ad32e7d6 100644 --- a/library/cpp/protobuf/json/ut/inline_ut.cpp +++ b/library/cpp/protobuf/json/ut/inline_ut.cpp @@ -1,8 +1,8 @@ -#include <library/cpp/protobuf/json/ut/inline_ut.pb.h>  +#include <library/cpp/protobuf/json/ut/inline_ut.pb.h> -#include <library/cpp/protobuf/json/inline.h>  -#include <library/cpp/protobuf/json/field_option.h>  -#include <library/cpp/protobuf/json/proto2json.h>  +#include <library/cpp/protobuf/json/inline.h> +#include <library/cpp/protobuf/json/field_option.h> +#include <library/cpp/protobuf/json/proto2json.h>  #include <library/cpp/testing/unittest/registar.h>  #include <util/generic/string.h> diff --git a/library/cpp/protobuf/json/ut/json.h b/library/cpp/protobuf/json/ut/json.h index fe548409998..c1f108e6e48 100644 --- a/library/cpp/protobuf/json/ut/json.h +++ b/library/cpp/protobuf/json/ut/json.h @@ -1,8 +1,8 @@  #pragma once -#include <library/cpp/protobuf/json/ut/test.pb.h>  +#include <library/cpp/protobuf/json/ut/test.pb.h> -#include <library/cpp/json/json_value.h>  +#include <library/cpp/json/json_value.h>  #include <cstdarg> diff --git a/library/cpp/protobuf/json/ut/json2proto_ut.cpp b/library/cpp/protobuf/json/ut/json2proto_ut.cpp index 6fdbba42456..0dfe57bc7a2 100644 --- a/library/cpp/protobuf/json/ut/json2proto_ut.cpp +++ b/library/cpp/protobuf/json/ut/json2proto_ut.cpp @@ -2,13 +2,13 @@  #include "proto.h"  #include "proto2json.h" -#include <library/cpp/protobuf/json/ut/test.pb.h>  +#include <library/cpp/protobuf/json/ut/test.pb.h> -#include <library/cpp/json/json_value.h>  -#include <library/cpp/json/json_reader.h>  -#include <library/cpp/json/json_writer.h>  +#include <library/cpp/json/json_value.h> +#include <library/cpp/json/json_reader.h> +#include <library/cpp/json/json_writer.h> -#include <library/cpp/protobuf/json/json2proto.h>  +#include <library/cpp/protobuf/json/json2proto.h>  #include <library/cpp/testing/unittest/registar.h> @@ -92,7 +92,7 @@ Y_UNIT_TEST_SUITE(TJson2ProtoTest) {          FillFlatProto(&modelProto, skippedField);                     \          UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);                  \      } -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD  } // TestFlatOptional @@ -114,7 +114,7 @@ UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);          TFlatRequired proto;                                          \          UNIT_ASSERT_EXCEPTION(Json2Proto(json, proto), yexception);   \      } -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD  } // TestFlatRequired @@ -153,7 +153,7 @@ Y_UNIT_TEST(TestFlatNoCheckRequired) {          TFlatRequired proto;                                          \          UNIT_ASSERT_NO_EXCEPTION(Json2Proto(json, proto, cfg));       \      } -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD  } // TestFlatNoCheckRequired @@ -178,7 +178,7 @@ UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);          FillRepeatedProto(&modelProto, skippedField);                         \          UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);                          \      } -#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  +#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  #undef DEFINE_REPEATED_FIELD  } // TestFlatRepeated @@ -203,7 +203,7 @@ UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);          FillCompositeProto(&modelProto, skippedField);                     \          UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);                       \      } -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD  } // TestCompositeOptional @@ -236,7 +236,7 @@ UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);          }                                                           \          UNIT_ASSERT_PROTOS_EQUAL(proto, modelProto);                \      } -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD  } // TestCompositeOptionalStringBuf @@ -289,7 +289,7 @@ Y_UNIT_TEST(TestCompositeRepeated) {          modelProto.AddPart()->CopyFrom(partModelProto);  \          array.AppendValue(CreateFlatJson(skippedField)); \      } -#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  +#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  #undef DEFINE_REPEATED_FIELD          NJson::TJsonValue json; @@ -462,7 +462,7 @@ Y_UNIT_TEST(TestFieldNameMode) {      {          // FIXME(CONTRIB-139): since protobuf 3.1, Def_upper json name is          // "DefUpper", but until kernel/ugc/schema and yweb/yasap/pdb are -        // updated, library/cpp/protobuf/json preserves compatibility with  +        // updated, library/cpp/protobuf/json preserves compatibility with          // protobuf 3.0 by lowercasing default names, making it "defUpper".          TString modelStr(R"_({"My-Upper":1,"my-lower":2,"defUpper":3,"defLower":4})_"); @@ -591,7 +591,7 @@ Y_UNIT_TEST(TestCastFromString) {          NJson::TJsonValue json;  #define DEFINE_FIELD(name, value) \      json.InsertValue(#name, ConvertToString(value)); -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD          TFlatOptional proto; @@ -618,7 +618,7 @@ Y_UNIT_TEST(TestCastFromString) {          }                                                              \          json.InsertValue(#name, array);                                \      } -#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  +#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  #undef DEFINE_REPEATED_FIELD          TFlatRepeated proto; @@ -676,7 +676,7 @@ Y_UNIT_TEST(TestVectorizeScalars) {      NJson::TJsonValue json;  #define DEFINE_FIELD(name, value) \      json.InsertValue(#name, value); -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD      TFlatRepeated proto; @@ -686,7 +686,7 @@ Y_UNIT_TEST(TestVectorizeScalars) {  #define DEFINE_FIELD(name, value) \      UNIT_ASSERT_VALUES_EQUAL(proto.Get ## name(0), value); -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD  } diff --git a/library/cpp/protobuf/json/ut/proto.h b/library/cpp/protobuf/json/ut/proto.h index 715a51116c7..8183bfc8e18 100644 --- a/library/cpp/protobuf/json/ut/proto.h +++ b/library/cpp/protobuf/json/ut/proto.h @@ -13,7 +13,7 @@ namespace NProtobufJsonTest {  #define DEFINE_FIELD(name, value)                         \      if (skippedFields.find(#name) == skippedFields.end()) \          proto->Set##name(value); -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD      } @@ -38,7 +38,7 @@ namespace NProtobufJsonTest {              AddValue(proto->Mutable##name(), values[i]);               \          }                                                              \      } -#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  +#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  #undef DEFINE_REPEATED_FIELD      } diff --git a/library/cpp/protobuf/json/ut/proto2json_ut.cpp b/library/cpp/protobuf/json/ut/proto2json_ut.cpp index 2fb81cf1842..07e52d7f2f5 100644 --- a/library/cpp/protobuf/json/ut/proto2json_ut.cpp +++ b/library/cpp/protobuf/json/ut/proto2json_ut.cpp @@ -1,13 +1,13 @@  #include "json.h"  #include "proto.h" -#include <library/cpp/protobuf/json/ut/test.pb.h>  +#include <library/cpp/protobuf/json/ut/test.pb.h> -#include <library/cpp/json/json_value.h>  -#include <library/cpp/json/json_reader.h>  -#include <library/cpp/json/json_writer.h>  +#include <library/cpp/json/json_value.h> +#include <library/cpp/json/json_reader.h> +#include <library/cpp/json/json_writer.h> -#include <library/cpp/protobuf/json/proto2json.h>  +#include <library/cpp/protobuf/json/proto2json.h>  #include <library/cpp/testing/unittest/registar.h> @@ -70,7 +70,7 @@ Y_UNIT_TEST_SUITE(TProto2JsonFlatTest) {                  break;                                                                                \          }                                                                                             \      } -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD      } @@ -137,7 +137,7 @@ Y_UNIT_TEST_SUITE(TProto2JsonFlatTest) {              UNIT_ASSERT_JSONS_EQUAL(json, modelJson);                      \          }                                                                  \      } -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD  } // TestFlatOptional @@ -178,7 +178,7 @@ const NJson::TJsonValue& modelJson = CreateFlatJson();              UNIT_ASSERT_JSONS_EQUAL(json, modelJson);                      \          }                                                                  \      } -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD  } // TestFlatRequired @@ -223,7 +223,7 @@ Y_UNIT_TEST(TestFlatRepeated) {              UNIT_ASSERT_JSONS_EQUAL(json, modelJson);                              \          }                                                                          \      } -#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  +#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  #undef DEFINE_REPEATED_FIELD  } // TestFlatRepeated @@ -264,7 +264,7 @@ const NJson::TJsonValue& modelJson = CreateCompositeJson();              UNIT_ASSERT_JSONS_EQUAL(json, modelJson);                           \          }                                                                       \      } -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD  } // TestCompositeOptional @@ -305,7 +305,7 @@ const NJson::TJsonValue& modelJson = CreateCompositeJson();              UNIT_ASSERT_JSONS_EQUAL(json, modelJson);                           \          }                                                                       \      } -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD  } // TestCompositeRequired @@ -349,7 +349,7 @@ Y_UNIT_TEST(TestCompositeRepeated) {          proto.AddPart()->CopyFrom(partProto);                 \          modelArray.AppendValue(CreateFlatJson(skippedField)); \      } -#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  +#include <library/cpp/protobuf/json/ut/repeated_fields.incl>  #undef DEFINE_REPEATED_FIELD          NJson::TJsonValue modelJson; @@ -454,7 +454,7 @@ Y_UNIT_TEST(TestMissingSingleKeyConfig) {          NJson::TJsonValue modelJson;  #define DEFINE_FIELD(name, value) \      modelJson.InsertValue(#name, NJson::TJsonValue(NJson::JSON_NULL)); -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD          TFlatOptional proto; @@ -540,7 +540,7 @@ Y_UNIT_TEST(TestMissingRepeatedKeyConfig) {          NJson::TJsonValue modelJson;  #define DEFINE_FIELD(name, value) \      modelJson.InsertValue(#name, NJson::TJsonValue(NJson::JSON_NULL)); -#include <library/cpp/protobuf/json/ut/fields.incl>  +#include <library/cpp/protobuf/json/ut/fields.incl>  #undef DEFINE_FIELD          TFlatRepeated proto; diff --git a/library/cpp/protobuf/json/ut/string_transform_ut.cpp b/library/cpp/protobuf/json/ut/string_transform_ut.cpp index 64e2f71bb44..a31dabcb0f0 100644 --- a/library/cpp/protobuf/json/ut/string_transform_ut.cpp +++ b/library/cpp/protobuf/json/ut/string_transform_ut.cpp @@ -1,7 +1,7 @@  #include "json.h"  #include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/protobuf/json/proto2json.h>  +#include <library/cpp/protobuf/json/proto2json.h>  Y_UNIT_TEST_SUITE(TDoubleEscapeTransform) {      Y_UNIT_TEST(TestEmptyString) { diff --git a/library/cpp/protobuf/json/ut/ya.make b/library/cpp/protobuf/json/ut/ya.make index 8b9c9fd3bc5..b60a6d3c17f 100644 --- a/library/cpp/protobuf/json/ut/ya.make +++ b/library/cpp/protobuf/json/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/protobuf/json)  +UNITTEST_FOR(library/cpp/protobuf/json)  OWNER(avitella) @@ -17,7 +17,7 @@ SRCS(  GENERATE_ENUM_SERIALIZATION(test.pb.h)  PEERDIR( -    library/cpp/protobuf/json  +    library/cpp/protobuf/json  )  END() diff --git a/library/cpp/protobuf/json/ya.make b/library/cpp/protobuf/json/ya.make index 8b7104cf2ac..2f2c75cfdb2 100644 --- a/library/cpp/protobuf/json/ya.make +++ b/library/cpp/protobuf/json/ya.make @@ -17,8 +17,8 @@ SRCS(  PEERDIR(      contrib/libs/protobuf -    library/cpp/json  -    library/cpp/protobuf/util  +    library/cpp/json +    library/cpp/protobuf/util      library/cpp/string_utils/relaxed_escaper  )  | 
