Skip to content

Commit df13e31

Browse files
author
pananton
committed
feat userver/protobuf: remove default value for MessageToJson parameter
Relates: <https://nda.ya.ru/t/Jyw4aXDp7R33xx> commit_hash:738cf3a73397f47c8267cf9a51eb0ab9945ae683
1 parent ed44f43 commit df13e31

23 files changed

+55
-55
lines changed

‎libraries/proto-structs/src/proto-structs/io/userver/formats/json/array_conv.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ formats::json::Array ReadProtoStruct(
1515
const ::google::protobuf::ListValue& msg
1616
) {
1717
try {
18-
return formats::json::Array{protobuf::json::MessageToJson(msg)};
18+
return formats::json::Array{protobuf::json::MessageToJson(msg, protobuf::json::WriteOptions{})};
1919
} catch (const protobuf::json::WriteError& e) {
2020
ctx.AddError(e.what());
2121
return formats::json::Array{};

‎libraries/proto-structs/src/proto-structs/io/userver/formats/json/object_conv.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ formats::json::Object ReadProtoStruct(
1515
const ::google::protobuf::Struct& msg
1616
) {
1717
try {
18-
return formats::json::Object{protobuf::json::MessageToJson(msg)};
18+
return formats::json::Object{protobuf::json::MessageToJson(msg, protobuf::json::WriteOptions{})};
1919
} catch (const protobuf::json::WriteError& e) {
2020
ctx.AddError(e.what());
2121
return formats::json::Object{};

‎libraries/proto-structs/src/proto-structs/io/userver/formats/json/value_conv.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace proto_structs::io {
1111

1212
formats::json::Value ReadProtoStruct(ReadContext& ctx, To<formats::json::Value>, const ::google::protobuf::Value& msg) {
1313
try {
14-
return protobuf::json::MessageToJson(msg);
14+
return protobuf::json::MessageToJson(msg, protobuf::json::WriteOptions{});
1515
} catch (const protobuf::json::WriteError& e) {
1616
ctx.AddError(e.what());
1717
return formats::json::Value{};

‎libraries/protobuf/include/userver/protobuf/json/convert.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace protobuf::json {
3131
/// are not supported, but also some other `proto2`-specific parts of the syntax may not be correctly handled.
3232
[[nodiscard]] formats::json::ValueBuilder MessageToJsonBuilder(
3333
const ::google::protobuf::Message& message,
34-
const WriteOptions& options = {}
34+
const WriteOptions& options
3535
);
3636

3737
/// @brief Converts protobuf @a message to JSON `Value`.
@@ -46,7 +46,7 @@ namespace protobuf::json {
4646
/// are not supported, but also some other `proto2`-specific parts of the syntax may not be correctly handled.
4747
[[nodiscard]] inline formats::json::Value MessageToJson(
4848
const ::google::protobuf::Message& message,
49-
const WriteOptions& options = {}
49+
const WriteOptions& options
5050
) {
5151
return protobuf::json::MessageToJsonBuilder(message, options).ExtractValue();
5252
}

‎libraries/protobuf/tests/json/any_to_json_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ TEST(AnyToJsonAdditionalTest, InlinedNonNull) {
218218
auto message = PrepareTestData(data);
219219
formats::json::Value json, sample;
220220

221-
UASSERT_NO_THROW((json = MessageToJson(message.field1())));
221+
UASSERT_NO_THROW((json = MessageToJson(message.field1(), {})));
222222
UASSERT_NO_THROW((sample = CreateSampleJson(message.field1())));
223223
ASSERT_TRUE(json.IsObject());
224224
EXPECT_EQ(json, sample);
@@ -232,7 +232,7 @@ TEST(AnyToJsonAdditionalTest, InlinedNull) {
232232
proto_json::messages::AnyMessage message;
233233
formats::json::Value json, sample;
234234

235-
UASSERT_NO_THROW((json = MessageToJson(message.field1())));
235+
UASSERT_NO_THROW((json = MessageToJson(message.field1(), {})));
236236
UASSERT_NO_THROW((sample = CreateSampleJson(message.field1())));
237237
ASSERT_TRUE(json.IsObject());
238238
EXPECT_EQ(json, sample);
@@ -267,7 +267,7 @@ TEST(AnyToJsonAdditionalTest, DynamicMessage) {
267267

268268
formats::json::Value json;
269269

270-
UASSERT_NO_THROW((json = MessageToJson(*message)));
270+
UASSERT_NO_THROW((json = MessageToJson(*message, {})));
271271
ASSERT_TRUE(json.IsObject());
272272
ASSERT_EQ(json.GetSize(), std::size_t{4});
273273
EXPECT_EQ(json["@type"].As<std::string>(), "type.googleapis.com/proto_json.messages.Int32Message");

‎libraries/protobuf/tests/json/bool_to_json_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ INSTANTIATE_TEST_SUITE_P(
3434
BoolToJsonSuccessTestParam{
3535
BoolMessageData{false},
3636
R"({"field1":false})",
37-
WriteOptions{.always_print_fields_with_no_presence = true}
37+
{.always_print_fields_with_no_presence = true}
3838
},
3939
BoolToJsonSuccessTestParam{BoolMessageData{true}, R"({"field1":true})"}
4040
)

‎libraries/protobuf/tests/json/bytes_to_json_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ INSTANTIATE_TEST_SUITE_P(
3535
BytesToJsonSuccessTestParam{
3636
BytesMessageData{""},
3737
R"({"field1":""})",
38-
WriteOptions{.always_print_fields_with_no_presence = true}
38+
{.always_print_fields_with_no_presence = true}
3939
},
4040
BytesToJsonSuccessTestParam{BytesMessageData{std::string("\xfb\xfb", 2)}, R"({"field1":"+/s="})"}
4141
)

‎libraries/protobuf/tests/json/double_to_json_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ INSTANTIATE_TEST_SUITE_P(
3434
DoubleToJsonSuccessTest,
3535
::testing::Values(
3636
DoubleToJsonSuccessTestParam{DoubleMessageData{0.0}},
37-
DoubleToJsonSuccessTestParam{DoubleMessageData{0}, WriteOptions{.always_print_fields_with_no_presence = true}},
37+
DoubleToJsonSuccessTestParam{DoubleMessageData{0}, {.always_print_fields_with_no_presence = true}},
3838
DoubleToJsonSuccessTestParam{DoubleMessageData{1}},
3939
DoubleToJsonSuccessTestParam{DoubleMessageData{-1}},
4040
DoubleToJsonSuccessTestParam{DoubleMessageData{100.12357}},

‎libraries/protobuf/tests/json/duration_to_json_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ TEST(DurationToJsonAdditionalTest, InlinedNonNull) {
123123
auto message = PrepareTestData(data);
124124
formats::json::Value json, sample;
125125

126-
UASSERT_NO_THROW((json = MessageToJson(message.field1())));
126+
UASSERT_NO_THROW((json = MessageToJson(message.field1(), {})));
127127
UASSERT_NO_THROW((sample = CreateSampleJson(message.field1())));
128128
ASSERT_TRUE(json.IsString());
129129
EXPECT_EQ(json, sample);
@@ -134,7 +134,7 @@ TEST(DurationToJsonAdditionalTest, InlinedNull) {
134134
proto_json::messages::DurationMessage message;
135135
formats::json::Value json, sample;
136136

137-
UASSERT_NO_THROW((json = MessageToJson(message.field1())));
137+
UASSERT_NO_THROW((json = MessageToJson(message.field1(), {})));
138138
UASSERT_NO_THROW((sample = CreateSampleJson(message.field1())));
139139
ASSERT_TRUE(json.IsString());
140140
EXPECT_EQ(json, sample);
@@ -156,7 +156,7 @@ TEST(DurationToJsonAdditionalTest, DynamicMessage) {
156156

157157
formats::json::Value json;
158158

159-
UASSERT_NO_THROW((json = MessageToJson(*message)));
159+
UASSERT_NO_THROW((json = MessageToJson(*message, {})));
160160
ASSERT_TRUE(json.IsString());
161161
EXPECT_EQ(json.As<std::string>(), "-123.000000987s");
162162
}

‎libraries/protobuf/tests/json/empty_to_json_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ TEST(EmptyToJsonSuccessTest, Test) {
1313
proto_json::messages::EmptyMessage input;
1414
formats::json::Value json, expected_json, sample_json;
1515

16-
UASSERT_NO_THROW((json = MessageToJson(input)));
16+
UASSERT_NO_THROW((json = MessageToJson(input, {})));
1717
UASSERT_NO_THROW((expected_json = PrepareJsonTestData("{}")));
1818
UASSERT_NO_THROW((sample_json = CreateSampleJson(input)));
1919

0 commit comments

Comments
 (0)