X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-ri%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fspi%2Fimpl%2FCpsAdminPersistenceServiceImpl.java;h=e5df9c5cab9adb93956d58dca81b416ccfa6e825;hb=6804157f3ee5b1268e53ae86e4767ee267d48eec;hp=684750c4594b1c9d737de8a324e4e21e9a31021d;hpb=0cd5910ca2c949bab95ec73591729c4b7230fdd1;p=cps.git diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceImpl.java old mode 100644 new mode 100755 index 684750c45..e5df9c5ca --- a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceImpl.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceImpl.java @@ -1,6 +1,8 @@ -/*- +/* * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation. All rights reserved. + * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Bell Canada. + * Modifications Copyright (C) 2021 Pantheon.tech * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,16 +22,22 @@ package org.onap.cps.spi.impl; -import org.onap.cps.exceptions.CpsNotFoundException; -import org.onap.cps.exceptions.CpsValidationException; +import java.util.Collection; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import javax.transaction.Transactional; import org.onap.cps.spi.CpsAdminPersistenceService; -import org.onap.cps.spi.entities.Dataspace; -import org.onap.cps.spi.entities.Fragment; -import org.onap.cps.spi.entities.Module; +import org.onap.cps.spi.entities.AnchorEntity; +import org.onap.cps.spi.entities.DataspaceEntity; +import org.onap.cps.spi.exceptions.AlreadyDefinedException; +import org.onap.cps.spi.exceptions.ModuleNamesNotFoundException; import org.onap.cps.spi.model.Anchor; +import org.onap.cps.spi.repository.AnchorRepository; import org.onap.cps.spi.repository.DataspaceRepository; import org.onap.cps.spi.repository.FragmentRepository; -import org.onap.cps.spi.repository.ModuleRepository; +import org.onap.cps.spi.repository.SchemaSetRepository; +import org.onap.cps.spi.repository.YangResourceRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Component; @@ -40,34 +48,102 @@ public class CpsAdminPersistenceServiceImpl implements CpsAdminPersistenceServic @Autowired private DataspaceRepository dataspaceRepository; + @Autowired + private AnchorRepository anchorRepository; + + @Autowired + private SchemaSetRepository schemaSetRepository; + @Autowired private FragmentRepository fragmentRepository; @Autowired - private ModuleRepository moduleRepository; + private YangResourceRepository yangResourceRepository; @Override - public String createAnchor(final Anchor anchor) { - final String anchorName = anchor.getAnchorName(); + public void createDataspace(final String dataspaceName) { try { - final Dataspace dataspace = dataspaceRepository.getByName(anchor.getDataspaceName()); - final Module module = - moduleRepository.getByDataspaceAndNamespaceAndRevision(dataspace, - anchor.getNamespace(), anchor.getRevision()); - - final Fragment fragment = Fragment.builder().xpath(anchorName) - .anchorName(anchorName) - .dataspace(dataspace).module(module).build(); - - fragmentRepository.save(fragment); - return anchorName; - } catch (final CpsNotFoundException ex) { - throw new CpsValidationException("Validation Error", - "Dataspace and/or Module do not exist."); - } catch (final DataIntegrityViolationException ex) { - throw new CpsValidationException("Duplication Error", - String.format("Anchor with name %s already exist in dataspace %s.", - anchorName, anchor.getDataspaceName())); + dataspaceRepository.save(new DataspaceEntity(dataspaceName)); + } catch (final DataIntegrityViolationException e) { + throw AlreadyDefinedException.forDataspace(dataspaceName, e); + } + } + + @Override + public void createAnchor(final String dataspaceName, final String schemaSetName, final String anchorName) { + final var dataspaceEntity = dataspaceRepository.getByName(dataspaceName); + final var schemaSetEntity = + schemaSetRepository.getByDataspaceAndName(dataspaceEntity, schemaSetName); + final var anchorEntity = AnchorEntity.builder() + .name(anchorName) + .dataspace(dataspaceEntity) + .schemaSet(schemaSetEntity) + .build(); + try { + anchorRepository.save(anchorEntity); + } catch (final DataIntegrityViolationException e) { + throw AlreadyDefinedException.forAnchor(anchorName, dataspaceName, e); + } + } + + @Override + public Collection getAnchors(final String dataspaceName) { + final var dataspaceEntity = dataspaceRepository.getByName(dataspaceName); + final Collection anchorEntities = anchorRepository.findAllByDataspace(dataspaceEntity); + return anchorEntities.stream().map(CpsAdminPersistenceServiceImpl::toAnchor).collect(Collectors.toList()); + } + + @Override + public Collection queryAnchors(final String dataspaceName, final Collection inputModuleNames) { + validateDataspaceAndModuleNames(dataspaceName, inputModuleNames); + final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName); + final Collection anchorEntities = anchorRepository + .getAnchorsByDataspaceIdAndModuleNames(dataspaceEntity.getId(), inputModuleNames, inputModuleNames.size()); + return anchorEntities.stream().map(CpsAdminPersistenceServiceImpl::toAnchor).collect(Collectors.toSet()); + } + + @Override + public Anchor getAnchor(final String dataspaceName, final String anchorName) { + return toAnchor(getAnchorEntity(dataspaceName, anchorName)); + } + + @Transactional + @Override + public void deleteAnchor(final String dataspaceName, final String anchorName) { + final var anchorEntity = getAnchorEntity(dataspaceName, anchorName); + fragmentRepository.deleteByAnchorIn(Set.of(anchorEntity)); + anchorRepository.delete(anchorEntity); + } + + private AnchorEntity getAnchorEntity(final String dataspaceName, final String anchorName) { + final var dataspaceEntity = dataspaceRepository.getByName(dataspaceName); + return anchorRepository.getByDataspaceAndName(dataspaceEntity, anchorName); + } + + private static Anchor toAnchor(final AnchorEntity anchorEntity) { + return Anchor.builder() + .name(anchorEntity.getName()) + .dataspaceName(anchorEntity.getDataspace().getName()) + .schemaSetName(anchorEntity.getSchemaSet().getName()) + .build(); + } + + private void validateDataspaceAndModuleNames(final String dataspaceName, + final Collection inputModuleNames) { + final Collection retrievedModuleNames = + yangResourceRepository.findAllModuleReferences(dataspaceName, inputModuleNames) + .stream().map(module -> module.getModuleName()) + .collect(Collectors.toList()); + if (retrievedModuleNames.isEmpty()) { + dataspaceRepository.getByName(dataspaceName); + } + if (inputModuleNames.size() > retrievedModuleNames.size()) { + final List moduleNamesNotFound = inputModuleNames.stream() + .filter(moduleName -> !retrievedModuleNames.contains(moduleName)) + .collect(Collectors.toList()); + if (!moduleNamesNotFound.isEmpty()) { + throw new ModuleNamesNotFoundException(dataspaceName, moduleNamesNotFound); + } } } }