diff options
Diffstat (limited to 'cps-ri')
4 files changed, 19 insertions, 15 deletions
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 index 5b89d9f4c..50b27207e 100755 --- 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,6 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation. + * Copyright (C) 2020-2022 Nordix Foundation. * Modifications Copyright (C) 2020-2022 Bell Canada. * Modifications Copyright (C) 2021 Pantheon.tech * ================================================================================ @@ -147,20 +147,24 @@ public class CpsAdminPersistenceServiceImpl implements CpsAdminPersistenceServic private void validateDataspaceAndModuleNames(final String dataspaceName, final Collection<String> inputModuleNames) { - final Collection<String> retrievedModuleNames = - yangResourceRepository.findAllModuleReferences(dataspaceName, inputModuleNames) + final Collection<String> retrievedModuleReferences = + yangResourceRepository.findAllModuleReferencesByDataspaceAndModuleNames(dataspaceName, inputModuleNames) .stream().map(YangResourceModuleReference::getModuleName) .collect(Collectors.toList()); - if (retrievedModuleNames.isEmpty()) { - dataspaceRepository.getByName(dataspaceName); + if (retrievedModuleReferences.isEmpty()) { + verifyDataspaceName(dataspaceName); } - if (inputModuleNames.size() > retrievedModuleNames.size()) { + if (inputModuleNames.size() > retrievedModuleReferences.size()) { final List<String> moduleNamesNotFound = inputModuleNames.stream() - .filter(moduleName -> !retrievedModuleNames.contains(moduleName)) + .filter(moduleName -> !retrievedModuleReferences.contains(moduleName)) .collect(Collectors.toList()); if (!moduleNamesNotFound.isEmpty()) { throw new ModuleNamesNotFoundException(dataspaceName, moduleNamesNotFound); } } } + + private void verifyDataspaceName(final String dataspaceName) { + dataspaceRepository.getByName(dataspaceName); + } } diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java index ec720b8a9..3719256fc 100755 --- a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java @@ -106,7 +106,7 @@ public class CpsModulePersistenceServiceImpl implements CpsModulePersistenceServ @Override public Collection<ModuleReference> getYangResourceModuleReferences(final String dataspaceName) { final Set<YangResourceModuleReference> yangResourceModuleReferenceList = - yangResourceRepository.findAllModuleReferences(dataspaceName); + yangResourceRepository.findAllModuleReferencesByDataspace(dataspaceName); return yangResourceModuleReferenceList.stream().map(CpsModulePersistenceServiceImpl::toModuleReference) .collect(Collectors.toList()); } @@ -116,7 +116,7 @@ public class CpsModulePersistenceServiceImpl implements CpsModulePersistenceServ final String anchorName) { final Set<YangResourceModuleReference> yangResourceModuleReferenceList = yangResourceRepository - .findAllModuleReferences(dataspaceName, anchorName); + .findAllModuleReferencesByDataspaceAndAnchor(dataspaceName, anchorName); return yangResourceModuleReferenceList.stream().map(CpsModulePersistenceServiceImpl::toModuleReference) .collect(Collectors.toList()); } diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleReferenceRepositoryImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleReferenceRepositoryImpl.java index f4078ffec..0e79deb8e 100644 --- a/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleReferenceRepositoryImpl.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleReferenceRepositoryImpl.java @@ -45,11 +45,11 @@ public class ModuleReferenceRepositoryImpl implements ModuleReferenceQuery { final Collection<ModuleReference> moduleReferencesToCheck) { if (moduleReferencesToCheck == null || moduleReferencesToCheck.isEmpty()) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } final String tempTableName = "moduleReferencesToCheckTemp" - + UUID.randomUUID().toString().replaceAll("-", ""); + + UUID.randomUUID().toString().replace("-", ""); createTemporaryTable(tempTableName); insertDataIntoTable(tempTableName, moduleReferencesToCheck); diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java index 895937b60..5e9c47429 100644 --- a/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java @@ -49,7 +49,7 @@ public interface YangResourceRepository extends JpaRepository<YangResourceEntity + "JOIN yang_resource ON yang_resource.id = schema_set_yang_resources.yang_resource_id\n" + "WHERE\n" + "dataspace.name = :dataspaceName", nativeQuery = true) - Set<YangResourceModuleReference> findAllModuleReferences(@Param("dataspaceName") String dataspaceName); + Set<YangResourceModuleReference> findAllModuleReferencesByDataspace(@Param("dataspaceName") String dataspaceName); @Query(value = "SELECT DISTINCT\n" + "yang_resource.module_Name AS module_name,\n" @@ -64,7 +64,7 @@ public interface YangResourceRepository extends JpaRepository<YangResourceEntity + "WHERE\n" + "dataspace.name = :dataspaceName AND\n" + "anchor.name =:anchorName", nativeQuery = true) - Set<YangResourceModuleReference> findAllModuleReferences( + Set<YangResourceModuleReference> findAllModuleReferencesByDataspaceAndAnchor( @Param("dataspaceName") String dataspaceName, @Param("anchorName") String anchorName); @Query(value = "SELECT DISTINCT\n" @@ -77,8 +77,8 @@ public interface YangResourceRepository extends JpaRepository<YangResourceEntity + "JOIN yang_resource ON yang_resource.id = schema_set_yang_resources.yang_resource_id\n" + "WHERE\n" + "dataspace.name = :dataspaceName and yang_resource.module_Name IN (:moduleNames)", nativeQuery = true) - Set<YangResourceModuleReference> findAllModuleReferences(@Param("dataspaceName") String dataspaceName, - @Param("moduleNames") Collection<String> moduleNames); + Set<YangResourceModuleReference> findAllModuleReferencesByDataspaceAndModuleNames( + @Param("dataspaceName") String dataspaceName, @Param("moduleNames") Collection<String> moduleNames); @Query(value = "SELECT id FROM yang_resource WHERE module_name=:name and revision=:revision", nativeQuery = true) |