From ed263f7628bbeaf1c0803fc10c0e0581f6cc03b1 Mon Sep 17 00:00:00 2001 From: emaclee Date: Tue, 23 Sep 2025 17:34:23 +0100 Subject: [PATCH] Change parent node xPath for saving subscription - wrong parent node xPath was used by calling wrong method , should be /dataJob and not '/' Issue-ID: CPS-2723 Change-Id: I62549bc1c0df4359de1f89d5951f351fdeed830d Signed-off-by: emaclee --- .../subscription/utils/CmDataJobSubscriptionPersistenceService.java | 6 +++--- .../subscription/utils/CmSubscriptionPersistenceServiceSpec.groovy | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/datajobs/subscription/utils/CmDataJobSubscriptionPersistenceService.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/datajobs/subscription/utils/CmDataJobSubscriptionPersistenceService.java index cdb12954b4..6b8e9c05e8 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/datajobs/subscription/utils/CmDataJobSubscriptionPersistenceService.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/datajobs/subscription/utils/CmDataJobSubscriptionPersistenceService.java @@ -158,7 +158,7 @@ public class CmDataJobSubscriptionPersistenceService { final String cmSubscriptionStatus = UNKNOWN.name(); final String subscriptionDetailsAsJson = createSubscriptionDetailsAsJson(dataNodeSelector, newSubscriptionList, cmSubscriptionStatus); - cpsDataService.saveData(DATASPACE, ANCHOR, subscriptionDetailsAsJson, + cpsDataService.saveData(DATASPACE, ANCHOR, PARENT_NODE_XPATH, subscriptionDetailsAsJson, OffsetDateTime.now(), ContentType.JSON); } @@ -166,8 +166,8 @@ public class CmDataJobSubscriptionPersistenceService { final String cmSubscriptionStatusName) { final String subscriptionDetailsAsJson = createSubscriptionDetailsAsJson(dataNodeSelector, subscriptionIds, cmSubscriptionStatusName); - cpsDataService.updateNodeLeaves(DATASPACE, ANCHOR, - PARENT_NODE_XPATH, subscriptionDetailsAsJson, OffsetDateTime.now(), + cpsDataService.updateNodeLeaves(DATASPACE, ANCHOR, PARENT_NODE_XPATH, subscriptionDetailsAsJson, + OffsetDateTime.now(), ContentType.JSON); } diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/datajobs/subscription/utils/CmSubscriptionPersistenceServiceSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/datajobs/subscription/utils/CmSubscriptionPersistenceServiceSpec.groovy index a105d1daa3..50f09b4c38 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/datajobs/subscription/utils/CmSubscriptionPersistenceServiceSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/datajobs/subscription/utils/CmSubscriptionPersistenceServiceSpec.groovy @@ -101,7 +101,7 @@ class CmSubscriptionPersistenceServiceSpec extends Specification { when: 'the method to add cm notification subscription is called' objectUnderTest.add('newSubId', dataNodeSelector) then: 'data service method to create new subscription for given subscriber is called once with the correct parameters' - 1 * mockCpsDataService.saveData('NCMP-Admin', 'cm-data-job-subscriptions', subscriptionAsJson, _, ContentType.JSON) + 1 * mockCpsDataService.saveData('NCMP-Admin', 'cm-data-job-subscriptions', PARENT_NODE_XPATH, subscriptionAsJson, _, ContentType.JSON) } def 'Add subscription for a data node selector that already have subscription(s).'() { -- 2.16.6