From da7426ccb4aae87b322a884c31c6e5136c40927f Mon Sep 17 00:00:00 2001 From: HampusM Date: Sat, 16 Sep 2023 14:28:50 +0200 Subject: refactor!: remove async DI container interface BREAKING CHANGE: IAsyncDIContainer have been removed and multiple structs no longer take a DI container generic parameter --- src/provider/async.rs | 123 +++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 67 deletions(-) (limited to 'src/provider') diff --git a/src/provider/async.rs b/src/provider/async.rs index 2a241a7..ae633fd 100644 --- a/src/provider/async.rs +++ b/src/provider/async.rs @@ -3,7 +3,6 @@ use std::sync::Arc; use async_trait::async_trait; -use crate::di_container::asynchronous::IAsyncDIContainer; use crate::errors::injectable::InjectableError; use crate::interfaces::async_injectable::AsyncInjectable; use crate::ptr::{ThreadsafeSingletonPtr, TransientPtr}; @@ -12,12 +11,10 @@ use crate::util::use_double; use_double!(crate::dependency_history::DependencyHistory); #[derive(strum_macros::Display, Debug)] -pub enum AsyncProvidable -where - DIContainerType: IAsyncDIContainer, +pub enum AsyncProvidable { - Transient(TransientPtr>), - Singleton(ThreadsafeSingletonPtr>), + Transient(TransientPtr>), + Singleton(ThreadsafeSingletonPtr>), #[cfg(feature = "factory")] Factory( crate::ptr::ThreadsafeFactoryPtr< @@ -40,22 +37,22 @@ where #[async_trait] #[cfg_attr(test, mockall::automock, allow(dead_code))] -pub trait IAsyncProvider: Send + Sync +pub trait IAsyncProvider: Send + Sync where - DIContainerType: IAsyncDIContainer, + DIContainerT: Send + Sync, { async fn provide( &self, - di_container: &Arc, + di_container: &Arc, dependency_history: DependencyHistory, - ) -> Result, InjectableError>; + ) -> Result, InjectableError>; - fn do_clone(&self) -> Box>; + fn do_clone(&self) -> Box>; } -impl Clone for Box> +impl Clone for Box> where - DIContainerType: IAsyncDIContainer, + DIContainerT: Send + Sync, { fn clone(&self) -> Self { @@ -63,20 +60,17 @@ where } } -pub struct AsyncTransientTypeProvider +pub struct AsyncTransientTypeProvider where - InjectableType: AsyncInjectable, - DIContainerType: IAsyncDIContainer, + InjectableT: AsyncInjectable, { - injectable_phantom: PhantomData, - di_container_phantom: PhantomData, + injectable_phantom: PhantomData, + di_container_phantom: PhantomData, } -impl - AsyncTransientTypeProvider +impl AsyncTransientTypeProvider where - InjectableType: AsyncInjectable, - DIContainerType: IAsyncDIContainer, + InjectableT: AsyncInjectable, { pub fn new() -> Self { @@ -88,34 +82,33 @@ where } #[async_trait] -impl IAsyncProvider - for AsyncTransientTypeProvider +impl IAsyncProvider + for AsyncTransientTypeProvider where - InjectableType: AsyncInjectable, - DIContainerType: IAsyncDIContainer, + InjectableT: AsyncInjectable, + DIContainerT: Send + Sync + 'static, { async fn provide( &self, - di_container: &Arc, + di_container: &Arc, dependency_history: DependencyHistory, - ) -> Result, InjectableError> + ) -> Result, InjectableError> { Ok(AsyncProvidable::Transient( - InjectableType::resolve(di_container, dependency_history).await?, + InjectableT::resolve(di_container, dependency_history).await?, )) } - fn do_clone(&self) -> Box> + fn do_clone(&self) -> Box> { Box::new(self.clone()) } } -impl Clone - for AsyncTransientTypeProvider +impl Clone + for AsyncTransientTypeProvider where - InjectableType: AsyncInjectable, - DIContainerType: IAsyncDIContainer, + InjectableT: AsyncInjectable, { fn clone(&self) -> Self { @@ -126,23 +119,20 @@ where } } -pub struct AsyncSingletonProvider +pub struct AsyncSingletonProvider where - InjectableType: AsyncInjectable, - DIContainerType: IAsyncDIContainer, + InjectableT: AsyncInjectable, { - singleton: ThreadsafeSingletonPtr, + singleton: ThreadsafeSingletonPtr, - di_container_phantom: PhantomData, + di_container_phantom: PhantomData, } -impl - AsyncSingletonProvider +impl AsyncSingletonProvider where - InjectableType: AsyncInjectable, - DIContainerType: IAsyncDIContainer, + InjectableT: AsyncInjectable, { - pub fn new(singleton: ThreadsafeSingletonPtr) -> Self + pub fn new(singleton: ThreadsafeSingletonPtr) -> Self { Self { singleton, @@ -152,32 +142,31 @@ where } #[async_trait] -impl IAsyncProvider - for AsyncSingletonProvider +impl IAsyncProvider + for AsyncSingletonProvider where - InjectableType: AsyncInjectable, - DIContainerType: IAsyncDIContainer, + InjectableT: AsyncInjectable, + DIContainerT: Send + Sync + 'static, { async fn provide( &self, - _di_container: &Arc, + _di_container: &Arc, _dependency_history: DependencyHistory, - ) -> Result, InjectableError> + ) -> Result, InjectableError> { Ok(AsyncProvidable::Singleton(self.singleton.clone())) } - fn do_clone(&self) -> Box> + fn do_clone(&self) -> Box> { Box::new(self.clone()) } } -impl Clone - for AsyncSingletonProvider +impl Clone + for AsyncSingletonProvider where - InjectableType: AsyncInjectable, - DIContainerType: IAsyncDIContainer, + InjectableT: AsyncInjectable, { fn clone(&self) -> Self { @@ -222,15 +211,15 @@ impl AsyncFactoryProvider #[cfg(feature = "factory")] #[async_trait] -impl IAsyncProvider for AsyncFactoryProvider +impl IAsyncProvider for AsyncFactoryProvider where - DIContainerType: IAsyncDIContainer, + DIContainerT: Send + Sync, { async fn provide( &self, - _di_container: &Arc, + _di_container: &Arc, _dependency_history: DependencyHistory, - ) -> Result, InjectableError> + ) -> Result, InjectableError> { Ok(match self.variant { AsyncFactoryVariant::Normal => AsyncProvidable::Factory(self.factory.clone()), @@ -243,7 +232,7 @@ where }) } - fn do_clone(&self) -> Box> + fn do_clone(&self) -> Box> { Box::new(self.clone()) } @@ -268,17 +257,18 @@ mod tests use super::*; use crate::dependency_history::MockDependencyHistory; - use crate::test_utils::{mocks, subjects_async}; + use crate::di_container::asynchronous::MockAsyncDIContainer; + use crate::test_utils::subjects_async; #[tokio::test] async fn async_transient_type_provider_works() -> Result<(), Box> { let transient_type_provider = AsyncTransientTypeProvider::< subjects_async::UserManager, - mocks::async_di_container::MockAsyncDIContainer, + MockAsyncDIContainer, >::new(); - let di_container = mocks::async_di_container::MockAsyncDIContainer::new(); + let di_container = MockAsyncDIContainer::new(); assert!( matches!( @@ -298,12 +288,12 @@ mod tests { let singleton_provider = AsyncSingletonProvider::< subjects_async::UserManager, - mocks::async_di_container::MockAsyncDIContainer, + MockAsyncDIContainer, >::new(ThreadsafeSingletonPtr::new( subjects_async::UserManager {}, )); - let di_container = mocks::async_di_container::MockAsyncDIContainer::new(); + let di_container = MockAsyncDIContainer::new(); assert!( matches!( @@ -345,8 +335,7 @@ mod tests AsyncFactoryVariant::AsyncDefault, ); - let di_container = - Arc::new(mocks::async_di_container::MockAsyncDIContainer::new()); + let di_container = Arc::new(MockAsyncDIContainer::new()); assert!( matches!( -- cgit v1.2.3-18-g5258