rename SecdistProvider -> SecdistProviderBase

userver-framework · Jun 7, 2024 · 4cc9c6d · 4cc9c6d
1 parent 6b54b4a
commit 4cc9c6d
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 37 deletions.
diff --git 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
@@ -5,22 +5,22 @@
 
 #include <string>
 
-#include <userver/storages/secdist/provider.hpp>
+#include <userver/storages/secdist/provider_base.hpp>
 #include <userver/storages/secdist/secdist.hpp>
 
 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
diff --git a/core/include/userver/storages/secdist/provider_base.hpp 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
@@ -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
@@ -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
@@ -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>