Remove retry mechanism for duplicate module(resource) errors

- CM Handle with problems will go into 'LOCKED' state and retried using existing business logic

Issue-ID: CPS-2555
Change-Id: I563f6bc536d8fd8c6675891c62318ff2fb43fea6
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>

1 files changed, 8 insertions, 16 deletions

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncService.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncService.java
index 9534cf35b1..041daa0927 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncService.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncService.java
@@ -35,8 +35,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.onap.cps.api.CpsAnchorService;
 import org.onap.cps.api.CpsDataService;
 import org.onap.cps.api.CpsModuleService;
-import org.onap.cps.api.exceptions.AlreadyDefinedException;
-import org.onap.cps.api.exceptions.DuplicatedYangResourceException;
 import org.onap.cps.api.model.ModuleReference;
 import org.onap.cps.ncmp.impl.inventory.models.YangModelCmHandle;
 import org.onap.cps.utils.ContentType;
@@ -101,20 +99,14 @@ public class ModuleSyncService {
     private void syncAndCreateSchemaSet(final YangModelCmHandle yangModelCmHandle, final String schemaSetName) {
         if (isNewSchemaSet(schemaSetName)) {
             final ModuleDelta moduleDelta = getModuleDelta(yangModelCmHandle);
-            try {
-                log.info("Creating Schema Set {} for CM Handle {}", schemaSetName, yangModelCmHandle.getId());
-                cpsModuleService.createSchemaSetFromModules(
-                        NFP_OPERATIONAL_DATASTORE_DATASPACE_NAME,
-                        schemaSetName,
-                        moduleDelta.newModuleNameToContentMap,
-                        moduleDelta.allModuleReferences
-                );
-                log.info("Successfully created Schema Set {} for CM Handle {}",
-                    schemaSetName, yangModelCmHandle.getId());
-            } catch (final AlreadyDefinedException | DuplicatedYangResourceException exception) {
-                log.warn("Schema Set {} already exists, no need to (re)create it for {}",
-                    schemaSetName, yangModelCmHandle.getId());
-            }
+            log.info("Creating Schema Set {} for CM Handle {}", schemaSetName, yangModelCmHandle.getId());
+            cpsModuleService.createSchemaSetFromModules(
+                    NFP_OPERATIONAL_DATASTORE_DATASPACE_NAME,
+                    schemaSetName,
+                    moduleDelta.newModuleNameToContentMap,
+                    moduleDelta.allModuleReferences
+            );
+            log.info("Successfully created Schema Set {} for CM Handle {}", schemaSetName, yangModelCmHandle.getId());
         }
     }