Merge "Cm Avc Event to have same key"

1 files changed, 5 insertions, 3 deletions

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cmnotificationsubscription/cmavc/CmAvcEventConsumer.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cmnotificationsubscription/cmavc/CmAvcEventConsumer.java
index 9e90eabbc4..2d1f64802b 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cmnotificationsubscription/cmavc/CmAvcEventConsumer.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cmnotificationsubscription/cmavc/CmAvcEventConsumer.java
@@ -46,7 +46,8 @@ public class CmAvcEventConsumer {
     private final EventsPublisher<CloudEvent> eventsPublisher;
 
     /**
-     * Incoming AvcEvent in the form of Consumer Record.
+     * Incoming Cm AvcEvent in the form of Consumer Record, it will be forwarded as is to a target topic.
+     * The key from incoming record will be used as key for the target topic as well to preserve the message ordering.
      *
      * @param cmAvcEventAsConsumerRecord Incoming raw consumer record
      */
@@ -55,7 +56,8 @@ public class CmAvcEventConsumer {
     public void consumeAndForward(
             final ConsumerRecord<String, CloudEvent> cmAvcEventAsConsumerRecord) {
         final CloudEvent outgoingAvcEvent = cmAvcEventAsConsumerRecord.value();
-        log.debug("Consuming AVC event {} ...", outgoingAvcEvent);
-        eventsPublisher.publishCloudEvent(cmEventsTopicName, outgoingAvcEvent.getId(), outgoingAvcEvent);
+        final String outgoingAvcEventKey = cmAvcEventAsConsumerRecord.key();
+        log.debug("Consuming AVC event with key : {} and value : {}", outgoingAvcEventKey, outgoingAvcEvent);
+        eventsPublisher.publishCloudEvent(cmEventsTopicName, outgoingAvcEventKey, outgoingAvcEvent);
     }
 }