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, 6 insertions, 6 deletions

diff --git a/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java b/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java
index f7f4bf96..c5fb8fbe 100644
--- a/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java
+++ b/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java
@@ -20,10 +20,10 @@
 
 package org.onap.cps.ncmp.dmi.notifications.avc;
 
+import io.cloudevents.CloudEvent;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.cps.ncmp.event.model.AvcEvent;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,18 +42,18 @@ public class DmiDataAvcEventSimulationController {
 
     /**
      * Simulate Event for AVC.
+     *
      * @param numberOfSimulatedEvents number of events to be generated
      * @return ResponseEntity
      */
     @GetMapping(path = "/v1/simulateDmiDataEvent")
-    public ResponseEntity<Void> simulateEvents(@RequestParam("numberOfSimulatedEvents")
-                                                   final Integer numberOfSimulatedEvents) {
-        final DmiDataAvcEventCreator dmiDataAvcEventCreator = new DmiDataAvcEventCreator();
+    public ResponseEntity<Void> simulateEvents(
+            @RequestParam("numberOfSimulatedEvents") final Integer numberOfSimulatedEvents) {
 
         for (int i = 0; i < numberOfSimulatedEvents; i++) {
             final String eventCorrelationId = UUID.randomUUID().toString();
-            final AvcEvent avcEvent = dmiDataAvcEventCreator.createEvent(eventCorrelationId);
-            dmiDataAvcEventProducer.sendMessage(eventCorrelationId, avcEvent);
+            final CloudEvent cloudEvent = DmiDataAvcCloudEventCreator.createCloudEvent(eventCorrelationId);
+            dmiDataAvcEventProducer.publishDmiDataAvcCloudEvent(eventCorrelationId, cloudEvent);
         }
 
         return new ResponseEntity<>(HttpStatus.OK);