diff options
author | 2021-08-31 10:04:26 +0100 | |
---|---|---|
committer | 2021-08-31 10:20:06 +0100 | |
commit | 38c6faa738abe6e0acdd24df2364d725d36fca40 (patch) | |
tree | 3412c0ee222d60bbc98a997390dbae19d55e3fc9 /catalog-dao/src/main/java/org/openecomp | |
parent | a1cdcda28701f603cf95f591ba447bd723273622 (diff) |
Fix additional types import file generation
The additional_type_definitions.yaml is missing types entries and
header.
Also, the solution is not considering the types entries, i.e.
'data_types:', 'policy_types:', etc., when replacing types and
generating the new file, which renders the solution broken.
This change aims to fix the related problems.
Change-Id: I412683b49966c09dd067ecbf8a1d778155b23fa6
Issue-ID: SDC-3703
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'catalog-dao/src/main/java/org/openecomp')
-rw-r--r-- | catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/ToscaModelImportCassandraDao.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/ToscaModelImportCassandraDao.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/ToscaModelImportCassandraDao.java index 5d1501c0b5..c250aecdef 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/ToscaModelImportCassandraDao.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/ToscaModelImportCassandraDao.java @@ -84,7 +84,14 @@ public class ToscaModelImportCassandraDao extends CassandraDao { LOGGER.info("{} successfully initialized", ToscaModelImportCassandraDao.class.getName()); } - public void importAll(final String modelId, final List<ToscaImportByModel> toscaImportByModelList) { + /** + * Completely replaces the previous model imports by the imports on the given list that are from the same model. + * New imports will be added, existing will be replaced and the remaining will be deleted. + * + * @param modelId the model id + * @param toscaImportByModelList the new list of imports + */ + public void replaceImports(final String modelId, final List<ToscaImportByModel> toscaImportByModelList) { final List<ToscaImportByModel> importOfModelList = toscaImportByModelList.stream() .filter(toscaImportByModel -> modelId.equals(toscaImportByModel.getModelId())) .collect(Collectors.toList()); @@ -99,7 +106,13 @@ public class ToscaModelImportCassandraDao extends CassandraDao { ); } - public void importOnly(final String modelId, final List<ToscaImportByModel> toscaImportByModelList) { + /** + * Saves all imports provided on the list that are from the given modelId. + * + * @param modelId the model id + * @param toscaImportByModelList the list of imports to save + */ + public void saveAll(final String modelId, final List<ToscaImportByModel> toscaImportByModelList) { toscaImportByModelList.stream() .filter(toscaImportByModel -> modelId.equals(toscaImportByModel.getModelId())) .forEach(toscaImportByModelMapper::save); |