Refactoring

src/abstract/v00/configuration.py

@@ -21,7 +21,7 @@ def get_Configuration(self) -> PostgresConfiguration:
         RaiseError.MethodIsNotImplemented(__class__, "get_Configuration")
 
     # --------------------------------------------------------------------
-    def get_Parent(self) -> PostgresConfigurationObject:
+    def get_Parent(self) -> typing.Optional[PostgresConfigurationObject]:
         RaiseError.MethodIsNotImplemented(__class__, "get_Parent")
 
 
@@ -49,7 +49,7 @@ def __init__(self):
 
     # interface -----------------------------------------------------------
     @property
-    def Option(self) -> PostgresConfigurationOption:
+    def Option(self) -> typing.Optional[PostgresConfigurationOption]:
         RaiseError.GetPropertyIsNotImplemented(__class__, "Option")
 
     # ---------------------------------------------------------------------
@@ -144,7 +144,7 @@ def __len__(self) -> int:
         RaiseError.MethodIsNotImplemented(__class__, "__len__")
 
     # --------------------------------------------------------------------
-    def __iter__(self) -> PostgresConfigurationFileLinesIterator:
+    def __iter__(self) -> PostgresConfigurationOptionsIterator:
         RaiseError.MethodIsNotImplemented(__class__, "__iter__")
 
 
@@ -161,7 +161,7 @@ def get_File(self) -> PostgresConfigurationFile:
         RaiseError.MethodIsNotImplemented(__class__, "get_File")
 
     # --------------------------------------------------------------------
-    def Delete(self, withLine: bool):
+    def Delete(self, withLine: bool) -> None:
         assert type(withLine) is bool
         RaiseError.MethodIsNotImplemented(__class__, "Delete")
 

src/core/model.py

@@ -204,6 +204,8 @@ class FileStatus(enum.Enum):
 
 
 class FileData(ObjectData):
+    T_OPTIONS_BY_NAME = typing.Dict[str, OptionData]
+
     m_Parent: ConfigurationData
 
     m_Status: FileStatus
@@ -212,7 +214,7 @@ class FileData(ObjectData):
     m_Path: str
     m_Lines: typing.List[FileLineData]
 
-    m_OptionsByName: typing.Dict[str, OptionData]
+    m_OptionsByName: T_OPTIONS_BY_NAME
 
     # --------------------------------------------------------------------
     def __init__(self, parent: ConfigurationData, path: str):
@@ -256,15 +258,33 @@ def IsAlive(self) -> bool:
 
 
 class ConfigurationData(ObjectData):
+    T_OPTION_OR_OPTIONS = typing.Union[
+        OptionData,
+        typing.List[OptionData],
+    ]
+
+    T_ALL_OPTIONS_BY_NAME = typing.Dict[
+        str,
+        T_OPTION_OR_OPTIONS,
+    ]
+
+    T_FILE_OR_FILES = typing.Union[
+        FileData,
+        typing.List[FileData],
+    ]
+
+    T_ALL_FILES_BY_NAME = typing.Dict[
+        str,
+        T_FILE_OR_FILES,
+    ]
+
     m_DataDir: str
     m_OsOps: ConfigurationOsOps
 
     m_Files: typing.List[FileData]
 
-    m_AllOptionsByName: typing.Dict[
-        str, typing.Union[OptionData, typing.List[OptionData]]
-    ]
-    m_AllFilesByName: typing.Dict[str, typing.Union[FileData, typing.List[FileData]]]
+    m_AllOptionsByName: T_ALL_OPTIONS_BY_NAME
+    m_AllFilesByName: T_ALL_FILES_BY_NAME
 
     # --------------------------------------------------------------------
     def __init__(self, data_dir: str, osOps: ConfigurationOsOps):