X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-ri%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fspi%2Frepository%2FFragmentQueryBuilder.java;fp=cps-ri%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fspi%2Frepository%2FFragmentQueryBuilder.java;h=b2014757d70d04918fbdc5ceaa5e815a2cf6632c;hb=8d0a18c7e5fb8bd98baeb98aaa006b3b385964f5;hp=e62471b0053f8920b65ee8da5c97667549385008;hpb=a6e62210e7d81a98ae2587ec0684a27e638911cc;p=cps.git

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentQueryBuilder.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentQueryBuilder.java
index e62471b00..b2014757d 100644
--- a/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentQueryBuilder.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentQueryBuilder.java
@@ -1,6 +1,6 @@
 /*
  *  ============LICENSE_START=======================================================
- *  Copyright (C) 2022-2023 Nordix Foundation
+ *  Copyright (C) 2022-2024 Nordix Foundation
  *  Modifications Copyright (C) 2023 TechMahindra Ltd.
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -92,7 +92,8 @@ public class FragmentQueryBuilder {
         sqlStringBuilder.append("SELECT distinct(fragment.anchor_id) FROM fragment "
                 + "JOIN anchor ON anchor.id = fragment.anchor_id WHERE dataspace_id = :dataspaceId");
         queryParameters.put("dataspaceId", dataspaceEntity.getId());
-        addXpathSearch(cpsPathQuery, sqlStringBuilder, queryParameters);
+        addAbsoluteParentXpathSearchCondition(cpsPathQuery, sqlStringBuilder, queryParameters, ACROSS_ALL_ANCHORS);
+        addXpathSearchCondition(cpsPathQuery, sqlStringBuilder, queryParameters);
         addLeafConditions(cpsPathQuery, sqlStringBuilder);
         addTextFunctionCondition(cpsPathQuery, sqlStringBuilder, queryParameters);
         addContainsFunctionCondition(cpsPathQuery, sqlStringBuilder, queryParameters);
@@ -125,7 +126,8 @@ public class FragmentQueryBuilder {
             sqlStringBuilder.append("SELECT * FROM fragment WHERE anchor_id = :anchorId");
             queryParameters.put("anchorId", anchorEntity.getId());
         }
-        addXpathSearch(cpsPathQuery, sqlStringBuilder, queryParameters);
+        addAbsoluteParentXpathSearchCondition(cpsPathQuery, sqlStringBuilder, queryParameters, anchorEntity);
+        addXpathSearchCondition(cpsPathQuery, sqlStringBuilder, queryParameters);
         addLeafConditions(cpsPathQuery, sqlStringBuilder);
         addTextFunctionCondition(cpsPathQuery, sqlStringBuilder, queryParameters);
         addContainsFunctionCondition(cpsPathQuery, sqlStringBuilder, queryParameters);
@@ -135,9 +137,9 @@ public class FragmentQueryBuilder {
         return query;
     }
 
-    private static void addXpathSearch(final CpsPathQuery cpsPathQuery,
-                                       final StringBuilder sqlStringBuilder,
-                                       final Map<String, Object> queryParameters) {
+    private static void addXpathSearchCondition(final CpsPathQuery cpsPathQuery,
+                                                final StringBuilder sqlStringBuilder,
+                                                final Map<String, Object> queryParameters) {
         sqlStringBuilder.append(" AND (xpath LIKE :escapedXpath OR "
                 + "(xpath LIKE :escapedXpath||'[@%]' AND xpath NOT LIKE :escapedXpath||'[@%]/%[@%]'))");
         if (CpsPathPrefixType.ABSOLUTE.equals(cpsPathQuery.getCpsPathPrefixType())) {
@@ -147,6 +149,25 @@ public class FragmentQueryBuilder {
         }
     }
 
+    private static void addAbsoluteParentXpathSearchCondition(final CpsPathQuery cpsPathQuery,
+                                                              final StringBuilder sqlStringBuilder,
+                                                              final Map<String, Object> queryParameters,
+                                                              final AnchorEntity anchorEntity) {
+        if (CpsPathPrefixType.ABSOLUTE.equals(cpsPathQuery.getCpsPathPrefixType())) {
+            if (cpsPathQuery.getNormalizedParentPath().isEmpty()) {
+                sqlStringBuilder.append(" AND parent_id IS NULL");
+            } else {
+                if (anchorEntity == ACROSS_ALL_ANCHORS) {
+                    sqlStringBuilder.append(" AND parent_id IN (SELECT id FROM fragment WHERE xpath = :parentXpath)");
+                } else {
+                    sqlStringBuilder.append(" AND parent_id = (SELECT id FROM fragment WHERE xpath = :parentXpath"
+                            + " AND anchor_id = :anchorId)");
+                }
+                queryParameters.put("parentXpath", cpsPathQuery.getNormalizedParentPath());
+            }
+        }
+    }
+
     private static void addPaginationCondition(final StringBuilder sqlStringBuilder,
                                                final Map<String, Object> queryParameters,
                                                final PaginationOption paginationOption) {