DMI Data AVC RFC8641 and CloudEvent Compliant

- Introduced CloudEvents for DMI Data AVC Events
- Kafkatemplate config to support legacy as well as CloudEvents
- AvcEvent to be compliant with RFC8641 schema format
- Updating the released version of CPS and NCMP 3.3.3
- Refactored the test code to handle the changes related to CloudEvents

Issue-ID: CPS-1719
Change-Id: I082bbceda6dc26c860e1eff977ede219296d1875
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

1 files changed, 12 insertions, 8 deletions

diff --git a/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java b/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java
index 4fd46b66..075dcf20 100644
--- a/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java
+++ b/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java
@@ -20,9 +20,11 @@
 
 package org.onap.cps.ncmp.dmi.notifications.avc;
 
+
+import io.cloudevents.CloudEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.cps.ncmp.event.model.AvcEvent;
+import org.apache.kafka.clients.producer.ProducerRecord;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Service;
 
@@ -31,16 +33,18 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class DmiDataAvcEventProducer {
 
-    private final KafkaTemplate<String, AvcEvent> kafkaTemplate;
-
+    private final KafkaTemplate<String, CloudEvent> cloudEventKafkaTemplate;
+    
     /**
-     * Sends message to the configured topic with a message key.
+     * Publishing DMI Data AVC event payload as CloudEvent.
      *
-     * @param requestId the request id
-     * @param avcEvent the event to publish
+     * @param requestId     the request id
+     * @param cloudAvcEvent event with data as DMI DataAVC event
      */
-    public void sendMessage(final String requestId, final AvcEvent avcEvent) {
-        kafkaTemplate.send("dmi-cm-events", requestId, avcEvent);
+    public void publishDmiDataAvcCloudEvent(final String requestId, final CloudEvent cloudAvcEvent) {
+        final ProducerRecord<String, CloudEvent> producerRecord =
+                new ProducerRecord<>("dmi-cm-events", requestId, cloudAvcEvent);
+        cloudEventKafkaTemplate.send(producerRecord);
         log.debug("AVC event sent");
     }
 }