From edd3f9055e9780761a6b4a34e9c10415d8d7003a Mon Sep 17 00:00:00 2001
From: emaclee <lee.anjella.macabuhay@est.tech>
Date: Wed, 22 Jan 2025 08:38:13 +0000
Subject: Change event topic name for trust level

	- Seperate inventory related topics to cm data event topic

Issue-ID: CPS-2500
Change-Id: I41a2cda78568f9979fc9f030f076c295c8d6908b
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
---
 .../ncmp/impl/inventory/trustlevel/TrustLevelManager.java  | 10 +++++-----
 .../onap/cps/ncmp/utils/events/CmAvcEventPublisher.java    | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'cps-ncmp-service/src/main/java/org/onap')

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManager.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManager.java
index f68bb3b543..692bf5caee 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManager.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManager.java
@@ -193,14 +193,14 @@ public class TrustLevelManager {
                                                final TrustLevel newEffectiveTrustLevel) {
         if (oldEffectiveTrustLevel.equals(newEffectiveTrustLevel)) {
             log.debug("The Cm Handle: {} has already the same trust level: {}", notificationCandidateCmHandleId,
-                newEffectiveTrustLevel);
+                    newEffectiveTrustLevel);
         } else {
             log.info("The trust level for Cm Handle: {} is now: {} ", notificationCandidateCmHandleId,
-                newEffectiveTrustLevel);
+                    newEffectiveTrustLevel);
             cmAvcEventPublisher.publishAvcEvent(notificationCandidateCmHandleId,
-                AVC_CHANGED_ATTRIBUTE_NAME,
-                oldEffectiveTrustLevel.name(),
-                newEffectiveTrustLevel.name());
+                    AVC_CHANGED_ATTRIBUTE_NAME,
+                    oldEffectiveTrustLevel.name(),
+                    newEffectiveTrustLevel.name());
         }
     }
 
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/utils/events/CmAvcEventPublisher.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/utils/events/CmAvcEventPublisher.java
index 2a9717cc1a..bdc7899724 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/utils/events/CmAvcEventPublisher.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/utils/events/CmAvcEventPublisher.java
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2023-2024 Nordix Foundation
+ *  Copyright (C) 2023-2025 Nordix Foundation
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -38,8 +38,8 @@ public class CmAvcEventPublisher {
 
     private final EventsPublisher<CloudEvent> eventsPublisher;
 
-    @Value("${app.ncmp.avc.cm-events-topic}")
-    private String avcTopic;
+    @Value("${app.ncmp.avc.inventory-events-topic}")
+    private String ncmpInventoryEventsTopicName;
 
     /**
      * Publish attribute value change event.
@@ -52,10 +52,10 @@ public class CmAvcEventPublisher {
 
         final Map<String, String> extensions = createAvcEventExtensions(eventKey);
         final CloudEvent avcCloudEvent =
-            NcmpEvent.builder().type(AvcEvent.class.getTypeName())
-            .data(avcEvent).extensions(extensions).build().asCloudEvent();
+                NcmpEvent.builder().type(AvcEvent.class.getTypeName())
+                        .data(avcEvent).extensions(extensions).build().asCloudEvent();
 
-        eventsPublisher.publishCloudEvent(avcTopic, eventKey, avcCloudEvent);
+        eventsPublisher.publishCloudEvent(ncmpInventoryEventsTopicName, eventKey, avcCloudEvent);
     }
 
     private AvcEvent buildAvcEvent(final String attributeName,
@@ -78,4 +78,4 @@ public class CmAvcEventPublisher {
         extensions.put("correlationid", eventKey);
         return extensions;
     }
-}
+}
\ No newline at end of file
-- 
cgit