Associate anchor to schema set

- db schema updated
- db layer tests provided for ancor create and reading by dataspace
- anchor model is removed from rest api as extra
- api/spi updated to use string references instead of object

Issue-ID: CPS-99
Change-Id: Ideeb83fa9e91ec1816308d8327a6589b999c64c5
Signed-off-by: Ruslan Kashapov <ruslan.kashapov@pantheon.tech>

8 files changed, 191 insertions, 30 deletions

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java
index 7afdb3e09..2dbd6e98f 100755
--- a/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java
@@ -84,6 +84,6 @@ public class Fragment implements Serializable {
     private Fragment parentFragment;

 

     @OneToOne(fetch = FetchType.LAZY)

-    @JoinColumn(name = "module_id")

-    private Module module;

+    @JoinColumn(name = "schema_set_id")

+    private SchemaSet schemaSet;

 }

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 48e730359..5093ba589 100644
--- 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
@@ -21,19 +21,17 @@
 
 package org.onap.cps.spi.impl;
 
-import java.lang.reflect.Type;
 import java.util.Collection;
-import org.modelmapper.ModelMapper;
-import org.modelmapper.TypeToken;
+import java.util.stream.Collectors;
 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.SchemaSet;
 import org.onap.cps.spi.exceptions.AnchorAlreadyDefinedException;
 import org.onap.cps.spi.model.Anchor;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Component;
@@ -48,22 +46,22 @@ public class CpsAdminPersistenceServiceImpl implements CpsAdminPersistenceServic
     private FragmentRepository fragmentRepository;
 
     @Autowired
-    private ModuleRepository moduleRepository;
+    private SchemaSetRepository schemaSetRepository;
 
     @Override
-    public String createAnchor(final Anchor anchor) {
-        final String anchorName = anchor.getAnchorName();
+    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)
+            .build();
         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 DataIntegrityViolationException ex) {
-            throw new AnchorAlreadyDefinedException(anchor.getDataspaceName(), anchorName, ex);
+            fragmentRepository.save(anchor);
+        } catch (final DataIntegrityViolationException e) {
+            throw new AnchorAlreadyDefinedException(dataspaceName, anchorName, e);
         }
     }
 
@@ -71,7 +69,12 @@ public class CpsAdminPersistenceServiceImpl implements CpsAdminPersistenceServic
     public Collection<Anchor> getAnchors(final String dataspaceName) {
         final Dataspace dataspace = dataspaceRepository.getByName(dataspaceName);
         final Collection<Fragment> fragments = fragmentRepository.findFragmentsThatAreAnchorsByDataspace(dataspace);
-        final Type anchorListType = new TypeToken<Collection<Anchor>>() {}.getType();
-        return new ModelMapper().map(fragments, anchorListType);
+        return fragments.stream().map(
+            entity -> Anchor.builder()
+                .name(entity.getAnchorName())
+                .dataspaceName(dataspaceName)
+                .schemaSetName(entity.getSchemaSet().getName())
+                .build()
+        ).collect(Collectors.toList());
     }
 }
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
index b1a899237..2ee76cc12 100755
--- a/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
@@ -22,6 +22,8 @@
 package org.onap.cps.spi.repository;

 

 import java.util.Collection;

+import java.util.Optional;

+import javax.validation.constraints.NotNull;

 import org.onap.cps.spi.entities.Dataspace;

 import org.onap.cps.spi.entities.Fragment;

 import org.springframework.data.jpa.repository.JpaRepository;

