X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=cps-ri%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fspi%2Fimpl%2FCpsAdminPersistenceServiceImpl.java;h=2e7bb7e969f767b683330d1ca6da4e02825ee3b9;hb=refs%2Fchanges%2F41%2F127541%2F32;hp=51b2482953846a872a18b57dabd87fed2bceb5a4;hpb=cdc85a32069485641b0c8c37f8d7c4e6727e336a;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
index 51b248295..2e7bb7e96 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
  * ================================================================================
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.transaction.Transactional;
+import lombok.AllArgsConstructor;
 import org.onap.cps.spi.CpsAdminPersistenceService;
 import org.onap.cps.spi.entities.AnchorEntity;
 import org.onap.cps.spi.entities.DataspaceEntity;
@@ -36,32 +37,24 @@ import org.onap.cps.spi.exceptions.AlreadyDefinedException;
 import org.onap.cps.spi.exceptions.DataspaceInUseException;
 import org.onap.cps.spi.exceptions.ModuleNamesNotFoundException;
 import org.onap.cps.spi.model.Anchor;
+import org.onap.cps.spi.model.CmHandleQueryParameters;
 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.ModuleReferenceRepository;
 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;
 
 @Component
+@AllArgsConstructor
 public class CpsAdminPersistenceServiceImpl implements CpsAdminPersistenceService {
 
-    @Autowired
-    private DataspaceRepository dataspaceRepository;
-
-    @Autowired
-    private AnchorRepository anchorRepository;
-
-    @Autowired
-    private SchemaSetRepository schemaSetRepository;
-
-    @Autowired
-    private FragmentRepository fragmentRepository;
-
-    @Autowired
-    private YangResourceRepository yangResourceRepository;
+    private final DataspaceRepository dataspaceRepository;
+    private final AnchorRepository anchorRepository;
+    private final SchemaSetRepository schemaSetRepository;
+    private final YangResourceRepository yangResourceRepository;
+    private final ModuleReferenceRepository moduleReferenceRepository;
 
     @Override
     public void createDataspace(final String dataspaceName) {
@@ -140,10 +133,14 @@ public class CpsAdminPersistenceServiceImpl implements CpsAdminPersistenceServic
     @Override
     public void deleteAnchor(final String dataspaceName, final String anchorName) {
         final var anchorEntity = getAnchorEntity(dataspaceName, anchorName);
-        fragmentRepository.deleteByAnchorIn(Set.of(anchorEntity));
         anchorRepository.delete(anchorEntity);
     }
 
+    @Override
+    public Set<String> queryCmHandles(final CmHandleQueryParameters cmHandleQueryParameters) {
+        return moduleReferenceRepository.queryCmHandles(cmHandleQueryParameters);
+    }
+
     private AnchorEntity getAnchorEntity(final String dataspaceName, final String anchorName) {
         final var dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
         return anchorRepository.getByDataspaceAndName(dataspaceEntity, anchorName);
@@ -159,20 +156,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);
+    }
 }