From 9123176b341b6f2658cff5132482b8237c1416c8 Mon Sep 17 00:00:00 2001
From: Ruslan Kovalev <ruslan.a.kovalev@gmail.com>
Date: Thu, 10 Feb 2022 16:46:45 +0300
Subject: Restoring authorship annotation for Ruslan Kovalev
<ruslan.a.kovalev@gmail.com>. Commit 2 of 2.
---
library/cpp/protobuf/json/json2proto.cpp | 14 +++++++-------
library/cpp/protobuf/json/ut/json2proto_ut.cpp | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'library/cpp/protobuf/json')
diff --git a/library/cpp/protobuf/json/json2proto.cpp b/library/cpp/protobuf/json/json2proto.cpp
index 70605275e6..640c10f5a5 100644
--- a/library/cpp/protobuf/json/json2proto.cpp
+++ b/library/cpp/protobuf/json/json2proto.cpp
@@ -6,7 +6,7 @@
#include <google/protobuf/message.h>
#include <google/protobuf/descriptor.h>
-#include <util/generic/hash.h>
+#include <util/generic/hash.h>
#include <util/generic/maybe.h>
#include <util/string/ascii.h>
#include <util/string/cast.h>
@@ -378,10 +378,10 @@ namespace NProtobufJson {
}
Y_ENSURE(json.IsMap(), "expected json map");
-
+
const google::protobuf::Descriptor* descriptor = proto.GetDescriptor();
Y_ASSERT(!!descriptor);
-
+
for (int f = 0, endF = descriptor->field_count(); f < endF; ++f) {
const google::protobuf::FieldDescriptor* field = descriptor->field(f);
Y_ASSERT(!!field);
@@ -391,8 +391,8 @@ namespace NProtobufJson {
} else {
Json2SingleField(json, proto, *field, config);
}
- }
-
+ }
+
if (!config.AllowUnknownFields) {
THashMap<TString, bool> knownFields;
for (int f = 0, endF = descriptor->field_count(); f < endF; ++f) {
@@ -402,8 +402,8 @@ namespace NProtobufJson {
for (const auto& f : json.GetMap()) {
Y_ENSURE(knownFields.contains(f.first), "unknown field " << f.first);
}
- }
- }
+ }
+ }
void MergeJson2Proto(const TStringBuf& json, google::protobuf::Message& proto, const TJson2ProtoConfig& config) {
NJson::TJsonReaderConfig jsonCfg;
diff --git a/library/cpp/protobuf/json/ut/json2proto_ut.cpp b/library/cpp/protobuf/json/ut/json2proto_ut.cpp
index 97333a8986..0dfe57bc7a 100644
--- a/library/cpp/protobuf/json/ut/json2proto_ut.cpp
+++ b/library/cpp/protobuf/json/ut/json2proto_ut.cpp
@@ -506,14 +506,14 @@ class TBytesTransform: public IStringTransform {
public:
int GetType() const override {
return 0;
- }
+ }
void Transform(TString&) const override {
}
void TransformBytes(TString& str) const override {
str = "transformed_bytes";
}
};
-
+
Y_UNIT_TEST(TestInvalidJson) {
NJson::TJsonValue val{"bad value"};
TFlatOptional proto;
--
cgit v1.2.3