refactor: [#1211] rename type to WhitelistManager

Author: josecelano

src/bootstrap/jobs/tracker_apis.rs

@@ -34,7 +34,7 @@ use crate::core::authentication::handler::KeysHandler;
 use crate::core::statistics::event::sender::Sender;
 use crate::core::statistics::repository::Repository;
 use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use crate::core::whitelist::manager::WhiteListManager;
+use crate::core::whitelist::manager::WhitelistManager;
 use crate::servers::apis::server::{ApiServer, Launcher};
 use crate::servers::apis::Version;
 use crate::servers::registar::ServiceRegistrationForm;
@@ -74,7 +74,7 @@ pub async fn start_job(
     config: &HttpApi,
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     keys_handler: Arc<KeysHandler>,
-    whitelist_manager: Arc<WhiteListManager>,
+    whitelist_manager: Arc<WhitelistManager>,
     ban_service: Arc<RwLock<BanService>>,
     stats_event_sender: Arc<Option<Box<dyn Sender>>>,
     stats_repository: Arc<Repository>,
@@ -126,7 +126,7 @@ async fn start_v1(
     tls: Option<RustlsConfig>,
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     keys_handler: Arc<KeysHandler>,
-    whitelist_manager: Arc<WhiteListManager>,
+    whitelist_manager: Arc<WhitelistManager>,
     ban_service: Arc<RwLock<BanService>>,
     stats_event_sender: Arc<Option<Box<dyn Sender>>>,
     stats_repository: Arc<Repository>,

src/container.rs

@@ -13,7 +13,7 @@ use crate::core::torrent::manager::TorrentsManager;
 use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
 use crate::core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
 use crate::core::whitelist;
-use crate::core::whitelist::manager::WhiteListManager;
+use crate::core::whitelist::manager::WhitelistManager;
 use crate::servers::udp::server::banning::BanService;
 
 pub struct AppContainer {
@@ -26,7 +26,7 @@ pub struct AppContainer {
     pub ban_service: Arc<RwLock<BanService>>,
     pub stats_event_sender: Arc<Option<Box<dyn Sender>>>,
     pub stats_repository: Arc<Repository>,
-    pub whitelist_manager: Arc<WhiteListManager>,
+    pub whitelist_manager: Arc<WhitelistManager>,
     pub in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     pub db_torrent_repository: Arc<DatabasePersistentTorrentRepository>,
     pub torrents_manager: Arc<TorrentsManager>,

src/core/services/mod.rs

@@ -14,7 +14,7 @@ use torrust_tracker_configuration::v2_0_0::database;
 use torrust_tracker_configuration::Configuration;
 
 use super::databases::{self, Database};
-use super::whitelist::manager::WhiteListManager;
+use super::whitelist::manager::WhitelistManager;
 use super::whitelist::repository::in_memory::InMemoryWhitelist;
 use super::whitelist::repository::persisted::DatabaseWhitelist;
 
@@ -35,7 +35,7 @@ pub fn initialize_database(config: &Configuration) -> Arc<Box<dyn Database>> {
 pub fn initialize_whitelist_manager(
     database: Arc<Box<dyn Database>>,
     in_memory_whitelist: Arc<InMemoryWhitelist>,
-) -> Arc<WhiteListManager> {
+) -> Arc<WhitelistManager> {
     let database_whitelist = Arc::new(DatabaseWhitelist::new(database));
-    Arc::new(WhiteListManager::new(database_whitelist, in_memory_whitelist))
+    Arc::new(WhitelistManager::new(database_whitelist, in_memory_whitelist))
 }

src/core/whitelist/manager.rs

@@ -7,15 +7,15 @@ use super::repository::persisted::DatabaseWhitelist;
 use crate::core::databases;
 
 /// It handles the list of allowed torrents. Only for listed trackers.
-pub struct WhiteListManager {
+pub struct WhitelistManager {
     /// The in-memory list of allowed torrents.
     in_memory_whitelist: Arc<InMemoryWhitelist>,
 
     /// The persisted list of allowed torrents.
     database_whitelist: Arc<DatabaseWhitelist>,
 }
 
-impl WhiteListManager {
+impl WhitelistManager {
     #[must_use]
     pub fn new(database_whitelist: Arc<DatabaseWhitelist>, in_memory_whitelist: Arc<InMemoryWhitelist>) -> Self {
         Self {
@@ -97,10 +97,10 @@ mod tests {
 
     use torrust_tracker_test_helpers::configuration;
 
-    use crate::core::whitelist::manager::WhiteListManager;
+    use crate::core::whitelist::manager::WhitelistManager;
     use crate::core::whitelist::whitelist_tests::initialize_whitelist_services;
 
-    fn initialize_whitelist_manager_for_whitelisted_tracker() -> Arc<WhiteListManager> {
+    fn initialize_whitelist_manager_for_whitelisted_tracker() -> Arc<WhitelistManager> {
         let config = configuration::ephemeral_listed();
 
         let (_whitelist_authorization, whitelist_manager) = initialize_whitelist_services(&config);

src/core/whitelist/whitelist_tests.rs

@@ -3,12 +3,12 @@ use std::sync::Arc;
 use torrust_tracker_configuration::Configuration;
 
 use super::authorization::WhitelistAuthorization;
-use super::manager::WhiteListManager;
+use super::manager::WhitelistManager;
 use super::repository::in_memory::InMemoryWhitelist;
 use crate::core::services::{initialize_database, initialize_whitelist_manager};
 
 #[must_use]
-pub fn initialize_whitelist_services(config: &Configuration) -> (Arc<WhitelistAuthorization>, Arc<WhiteListManager>) {
+pub fn initialize_whitelist_services(config: &Configuration) -> (Arc<WhitelistAuthorization>, Arc<WhitelistManager>) {
     let database = initialize_database(config);
     let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
     let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
@@ -19,7 +19,7 @@ pub fn initialize_whitelist_services(config: &Configuration) -> (Arc<WhitelistAu
 
 #[cfg(test)]
 #[must_use]
-pub fn initialize_whitelist_services_for_listed_tracker() -> (Arc<WhitelistAuthorization>, Arc<WhiteListManager>) {
+pub fn initialize_whitelist_services_for_listed_tracker() -> (Arc<WhitelistAuthorization>, Arc<WhitelistManager>) {
     use torrust_tracker_test_helpers::configuration;
 
     initialize_whitelist_services(&configuration::ephemeral_listed())

src/servers/apis/routes.rs

@@ -34,7 +34,7 @@ use crate::core::authentication::handler::KeysHandler;
 use crate::core::statistics::event::sender::Sender;
 use crate::core::statistics::repository::Repository;
 use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use crate::core::whitelist::manager::WhiteListManager;
+use crate::core::whitelist::manager::WhitelistManager;
 use crate::servers::apis::API_LOG_TARGET;
 use crate::servers::logging::Latency;
 use crate::servers::udp::server::banning::BanService;
@@ -53,7 +53,7 @@ use crate::servers::udp::server::banning::BanService;
 pub fn router(
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     keys_handler: Arc<KeysHandler>,
-    whitelist_manager: Arc<WhiteListManager>,
+    whitelist_manager: Arc<WhitelistManager>,
     ban_service: Arc<RwLock<BanService>>,
     stats_event_sender: Arc<Option<Box<dyn Sender>>>,
     stats_repository: Arc<Repository>,

src/servers/apis/server.rs

@@ -43,7 +43,7 @@ use crate::core::authentication::handler::KeysHandler;
 use crate::core::statistics;
 use crate::core::statistics::repository::Repository;
 use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use crate::core::whitelist::manager::WhiteListManager;
+use crate::core::whitelist::manager::WhitelistManager;
 use crate::servers::apis::API_LOG_TARGET;
 use crate::servers::custom_axum_server::{self, TimeoutAcceptor};
 use crate::servers::logging::STARTED_ON;
@@ -134,7 +134,7 @@ impl ApiServer<Stopped> {
         self,
         in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
         keys_handler: Arc<KeysHandler>,
-        whitelist_manager: Arc<WhiteListManager>,
+        whitelist_manager: Arc<WhitelistManager>,
         stats_event_sender: Arc<Option<Box<dyn statistics::event::sender::Sender>>>,
         stats_repository: Arc<Repository>,
         ban_service: Arc<RwLock<BanService>>,
@@ -275,7 +275,7 @@ impl Launcher {
         &self,
         in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
         keys_handler: Arc<KeysHandler>,
-        whitelist_manager: Arc<WhiteListManager>,
+        whitelist_manager: Arc<WhitelistManager>,
         ban_service: Arc<RwLock<BanService>>,
         stats_event_sender: Arc<Option<Box<dyn statistics::event::sender::Sender>>>,
         stats_repository: Arc<Repository>,

src/servers/apis/v1/context/whitelist/handlers.rs

@@ -10,7 +10,7 @@ use bittorrent_primitives::info_hash::InfoHash;
 use super::responses::{
     failed_to_reload_whitelist_response, failed_to_remove_torrent_from_whitelist_response, failed_to_whitelist_torrent_response,
 };
-use crate::core::whitelist::manager::WhiteListManager;
+use crate::core::whitelist::manager::WhitelistManager;
 use crate::servers::apis::v1::responses::{invalid_info_hash_param_response, ok_response};
 use crate::servers::apis::InfoHashParam;
 
@@ -24,7 +24,7 @@ use crate::servers::apis::InfoHashParam;
 /// Refer to the [API endpoint documentation](crate::servers::apis::v1::context::whitelist#add-a-torrent-to-the-whitelist)
 /// for more information about this endpoint.
 pub async fn add_torrent_to_whitelist_handler(
-    State(whitelist_manager): State<Arc<WhiteListManager>>,
+    State(whitelist_manager): State<Arc<WhitelistManager>>,
     Path(info_hash): Path<InfoHashParam>,
 ) -> Response {
     match InfoHash::from_str(&info_hash.0) {
@@ -47,7 +47,7 @@ pub async fn add_torrent_to_whitelist_handler(
 /// Refer to the [API endpoint documentation](crate::servers::apis::v1::context::whitelist#remove-a-torrent-from-the-whitelist)
 /// for more information about this endpoint.
 pub async fn remove_torrent_from_whitelist_handler(
-    State(whitelist_manager): State<Arc<WhiteListManager>>,
+    State(whitelist_manager): State<Arc<WhitelistManager>>,
     Path(info_hash): Path<InfoHashParam>,
 ) -> Response {
     match InfoHash::from_str(&info_hash.0) {
@@ -69,7 +69,7 @@ pub async fn remove_torrent_from_whitelist_handler(
 ///
 /// Refer to the [API endpoint documentation](crate::servers::apis::v1::context::whitelist#reload-the-whitelist)
 /// for more information about this endpoint.
-pub async fn reload_whitelist_handler(State(whitelist_manager): State<Arc<WhiteListManager>>) -> Response {
+pub async fn reload_whitelist_handler(State(whitelist_manager): State<Arc<WhitelistManager>>) -> Response {
     match whitelist_manager.load_whitelist_from_database().await {
         Ok(()) => ok_response(),
         Err(e) => failed_to_reload_whitelist_response(e),

src/servers/apis/v1/context/whitelist/routes.rs

@@ -11,10 +11,10 @@ use axum::routing::{delete, get, post};
 use axum::Router;
 
 use super::handlers::{add_torrent_to_whitelist_handler, reload_whitelist_handler, remove_torrent_from_whitelist_handler};
-use crate::core::whitelist::manager::WhiteListManager;
+use crate::core::whitelist::manager::WhitelistManager;
 
 /// It adds the routes to the router for the [`whitelist`](crate::servers::apis::v1::context::whitelist) API context.
-pub fn add(prefix: &str, router: Router, whitelist_manager: &Arc<WhiteListManager>) -> Router {
+pub fn add(prefix: &str, router: Router, whitelist_manager: &Arc<WhitelistManager>) -> Router {
     let prefix = format!("{prefix}/whitelist");
 
     router

src/servers/apis/v1/routes.rs

@@ -9,7 +9,7 @@ use crate::core::authentication::handler::KeysHandler;
 use crate::core::statistics::event::sender::Sender;
 use crate::core::statistics::repository::Repository;
 use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use crate::core::whitelist::manager::WhiteListManager;
+use crate::core::whitelist::manager::WhitelistManager;
 use crate::servers::udp::server::banning::BanService;
 
 /// Add the routes for the v1 API.
@@ -19,7 +19,7 @@ pub fn add(
     router: Router,
     in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>,
     keys_handler: &Arc<KeysHandler>,
-    whitelist_manager: &Arc<WhiteListManager>,
+    whitelist_manager: &Arc<WhitelistManager>,
     ban_service: Arc<RwLock<BanService>>,
     stats_event_sender: Arc<Option<Box<dyn Sender>>>,
     stats_repository: Arc<Repository>,

src/servers/udp/handlers.rs

@@ -505,7 +505,7 @@ mod tests {
     use crate::core::statistics::event::sender::Sender;
     use crate::core::torrent::repository::in_memory::InMemoryTorrentRepository;
     use crate::core::whitelist;
-    use crate::core::whitelist::manager::WhiteListManager;
+    use crate::core::whitelist::manager::WhitelistManager;
     use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::CurrentClock;
 
@@ -516,7 +516,7 @@ mod tests {
         Arc<InMemoryTorrentRepository>,
         Arc<Option<Box<dyn Sender>>>,
         Arc<InMemoryWhitelist>,
-        Arc<WhiteListManager>,
+        Arc<WhitelistManager>,
         Arc<whitelist::authorization::WhitelistAuthorization>,
     );
 

tests/servers/api/environment.rs

@@ -14,7 +14,7 @@ use torrust_tracker_lib::core::databases::Database;
 use torrust_tracker_lib::core::statistics::event::sender::Sender;
 use torrust_tracker_lib::core::statistics::repository::Repository;
 use torrust_tracker_lib::core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use torrust_tracker_lib::core::whitelist::manager::WhiteListManager;
+use torrust_tracker_lib::core::whitelist::manager::WhitelistManager;
 use torrust_tracker_lib::servers::apis::server::{ApiServer, Launcher, Running, Stopped};
 use torrust_tracker_lib::servers::registar::Registar;
 use torrust_tracker_lib::servers::udp::server::banning::BanService;
@@ -31,7 +31,7 @@ where
     pub authentication_service: Arc<AuthenticationService>,
     pub stats_event_sender: Arc<Option<Box<dyn Sender>>>,
     pub stats_repository: Arc<Repository>,
-    pub whitelist_manager: Arc<WhiteListManager>,
+    pub whitelist_manager: Arc<WhitelistManager>,
     pub ban_service: Arc<RwLock<BanService>>,
     pub registar: Registar,
     pub server: ApiServer<S>,

tests/servers/http/environment.rs

@@ -14,7 +14,7 @@ use torrust_tracker_lib::core::statistics::event::sender::Sender;
 use torrust_tracker_lib::core::statistics::repository::Repository;
 use torrust_tracker_lib::core::torrent::repository::in_memory::InMemoryTorrentRepository;
 use torrust_tracker_lib::core::whitelist;
-use torrust_tracker_lib::core::whitelist::manager::WhiteListManager;
+use torrust_tracker_lib::core::whitelist::manager::WhitelistManager;
 use torrust_tracker_lib::servers::http::server::{HttpServer, Launcher, Running, Stopped};
 use torrust_tracker_lib::servers::registar::Registar;
 use torrust_tracker_primitives::peer;
@@ -31,7 +31,7 @@ pub struct Environment<S> {
     pub stats_event_sender: Arc<Option<Box<dyn Sender>>>,
     pub stats_repository: Arc<Repository>,
     pub whitelist_authorization: Arc<whitelist::authorization::WhitelistAuthorization>,
-    pub whitelist_manager: Arc<WhiteListManager>,
+    pub whitelist_manager: Arc<WhitelistManager>,
     pub registar: Registar,
     pub server: HttpServer<S>,
 }