Merge "Patch # 1: Data operation response event (NCMP → Client App) to comply with CloudEvents"

2 files changed, 14 insertions, 70 deletions

diff --git a/cps-ncmp-events/src/main/resources/schemas/async/batch-event-headers-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/async/batch-event-headers-1.0.0.json
deleted file mode 100644
index bbcadcd0f4..0000000000
--- a/cps-ncmp-events/src/main/resources/schemas/async/batch-event-headers-1.0.0.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2019-09/schema",
-  "$id": "urn:cps:org.onap.cps.ncmp.events.async:batch-event-headers:1.0.0",
-  "$ref": "#/definitions/BatchEventHeaders",
-  "definitions": {
-    "BatchEventHeaders": {
-      "description": "The header information of the Batch event.",
-      "type": "object",
-      "javaType" : "org.onap.cps.ncmp.events.async.BatchEventHeadersV1",
-      "properties": {
-        "eventId": {
-          "description": "The unique id for identifying the event.",
-          "type": "string"
-        },
-        "eventCorrelationId": {
-          "description": "The request id received by NCMP as an acknowledgement.",
-          "type": "string"
-        },
-        "eventTime": {
-          "description": "The time of the event. It should be in RFC format ('yyyy-MM-dd'T'HH:mm:ss.SSSZ').",
-          "type": "string"
-        },
-        "eventTarget": {
-          "description": "The destination topic to forward the consumed event.",
-          "type": "string"
-        },
-        "eventSource": {
-          "description": "The source of the event.",
-          "type": "string"
-        },
-        "eventType": {
-          "description": "The type of the Batch event.",
-          "type": "string"
-        },
-        "eventSchema": {
-          "description": "The schema of the Batch event payload.",
-          "type": "string"
-        },
-        "eventSchemaVersion": {
-          "description": "The schema version of the Batch event payload.",
-          "type": "string"
-        }
-      },
-      "required": [
-        "eventId",
-        "eventCorrelationId",
-        "eventTarget",
-        "eventType",
-        "eventSchema",
-        "eventSchemaVersion"
-      ],
-      "additionalProperties": false
-    }
-  }
-}
\ No newline at end of file
diff --git a/cps-ncmp-events/src/main/resources/schemas/async/batch-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json
index da836ff167..308e3068d6 100644
--- a/cps-ncmp-events/src/main/resources/schemas/async/batch-event-schema-1.0.0.json
+++ b/cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json
@@ -1,19 +1,18 @@
 {
   "$schema": "https://json-schema.org/draft/2019-09/schema",
-  "$id": "urn:cps:org.onap.cps.ncmp.events.async:batch-event-schema:1.0.0",
-  "$ref": "#/definitions/BatchDataResponseEvent",
+  "$id": "urn:cps:org.onap.cps.ncmp.events.async:data-operation-event-schema:1.0.0",
+  "$ref": "#/definitions/DataOperationEvent",
   "definitions": {
-    "BatchDataResponseEvent": {
-      "description": "The payload of batch event.",
+    "DataOperationEvent": {
+      "description": "The payload of data operation event.",
       "type": "object",
-      "javaType" : "org.onap.cps.ncmp.events.async.BatchDataResponseEventV1",
+      "javaType" : "org.onap.cps.ncmp.events.async1_0_0.DataOperationEvent",
       "properties": {
-        "event": {
+        "data": {
           "description": "The payload content of the requested data.",
           "type": "object",
-          "javaType" : "org.onap.cps.ncmp.events.async.BatchDataEvent",
           "properties": {
-            "batch-responses": {
+            "responses": {
               "description": "An array of batch responses which contains both success and failure",
               "type": "array",
               "items": {
@@ -27,15 +26,15 @@
                     "description": "Id's of the cmhandles",
                     "type": "array"
                   },
-                  "status-code": {
+                  "statusCode": {
                     "description": "which says success or failure (0-99) are for success and (100-199) are for failure",
                     "type": "string"
                   },
-                  "status-message": {
+                  "statusMessage": {
                     "description": "Human readable message, Which says what the response has",
                     "type": "string"
                   },
-                  "data": {
+                  "responseContent": {
                     "description": "Contains the requested data response.",
                     "type": "object",
                     "existingJavaType": "java.lang.Object",
@@ -45,21 +44,21 @@
                 "required": [
                   "operationId",
                   "ids",
-                  "status-code",
-                  "status-message"
+                  "statusCode",
+                  "statusMessage"
                 ],
                 "additionalProperties": false
               }
             }
           },
           "required": [
-            "batch-responses"
+            "responses"
           ],
           "additionalProperties": false
         }
       },
       "required": [
-        "event"
+        "data"
       ],
       "additionalProperties": false
     }