Move configuration library to fly::config namespace

Author: trflynn89

fly/coders/coder_config.hpp

@@ -14,7 +14,7 @@ namespace fly {
  * @author Timothy Flynn ([email protected])
  * @version July 7, 2019
  */
-class CoderConfig : public Config
+class CoderConfig : public fly::config::Config
 {
 public:
     static constexpr const char *identifier = "coder";

fly/config/config.cpp

@@ -1,6 +1,6 @@
 #include "fly/config/config.hpp"
 
-namespace fly {
+namespace fly::config {
 
 //==================================================================================================
 void Config::update(const Json &values)
@@ -9,4 +9,4 @@ void Config::update(const Json &values)
     m_values = values;
 }
 
-} // namespace fly
+} // namespace fly::config

fly/config/config.hpp

@@ -5,7 +5,7 @@
 #include <shared_mutex>
 #include <string>
 
-namespace fly {
+namespace fly::config {
 
 /**
  * Class to hold a set of related configuration values.
@@ -68,4 +68,4 @@ T Config::get_value(const std::string &name, T def) const
     return def;
 }
 
-} // namespace fly
+} // namespace fly::config

fly/config/config_manager.cpp

@@ -9,7 +9,7 @@
 #include <filesystem>
 #include <functional>
 
-namespace fly {
+namespace fly::config {
 
 //==================================================================================================
 std::shared_ptr<ConfigManager> ConfigManager::create(
@@ -49,11 +49,11 @@ ConfigManager::ConfigManager(
     switch (file_type)
     {
         case ConfigFileType::Ini:
-            m_parser = std::make_unique<IniParser>();
+            m_parser = std::make_unique<fly::IniParser>();
             break;
 
         case ConfigFileType::Json:
-            m_parser = std::make_unique<JsonParser>();
+            m_parser = std::make_unique<fly::JsonParser>();
             break;
 
         default:
@@ -158,4 +158,4 @@ void ConfigManager::update_config()
     }
 }
 
-} // namespace fly
+} // namespace fly::config

fly/config/config_manager.hpp

@@ -12,6 +12,10 @@
 #include <string>
 #include <type_traits>
 
+namespace fly {
+class Parser;
+} // namespace fly
+
 namespace fly::path {
 class PathMonitor;
 } // namespace fly::path
@@ -20,9 +24,7 @@ namespace fly::task {
 class SequencedTaskRunner;
 } // namespace fly::task
 
-namespace fly {
-
-class Parser;
+namespace fly::config {
 
 /**
  * Class to create and manage a set of configurations.
@@ -69,7 +71,7 @@ class ConfigManager : public std::enable_shared_from_this<ConfigManager>
     /**
      * Create a configuration object, or if one with the given type's name exists, fetch it.
      *
-     * @tparam T Config type (must derive from or be fly::Config).
+     * @tparam T Config type (must derive from or be fly::config::Config).
      *
      * @return A reference to the created/found configuration.
      */
@@ -111,8 +113,8 @@ class ConfigManager : public std::enable_shared_from_this<ConfigManager>
     std::shared_ptr<fly::task::SequencedTaskRunner> m_task_runner;
 
     std::shared_ptr<fly::path::PathMonitor> m_monitor;
-    std::unique_ptr<Parser> m_parser;
-    Json m_values;
+    std::unique_ptr<fly::Parser> m_parser;
+    fly::Json m_values;
 
     const std::filesystem::path m_path;
 
@@ -163,4 +165,4 @@ std::shared_ptr<T> ConfigManager::create_config()
     return config;
 }
 
-} // namespace fly
+} // namespace fly::config

fly/logger/logger_config.hpp

