Restructuring

tests/custom/general/src/general/application.py

@@ -1,10 +1,10 @@
 import time
 from typing import Optional
 
-from cpl.core.application.application_abc import ApplicationABC
+from cpl.application.application_abc import ApplicationABC
 from cpl.core.configuration import Configuration
 from cpl.core.console import Console
-from cpl.core.dependency_injection import ServiceProviderABC
+from cpl.dependency import ServiceProviderABC
 from cpl.core.environment import Environment
 from cpl.core.log import LoggerABC
 from cpl.core.pipes import IPAddressPipe

tests/custom/general/src/general/main.py

@@ -1,5 +1,5 @@
 from application import Application
-from cpl.core.application import ApplicationBuilder
+from cpl.application import ApplicationBuilder
 from test_extension import TestExtension
 from startup import Startup
 from test_startup_extension import TestStartupExtension

tests/custom/general/src/general/startup.py

@@ -1,6 +1,6 @@
-from cpl.core.application import StartupABC
+from cpl.application import StartupABC
 from cpl.core.configuration import Configuration
-from cpl.core.dependency_injection import ServiceCollectionABC, ServiceProviderABC
+from cpl.dependency import ServiceCollectionABC, ServiceProviderABC
 from cpl.core.environment import Environment
 from cpl.core.pipes import IPAddressPipe
 from test_service import TestService

tests/custom/general/src/general/test_extension.py

@@ -1,7 +1,7 @@
-from cpl.core.application import ApplicationExtensionABC
+from cpl.application import ApplicationExtensionABC
 from cpl.core.configuration import Configuration
 from cpl.core.console import Console
-from cpl.core.dependency_injection import ServiceProviderABC
+from cpl.dependency import ServiceProviderABC
 
 
 class TestExtension(ApplicationExtensionABC):

tests/custom/general/src/general/test_service.py

@@ -1,5 +1,5 @@
 from cpl.core.console.console import Console
-from cpl.core.dependency_injection import ServiceProviderABC
+from cpl.dependency import ServiceProviderABC
 from cpl.core.pipes.ip_address_pipe import IPAddressPipe
 
 

tests/custom/general/src/general/test_startup_extension.py

@@ -1,7 +1,7 @@
-from cpl.core.application import StartupExtensionABC
+from cpl.application import StartupExtensionABC
 from cpl.core.configuration import Configuration
 from cpl.core.console import Console
-from cpl.core.dependency_injection import ServiceCollectionABC
+from cpl.dependency import ServiceCollectionABC
 from cpl.core.environment import Environment