UC1-Updates

Author: Kolea Plesco

ted_sws/mapping_suite_processor/entrypoints/cli/__init__.py

@@ -1,5 +1,5 @@
 from ted_sws.data_manager.adapters.mapping_suite_repository import TRANSFORM_PACKAGE_NAME
 from ted_sws.mapping_suite_processor.services.conceptual_mapping_reader import CONCEPTUAL_MAPPINGS_FILE_NAME
 
-CONCEPTUAL_MAPPINGS_FILE = '{mappings_path}/{mapping_suite_id}/' + TRANSFORM_PACKAGE_NAME + '/' \
+CONCEPTUAL_MAPPINGS_FILE_TEMPLATE = '{mappings_path}/{mapping_suite_id}/' + TRANSFORM_PACKAGE_NAME + '/' \
                            + CONCEPTUAL_MAPPINGS_FILE_NAME

ted_sws/mapping_suite_processor/entrypoints/cli/cmd_metadata_generator.py

@@ -8,7 +8,7 @@
 from ted_sws.core.adapters.cmd_runner import CmdRunner as BaseCmdRunner, DEFAULT_MAPPINGS_PATH
 from ted_sws.data_manager.adapters.mapping_suite_repository import METADATA_FILE_NAME
 from ted_sws.event_manager.adapters.logger import LOG_INFO_TEXT
-from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE
+from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE_TEMPLATE
 from ted_sws.mapping_suite_processor.services.conceptual_mapping_generate_metadata import \
     mapping_suite_processor_generate_metadata as generate_metadata
 
@@ -64,7 +64,7 @@ def run(mapping_suite_id=None, opt_conceptual_mappings_file=None, opt_output_met
     if opt_conceptual_mappings_file:
         conceptual_mappings_file = opt_conceptual_mappings_file
     else:
-        conceptual_mappings_file = CONCEPTUAL_MAPPINGS_FILE.format(
+        conceptual_mappings_file = CONCEPTUAL_MAPPINGS_FILE_TEMPLATE.format(
             mappings_path=opt_mappings_folder,
             mapping_suite_id=mapping_suite_id
         )

ted_sws/mapping_suite_processor/entrypoints/cli/cmd_resources_injector.py

@@ -5,7 +5,7 @@
 
 from ted_sws.core.adapters.cmd_runner import CmdRunner as BaseCmdRunner, DEFAULT_MAPPINGS_PATH
 from ted_sws.data_manager.adapters.mapping_suite_repository import TRANSFORM_PACKAGE_NAME, RESOURCES_PACKAGE_NAME
-from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE
+from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE_TEMPLATE
 from ted_sws.mapping_suite_processor.services.conceptual_mapping_files_injection import \
     mapping_suite_processor_inject_resources as inject_resources
 from ted_sws.mapping_suite_processor.services.conceptual_mapping_processor import MAPPING_FILES_RESOURCES_FOLDER
@@ -74,7 +74,7 @@ def run(mapping_suite_id=None,
     if opt_conceptual_mappings_file:
         conceptual_mappings_file = opt_conceptual_mappings_file
     else:
-        conceptual_mappings_file = CONCEPTUAL_MAPPINGS_FILE.format(
+        conceptual_mappings_file = CONCEPTUAL_MAPPINGS_FILE_TEMPLATE.format(
             mappings_path=opt_mappings_folder,
             mapping_suite_id=mapping_suite_id
         )

ted_sws/mapping_suite_processor/entrypoints/cli/cmd_rml_modules_injector.py

@@ -5,7 +5,7 @@
 
 from ted_sws.core.adapters.cmd_runner import CmdRunner as BaseCmdRunner, DEFAULT_MAPPINGS_PATH
 from ted_sws.data_manager.adapters.mapping_suite_repository import TRANSFORM_PACKAGE_NAME, MAPPINGS_PACKAGE_NAME
-from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE
+from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE_TEMPLATE
 from ted_sws.mapping_suite_processor.services.conceptual_mapping_files_injection import \
     mapping_suite_processor_inject_rml_modules as inject_rml_modules
 
@@ -81,7 +81,7 @@ def run(mapping_suite_id=None,
     if opt_conceptual_mappings_file:
         conceptual_mappings_file = opt_conceptual_mappings_file
     else:
-        conceptual_mappings_file = CONCEPTUAL_MAPPINGS_FILE.format(
+        conceptual_mappings_file = CONCEPTUAL_MAPPINGS_FILE_TEMPLATE.format(
             mappings_path=opt_mappings_folder,
             mapping_suite_id=mapping_suite_id
         )

ted_sws/mapping_suite_processor/entrypoints/cli/cmd_sparql_generator.py

@@ -8,7 +8,7 @@
 from ted_sws.core.adapters.cmd_runner import CmdRunner as BaseCmdRunner, DEFAULT_MAPPINGS_PATH
 from ted_sws.data_manager.adapters.mapping_suite_repository import VALIDATE_PACKAGE_NAME, SPARQL_PACKAGE_NAME
 from ted_sws.event_manager.adapters.logger import LOG_INFO_TEXT
-from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE
+from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE_TEMPLATE
 from ted_sws.mapping_suite_processor.services.conceptual_mapping_generate_sparql_queries import \
     mapping_suite_processor_generate_sparql_queries as generate_sparql_queries, DEFAULT_RQ_NAME
 
@@ -66,7 +66,7 @@ def run(mapping_suite_id=None, opt_conceptual_mappings_file=None, opt_output_spa
     if opt_conceptual_mappings_file:
         conceptual_mappings_file = opt_conceptual_mappings_file
     else:
-        conceptual_mappings_file = CONCEPTUAL_MAPPINGS_FILE.format(
+        conceptual_mappings_file = CONCEPTUAL_MAPPINGS_FILE_TEMPLATE.format(
             mappings_path=opt_mappings_folder,
             mapping_suite_id=mapping_suite_id
         )

ted_sws/notice_validator/entrypoints/cli/cmd_xpath_coverage_runner.py

@@ -13,7 +13,7 @@
 from ted_sws.core.model.notice import Notice
 from ted_sws.data_manager.adapters.mapping_suite_repository import MappingSuiteRepositoryInFileSystem
 from ted_sws.event_manager.adapters.logger import LOG_INFO_TEXT
-from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE
+from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE_TEMPLATE
 from ted_sws.notice_validator.adapters.xpath_coverage_runner import CoverageRunner
 from ted_sws.notice_validator.services.xpath_coverage_runner import coverage_notice_xpath_report, \
     xpath_coverage_html_report, xpath_coverage_json_report
@@ -106,7 +106,7 @@ def run(mapping_suite_id=None, opt_conceptual_mappings_file=None, opt_mappings_f
     if opt_conceptual_mappings_file:
         conceptual_mappings_file = opt_conceptual_mappings_file
     else:
-        conceptual_mappings_file = CONCEPTUAL_MAPPINGS_FILE.format(
+        conceptual_mappings_file = CONCEPTUAL_MAPPINGS_FILE_TEMPLATE.format(
             mappings_path=opt_mappings_folder,
             mapping_suite_id=mapping_suite_id
         )