X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fapi%2Fimpl%2FCpsModuleServiceImpl.java;h=8e43227f97f526b4938ccbbeb87259a2e7888fc0;hb=1839f38e054a958793ec40f524d911253086c74e;hp=34735f84825468c21718403b93e9868ca8f90436;hpb=f351ced1db57e63663b84acdab9410aa517018c8;p=cps.git diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java index 34735f848..8e43227f9 100644 --- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java +++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java @@ -1,7 +1,8 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2020-2021 Nordix Foundation + * Copyright (C) 2020-2022 Nordix Foundation * Modifications Copyright (C) 2020-2021 Pantheon.tech + * Modifications Copyright (C) 2022 Bell Canada * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,37 +22,53 @@ package org.onap.cps.api.impl; -import java.util.List; +import java.util.Collection; import java.util.Map; +import lombok.AllArgsConstructor; +import org.onap.cps.api.CpsAdminService; import org.onap.cps.api.CpsModuleService; import org.onap.cps.spi.CascadeDeleteAllowed; import org.onap.cps.spi.CpsModulePersistenceService; +import org.onap.cps.spi.exceptions.SchemaSetInUseException; +import org.onap.cps.spi.model.Anchor; import org.onap.cps.spi.model.ModuleReference; import org.onap.cps.spi.model.SchemaSet; +import org.onap.cps.utils.CpsValidator; import org.onap.cps.yang.YangTextSchemaSourceSetBuilder; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service("CpsModuleServiceImpl") +@AllArgsConstructor public class CpsModuleServiceImpl implements CpsModuleService { - @Autowired - private CpsModulePersistenceService cpsModulePersistenceService; - - @Autowired - private YangTextSchemaSourceSetCache yangTextSchemaSourceSetCache; + private final CpsModulePersistenceService cpsModulePersistenceService; + private final YangTextSchemaSourceSetCache yangTextSchemaSourceSetCache; + private final CpsAdminService cpsAdminService; @Override public void createSchemaSet(final String dataspaceName, final String schemaSetName, final Map yangResourcesNameToContentMap) { + CpsValidator.validateNameCharacters(dataspaceName, schemaSetName); final var yangTextSchemaSourceSet = YangTextSchemaSourceSetBuilder.of(yangResourcesNameToContentMap); cpsModulePersistenceService.storeSchemaSet(dataspaceName, schemaSetName, yangResourcesNameToContentMap); yangTextSchemaSourceSetCache.updateCache(dataspaceName, schemaSetName, yangTextSchemaSourceSet); } + @Override + public void createSchemaSetFromModules(final String dataspaceName, final String schemaSetName, + final Map newModuleNameToContentMap, + final Collection moduleReferences) { + CpsValidator.validateNameCharacters(dataspaceName, schemaSetName); + cpsModulePersistenceService.storeSchemaSetFromModules(dataspaceName, schemaSetName, + newModuleNameToContentMap, moduleReferences); + + } + @Override public SchemaSet getSchemaSet(final String dataspaceName, final String schemaSetName) { + CpsValidator.validateNameCharacters(dataspaceName, schemaSetName); final var yangTextSchemaSourceSet = yangTextSchemaSourceSetCache .get(dataspaceName, schemaSetName); return SchemaSet.builder().name(schemaSetName).dataspaceName(dataspaceName) @@ -59,14 +76,43 @@ public class CpsModuleServiceImpl implements CpsModuleService { } @Override + @Transactional public void deleteSchemaSet(final String dataspaceName, final String schemaSetName, final CascadeDeleteAllowed cascadeDeleteAllowed) { - cpsModulePersistenceService.deleteSchemaSet(dataspaceName, schemaSetName, cascadeDeleteAllowed); + CpsValidator.validateNameCharacters(dataspaceName, schemaSetName); + final Collection anchors = cpsAdminService.getAnchors(dataspaceName, schemaSetName); + if (!anchors.isEmpty() && isCascadeDeleteProhibited(cascadeDeleteAllowed)) { + throw new SchemaSetInUseException(dataspaceName, schemaSetName); + } + for (final Anchor anchor : anchors) { + cpsAdminService.deleteAnchor(dataspaceName, anchor.getName()); + } + cpsModulePersistenceService.deleteSchemaSet(dataspaceName, schemaSetName); + yangTextSchemaSourceSetCache.removeFromCache(dataspaceName, schemaSetName); + cpsModulePersistenceService.deleteUnusedYangResourceModules(); + } + + @Override + public Collection getYangResourceModuleReferences(final String dataspaceName) { + CpsValidator.validateNameCharacters(dataspaceName); + return cpsModulePersistenceService.getYangResourceModuleReferences(dataspaceName); + } + + @Override + public Collection getYangResourcesModuleReferences(final String dataspaceName, + final String anchorName) { + CpsValidator.validateNameCharacters(dataspaceName); + return cpsModulePersistenceService.getYangResourceModuleReferences(dataspaceName, anchorName); + } + + private boolean isCascadeDeleteProhibited(final CascadeDeleteAllowed cascadeDeleteAllowed) { + return CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED == cascadeDeleteAllowed; } @Override - public List getAllYangResourcesModuleReferences() { - return cpsModulePersistenceService.getAllYangResourcesModuleReferences(); + public Collection identifyNewModuleReferences( + final Collection moduleReferencesToCheck) { + return cpsModulePersistenceService.identifyNewModuleReferences(moduleReferencesToCheck); } }