diff --git a/src/cpl/application/application_builder.py b/src/cpl/application/application_builder.py index 7aebf781..6922cfd3 100644 --- a/src/cpl/application/application_builder.py +++ b/src/cpl/application/application_builder.py @@ -14,7 +14,8 @@ class ApplicationBuilder(ApplicationBuilderABC): """ Builder class for application """ - ApplicationBuilderABC.__init__(self, app) + ApplicationBuilderABC.__init__(self) + self._app = app self._startup: Optional[StartupABC] = None self._configuration = Configuration() diff --git a/src/cpl/application/application_builder_abc.py b/src/cpl/application/application_builder_abc.py index bbaa4638..b4e7d0d4 100644 --- a/src/cpl/application/application_builder_abc.py +++ b/src/cpl/application/application_builder_abc.py @@ -7,11 +7,10 @@ from cpl.application.startup_abc import StartupABC class ApplicationBuilderABC(ABC): - def __init__(self, app: Type[ApplicationABC]): + def __init__(self, *args): """ ABC of application builder """ - self._app = app @abstractmethod def use_startup(self, startup: Type[StartupABC]): diff --git a/src/cpl/application/startup_abc.py b/src/cpl/application/startup_abc.py index c8599f1c..203adebf 100644 --- a/src/cpl/application/startup_abc.py +++ b/src/cpl/application/startup_abc.py @@ -1,6 +1,5 @@ from abc import ABC, abstractmethod -from cpl.application.application_runtime_abc import ApplicationRuntimeABC from cpl.configuration.configuration_abc import ConfigurationABC from cpl.dependency_injection.service_provider_abc import ServiceProviderABC @@ -8,15 +7,11 @@ from cpl.dependency_injection.service_provider_abc import ServiceProviderABC class StartupABC(ABC): @abstractmethod - def __init__(self, config: ConfigurationABC, runtime: ApplicationRuntimeABC, services: ServiceProviderABC): + def __init__(self, *args): """ ABC for a startup class """ - self._configuration = config - self._application_runtime = runtime - self._services = services - @abstractmethod def configure_configuration(self) -> ConfigurationABC: """ diff --git a/src/cpl_cli/startup.py b/src/cpl_cli/startup.py index 1f7c41a9..b936e3ce 100644 --- a/src/cpl_cli/startup.py +++ b/src/cpl_cli/startup.py @@ -23,7 +23,11 @@ from cpl_cli.publish.publisher_abc import PublisherABC class Startup(StartupABC): def __init__(self, config: ConfigurationABC, runtime: ApplicationRuntimeABC, services: ServiceProviderABC): - StartupABC.__init__(self, config, runtime, services) + StartupABC.__init__(self) + + self._configuration = config + self._application_runtime = runtime + self._services = services self._application_runtime.set_runtime_directory(__file__) diff --git a/src/cpl_cli/templates/new/console/src/startup.py b/src/cpl_cli/templates/new/console/src/startup.py index ac8a282a..3ae387cf 100644 --- a/src/cpl_cli/templates/new/console/src/startup.py +++ b/src/cpl_cli/templates/new/console/src/startup.py @@ -20,7 +20,11 @@ class StartupTemplate(TemplateFileABC): class Startup(StartupABC): def __init__(self, config: ConfigurationABC, runtime: ApplicationRuntimeABC, services: ServiceProviderABC): - StartupABC.__init__(self, config, runtime, services) + StartupABC.__init__(self) + + self._configuration = config + self._application_runtime = runtime + self._services = services def configure_configuration(self) -> ConfigurationABC: return self._configuration diff --git a/src/tests/custom/general/startup.py b/src/tests/custom/general/startup.py index 3c08c0a1..56829dd3 100644 --- a/src/tests/custom/general/startup.py +++ b/src/tests/custom/general/startup.py @@ -14,7 +14,11 @@ from cpl.utils.credential_manager import CredentialManager class Startup(StartupABC): def __init__(self, config: ConfigurationABC, runtime: ApplicationRuntimeABC, services: ServiceProviderABC): - StartupABC.__init__(self, config, runtime, services) + StartupABC.__init__(self) + + self._configuration = config + self._application_runtime = runtime + self._services = services def configure_configuration(self) -> ConfigurationABC: self._configuration.add_environment_variables('PYTHON_')