From 8a1e3c9f90d2111835460fc042b4a63f93b80384 Mon Sep 17 00:00:00 2001 From: Ruslan Kashapov Date: Tue, 24 Nov 2020 11:13:43 +0200 Subject: 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 --- .../java/org/onap/cps/spi/entities/Fragment.java | 4 +- .../spi/impl/CpsAdminPersistenceServiceImpl.java | 43 ++++++++++++---------- .../cps/spi/repository/FragmentRepository.java | 4 ++ .../cps/spi/repository/SchemaSetRepository.java | 13 ++++--- 4 files changed, 36 insertions(+), 28 deletions(-) (limited to 'cps-ri/src/main/java/org/onap') 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 7afdb3e092..2dbd6e98fe 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 48e7303593..5093ba5899 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 getAnchors(final String dataspaceName) { final Dataspace dataspace = dataspaceRepository.getByName(dataspaceName); final Collection fragments = fragmentRepository.findFragmentsThatAreAnchorsByDataspace(dataspace); - final Type anchorListType = new TypeToken>() {}.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 b1a8992370..2ee76cc126 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 { + Optional findByDataspaceAndAnchorName(@NotNull Dataspace dataspace, @NotNull String anchorName); + default Collection 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 035c831f2f..9b9d70625c 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 { Optional 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)); } } -- cgit 1.2.3-korg