From 8b8ad6ae1934071442af6bb1246784db54b12379 Mon Sep 17 00:00:00 2001
From: Niyaz <nmingaripov@gmail.com>
Date: Wed, 5 Jun 2024 17:24:46 +0300
Subject: [PATCH] rename SecdistProvider -> SecdistProviderBase

---
 .../storages/secdist/component_base.hpp       |  4 +--
 .../storages/secdist/default_provider.hpp     |  6 ++---
 .../userver/storages/secdist/provider.hpp     | 27 -------------------
 .../storages/secdist/provider_base.hpp        | 27 +++++++++++++++++++
 .../userver/storages/secdist/secdist.hpp      |  4 +--
 core/src/storages/secdist/component_base.cpp  |  4 +--
 .../src/storages/secdist/default_provider.cpp |  1 -
 7 files changed, 36 insertions(+), 37 deletions(-)
 delete mode 100644 core/include/userver/storages/secdist/provider.hpp
 create mode 100644 core/include/userver/storages/secdist/provider_base.hpp

diff --git a/core/include/userver/storages/secdist/component_base.hpp b/core/include/userver/storages/secdist/component_base.hpp
index 80ad2261dc59..b2f45efa59e9 100644
--- a/core/include/userver/storages/secdist/component_base.hpp
+++ b/core/include/userver/storages/secdist/component_base.hpp
@@ -5,7 +5,7 @@
 
 #include <string>
 
-#include <userver/components/loggable_component_base.hpp>
+#include <userver/components/component_base.hpp>
 #include <userver/storages/secdist/secdist.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -29,7 +29,7 @@ namespace components {
 ///
 // clang-format on
 
