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=9f33b2fa50e2220457874f1e75afb744ad33bb2c;hb=3d8ee6a5e81faa53b438c8cf78d3403b6df678e1;hp=d6579bdbb5838ae33e4a7061816764921fbd6b24;hpb=5a8718b84dbd3c6fa78aa644a4695274a0a1ab5d;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 d6579bdbb..9f33b2fa5
--- 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,7 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation. All rights reserved.
- *  Modifications Copyright (C) 2020 Bell Canada. 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.
@@ -22,17 +23,22 @@
 package org.onap.cps.spi.impl;
 
 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.SchemaSet;
-import org.onap.cps.spi.exceptions.AnchorAlreadyDefinedException;
-import org.onap.cps.spi.exceptions.DataspaceAlreadyDefinedException;
+import org.onap.cps.spi.entities.AnchorEntity;
+import org.onap.cps.spi.entities.DataspaceEntity;
+import org.onap.cps.spi.entities.YangResourceModuleReference;
+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.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;
@@ -44,47 +50,100 @@ public class CpsAdminPersistenceServiceImpl implements CpsAdminPersistenceServic
     private DataspaceRepository dataspaceRepository;
 
     @Autowired
-    private FragmentRepository fragmentRepository;
+    private AnchorRepository anchorRepository;
 
     @Autowired
     private SchemaSetRepository schemaSetRepository;
 
+    @Autowired
+    private FragmentRepository fragmentRepository;
+
+    @Autowired
+    private YangResourceRepository yangResourceRepository;
+
     @Override
     public void createDataspace(final String dataspaceName) {
         try {
-            dataspaceRepository.save(new Dataspace(dataspaceName));
+            dataspaceRepository.save(new DataspaceEntity(dataspaceName));
         } catch (final DataIntegrityViolationException e) {
-            throw new DataspaceAlreadyDefinedException(dataspaceName, e);
+            throw AlreadyDefinedException.forDataspace(dataspaceName, e);
         }
     }
 
     @Override
     public void createAnchor(final String dataspaceName, final String schemaSetName, final String anchorName) {
-        final Dataspace dataspace = dataspaceRepository.getByName(dataspaceName);
-        final SchemaSet schemaSet = schemaSetRepository.getByDataspaceAndName(dataspace, schemaSetName);
-        final Fragment anchor = Fragment.builder()
-            .xpath(anchorName)
-            .anchorName(anchorName)
-            .dataspace(dataspace)
-            .schemaSet(schemaSet)
+        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 {
-            fragmentRepository.save(anchor);
+            anchorRepository.save(anchorEntity);
         } catch (final DataIntegrityViolationException e) {
-            throw new AnchorAlreadyDefinedException(dataspaceName, anchorName, e);
+            throw AlreadyDefinedException.forAnchor(anchorName, dataspaceName, e);
         }
     }
 
     @Override
     public Collection<Anchor> getAnchors(final String dataspaceName) {
-        final Dataspace dataspace = dataspaceRepository.getByName(dataspaceName);
-        final Collection<Fragment> fragments = fragmentRepository.findFragmentsThatAreAnchorsByDataspace(dataspace);
-        return fragments.stream().map(
-            entity -> Anchor.builder()
-                .name(entity.getAnchorName())
-                .dataspaceName(dataspaceName)
-                .schemaSetName(entity.getSchemaSet().getName())
-                .build()
-        ).collect(Collectors.toList());
+        final var dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
+        final Collection<AnchorEntity> anchorEntities = anchorRepository.findAllByDataspace(dataspaceEntity);
+        return anchorEntities.stream().map(CpsAdminPersistenceServiceImpl::toAnchor).collect(Collectors.toList());
+    }
+
+    @Override
+    public Collection<Anchor> queryAnchors(final String dataspaceName, final Collection<String> inputModuleNames) {
+        validateDataspaceAndModuleNames(dataspaceName, inputModuleNames);
+        final Collection<AnchorEntity> anchorEntities =
+            anchorRepository.getAnchorsByDataspaceNameAndModuleNames(dataspaceName, inputModuleNames);
+        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<String> inputModuleNames) {
+        final Collection<String> retrievedModuleNames =
+            yangResourceRepository.findAllModuleReferences(dataspaceName, inputModuleNames)
+                .stream().map(YangResourceModuleReference::getModuleName)
+                .collect(Collectors.toList());
+        if (retrievedModuleNames.isEmpty()) {
+            dataspaceRepository.getByName(dataspaceName);
+        }
+        if (inputModuleNames.size() > retrievedModuleNames.size()) {
+            final List<String> moduleNamesNotFound = inputModuleNames.stream()
+                .filter(moduleName -> !retrievedModuleNames.contains(moduleName))
+                .collect(Collectors.toList());
+            if (!moduleNamesNotFound.isEmpty()) {
+                throw new ModuleNamesNotFoundException(dataspaceName, moduleNamesNotFound);
+            }
+        }
     }
 }