Merge "Changing putOperationWithJson to postOperationWithJson"
authorToine Siebelink <toine.siebelink@est.tech>
Tue, 14 Dec 2021 16:23:49 +0000 (16:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 14 Dec 2021 16:23:49 +0000 (16:23 +0000)
1  2 
cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java

@@@ -306,19 -302,9 +301,18 @@@ public class NetworkCmProxyDataServiceI
          }
      }
  
 +    private void attemptToDeleteSchemaSetWithCascade(final String schemaSetName) {
 +        try {
 +            cpsModuleService.deleteSchemaSet(NFP_OPERATIONAL_DATASTORE_DATASPACE_NAME, schemaSetName,
 +                CASCADE_DELETE_ALLOWED);
 +        } catch (final Exception e) {
 +            log.warn("Schema set {} delete failed, reason {}", schemaSetName, e.getMessage());
 +        }
 +    }
 +
      private void syncAndCreateSchemaSet(final PersistenceCmHandle persistenceCmHandle) {
          final List<ModuleReference> moduleReferencesFromCmHandle =
-             toModuleReferences(dmiModelOperations.getModuleReferences(persistenceCmHandle));
+             dmiModelOperations.getModuleReferences(persistenceCmHandle);
          final List<ModuleReference> existingModuleReferences = new ArrayList<>();
          final List<ModuleReference> unknownModuleReferences = new ArrayList<>();
          prepareModuleSubsets(moduleReferencesFromCmHandle, existingModuleReferences, unknownModuleReferences);