-class SecdistComponentBase : public LoggableComponentBase {
+class SecdistComponentBase : public ComponentBase {
  public:
   SecdistComponentBase(const ComponentConfig&, const ComponentContext&,
                        storages::secdist::SecdistConfig::Settings&&);
diff --git a/core/include/userver/storages/secdist/default_provider.hpp b/core/include/userver/storages/secdist/default_provider.hpp
index 780fd238047d..2070073507cb 100644
--- a/core/include/userver/storages/secdist/default_provider.hpp
+++ b/core/include/userver/storages/secdist/default_provider.hpp
@@ -5,7 +5,7 @@
 
 #include <string>
 
-#include <userver/storages/secdist/provider.hpp>
+#include <userver/storages/secdist/provider_base.hpp>
 #include <userver/storages/secdist/secdist.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -13,14 +13,14 @@ USERVER_NAMESPACE_BEGIN
 namespace storages::secdist {
 // clang-format off
 
-/// @brief Default implementation of storages::secdist::SecdistProvider.
+/// @brief Default implementation of storages::secdist::SecdistProviderBase.
 ///
 /// Provides components::Secdist configurations to the
 /// storages::secdist::SecdistConfig
 
 // clang-format on
 /// [Sample secdist - default provider]
-class DefaultProvider final : public storages::secdist::SecdistProvider {
+class DefaultProvider final : public storages::secdist::SecdistProviderBase {
  public:
   struct Settings {
     std::string config_path;
diff --git a/core/include/userver/storages/secdist/provider.hpp b/core/include/userver/storages/secdist/provider.hpp
deleted file mode 100644
index b74532c94799..000000000000
--- a/core/include/userver/storages/secdist/provider.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-/// @file userver/storages/secdist/provider.hpp
-
-#include <userver/formats/json_fwd.hpp>
-
-USERVER_NAMESPACE_BEGIN
-
-namespace storages::secdist {
-
-class SecdistProvider {
- public:
-  SecdistProvider() = default;
-  virtual ~SecdistProvider() = default;
-
-  SecdistProvider(const SecdistProvider&) = delete;
-  SecdistProvider& operator=(const SecdistProvider&) = delete;
-
-  SecdistProvider(SecdistProvider&&) = default;
-  SecdistProvider& operator=(SecdistProvider&&) = default;
-
-  virtual formats::json::Value Get() const = 0;
-};
-
-}  // namespace storages::secdist
-
-USERVER_NAMESPACE_END
diff --git a/core/include/userver/storages/secdist/provider_base.hpp b/core/include/userver/storages/secdist/provider_base.hpp
new file mode 100644
index 000000000000..bfa991308ea9
--- /dev/null
+++ b/core/include/userver/storages/secdist/provider_base.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+/// @file userver/storages/secdist/provider_base.hpp
+
+#include <userver/formats/json_fwd.hpp>
+
+USERVER_NAMESPACE_BEGIN
+
+namespace storages::secdist {
+
+class SecdistProviderBase {
+ public:
+  SecdistProviderBase() = default;
+  virtual ~SecdistProviderBase() = default;
+
+  SecdistProviderBase(const SecdistProviderBase&) = delete;
+  SecdistProviderBase& operator=(const SecdistProviderBase&) = delete;
+
+  SecdistProviderBase(SecdistProviderBase&&) = default;
+  SecdistProviderBase& operator=(SecdistProviderBase&&) = default;
+
+  virtual formats::json::Value Get() const = 0;
+};
+
+}  // namespace storages::secdist
+
+USERVER_NAMESPACE_END
diff --git a/core/include/userver/storages/secdist/secdist.hpp b/core/include/userver/storages/secdist/secdist.hpp
index c387b42a5fe2..7676b9f3139f 100644
--- a/core/include/userver/storages/secdist/secdist.hpp
+++ b/core/include/userver/storages/secdist/secdist.hpp
@@ -18,7 +18,7 @@
 #include <userver/engine/task/task_processor_fwd.hpp>
 #include <userver/formats/json/value.hpp>
 #include <userver/rcu/rcu.hpp>
-#include <userver/storages/secdist/provider.hpp>
+#include <userver/storages/secdist/provider_base.hpp>
 #include <userver/utils/fast_pimpl.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -78,7 +78,7 @@ enum class SecdistFormat {
 class SecdistConfig final {
  public:
   struct Settings {
-    std::unique_ptr<SecdistProvider> provider{nullptr};
+    std::unique_ptr<SecdistProviderBase> provider{nullptr};
     std::chrono::milliseconds update_period{std::chrono::milliseconds::zero()};
   };
 
diff --git a/core/src/storages/secdist/component_base.cpp b/core/src/storages/secdist/component_base.cpp
index 6ac57d2d48f7..65a6345668df 100644
--- a/core/src/storages/secdist/component_base.cpp
+++ b/core/src/storages/secdist/component_base.cpp
@@ -14,7 +14,7 @@ namespace components {
 SecdistComponentBase::SecdistComponentBase(
     const ComponentConfig& config, const ComponentContext& context,
     storages::secdist::SecdistConfig::Settings&& settings)
-    : LoggableComponentBase(config, context), secdist_(std::move(settings)) {}
+    : ComponentBase(config, context), secdist_(std::move(settings)) {}
 
 const storages::secdist::SecdistConfig& SecdistComponentBase::Get() const {
   return secdist_.Get();
@@ -30,7 +30,7 @@ storages::secdist::Secdist& SecdistComponentBase::GetStorage() {
 }
 
 yaml_config::Schema SecdistComponentBase::GetStaticConfigSchema() {
-  auto schema = LoggableComponentBase::GetStaticConfigSchema();
+  auto schema = ComponentBase::GetStaticConfigSchema();
   schema.UpdateDescription(
       "Base class for user defined secdists and DefaultSecdist");
   return schema;
diff --git a/core/src/storages/secdist/default_provider.cpp b/core/src/storages/secdist/default_provider.cpp
index 190ba64ce428..7971ec993f07 100644
--- a/core/src/storages/secdist/default_provider.cpp
+++ b/core/src/storages/secdist/default_provider.cpp
@@ -7,7 +7,6 @@
 #include <userver/formats/json/value_builder.hpp>
 #include <userver/formats/yaml/serialize.hpp>
 #include <userver/logging/log.hpp>
-#include <userver/storages/secdist/exceptions.hpp>
 #include <userver/storages/secdist/default_provider.hpp>
 #include <userver/storages/secdist/exceptions.hpp>
 #include <userver/utils/async.hpp>