Restructuring

tests/custom/di/src/di/application.py

@@ -1,8 +1,8 @@
-from cpl.core.application import ApplicationABC
+from cpl.application import ApplicationABC
 from cpl.core.configuration import ConfigurationABC
 from cpl.core.console.console import Console
-from cpl.core.dependency_injection import ServiceProviderABC
-from cpl.core.dependency_injection.scope import Scope
+from cpl.dependency import ServiceProviderABC
+from cpl.dependency.scope import Scope
 from di.static_test import StaticTest
 from di.test_abc import TestABC
 from di.test_service import TestService

tests/custom/di/src/di/main.py

@@ -1,4 +1,4 @@
-from cpl.core.application import ApplicationBuilder
+from cpl.application import ApplicationBuilder
 
 from di.application import Application
 from di.startup import Startup

tests/custom/di/src/di/startup.py

@@ -1,6 +1,6 @@
-from cpl.core.application import StartupABC
+from cpl.application import StartupABC
 from cpl.core.configuration import ConfigurationABC
-from cpl.core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+from cpl.dependency import ServiceProviderABC, ServiceCollectionABC
 from cpl.core.environment import Environment
 from di.test1_service import Test1Service
 from di.test2_service import Test2Service
@@ -14,14 +14,10 @@ class Startup(StartupABC):
     def __init__(self):
         StartupABC.__init__(self)
 
-    def configure_configuration(
-        self, configuration: ConfigurationABC, environment: Environment
-    ) -> ConfigurationABC:
+    def configure_configuration(self, configuration: ConfigurationABC, environment: Environment) -> ConfigurationABC:
         return configuration
 
-    def configure_services(
-        self, services: ServiceCollectionABC, environment: Environment
-    ) -> ServiceProviderABC:
+    def configure_services(self, services: ServiceCollectionABC, environment: Environment) -> ServiceProviderABC:
         services.add_scoped(TestService)
         services.add_scoped(DITesterService)
 

tests/custom/di/src/di/static_test.py

@@ -1,5 +1,5 @@
 from cpl.core.configuration import ConfigurationABC
-from cpl.core.dependency_injection import ServiceProvider, ServiceProviderABC
+from cpl.dependency import ServiceProvider, ServiceProviderABC
 from di.test_service import TestService