VSE: Create an anchor in the given dataspace

Issue-ID: CPS-42
https://jira.onap.org/browse/CPS-42

Signed-off-by: Rishi Chail <rishi.chail@est.tech>
Change-Id: If67be6f13889808da4d9fe830595766af67e4fdf

8 files changed, 222 insertions, 76 deletions

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java
index 627a14467d..aeab4f844b 100644
--- a/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java
@@ -19,6 +19,7 @@
 
 package org.onap.cps.spi.entities;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -41,7 +42,9 @@ import lombok.Setter;
 @AllArgsConstructor
 @NoArgsConstructor
 @Table(name = "dataspace")
-public class Dataspace {
+public class Dataspace implements Serializable {
+
+    private static final long serialVersionUID = 8395254649813051882L;
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
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 12422dc5f6..4d8a90b733 100644
--- 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
@@ -21,6 +21,7 @@
 package org.onap.cps.spi.entities;

 

 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;

+import java.io.Serializable;

 import javax.persistence.Column;

 import javax.persistence.Entity;

 import javax.persistence.FetchType;

@@ -32,6 +33,7 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;

 import javax.validation.constraints.NotNull;

 import lombok.AllArgsConstructor;

+import lombok.Builder;

 import lombok.Getter;

 import lombok.NoArgsConstructor;

 import lombok.Setter;

@@ -47,8 +49,11 @@ import org.hibernate.annotations.TypeDefs;
 @Entity

 @AllArgsConstructor

 @NoArgsConstructor

+@Builder

 @TypeDefs({@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)})

-public class Fragment {

+public class Fragment implements Serializable {

+

+    private static final long serialVersionUID = 7737669789097119667L;

 

     @Id

     @GeneratedValue(strategy = GenerationType.IDENTITY)

@@ -62,6 +67,10 @@ public class Fragment {
     @Column(columnDefinition = "jsonb")

     private String attributes;

 

+    @Column(columnDefinition = "text")

+    private String anchorName;

+

+    @NotNull

     @ManyToOne(fetch = FetchType.LAZY)

     @JoinColumn(name = "dataspace_id")

     private Dataspace dataspace;

@@ -73,4 +82,8 @@ public class Fragment {
     @OneToOne(fetch = FetchType.LAZY)

     @JoinColumn(name = "parent_id")

     private Fragment parentFragment;

+

+    @OneToOne(fetch = FetchType.LAZY)

+    @JoinColumn(name = "module_id")

+    private ModuleEntity module;

 }

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/FragmentPersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/FragmentPersistenceServiceImpl.java
new file mode 100755
index 0000000000..47d98c92b5
--- /dev/null
+++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/FragmentPersistenceServiceImpl.java
@@ -0,0 +1,72 @@
+/*-

+ * ============LICENSE_START=======================================================

+ *  Copyright (C) 2020 Nordix Foundation. All rights reserved.

+ * ================================================================================

+ * 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 org.onap.cps.api.model.AnchorDetails;

+import org.onap.cps.exceptions.CpsNotFoundException;

+import org.onap.cps.exceptions.CpsValidationException;

+import org.onap.cps.spi.FragmentPersistenceService;

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

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

+import org.onap.cps.spi.entities.ModuleEntity;

+import org.onap.cps.spi.repository.DataspaceRepository;

+import org.onap.cps.spi.repository.FragmentRepository;

+import org.onap.cps.spi.repository.ModuleRepository;

+import org.springframework.beans.factory.annotation.Autowired;

+import org.springframework.dao.DataIntegrityViolationException;

+import org.springframework.stereotype.Component;

+

+@Component

+public class FragmentPersistenceServiceImpl implements FragmentPersistenceService {

+

+    @Autowired

+    private DataspaceRepository dataspaceRepository;

+

+    @Autowired

+    private FragmentRepository fragmentRepository;

+

+    @Autowired

+    private ModuleRepository moduleRepository;

+

+    @Override

+    public String createAnchor(final AnchorDetails anchorDetails) {

+        try {

+            final Dataspace dataspace = dataspaceRepository.getByName(anchorDetails.getDataspace());

+            final ModuleEntity moduleEntity =

+                moduleRepository.getByDataspaceAndNamespaceAndRevision(dataspace,

+                anchorDetails.getNamespace(), anchorDetails.getRevision());

+

+            final Fragment fragment = Fragment.builder().xpath(anchorDetails.getAnchorName())

+                .anchorName(anchorDetails.getAnchorName())

+                .dataspace(dataspace).module(moduleEntity).build();

+

+            fragmentRepository.save(fragment);

+            return anchorDetails.getAnchorName();

+        } catch (final CpsNotFoundException ex) {

+            throw new CpsValidationException("Validation Error",

+                String.format("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.",

+                    anchorDetails.getAnchorName(), anchorDetails.getDataspace()));

+        }

+    }

+}
\ No newline at end of file
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java
index 01c7a7b53b..56bba04b73 100644..100755
--- a/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java
@@ -31,17 +31,11 @@ import org.springframework.stereotype.Component;
 @Component
 public class ModelPersistencyServiceImpl implements ModelPersistencyService {
 
-
-    private final ModuleRepository moduleRepository;
-
-    private final DataspaceRepository dataspaceRepository;
+    @Autowired
+    private ModuleRepository moduleRepository;
 
     @Autowired
-    public ModelPersistencyServiceImpl(final ModuleRepository moduleRepository,
-        final DataspaceRepository dataspaceRepository) {
-        this.moduleRepository = moduleRepository;
-        this.dataspaceRepository = dataspaceRepository;
-    }
+    private DataspaceRepository dataspaceRepository;
 
     @Override
     public void storeModule(final String namespace, final String moduleContent, final String revision,
@@ -50,7 +44,7 @@ public class ModelPersistencyServiceImpl implements ModelPersistencyService {
         if (Boolean.FALSE.equals(dataspaceRepository.existsByName(dataspaceName))) {
             dataspaceRepository.save(dataspace);
         }
-        dataspace.setId(dataspaceRepository.findByName(dataspaceName).getId());
+        dataspace.setId(dataspaceRepository.getByName(dataspaceName).getId());
         final ModuleEntity moduleEntity = new ModuleEntity(namespace, moduleContent, revision, dataspace);
         moduleRepository.save(moduleEntity);
     }
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java
index 46a5266103..ad8004c07d 100644..100755
--- a/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java
@@ -20,6 +20,9 @@
 package org.onap.cps.spi.repository;
 
 
+import java.util.Optional;
+import javax.validation.constraints.NotNull;
+import org.onap.cps.exceptions.CpsNotFoundException;
 import org.onap.cps.spi.entities.Dataspace;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -28,5 +31,10 @@ import org.springframework.stereotype.Repository;
 public interface DataspaceRepository extends JpaRepository<Dataspace, Integer> {
     Boolean existsByName(String name); //Checks if there are any records by name()
 
-    Dataspace findByName(String name);
+    Optional<Dataspace> findByName(@NotNull String name);
+
+    default Dataspace getByName(@NotNull String name) {
+        return findByName(name).orElseThrow(
+            () -> new CpsNotFoundException("Not Found", "Dataspace " + name + " does not exist."));
+    }
 }
\ No newline at end of file
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
new file mode 100755
index 0000000000..ba83f15881
--- /dev/null
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
@@ -0,0 +1,29 @@
+/*-

+ * ============LICENSE_START=======================================================

+ *  Copyright (C) 2020 Nordix Foundation. All rights reserved.

+ * ================================================================================

+ * 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.repository;

+

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

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

+import org.springframework.stereotype.Repository;

+

+@Repository

+public interface FragmentRepository extends JpaRepository<Fragment, Integer> {

+}
\ No newline at end of file
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java
index f9078d7c14..fe27c8ec3e 100644..100755
--- a/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java
@@ -20,10 +20,36 @@
 package org.onap.cps.spi.repository;
 
 
+import java.util.Optional;
+import javax.validation.constraints.NotNull;
+import org.onap.cps.exceptions.CpsNotFoundException;
+import org.onap.cps.spi.entities.Dataspace;
 import org.onap.cps.spi.entities.ModuleEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface ModuleRepository extends JpaRepository<ModuleEntity, Integer> {
+
+    Optional<ModuleEntity> findByDataspaceAndNamespaceAndRevision(@NotNull Dataspace dataspace,
+        @NotNull String namespace,
+        @NotNull String revision);
+
+    /**
+     * This method gets a ModuleEntity by dataspace, namespace and revision.
+     *
+     * @param dataspace the dataspace
+     * @param namespace the namespace
+     * @param revision the revision
+     * @return the ModuleEntity
+     * @throws CpsNotFoundException if ModuleEntity not found
+     */
+    default ModuleEntity getByDataspaceAndNamespaceAndRevision(@NotNull Dataspace dataspace, @NotNull String namespace,
+        @NotNull String revision) {
+        return findByDataspaceAndNamespaceAndRevision(dataspace, namespace,
+            revision)
+            .orElseThrow(() -> new CpsNotFoundException("Validation Error", String.format(
+                "Module with dataspace %s, revision %s does not exist in namespace %s.",
+                dataspace.getName(), revision, namespace)));
+    }
 }
\ No newline at end of file
diff --git a/cps-ri/src/main/resources/schema.sql b/cps-ri/src/main/resources/schema.sql
index ba05048e89..3fabc6c9f9 100644..100755
--- a/cps-ri/src/main/resources/schema.sql
+++ b/cps-ri/src/main/resources/schema.sql
@@ -1,64 +1,65 @@
-CREATE TABLE IF NOT EXISTS RELATION_TYPE
-(
-    RELATION_TYPE TEXT NOT NULL,
-    ID SERIAL PRIMARY KEY
-);
-
-CREATE TABLE IF NOT EXISTS DATASPACE
-(
-    ID SERIAL PRIMARY KEY,
-    NAME TEXT NOT NULL,
-    CONSTRAINT "UQ_NAME" UNIQUE (NAME)
-);
-
-CREATE TABLE IF NOT EXISTS SCHEMA_NODE
-(
-    SCHEMA_NODE_IDENTIFIER TEXT NOT NULL,
-    ID SERIAL PRIMARY KEY
-);
-
-CREATE TABLE IF NOT EXISTS MODULE
-(
-    NAMESPACE TEXT NOT NULL,
-    REVISION TEXT NOT NULL,
-    MODULE_CONTENT TEXT NOT NULL,
-    DATASPACE_ID BIGINT NOT NULL,
-    ID SERIAL PRIMARY KEY,
-    UNIQUE (DATASPACE_ID, NAMESPACE, REVISION),
-    CONSTRAINT module_dataspace FOREIGN KEY (DATASPACE_ID) REFERENCES DATASPACE (id) ON UPDATE CASCADE ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS FRAGMENT
-(
-    ID BIGSERIAL PRIMARY KEY,
-    XPATH TEXT NOT NULL,
-    DATASPACE_ID INTEGER NOT NULL REFERENCES DATASPACE(ID),
-    ATTRIBUTES JSONB,
-    ANCHOR_ID BIGINT REFERENCES FRAGMENT(ID),
-    PARENT_ID BIGINT REFERENCES FRAGMENT(ID),
-    MODULE_ID INTEGER REFERENCES MODULE(ID),
-    SCHEMA_NODE_ID INTEGER REFERENCES SCHEMA_NODE(ID)
-);
-
-CREATE TABLE IF NOT EXISTS RELATION
-(
-    FROM_FRAGMENT_ID BIGINT NOT NULL REFERENCES FRAGMENT(ID),
-    TO_FRAGMENT_ID   BIGINT NOT NULL REFERENCES FRAGMENT(ID),
-    RELATION_TYPE_ID  INTEGER NOT NULL REFERENCES RELATION_TYPE(ID),
-    FROM_REL_XPATH TEXT NOT NULL,
-    TO_REL_XPATH TEXT NOT NULL,
-    CONSTRAINT RELATION_PKEY PRIMARY KEY (TO_FRAGMENT_ID, FROM_FRAGMENT_ID, RELATION_TYPE_ID)
-);
-
-
-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_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) ;
-CREATE INDEX  IF NOT EXISTS "FKI_SCHEMA_NODE_ID_TO_ID"         ON FRAGMENT USING BTREE(SCHEMA_NODE_ID) ;
-CREATE INDEX  IF NOT EXISTS "FKI_RELATION_TYPE_ID_FK"          ON RELATION USING BTREE(RELATION_TYPE_ID);
-CREATE INDEX  IF NOT EXISTS "FKI_RELATIONS_FROM_ID_FK"         ON RELATION USING BTREE(FROM_FRAGMENT_ID);
-CREATE INDEX  IF NOT EXISTS "FKI_RELATIONS_TO_ID_FK"           ON RELATION USING BTREE(TO_FRAGMENT_ID);
-CREATE INDEX  IF NOT EXISTS "PERF_MODULE_MODULE_CONTENT"       ON MODULE USING BTREE(MODULE_CONTENT);
+CREATE TABLE IF NOT EXISTS RELATION_TYPE

+(

+    RELATION_TYPE TEXT NOT NULL,

+    ID SERIAL PRIMARY KEY

+);

+

+CREATE TABLE IF NOT EXISTS DATASPACE

+(

+    ID SERIAL PRIMARY KEY,

+    NAME TEXT NOT NULL,

+    CONSTRAINT "UQ_NAME" UNIQUE (NAME)

+);

+

+CREATE TABLE IF NOT EXISTS SCHEMA_NODE

+(

+    SCHEMA_NODE_IDENTIFIER TEXT NOT NULL,

+    ID SERIAL PRIMARY KEY

+);

+

+CREATE TABLE IF NOT EXISTS MODULE

+(

+    ID SERIAL PRIMARY KEY,

+    NAMESPACE TEXT NOT NULL,

+    REVISION TEXT NOT NULL,

+    MODULE_CONTENT TEXT NOT NULL,

+    DATASPACE_ID BIGINT NOT NULL,

+    UNIQUE (DATASPACE_ID, NAMESPACE, REVISION),

+    CONSTRAINT MODULE_DATASPACE FOREIGN KEY (DATASPACE_ID) REFERENCES DATASPACE (id) ON UPDATE CASCADE ON DELETE CASCADE

+);

+

+CREATE TABLE IF NOT EXISTS FRAGMENT

+(

+    ID BIGSERIAL PRIMARY KEY,

+    XPATH TEXT NOT NULL,

+    ATTRIBUTES JSONB,

+    ANCHOR_NAME TEXT,

+    ANCHOR_ID BIGINT REFERENCES FRAGMENT(ID),

+    PARENT_ID BIGINT REFERENCES FRAGMENT(ID),

+    MODULE_ID INTEGER REFERENCES MODULE(ID),

+    DATASPACE_ID INTEGER NOT NULL REFERENCES DATASPACE(ID),

+    SCHEMA_NODE_ID INTEGER REFERENCES SCHEMA_NODE(ID),

+    UNIQUE (DATASPACE_ID, ANCHOR_NAME, XPATH)

+);

+

+CREATE TABLE IF NOT EXISTS RELATION

+(

+    FROM_FRAGMENT_ID BIGINT NOT NULL REFERENCES FRAGMENT(ID),

+    TO_FRAGMENT_ID   BIGINT NOT NULL REFERENCES FRAGMENT(ID),

+    RELATION_TYPE_ID  INTEGER NOT NULL REFERENCES RELATION_TYPE(ID),

+    FROM_REL_XPATH TEXT NOT NULL,

+    TO_REL_XPATH TEXT NOT NULL,

+    CONSTRAINT RELATION_PKEY PRIMARY KEY (TO_FRAGMENT_ID, FROM_FRAGMENT_ID, RELATION_TYPE_ID)

+);

+

+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_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) ;

+CREATE INDEX  IF NOT EXISTS "FKI_SCHEMA_NODE_ID_TO_ID"         ON FRAGMENT USING BTREE(SCHEMA_NODE_ID) ;

+CREATE INDEX  IF NOT EXISTS "FKI_RELATION_TYPE_ID_FK"          ON RELATION USING BTREE(RELATION_TYPE_ID);

+CREATE INDEX  IF NOT EXISTS "FKI_RELATIONS_FROM_ID_FK"         ON RELATION USING BTREE(FROM_FRAGMENT_ID);

+CREATE INDEX  IF NOT EXISTS "FKI_RELATIONS_TO_ID_FK"           ON RELATION USING BTREE(TO_FRAGMENT_ID);

+CREATE INDEX  IF NOT EXISTS "PERF_MODULE_MODULE_CONTENT"       ON MODULE USING BTREE(MODULE_CONTENT);

 CREATE UNIQUE INDEX  IF NOT EXISTS "UQ_FRAGMENT_XPATH"ON FRAGMENT USING btree(xpath COLLATE pg_catalog."default" text_pattern_ops, dataspace_id);
\ No newline at end of file