Fix duplicated yang resource references V2

- Store Yang module references using SchemaSetEntity instead of SQL
- Added integration test to check number of references
- Update dispatcher for integration test to only return yang resources requested modules
- refactor schema set create & upgrade methods for better re-uses and readability
- consistent naming in related methods like(new)yangResourceContentPerName
(the name can be filename, module name or schema set name) depending on the context
- replaced 'var' with actual class names in affected classes

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

1 files changed, 7 insertions, 7 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 f929d6708c..79f5496eb7 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
@@ -56,7 +56,7 @@ public class ModuleSyncService {
     @AllArgsConstructor
     private static final class ModuleDelta {
         Collection<ModuleReference> allModuleReferences;
-        Map<String, String> newModuleNameToContentMap;
+        Map<String, String> newYangResourceContentPerName;
     }
 
     /**
@@ -90,7 +90,7 @@ public class ModuleSyncService {
         if (sourceModuleSetTag.isEmpty() && targetModuleSetTag.isEmpty()) {
             final ModuleDelta moduleDelta = getModuleDelta(yangModelCmHandle, targetModuleSetTag);
             cpsModuleService.upgradeSchemaSetFromModules(NFP_OPERATIONAL_DATASTORE_DATASPACE_NAME,
-                    schemaSetName, moduleDelta.newModuleNameToContentMap, moduleDelta.allModuleReferences);
+                    schemaSetName, moduleDelta.newYangResourceContentPerName, moduleDelta.allModuleReferences);
         } else {
             syncAndCreateSchemaSet(yangModelCmHandle, schemaSetName, targetModuleSetTag);
             cpsAnchorService.updateAnchorSchemaSet(NFP_OPERATIONAL_DATASTORE_DATASPACE_NAME, cmHandleId, schemaSetName);
@@ -111,7 +111,7 @@ public class ModuleSyncService {
                 cpsModuleService.createSchemaSetFromModules(
                     NFP_OPERATIONAL_DATASTORE_DATASPACE_NAME,
                     schemaSetName,
-                    moduleDelta.newModuleNameToContentMap,
+                    moduleDelta.newYangResourceContentPerName,
                     moduleDelta.allModuleReferences
                 );
                 log.info("Successfully created Schema Set {} for CM Handle {}", schemaSetName,
@@ -133,11 +133,11 @@ public class ModuleSyncService {
             dmiModelOperations.getModuleReferences(yangModelCmHandle, targetModuleSetTag);
         final Collection<ModuleReference> newModuleReferences =
                 cpsModuleService.identifyNewModuleReferences(allModuleReferences);
-        final Map<String, String> newYangResources = dmiModelOperations.getNewYangResourcesFromDmi(yangModelCmHandle,
-                targetModuleSetTag, newModuleReferences);
+        final Map<String, String> newYangResourceContentPerName =
+            dmiModelOperations.getNewYangResourcesFromDmi(yangModelCmHandle, targetModuleSetTag, newModuleReferences);
         log.debug("Module delta calculated for CM handle ID: {}. All references: {}. New modules: {}",
-            yangModelCmHandle.getId(), allModuleReferences, newYangResources.keySet());
-        return new ModuleDelta(allModuleReferences, newYangResources);
+            yangModelCmHandle.getId(), allModuleReferences, newYangResourceContentPerName.keySet());
+        return new ModuleDelta(allModuleReferences, newYangResourceContentPerName);
     }
 
     private void setCmHandleModuleSetTag(final YangModelCmHandle yangModelCmHandle, final String newModuleSetTag) {