NCMP inventory cm handle search should support cps path query

- Added cps path query conditions for inventory search api

Issue-ID: CPS-2289
Change-Id: I0bcc9a45af65ad9d41c4d4cf79b35bfb95f50cff
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>

2 files changed, 10 insertions, 8 deletions

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/ParameterizedCmHandleQueryServiceImpl.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/ParameterizedCmHandleQueryServiceImpl.java
index 45922454fd..34eeaccf8f 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/ParameterizedCmHandleQueryServiceImpl.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/ParameterizedCmHandleQueryServiceImpl.java
@@ -66,19 +66,20 @@ public class ParameterizedCmHandleQueryServiceImpl implements ParameterizedCmHan
     public Collection<String> queryCmHandleIds(
             final CmHandleQueryServiceParameters cmHandleQueryServiceParameters) {
         return executeQueries(cmHandleQueryServiceParameters,
-            this::executeCpsPathQuery,
-            this::queryCmHandlesByPublicProperties,
-            this::executeModuleNameQuery,
+                this::executeCpsPathQuery,
+                this::queryCmHandlesByPublicProperties,
+                this::executeModuleNameQuery,
                 this::queryCmHandlesByTrustLevel);
     }
 
     @Override
     public Collection<String> queryCmHandleIdsForInventory(
-        final CmHandleQueryServiceParameters cmHandleQueryServiceParameters) {
+            final CmHandleQueryServiceParameters cmHandleQueryServiceParameters) {
         return executeQueries(cmHandleQueryServiceParameters,
-            this::queryCmHandlesByPublicProperties,
-            this::queryCmHandlesByPrivateProperties,
-            this::queryCmHandlesByDmiPlugin);
+                this::executeCpsPathQuery,
+                this::queryCmHandlesByPublicProperties,
+                this::queryCmHandlesByPrivateProperties,
+                this::queryCmHandlesByDmiPlugin);
     }
 
     @Override
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/models/InventoryQueryConditions.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/models/InventoryQueryConditions.java
index fce285b415..e0b54d2197 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/models/InventoryQueryConditions.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/models/InventoryQueryConditions.java
@@ -32,7 +32,8 @@ public enum InventoryQueryConditions {
 
     HAS_ALL_PROPERTIES("hasAllProperties"),
     HAS_ALL_ADDITIONAL_PROPERTIES("hasAllAdditionalProperties"),
-    CM_HANDLE_WITH_DMI_PLUGIN("cmHandleWithDmiPlugin");
+    CM_HANDLE_WITH_DMI_PLUGIN("cmHandleWithDmiPlugin"),
+    WITH_CPS_PATH("cmHandleWithCpsPath");
 
     public static final List<String> ALL_CONDITION_NAMES = Arrays.stream(InventoryQueryConditions.values())
         .map(InventoryQueryConditions::getName).collect(Collectors.toList());