@@ -13,7 +13,7 @@ namespace fly {
  * @author Timothy Flynn ([email protected])
  * @version July 18, 2016
  */
-class LoggerConfig : public Config
+class LoggerConfig : public fly::config::Config
 {
 public:
     static constexpr const char *identifier = "logger";

fly/net/network_config.hpp

@@ -13,7 +13,7 @@ namespace fly::net {
  * @author Timothy Flynn ([email protected])
  * @version March 6, 2021
  */
-class NetworkConfig : public fly::Config
+class NetworkConfig : public fly::config::Config
 {
 public:
     static constexpr const char *identifier = "network";

fly/path/path_config.hpp

@@ -12,7 +12,7 @@ namespace fly::path {
  * @author Timothy Flynn ([email protected])
  * @version August 12, 2018
  */
-class PathConfig : public Config
+class PathConfig : public fly::config::Config
 {
 public:
     static constexpr const char *identifier = "path";

fly/system/system_config.hpp

@@ -12,7 +12,7 @@ namespace fly::system {
  * @author Timothy Flynn ([email protected])
  * @version August 12, 2018
  */
-class SystemConfig : public Config
+class SystemConfig : public fly::config::Config
 {
 public:
     static constexpr const char *identifier = "system";

test/config/config_manager.cpp

@@ -38,7 +38,7 @@ class TestPathConfig : public fly::path::PathConfig
 /**
  * Badly written config class which uses the same identifier as fly::test::TestConfig.
  */
-class BadConfig : public fly::Config
+class BadConfig : public fly::config::Config
 {
 public:
     static constexpr const char *identifier = fly::test::TestConfig::identifier;
@@ -53,9 +53,9 @@ CATCH_TEST_CASE("ConfigManager", "[config]")
     fly::test::PathUtil::ScopedTempDirectory config_path;
     std::filesystem::path config_file = config_path.file();
 
-    auto config_manager = fly::ConfigManager::create(
+    auto config_manager = fly::config::ConfigManager::create(
         task_runner,
-        fly::ConfigManager::ConfigFileType::Json,
+        fly::config::ConfigManager::ConfigFileType::Json,
         config_file);
     CATCH_REQUIRE(config_manager);
 
@@ -64,24 +64,24 @@ CATCH_TEST_CASE("ConfigManager", "[config]")
 
     CATCH_SECTION("Config managers can be started for all file types")
     {
-        config_manager = fly::ConfigManager::create(
+        config_manager = fly::config::ConfigManager::create(
             task_runner,
-            fly::ConfigManager::ConfigFileType::Ini,
+            fly::config::ConfigManager::ConfigFileType::Ini,
             config_file);
         CATCH_CHECK(config_manager);
 
-        config_manager = fly::ConfigManager::create(
+        config_manager = fly::config::ConfigManager::create(
             task_runner,
-            fly::ConfigManager::ConfigFileType::Json,
+            fly::config::ConfigManager::ConfigFileType::Json,
             config_file);
         CATCH_CHECK(config_manager);
     }
 
     CATCH_SECTION("Cannot start a config manager of an unsupported file type")
     {
-        config_manager = fly::ConfigManager::create(
+        config_manager = fly::config::ConfigManager::create(
             task_runner,
-            static_cast<fly::ConfigManager::ConfigFileType>(-1),
+            static_cast<fly::config::ConfigManager::ConfigFileType>(-1),
             config_file);
         CATCH_CHECK_FALSE(config_manager);
     }

test/config/test_config.hpp

@@ -11,20 +11,20 @@ namespace fly::test {
  * A pseudo config class to provide public access to Config methods. Only meant to be used by unit
  * tests.
  */
-class TestConfig : public fly::Config
+class TestConfig : public fly::config::Config
 {
 public:
     static constexpr const char *identifier = "config";
 
     template <typename T>
     T get_value(const std::string &name, T def) const
     {
-        return fly::Config::get_value(name, def);
+        return fly::config::Config::get_value(name, def);
     }
 
     void update(const fly::Json &values)
     {
-        fly::Config::update(values);
+        fly::config::Config::update(values);
     }
 };