update utility classes

Author: 7bitcoder

Include/SevenBit/DI/Utils/Injected.hpp

@@ -19,40 +19,37 @@ namespace sb::di
         [[nodiscard]] ServiceExtractor inject() const { return ServiceExtractor{provider}; }
     };
 
-    template <class TService, class TImplementation = TService, class TRegisterer = SingletonRegisterer>
-    struct InjectedSingleton : TService, Injected, RegisterSingleton<TService, TImplementation, TRegisterer>
+    template <class TService, class TImplementation = TService>
+    struct InjectedSingleton : TService, Injected, RegisterSingleton<TService, TImplementation>
     {
         using Injected::Injected;
     };
 
-    template <class TService, class TRegisterer>
-    struct InjectedSingleton<TService, TService, TRegisterer> : Injected,
-                                                                RegisterSingleton<TService, TService, TRegisterer>
+    template <class TService>
+    struct InjectedSingleton<TService, TService> : Injected, RegisterSingleton<TService, TService>
     {
         using Injected::Injected;
     };
 
-    template <class TService, class TImplementation = TService, class TRegisterer = ScopedRegisterer>
-    struct InjectedScoped : TService, Injected, RegisterScoped<TService, TImplementation, TRegisterer>
+    template <class TService, class TImplementation = TService>
+    struct InjectedScoped : TService, Injected, RegisterScoped<TService, TImplementation>
     {
         using Injected::Injected;
     };
 
-    template <class TService, class TRegisterer>
-    struct InjectedScoped<TService, TService, TRegisterer> : Injected, RegisterScoped<TService, TService, TRegisterer>
+    template <class TService> struct InjectedScoped<TService, TService> : Injected, RegisterScoped<TService, TService>
     {
         using Injected::Injected;
     };
 
-    template <class TService, class TImplementation = TService, class TRegisterer = TransientRegisterer>
-    struct InjectedTransient : TService, Injected, RegisterTransient<TService, TImplementation, TRegisterer>
+    template <class TService, class TImplementation = TService>
+    struct InjectedTransient : TService, Injected, RegisterTransient<TService, TImplementation>
     {
         using Injected::Injected;
     };
 
-    template <class TService, class TRegisterer>
-    struct InjectedTransient<TService, TService, TRegisterer> : Injected,
-                                                                RegisterTransient<TService, TService, TRegisterer>
+    template <class TService>
+    struct InjectedTransient<TService, TService> : Injected, RegisterTransient<TService, TService>
     {
         using Injected::Injected;
     };

Include/SevenBit/DI/Utils/Register.hpp

@@ -21,8 +21,8 @@ namespace sb::di
         }
     };
 
-    template <class TService, class TImplementation = TService, class TRegisterer = SingletonRegisterer>
-    using RegisterSingleton = RegisterService<TService, TImplementation, TRegisterer>;
+    template <class TService, class TImplementation = TService>
+    using RegisterSingleton = RegisterService<TService, TImplementation, SingletonRegisterer>;
 
     struct ScopedRegisterer
     {
@@ -32,8 +32,8 @@ namespace sb::di
         }
     };
 
-    template <class TService, class TImplementation = TService, class TRegisterer = ScopedRegisterer>
-    using RegisterScoped = RegisterService<TService, TImplementation, TRegisterer>;
+    template <class TService, class TImplementation = TService>
+    using RegisterScoped = RegisterService<TService, TImplementation, ScopedRegisterer>;
 
     struct TransientRegisterer
     {
@@ -43,6 +43,6 @@ namespace sb::di
         }
     };
 
-    template <class TService, class TImplementation = TService, class TRegisterer = TransientRegisterer>
-    using RegisterTransient = RegisterService<TService, TImplementation, TRegisterer>;
+    template <class TService, class TImplementation = TService>
+    using RegisterTransient = RegisterService<TService, TImplementation, TransientRegisterer>;
 } // namespace sb::di