Move fyamlcpp and yaml_config to NKikimr namespace

ydb/library/fyamlcpp/fyamlcpp.cpp

@@ -4,7 +4,7 @@
 
 #include <util/digest/murmur.h>
 
-namespace NFyaml {
+namespace NKikimr::NFyaml {
 
 const char* zstr = "";
 
@@ -1100,27 +1100,27 @@ bool IsComplexType(ENodeType type) {
 
 } // namespace NDetail
 
-} // namespace NFyaml
+} // namespace NKikimr::NFyaml
 
 template <>
-void Out<NFyaml::TDocument>(IOutputStream& out, const NFyaml::TDocument& value) {
+void Out<NKikimr::NFyaml::TDocument>(IOutputStream& out, const NKikimr::NFyaml::TDocument& value) {
     out << value.EmitToCharArray().get();
 }
 
 template <>
-void Out<NFyaml::TNodeRef>(IOutputStream& out, const NFyaml::TNodeRef& value) {
+void Out<NKikimr::NFyaml::TNodeRef>(IOutputStream& out, const NKikimr::NFyaml::TNodeRef& value) {
     out << value.EmitToCharArray().get();
 }
 
 template <>
-void Out<NFyaml::TJsonEmitter>(IOutputStream& out, const NFyaml::TJsonEmitter& value) {
+void Out<NKikimr::NFyaml::TJsonEmitter>(IOutputStream& out, const NKikimr::NFyaml::TJsonEmitter& value) {
     out << value.EmitToCharArray().get();
 }
 
-bool operator==(const fy_node* node1, const NFyaml::NDetail::TNodeOps<NFyaml::TNodeRef>& node2) {
+bool operator==(const fy_node* node1, const NKikimr::NFyaml::NDetail::TNodeOps<NKikimr::NFyaml::TNodeRef>& node2) {
      return node2.Node() == node1;
 }
 
-bool operator==(const fy_node* node1, const NFyaml::NDetail::TNodeOps<NFyaml::TNode>& node2) {
+bool operator==(const fy_node* node1, const NKikimr::NFyaml::NDetail::TNodeOps<NKikimr::NFyaml::TNode>& node2) {
      return node2.Node() == node1;
 }

ydb/library/fyamlcpp/fyamlcpp.h

@@ -21,7 +21,7 @@ struct fy_document_iterator;
 struct fy_node_pair;
 extern "C" struct fy_node *fy_node_buildf(struct fy_document *fyd, const char *fmt, ...);
 
-namespace NFyaml {
+namespace NKikimr::NFyaml {
     namespace NDetail {
         template <class T>
         class TNodeOps;
@@ -30,10 +30,10 @@ namespace NFyaml {
     class TNode;
 }
 
-bool operator==(const fy_node* node1, const NFyaml::NDetail::TNodeOps<NFyaml::TNodeRef>& node2);
-bool operator==(const fy_node* node1, const NFyaml::NDetail::TNodeOps<NFyaml::TNode>& node2);
+bool operator==(const fy_node* node1, const NKikimr::NFyaml::NDetail::TNodeOps<NKikimr::NFyaml::TNodeRef>& node2);
+bool operator==(const fy_node* node1, const NKikimr::NFyaml::NDetail::TNodeOps<NKikimr::NFyaml::TNode>& node2);
 
-namespace NFyaml {
+namespace NKikimr::NFyaml {
 
 struct TStringPtrHashT {
     size_t operator()(const TSimpleSharedPtr<TString>& str) const {
@@ -200,16 +200,16 @@ class TNodeOpsBase {
 
 template <class T>
 class TNodeOps : public TNodeOpsBase {
-friend class ::NFyaml::TNodeRef;
+friend class ::NKikimr::NFyaml::TNodeRef;
 
 public:
     template <class OtherT>
     bool operator==(const TNodeOps<OtherT>& other) const { return Node() == other.Node(); }
 
     bool operator==(const fy_node* node) const { return Node() == node; }
 
-    friend bool ::operator==(const fy_node* node1, const TNodeOps<NFyaml::TNodeRef>& node2);
-    friend bool ::operator==(const fy_node* node1, const TNodeOps<NFyaml::TNode>& node2);
+    friend bool ::operator==(const fy_node* node1, const TNodeOps<NKikimr::NFyaml::TNodeRef>& node2);
+    friend bool ::operator==(const fy_node* node1, const TNodeOps<NKikimr::NFyaml::TNode>& node2);
 
     explicit operator bool() const { return Node() != nullptr; }
 
@@ -936,4 +936,4 @@ void TNodeOps<T>::ClearUserData() {
 
 } // namespace NDetail
 
-} // namesapce NFyaml
+} // namesapce NKikimr::NFyaml

ydb/library/fyamlcpp/fyamlcpp_ut.cpp

@@ -6,6 +6,8 @@
 
 #include <util/stream/str.h>
 
+using namespace NKikimr;
+
 Y_UNIT_TEST_SUITE(FYamlCpp) {
     Y_UNIT_TEST(EnumEquals) {
         UNIT_ASSERT_EQUAL((int)NFyaml::ENodeType::Scalar, FYNT_SCALAR);

ydb/library/yaml_config/console_dumper.cpp

@@ -8,9 +8,7 @@
 
 #include <regex>
 
-namespace NYamlConfig {
-
-using namespace NKikimr;
+namespace NKikimr::NYamlConfig {
 
 using TUsageScope = NConsole::TUsageScope;
 
@@ -632,4 +630,4 @@ NKikimrConsole::TConfigureRequest DumpYamlConfigRequest(const TString &cItem, co
     return result;
 }
 
-} // namespace NYamlConfig
+} // namespace NKikimr::NYamlConfig

ydb/library/yaml_config/console_dumper.h

@@ -4,7 +4,7 @@
 
 #include <util/generic/string.h>
 
-namespace NYamlConfig {
+namespace NKikimr::NYamlConfig {
 
 TString DumpConsoleConfigs(const ::google::protobuf::RepeatedPtrField<NKikimrConsole::TConfigItem> &configItems);
 
@@ -17,4 +17,4 @@ TDumpConsoleConfigItemResult DumpConsoleConfigItem(const NKikimrConsole::TConfig
 
 NKikimrConsole::TConfigureRequest DumpYamlConfigRequest(const TString &config, const TString &domain);
 
-} // namespace NYamlConfig
+} // namespace NKikimr::NYamlConfig

ydb/library/yaml_config/console_dumper_ut.cpp

@@ -2,6 +2,8 @@
 
 #include <library/cpp/testing/unittest/registar.h>
 
+using namespace NKikimr;
+
 Y_UNIT_TEST_SUITE(ConsoleDumper) {
 
     void FillDomainItems(::google::protobuf::RepeatedPtrField<NKikimrConsole::TConfigItem> &items,

ydb/library/yaml_config/public/yaml_config.cpp

@@ -4,8 +4,8 @@
 #include <util/digest/sequence.h>
 
 template <>
-struct THash<NYamlConfig::TLabel> {
-    inline size_t operator()(const NYamlConfig::TLabel& value) const {
+struct THash<NKikimr::NYamlConfig::TLabel> {
+    inline size_t operator()(const NKikimr::NYamlConfig::TLabel& value) const {
         return CombineHashes(THash<TString>{}(value.Value), (size_t)value.Type);
     }
 };
@@ -22,9 +22,9 @@ struct THash<TVector<TString>> {
 };
 
 template <>
-struct THash<TVector<NYamlConfig::TLabel>> : public TSimpleRangeHash {};
+struct THash<TVector<NKikimr::NYamlConfig::TLabel>> : public TSimpleRangeHash {};
 
-namespace NYamlConfig {
+namespace NKikimr::NYamlConfig {
 
 inline const TMap<TString, EYamlConfigLabelTypeClass> ClassMapping{
     std::pair{TString("enum"), EYamlConfigLabelTypeClass::Closed},
@@ -751,9 +751,9 @@ TString StripMetadata(const TString& config) {
     return sstr.Str();
 }
 
-} // namespace NYamlConfig
+} // namespace NKikimr::NYamlConfig
 
 template <>
-void Out<NYamlConfig::TLabel>(IOutputStream& out, const NYamlConfig::TLabel& value) {
+void Out<NKikimr::NYamlConfig::TLabel>(IOutputStream& out, const NKikimr::NYamlConfig::TLabel& value) {
     out << (int)value.Type << ":" << value.Value;
 }

ydb/library/yaml_config/public/yaml_config.h

@@ -15,7 +15,7 @@
 #include <map>
 #include <string>
 
-namespace NYamlConfig {
+namespace NKikimr::NYamlConfig {
 
 struct TYamlConfigEx : public yexception {};
 
@@ -223,4 +223,4 @@ bool IsMainConfig(const TString& config);
  */
 TString StripMetadata(const TString& config);
 
-} // namespace NYamlConfig
+} // namespace NKikimr::NYamlConfig

ydb/library/yaml_config/public/yaml_config_impl.h

@@ -2,7 +2,7 @@
 
 #include "yaml_config.h"
 
-namespace NYamlConfig {
+namespace NKikimr::NYamlConfig {
 
 class TLabelSet {
 public:
@@ -44,4 +44,4 @@ void Combine(
 
 TSelector ParseSelector(const NFyaml::TNodeRef& selectors);
 
-} // namespace NYamlConfig
+} // namespace NKikimr::NYamlConfig

ydb/library/yaml_config/static_validator/builders.cpp

@@ -3,6 +3,8 @@
 #include <ydb/library/yaml_config/validator/validator_checks.h>
 #include <ydb/library/yaml_config/validator/configurators.h>
 
+namespace NKikimr {
+
 using namespace NYamlConfig::NValidator;
 using namespace NYamlConfig::NValidator::Configurators;
 
@@ -308,3 +310,5 @@ NYamlConfig::NValidator::TMapBuilder StaticConfigBuilder() {
     .Field("channel_profile_config", ChannelProfileConfigBuilder());
   });
 }
+
+} // namespace NKikimr

ydb/library/yaml_config/static_validator/builders.h

@@ -1,5 +1,7 @@
 #include <ydb/library/yaml_config/validator/validator_builder.h>
 
+namespace NKikimr {
+
 NYamlConfig::NValidator::TArrayBuilder HostConfigBuilder();
 NYamlConfig::NValidator::TArrayBuilder HostsBuilder();
 NYamlConfig::NValidator::TMapBuilder DomainsConfigBuilder();
@@ -14,3 +16,5 @@ NYamlConfig::NValidator::TMapBuilder BlobStorageConfigBuilder();
 NYamlConfig::NValidator::TMapBuilder ChannelProfileConfigBuilder();
 
 NYamlConfig::NValidator::TMapBuilder StaticConfigBuilder();
+
+} // namespace NKikimr

ydb/library/yaml_config/static_validator/ut/example_configs/test.cpp

@@ -5,6 +5,8 @@
 #include <ydb/library/yaml_config/validator/validator_builder.h>
 #include <ydb/library/yaml_config/static_validator/builders.h>
 
+namespace NKikimr {
+
 using namespace NYamlConfig::NValidator;
 using TIssue = TValidationResult::TIssue;
 
@@ -905,3 +907,5 @@ Y_UNIT_TEST_SUITE(StaticConfigExamples) {
     }
 
 }
+
+} // namespace NKikimr

ydb/library/yaml_config/static_validator/ut/test.cpp

@@ -4,6 +4,8 @@
 #include <ydb/library/yaml_config/validator/validator.h>
 #include <ydb/library/yaml_config/validator/validator_builder.h>
 
+namespace NKikimr {
+
 using namespace NYamlConfig::NValidator;
 using TIssue = TValidationResult::TIssue;
 
@@ -316,3 +318,5 @@ Y_UNIT_TEST_SUITE(StaticValidator) {
         }));
     }
 }
+
+} // namesapce NKikimr

ydb/library/yaml_config/util.h

@@ -2,7 +2,7 @@
 
 #include <library/cpp/protobuf/json/proto2json.h>
 
-namespace NYamlConfig {
+namespace NKikimr::NYamlConfig {
 
 inline NProtobufJson::TProto2JsonConfig GetProto2JsonConfig() {
     return NProtobufJson::TProto2JsonConfig()

ydb/library/yaml_config/validator/configurators.cpp

@@ -6,9 +6,7 @@
 #include <util/string/split.h>
 #include <util/generic/hash.h>
 
-using namespace NYamlConfig::NValidator;
-
-namespace NYamlConfig::NValidator {
+namespace NKikimr::NYamlConfig::NValidator {
 namespace Configurators {
 
 std::function<void(TInt64Builder&)> nonNegative() {
@@ -84,4 +82,4 @@ TNodeWrapper walkFrom(TNodeWrapper node, const TVector<TString>& pathTokens) {
     return node;
 }
 
-} // namespace NYamlConfig::NValidator
+} // namespace NKikimr::NYamlConfig::NValidator

ydb/library/yaml_config/validator/configurators.h

@@ -1,6 +1,6 @@
 #include <ydb/library/yaml_config/validator/validator_builder.h>
 
-namespace NYamlConfig::NValidator {
+namespace NKikimr::NYamlConfig::NValidator {
 namespace Configurators {
 
 std::function<void(TInt64Builder&)> nonNegative();
@@ -28,4 +28,4 @@ std::function<void(Builder&)> combine(
 TNodeWrapper walkFrom(TNodeWrapper node, TString path);
 TNodeWrapper walkFrom(TNodeWrapper node, const TVector<TString>& pathTokens);
 
-} // namespace NYamlConfig::NValidator
+} // namespace NKikimr::NYamlConfig::NValidator

ydb/library/yaml_config/validator/fwd.h

@@ -3,7 +3,7 @@
 #include <util/generic/yexception.h>
 #include <util/generic/ptr.h>
 
-namespace NYamlConfig::NValidator {
+namespace NKikimr::NYamlConfig::NValidator {
 
 enum class ENodeType {
     Generic, Map, Array, Int64, String, Bool, Enum
@@ -57,4 +57,4 @@ template <typename TThis, typename TContext> class TCommonBuilderOps;
 template <typename TThis, typename TContext> class TValidatorCommonOps;
 
 } // namespace NDetail
-} // namespace NYamlConfig::NValidator
+} // namespace NKikimr::NYamlConfig::NValidator

ydb/library/yaml_config/validator/ut/validator/validator_ut.cpp

@@ -5,6 +5,8 @@
 #include <ydb/library/yaml_config/validator/validator_builder.h>
 #include <ydb/library/yaml_config/validator/validator.h>
 
+namespace NKikimr {
+
 using namespace NYamlConfig::NValidator;
 using TIssue = TValidationResult::TIssue;
 
@@ -307,3 +309,5 @@ Y_UNIT_TEST_SUITE(Validator) {
             {"/", "Node value must be one of the following: a, b, c. (it was \"d\")"}));
     }
 }
+
+} // namespace NKikimr

ydb/library/yaml_config/validator/ut/validator_builder/validator_builder_ut.cpp

@@ -4,6 +4,8 @@
 
 #include <ydb/library/yaml_config/validator/validator_builder.h>
 
+namespace NKikimr {
+
 using namespace NYamlConfig::NValidator;
 
 Y_UNIT_TEST_SUITE(ValidatorBuilder) {
@@ -90,3 +92,5 @@ Y_UNIT_TEST_SUITE(ValidatorBuilder) {
         final_b.CanBe(b3);
     }
 }
+
+} // namespace NKikimr

ydb/library/yaml_config/validator/ut/validator_checks/validator_checks_ut.cpp

@@ -7,6 +7,8 @@
 #include <ydb/library/yaml_config/validator/validator.h>
 #include <ydb/library/yaml_config/validator/validator_checks.h>
 
+namespace NKikimr {
+
 using namespace NYamlConfig::NValidator;
 using TIssue = TValidationResult::TIssue;
 
@@ -384,3 +386,5 @@ Y_UNIT_TEST_SUITE(Checks) {
         }}));
     }
 }
+
+} // namespace NKikimr

ydb/library/yaml_config/validator/validator.cpp

@@ -6,9 +6,9 @@
 
 #include <utility>
 
-using namespace NFyaml;
+namespace NKikimr::NYamlConfig::NValidator {
 
-namespace NYamlConfig::NValidator {
+using namespace NFyaml;
 
 TValidationResult::TIssue::TIssue() {}
 
@@ -424,13 +424,13 @@ TValidationResult TEnumValidator::Validate(const TNodeRef& node) {
     return validationResult;
 }
 
-} // namespace NYamlConfig::NValidator
+} // namespace NKikimr::NYamlConfig::NValidator
 
-IOutputStream& operator<<(IOutputStream& out, const NYamlConfig::NValidator::TValidationResult::TIssue& issue) {
+IOutputStream& operator<<(IOutputStream& out, const NKikimr::NYamlConfig::NValidator::TValidationResult::TIssue& issue) {
     return out << issue.NodePath << ": " << issue.Problem;
 }
 
-Y_DECLARE_OUT_SPEC(, NYamlConfig::NValidator::TValidationResult, out, result) {
+Y_DECLARE_OUT_SPEC(, NKikimr::NYamlConfig::NValidator::TValidationResult, out, result) {
 for (const auto& issue : result.Issues) {
         out << issue << ";" << Endl;
     }