1 files changed, 7 insertions, 3 deletions

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 d486a39c7..0067cfe43 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
@@ -27,6 +27,7 @@ import java.util.Collection;
 import java.util.List;

 import java.util.Optional;

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

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

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

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

 import org.onap.cps.spi.exceptions.DataNodeNotFoundException;

@@ -54,7 +55,9 @@ public interface FragmentRepository extends JpaRepository<FragmentEntity, Long>,
 

     List<FragmentEntity> findAllByAnchorAndXpathIn(AnchorEntity anchorEntity, Collection<String> xpath);

 

-    List<FragmentEntity> findAllByXpathIn(Collection<String> xpath);

+    @Query("SELECT f FROM FragmentEntity f WHERE dataspace = :dataspace AND xpath IN :xpaths")

+    List<FragmentEntity> findAllByXpathIn(@Param("dataspace") DataspaceEntity dataspace,

+                                          @Param("xpaths") Collection<String> xpaths);

 

     @Modifying

     @Query("DELETE FROM FragmentEntity WHERE anchor IN (:anchors)")

@@ -109,7 +112,8 @@ public interface FragmentRepository extends JpaRepository<FragmentEntity, Long>,
 

     @Query(value = "SELECT id, anchor_id AS anchorId, xpath, parent_id AS parentId,"

             + " CAST(attributes AS TEXT) AS attributes"

-            + " FROM FRAGMENT WHERE xpath ~ :xpathRegex",

+            + " FROM FRAGMENT WHERE dataspace_id = :dataspaceId AND xpath ~ :xpathRegex",

             nativeQuery = true)

-    List<FragmentExtract> quickFindWithDescendantsAcrossAnchor(@Param("xpathRegex") String xpathRegex);

+    List<FragmentExtract> quickFindWithDescendantsAcrossAnchor(@Param("dataspaceId") int dataspaceId,

+                                                               @Param("xpathRegex") String xpathRegex);

 }