Cleanup for mysql

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

@@ -1,6 +1,7 @@
+from cpl import mail
 from cpl.application import StartupABC
 from cpl.core.configuration import Configuration
-from cpl.dependency import ServiceCollectionABC, ServiceProviderABC
+from cpl.dependency import ServiceCollection, ServiceProviderABC
 from cpl.core.environment import Environment
 from cpl.core.pipes import IPAddressPipe
 from test_service import TestService
@@ -15,8 +16,8 @@ class Startup(StartupABC):
         config.add_json_file(f"appsettings.{env.get_environment()}.json")
         config.add_json_file(f"appsettings.{env.get_host_name()}.json", optional=True)
 
-    def configure_services(self, services: ServiceCollectionABC, env: Environment):
+    def configure_services(self, services: ServiceCollection, env: Environment):
         services.add_logging()
-        services.add_mail()
+        services.add_module(mail)
         services.add_transient(IPAddressPipe)
         services.add_singleton(TestService)

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

@@ -1,7 +1,7 @@
 from cpl.application import StartupExtensionABC
 from cpl.core.configuration import Configuration
 from cpl.core.console import Console
-from cpl.dependency import ServiceCollectionABC
+from cpl.dependency import ServiceCollection
 from cpl.core.environment import Environment
 
 
@@ -12,5 +12,5 @@ class TestStartupExtension(StartupExtensionABC):
     def configure_configuration(self, config: Configuration, env: Environment):
         Console.write_line("config")
 
-    def configure_services(self, services: ServiceCollectionABC, env: Environment):
+    def configure_services(self, services: ServiceCollection, env: Environment):
         Console.write_line("services")