@@ -30,6 +32,8 @@ import org.springframework.stereotype.Repository;
 @Repository

 public interface FragmentRepository extends JpaRepository<Fragment, Integer> {

 

+    Optional<Fragment> findByDataspaceAndAnchorName(@NotNull Dataspace dataspace, @NotNull String anchorName);

+

     default Collection<Fragment> findFragmentsThatAreAnchorsByDataspace(Dataspace dataspace) {

         return findFragmentsByDataspaceAndParentFragmentIsNull(dataspace);

     }

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/SchemaSetRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/SchemaSetRepository.java
index 035c831f2..9b9d70625 100644
--- a/cps-ri/src/main/java/org/onap/cps/spi/repository/SchemaSetRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/SchemaSetRepository.java
@@ -36,14 +36,15 @@ public interface SchemaSetRepository extends JpaRepository<SchemaSet, Integer> {
     Optional<SchemaSet> findByDataspaceAndName(@NotNull Dataspace dataspace, @NotNull String schemaSetName);
 
     /**
-     * This method gets a SchemaSet by dataspace, namespace and schemaSetName.
+     * Gets a schema set by dataspace and schema set name.
      *
-     * @param dataspace     the dataspace
-     * @param schemaSetName the schemaSet Name
-     * @return schemaSet
+     * @param dataspace     dataspace entity
+     * @param schemaSetName schema set name
+     * @return schema set entity
+     * @throws SchemaSetNotFoundException if SchemaSet not found
      */
-    default SchemaSet getByDataspaceAndName(@NotNull Dataspace dataspace, @NotNull String schemaSetName) {
+    default SchemaSet getByDataspaceAndName(@NotNull final Dataspace dataspace, @NotNull final String schemaSetName) {
         return findByDataspaceAndName(dataspace, schemaSetName)
-                       .orElseThrow(() -> new SchemaSetNotFoundException(dataspace.getName(), schemaSetName));
+            .orElseThrow(() -> new SchemaSetNotFoundException(dataspace.getName(), schemaSetName));
     }
 }
diff --git a/cps-ri/src/main/resources/schema.sql b/cps-ri/src/main/resources/schema.sql
index 2dce470ae..58b3c63c8 100755
--- a/cps-ri/src/main/resources/schema.sql
+++ b/cps-ri/src/main/resources/schema.sql
@@ -61,7 +61,7 @@ CREATE TABLE IF NOT EXISTS FRAGMENT
     ANCHOR_NAME TEXT,

     ANCHOR_ID BIGINT REFERENCES FRAGMENT(ID),

     PARENT_ID BIGINT REFERENCES FRAGMENT(ID),

-    MODULE_ID INTEGER REFERENCES MODULE(ID),

+    SCHEMA_SET_ID INTEGER REFERENCES SCHEMA_SET(ID),

     DATASPACE_ID INTEGER NOT NULL REFERENCES DATASPACE(ID),

     SCHEMA_NODE_ID INTEGER REFERENCES SCHEMA_NODE(ID),

     UNIQUE (DATASPACE_ID, ANCHOR_NAME, XPATH)

@@ -78,7 +78,7 @@ CREATE TABLE IF NOT EXISTS RELATION
 );

 

 CREATE INDEX  IF NOT EXISTS "FKI_FRAGMENT_DATASPACE_ID_FK"     ON FRAGMENT USING BTREE(DATASPACE_ID) ;

-CREATE INDEX  IF NOT EXISTS "FKI_FRAGMENT_MODULE_ID_FK"        ON FRAGMENT USING BTREE(MODULE_ID) ;

+CREATE INDEX  IF NOT EXISTS "FKI_FRAGMENT_SCHEMA_SET_ID_FK"    ON FRAGMENT USING BTREE(SCHEMA_SET_ID) ;

 CREATE INDEX  IF NOT EXISTS "FKI_FRAGMENT_PARENT_ID_FK"        ON FRAGMENT USING BTREE(PARENT_ID) ;

 CREATE INDEX  IF NOT EXISTS "FKI_FRAGMENT_ANCHOR_ID_FK"        ON FRAGMENT USING BTREE(ANCHOR_ID) ;

 CREATE INDEX  IF NOT EXISTS "PERF_SCHEMA_NODE_SCHEMA_NODE_ID"  ON SCHEMA_NODE USING BTREE(SCHEMA_NODE_IDENTIFIER) ;

diff --git a/cps-ri/src/test/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceTest.java b/cps-ri/src/test/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceTest.java
new file mode 100644
index 000000000..455369d2c
--- /dev/null
+++ b/cps-ri/src/test/java/org/onap/cps/spi/impl/CpsAdminPersistenceServiceTest.java
@@ -0,0 +1,143 @@
+/*
+ *  ============LICENSE_START=======================================================
+ *  Copyright (C) 2020 Pantheon.tech
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.onap.cps.spi.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collection;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.cps.DatabaseTestContainer;
+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.exceptions.AnchorAlreadyDefinedException;
+import org.onap.cps.spi.exceptions.DataspaceNotFoundException;
+import org.onap.cps.spi.exceptions.SchemaSetNotFoundException;
+import org.onap.cps.spi.model.Anchor;
+import org.onap.cps.spi.repository.DataspaceRepository;
+import org.onap.cps.spi.repository.FragmentRepository;
+import org.onap.cps.spi.repository.SchemaSetRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlGroup;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class CpsAdminPersistenceServiceTest {
+
+    private static final String CLEAR_DATA = "/data/clear-all.sql";
+    private static final String SET_DATA = "/data/anchor.sql";
+
+    private static final String DATASPACE_NAME = "DATASPACE-001";
+    private static final String EMPTY_DATASPACE_NAME = "DATASPACE-002";
+    private static final String NON_EXISTING_DATASPACE_NAME = "NON EXISTING DATASPACE";
+    private static final String NON_EXISTING_SCHEMA_SET_NAME = "NON EXISTING SCHEMA SET";
+    private static final String SCHEMA_SET_NAME1 = "SCHEMA-SET-001";
+    private static final String SCHEMA_SET_NAME2 = "SCHEMA-SET-002";
+    private static final String ANCHOR_NAME1 = "ANCHOR-001";
+    private static final String ANCHOR_NAME2 = "ANCHOR-002";
+    private static final String ANCHOR_NAME_NEW = "ANCHOR-NEW";
+
+    @ClassRule
+    public static DatabaseTestContainer databaseTestContainer = DatabaseTestContainer.getInstance();
+
+    @Autowired
+    private CpsAdminPersistenceService cpsAdminPersistenceService;
+
+    @Autowired
+    private FragmentRepository fragmentRepository;
+
+    @Autowired
+    private DataspaceRepository dataspaceRepository;
+
+    @Autowired
+    private SchemaSetRepository schemaSetRepository;
+
+    @Test
+    @SqlGroup({@Sql(CLEAR_DATA), @Sql(SET_DATA)})
+    public void testCreateAnchor() {
+        cpsAdminPersistenceService.createAnchor(DATASPACE_NAME, SCHEMA_SET_NAME2, ANCHOR_NAME_NEW);
+
+        // validate anchor persisted
+        final Dataspace dataspace = dataspaceRepository.findByName(DATASPACE_NAME).orElseThrow();
+        final Fragment anchor =
+            fragmentRepository.findByDataspaceAndAnchorName(dataspace, ANCHOR_NAME_NEW).orElseThrow();
+
+        assertNotNull(anchor.getId());
+        assertEquals(ANCHOR_NAME_NEW, anchor.getAnchorName());
+        assertEquals(DATASPACE_NAME, anchor.getDataspace().getName());
+        assertEquals(SCHEMA_SET_NAME2, anchor.getSchemaSet().getName());
+    }
+
+    @Test(expected = DataspaceNotFoundException.class)
+    @SqlGroup({@Sql(CLEAR_DATA), @Sql(SET_DATA)})
+    public void testCreateAnchorAtNonExistingDataspace() {
+        cpsAdminPersistenceService.createAnchor(NON_EXISTING_DATASPACE_NAME, SCHEMA_SET_NAME2, ANCHOR_NAME_NEW);
+    }
+
+    @Test(expected = SchemaSetNotFoundException.class)
+    @SqlGroup({@Sql(CLEAR_DATA), @Sql(SET_DATA)})
+    public void testCreateAnchorWithNonExistingSchemaSet() {
+        cpsAdminPersistenceService.createAnchor(DATASPACE_NAME, NON_EXISTING_SCHEMA_SET_NAME, ANCHOR_NAME_NEW);
+    }
+
+    @Test(expected = AnchorAlreadyDefinedException.class)
+    @SqlGroup({@Sql(CLEAR_DATA), @Sql(SET_DATA)})
+    public void testCreateAnchorWithNameAlreadyDefined() {
+        cpsAdminPersistenceService.createAnchor(DATASPACE_NAME, SCHEMA_SET_NAME2, ANCHOR_NAME1);
+    }
+
+    @Test
+    @SqlGroup({@Sql(CLEAR_DATA), @Sql(SET_DATA)})
+    public void testGetAnchorsByDataspace() {
+        final Collection<Anchor> anchors = cpsAdminPersistenceService.getAnchors(DATASPACE_NAME);
+
+        assertNotNull(anchors);
+        assertEquals(2, anchors.size());
+        assertTrue(anchors.contains(
+            Anchor.builder().name(ANCHOR_NAME1).schemaSetName(SCHEMA_SET_NAME1).dataspaceName(DATASPACE_NAME).build()
+        ));
+        assertTrue(anchors.contains(
+            Anchor.builder().name(ANCHOR_NAME2).schemaSetName(SCHEMA_SET_NAME2).dataspaceName(DATASPACE_NAME).build()
+        ));
+    }
+
+    @Test(expected = DataspaceNotFoundException.class)
+    @SqlGroup({@Sql(CLEAR_DATA), @Sql(SET_DATA)})
+    public void testGetAnchorsByNonExistingDataspace() {
+        cpsAdminPersistenceService.getAnchors(NON_EXISTING_DATASPACE_NAME);
+    }
+
+    @Test
+    @SqlGroup({@Sql(CLEAR_DATA), @Sql(SET_DATA)})
+    public void testGetAnchorsFromEmptyDataspace() {
+        final Collection<Anchor> anchors = cpsAdminPersistenceService.getAnchors(EMPTY_DATASPACE_NAME);
+
+        assertNotNull(anchors);
+        assertTrue(anchors.isEmpty());
+    }
+
+}
diff --git a/cps-ri/src/test/resources/data/anchor.sql b/cps-ri/src/test/resources/data/anchor.sql
new file mode 100644
index 000000000..55075596b
--- /dev/null
+++ b/cps-ri/src/test/resources/data/anchor.sql
@@ -0,0 +1,9 @@
+INSERT INTO DATASPACE (ID, NAME) VALUES
+    (1001, 'DATASPACE-001'), (1002, 'DATASPACE-002');
+
+INSERT INTO SCHEMA_SET (ID, NAME, DATASPACE_ID) VALUES
+    (2001, 'SCHEMA-SET-001', 1001), (2002, 'SCHEMA-SET-002', 1001);
+
+INSERT INTO FRAGMENT (ID, XPATH, ANCHOR_NAME, DATASPACE_ID, SCHEMA_SET_ID) VALUES
+    (3001, 'ANCHOR-001', 'ANCHOR-001', 1001, 2001),
+    (3002, 'ANCHOR-002', 'ANCHOR-002', 1001, 2002);
\ No newline at end of file
diff --git a/cps-ri/src/test/resources/data/clear-all.sql b/cps-ri/src/test/resources/data/clear-all.sql
index 3d93825ba..522f9e617 100644
--- a/cps-ri/src/test/resources/data/clear-all.sql
+++ b/cps-ri/src/test/resources/data/clear-all.sql
@@ -1,3 +1,4 @@
+DELETE FROM FRAGMENT;
 -- clear all via dataspace table cleanup
 -- all other data will be removed by cascade
 DELETE FROM DATASPACE;