X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-ncmp-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fncmp%2Fapi%2Fimpl%2Fevents%2Fcmsubscription%2Fservice%2FCmNotificationSubscriptionPersistenceServiceImpl.java;h=2efd321b8d19a5d121a4fe1ad0d9bac8877a4c9d;hb=fd02245bd3aae4c2d57da8f5b5c5428d98ce8551;hp=5eca5e8c5786ccc27ca7e8efe6183882b6a4cec1;hpb=bdc3fae4230ea23accfae66f250526d51f3b3210;p=cps.git

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/service/CmNotificationSubscriptionPersistenceServiceImpl.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/service/CmNotificationSubscriptionPersistenceServiceImpl.java
index 5eca5e8c5..2efd321b8 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/service/CmNotificationSubscriptionPersistenceServiceImpl.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/service/CmNotificationSubscriptionPersistenceServiceImpl.java
@@ -20,7 +20,6 @@
 
 package org.onap.cps.ncmp.api.impl.events.cmsubscription.service;
 
-import static org.onap.cps.ncmp.api.impl.operations.DatastoreType.PASSTHROUGH_RUNNING;
 import static org.onap.cps.spi.FetchDescendantsOption.OMIT_DESCENDANTS;
 
 import java.io.Serializable;
@@ -109,14 +108,8 @@ public class CmNotificationSubscriptionPersistenceServiceImpl implements CmNotif
 
     private void addNewSubscriptionViaDatastore(final DatastoreType datastoreType, final String cmHandleId,
                                                 final String xpath, final String newSubscriptionId) {
-        final String parentXpathFormat = "/datastores/datastore[@name='%s']/cm-handles";
-        String parentXpath = "";
-        if (datastoreType == PASSTHROUGH_RUNNING) {
-            parentXpath = parentXpathFormat.formatted("ncmp-datastore:passthrough-running");
-        } else {
-            parentXpath = parentXpathFormat.formatted("ncmp-datastore:passthrough-operational");
-        }
-
+        final String parentXpath = "/datastores/datastore[@name='%s']/cm-handles"
+                .formatted(datastoreType.getDatastoreName());
         final String updatedJson = String.format("{\"cm-handle\":[{\"id\":\"%s\",\"filters\":{\"filter\":"
                 + "[{\"xpath\":\"%s\",\"subscriptionIds\":[\"%s\"]}]}}]}", cmHandleId, xpath, newSubscriptionId);
         cpsDataService.saveData(NCMP_DATASPACE_NAME, SUBSCRIPTION_ANCHOR_NAME, parentXpath, updatedJson,