From f4edb31a1d309efb6c243b2615a587cbbdec081d Mon Sep 17 00:00:00 2001
From: marakasov <marakasov@yandex-team.ru>
Date: Thu, 10 Feb 2022 16:49:50 +0300
Subject: Restoring authorship annotation for <marakasov@yandex-team.ru>.
Commit 2 of 2.
---
library/cpp/protobuf/json/config.h | 4 +-
library/cpp/protobuf/json/proto2json_printer.cpp | 66 ++++++++++++------------
library/cpp/protobuf/json/proto2json_printer.h | 6 +--
library/cpp/protobuf/json/ut/proto2json_ut.cpp | 12 ++---
4 files changed, 44 insertions(+), 44 deletions(-)
(limited to 'library/cpp/protobuf')
diff --git a/library/cpp/protobuf/json/config.h b/library/cpp/protobuf/json/config.h
index 2cfd82b4be..dc84fb4d5d 100644
--- a/library/cpp/protobuf/json/config.h
+++ b/library/cpp/protobuf/json/config.h
@@ -82,7 +82,7 @@ namespace NProtobufJson {
/// Custom field names generator.
TNameGenerator NameGenerator = {};
-
+
/// Custom enum values generator.
TEnumValueGenerator EnumValueGenerator = {};
@@ -144,7 +144,7 @@ namespace NProtobufJson {
StringifyLongNumbers = stringify;
return *this;
}
-
+
TSelf& SetNameGenerator(TNameGenerator callback) {
NameGenerator = callback;
return *this;
diff --git a/library/cpp/protobuf/json/proto2json_printer.cpp b/library/cpp/protobuf/json/proto2json_printer.cpp
index 145dbcabfc..6123eab0f2 100644
--- a/library/cpp/protobuf/json/proto2json_printer.cpp
+++ b/library/cpp/protobuf/json/proto2json_printer.cpp
@@ -201,8 +201,8 @@ namespace NProtobufJson {
json.WriteKey(key).Write(value); \
} \
break; \
- }
-
+ }
+
const Reflection* reflection = proto.GetReflection();
bool shouldPrintField = reflection->HasField(proto, &field);
@@ -218,10 +218,10 @@ namespace NProtobufJson {
if (shouldPrintField) {
switch (field.cpp_type()) {
- INT_FIELD_TO_JSON(CPPTYPE_INT32, GetInt32);
- INT_FIELD_TO_JSON(CPPTYPE_INT64, GetInt64);
- INT_FIELD_TO_JSON(CPPTYPE_UINT32, GetUInt32);
- INT_FIELD_TO_JSON(CPPTYPE_UINT64, GetUInt64);
+ INT_FIELD_TO_JSON(CPPTYPE_INT32, GetInt32);
+ INT_FIELD_TO_JSON(CPPTYPE_INT64, GetInt64);
+ INT_FIELD_TO_JSON(CPPTYPE_UINT32, GetUInt32);
+ INT_FIELD_TO_JSON(CPPTYPE_UINT64, GetUInt64);
FIELD_TO_JSON(CPPTYPE_DOUBLE, GetDouble);
FIELD_TO_JSON(CPPTYPE_FLOAT, GetFloat);
FIELD_TO_JSON(CPPTYPE_BOOL, GetBool);
@@ -487,31 +487,31 @@ namespace NProtobufJson {
}
}
- template <class T, class U>
- std::enable_if_t<!std::is_unsigned<T>::value, bool> ValueInRange(T value, U range) {
- return value >= -range && value <= range;
- }
-
- template <class T, class U>
- std::enable_if_t<std::is_unsigned<T>::value, bool> ValueInRange(T value, U range) {
- return value <= (std::make_unsigned_t<U>)(range);
- }
-
- template <class T>
- bool TProto2JsonPrinter::NeedStringifyNumber(T value) const {
- constexpr long SAFE_INTEGER_RANGE_FLOAT = 16777216;
- constexpr long long SAFE_INTEGER_RANGE_DOUBLE = 9007199254740992;
-
- switch (GetConfig().StringifyLongNumbers) {
- case TProto2JsonConfig::StringifyLongNumbersNever:
- return false;
- case TProto2JsonConfig::StringifyLongNumbersForFloat:
- return !ValueInRange(value, SAFE_INTEGER_RANGE_FLOAT);
- case TProto2JsonConfig::StringifyLongNumbersForDouble:
- return !ValueInRange(value, SAFE_INTEGER_RANGE_DOUBLE);
- }
-
- return false;
- }
-
+ template <class T, class U>
+ std::enable_if_t<!std::is_unsigned<T>::value, bool> ValueInRange(T value, U range) {
+ return value >= -range && value <= range;
+ }
+
+ template <class T, class U>
+ std::enable_if_t<std::is_unsigned<T>::value, bool> ValueInRange(T value, U range) {
+ return value <= (std::make_unsigned_t<U>)(range);
+ }
+
+ template <class T>
+ bool TProto2JsonPrinter::NeedStringifyNumber(T value) const {
+ constexpr long SAFE_INTEGER_RANGE_FLOAT = 16777216;
+ constexpr long long SAFE_INTEGER_RANGE_DOUBLE = 9007199254740992;
+
+ switch (GetConfig().StringifyLongNumbers) {
+ case TProto2JsonConfig::StringifyLongNumbersNever:
+ return false;
+ case TProto2JsonConfig::StringifyLongNumbersForFloat:
+ return !ValueInRange(value, SAFE_INTEGER_RANGE_FLOAT);
+ case TProto2JsonConfig::StringifyLongNumbersForDouble:
+ return !ValueInRange(value, SAFE_INTEGER_RANGE_DOUBLE);
+ }
+
+ return false;
+ }
+
}
diff --git a/library/cpp/protobuf/json/proto2json_printer.h b/library/cpp/protobuf/json/proto2json_printer.h
index c60021aa8a..9dc5aa86c6 100644
--- a/library/cpp/protobuf/json/proto2json_printer.h
+++ b/library/cpp/protobuf/json/proto2json_printer.h
@@ -57,9 +57,9 @@ namespace NProtobufJson {
const TStringBuf& key, const TString& value,
IJsonOutput& json);
- template <class T>
- bool NeedStringifyNumber(T value) const;
-
+ template <class T>
+ bool NeedStringifyNumber(T value) const;
+
protected:
const TProto2JsonConfig& Config;
TString TmpBuf;
diff --git a/library/cpp/protobuf/json/ut/proto2json_ut.cpp b/library/cpp/protobuf/json/ut/proto2json_ut.cpp
index 1160269459..07e52d7f2f 100644
--- a/library/cpp/protobuf/json/ut/proto2json_ut.cpp
+++ b/library/cpp/protobuf/json/ut/proto2json_ut.cpp
@@ -981,31 +981,31 @@ Y_UNIT_TEST(TestStringifyLongNumbers) {
UNIT_ASSERT_EQUAL(jsonStr.Str(), "{\"SI64\":" #value "}"); \
} \
} while (false)
-
+
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersNever, 1, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersNever, 1000000000, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersNever, 10000000000000000, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersNever, -1, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersNever, -1000000000, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersNever, -10000000000000000, false);
-
+
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForDouble, 1, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForDouble, 1000000000, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForDouble, 10000000000000000, true);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForDouble, -1, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForDouble, -1000000000, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForDouble, -10000000000000000, true);
-
+
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForFloat, 1, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForFloat, 1000000000, true);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForFloat, 10000000000000000, true);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForFloat, -1, false);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForFloat, -1000000000, true);
TEST_SINGLE(TProto2JsonConfig::StringifyLongNumbersForFloat, -10000000000000000, true);
-
-#undef TEST_SINGLE
+
+#undef TEST_SINGLE
} // TestStringifyLongNumbers
-
+
Y_UNIT_TEST(TestExtension) {
TExtensionField proto;
proto.SetExtension(bar, 1);
--
cgit v1.2.3