Moving and Renaming eexisting subscription impl

      -renamed the existing subscription related packages to have 'deprecated' on its name as this shall be removed with new implementation of the subscription positive cases
      - replaced the existing schemas with the new ones

Issue-ID: CPS-1991
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
Change-Id: I8f27861b80756540477e03971c53219ea589975c

4 files changed, 171 insertions, 255 deletions

diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-in-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-in-event-schema-1.0.0.json
index 3750bd047d..4d4d504ec8 100644
--- a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-in-event-schema-1.0.0.json
+++ b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-in-event-schema-1.0.0.json
@@ -4,118 +4,91 @@
   "$ref": "#/definitions/CmSubscriptionDmiInEvent",
   "definitions": {
     "CmSubscriptionDmiInEvent": {
-      "description": "The payload for subscription event to be forwarded to dmi plugins.",
-      "javaType": "org.onap.cps.ncmp.events.cmsubscription1_0_0.ncmp_to_dmi.CmSubscriptionDmiInEvent",
+      "description": "The payload for cm subscription merge event incoming message from NCMP.",
+      "type": "object",
+      "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.ncmp_to_dmi.CmSubscriptionDmiInEvent",
+      "additionalProperties": false,
       "properties": {
         "data": {
-          "properties": {
-            "dataType": {
-              "description": "The datatype content.",
-              "properties": {
-                "dataCategory": {
-                  "description": "The category type of the data",
-                  "type": "string"
-                },
-                "dataProvider": {
-                  "description": "The provider name of the data",
+          "$ref": "#/definitions/data"
+        }
+      },
+      "required": [
+        "data"
+      ]
+    },
+    "data": {
+      "type": "object",
+      "description": "Information about the targets and subscription",
+      "additionalProperties": false,
+      "properties": {
+        "cmhandles": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "description": "Details for the target cmhandles",
+            "additionalProperties": false,
+            "properties": {
+              "cmhandleId": {
+                "type": "string"
+              },
+              "private-properties": {
+                "type": "object",
+                "existingJavaType": "java.util.Map<String,String>",
+                "items": {
                   "type": "string"
-                },
-                "dataspace": {
-                  "description": "The dataspace name",
+                }
+              }
+            }
+          }
+        },
+        "predicates": {
+          "type": "array",
+          "description": "Additional values to be added into the subscription",
+          "items": {
+            "type": "object",
+            "properties": {
+              "targetFilter": {
+                "description": "CM Handles to be targeted by the subscription",
+                "type": "array",
+                "items": {
                   "type": "string"
                 }
               },
-              "required": [
-                "dataCategory",
-                "dataProvider",
-                "dataspace"
-              ],
-              "type": "object",
-              "additionalProperties": false
-            },
-            "predicates": {
-              "description": "Additional values to be added into the subscription",
-              "properties": {
-                "datastore": {
-                  "description": "datastore which is to be used by the subscription",
-                  "type": "string"
-                },
-                "targets": {
-                  "description": "CM Handles to be targeted by the subscription",
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/definitions/CmHandle"
+              "scopeFilter": {
+                "type": "object",
+                "properties": {
+                  "datastore": {
+                    "description": "Datastore which is to be used by the subscription",
+                    "type": "string",
+                    "enum": ["ncmp-datastore:passthrough-operational", "ncmp-datastore:passthrough-running"]
+                  },
+                  "xpath-filter": {
+                    "description": "Filter to be applied to the CM Handles through this event",
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
                   }
                 },
-                "datastore-xpath-filter": {
-                  "description": "filter to be applied to the CM Handles through this event",
-                  "type": "string"
-                }
-              },
-              "required": [
-                "datastore",
-                "targets",
-                "datastore-xpath-filter"
-              ],
-              "type": "object",
-              "additionalProperties": false
+                "additionalProperties": false,
+                "required": [
+                  "xpath-filter"
+                ]
+              }
             },
-            "subscription": {
-              "description": "The subscription details.",
-              "properties": {
-                "clientID": {
-                  "description": "The clientID",
-                  "type": "string"
-                },
-                "name": {
-                  "description": "The name of the subscription",
-                  "type": "string"
-                },
-                "isTagged": {
-                  "description": "optional parameter, default is no",
-                  "type": "boolean",
-                  "default": false
-                }
-              },
-              "required": [
-                "clientID",
-                "name"
-              ],
-              "type": "object",
-              "additionalProperties": false
-            }
+            "additionalProperties": false,
+            "required": [
+              "targetFilter"
+            ]
           },
-          "required": [
-            "dataType",
-            "predicates",
-            "subscription"
-          ],
-          "type": "object",
           "additionalProperties": false
         }
       },
-      "type": "object",
-      "additionalProperties": false,
       "required": [
-        "data"
+        "cmhandles",
+        "predicates"
       ]
-    },
-    "CmHandle": {
-      "description": "The CM handle information",
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string"
-        },
-        "additional-properties": {
-          "existingJavaType": "java.util.Map<String,String>"
-        }
-      },
-      "required": [
-        "id",
-        "additional-properties"
-      ],
-      "additionalProperties": false
     }
   }
 }
\ No newline at end of file
diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-out-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-out-event-schema-1.0.0.json
index ebbdde9318..5ae6225be6 100644
--- a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-out-event-schema-1.0.0.json
+++ b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-out-event-schema-1.0.0.json
@@ -3,67 +3,41 @@
   "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-dmi-out-event-schema:1.0.0",
   "$ref": "#/definitions/CmSubscriptionDmiOutEvent",
   "definitions": {
-    "SubscriptionStatus": {
-      "description": "The subscription status information",
+    "CmSubscriptionDmiOutEvent": {
+      "description": "The payload for cm subscription merge event coming out from DMI Plugin.",
       "type": "object",
+      "additionalProperties": false,
+      "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.dmi_to_ncmp.CmSubscriptionDmiOutEvent",
       "properties": {
-        "id": {
-          "type": "string"
-        },
-        "status" : {
-          "type": "string",
-          "enum": [
-            "ACCEPTED",
-            "REJECTED"
-          ]
-        },
-        "details" : {
-          "type": "string"
+        "data": {
+          "$ref": "#/definitions/Data"
         }
       },
       "required": [
-        "id",
-        "status"
+        "data"
       ],
-      "additionalProperties": false
+      "title": "CmSubscriptionDmiOutEvent"
     },
-    "CmSubscriptionDmiOutEvent" : {
-      "description": "The payload for subscription response event.",
+    "Data": {
       "type": "object",
-      "javaType": "org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.CmSubscriptionDmiOutEvent",
+      "description": "Information about the targets and subscription",
+      "additionalProperties": false,
       "properties": {
-        "data": {
-          "type": "object",
-          "properties": {
-            "clientId": {
-              "type": "string"
-            },
-            "subscriptionName": {
-              "type": "string"
-            },
-            "dmiName": {
-              "type": "string"
-            },
-            "subscriptionStatus": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/SubscriptionStatus"
-              }
-            }
-          },
-          "required": [
-            "clientId",
-            "subscriptionName",
-            "dmiName",
-            "subscriptionStatus"
-          ],
-          "additionalProperties": false
+        "statusCode": {
+          "type": "string",
+          "format": "integer",
+          "description": "The common status as defined in CPS"
+        },
+        "statusMessage": {
+          "type": "string",
+          "description": "The common status message as defined in CPS"
         }
       },
-      "additionalProperties": false,
       "required": [
-        "data"
-      ]
+        "statusCode",
+        "statusMessage"
+      ],
+      "title": "Data"
     }
   }
 }
\ No newline at end of file
diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-in-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-in-event-schema-1.0.0.json
index 818a8e78bc..ffdc2e36b7 100644
--- a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-in-event-schema-1.0.0.json
+++ b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-in-event-schema-1.0.0.json
@@ -4,86 +4,61 @@
   "$schema": "https://json-schema.org/draft/2019-09/schema",
   "definitions": {
     "CmSubscriptionNcmpInEvent": {
-      "description": "The payload for subscription event.",
-      "javaType": "org.onap.cps.ncmp.events.cmsubscription1_0_0.client_to_ncmp.CmSubscriptionNcmpInEvent",
+      "description": "The payload for subscription merge event.",
+      "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.client_to_ncmp.CmSubscriptionNcmpInEvent",
       "properties": {
         "data": {
           "properties": {
-            "dataType": {
-              "description": "The datatype content.",
-              "properties": {
-                "dataCategory": {
-                  "description": "The category type of the data",
-                  "type": "string"
-                },
-                "dataProvider": {
-                  "description": "The provider name of the data",
-                  "type": "string"
-                },
-                "dataspace": {
-                  "description": "The dataspace name",
-                  "type": "string"
-                }
-              },
-              "required": [
-                "dataCategory",
-                "dataProvider",
-                "dataspace"
-              ],
-              "type": "object",
-              "additionalProperties": false
+            "subscriptionId": {
+              "description": "The subscription details.",
+              "type": "string"
             },
             "predicates": {
+              "type": "array",
               "description": "Additional values to be added into the subscription",
-              "properties": {
-                "datastore": {
-                  "description": "datastore which is to be used by the subscription",
-                  "type": "string"
-                },
-                "targets": {
-                  "description": "CM Handles to be targeted by the subscription",
-                  "type": "array",
-                  "items": {
-                    "type": "string"
+              "items": {
+                "type": "object",
+                "properties": {
+                  "targetFilter": {
+                    "description": "CM Handles to be targeted by the subscription",
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "scopeFilter": {
+                    "type": "object",
+                    "properties": {
+                      "datastore": {
+                        "description": "Datastore which is to be used by the subscription",
+                        "type": "string",
+                        "enum": ["ncmp-datastore:passthrough-operational", "ncmp-datastore:passthrough-running"]
+                      },
+                      "xpath-filter": {
+                        "description": "Filter to be applied to the CM Handles through this event",
+                        "type": "array",
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    },
+                    "additionalProperties": false,
+                    "required": [
+                      "xpath-filter"
+                    ]
                   }
                 },
-                "datastore-xpath-filter": {
-                  "description": "filter to be applied to the CM Handles through this event",
-                  "type": "string"
-                }
-              },
-              "required": [
-                "datastore",
-                "targets",
-                "datastore-xpath-filter"
-              ],
-              "type": "object",
-              "additionalProperties": false
-            },
-            "subscription": {
-              "description": "The subscription details.",
-              "properties": {
-                "clientID": {
-                  "description": "The clientID",
-                  "type": "string"
-                },
-                "name": {
-                  "description": "The name of the subscription",
-                  "type": "string"
-                }
+                "additionalProperties": false,
+                "required": [
+                  "targetFilter"
+                ]
               },
-              "required": [
-                "clientID",
-                "name"
-              ],
-              "type": "object",
               "additionalProperties": false
             }
           },
           "required": [
-            "dataType",
-            "predicates",
-            "subscription"
+            "subscriptionId",
+            "predicates"
           ],
           "type": "object",
           "additionalProperties": false
diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json
index 9c0c28b2fa..e5659a7b61 100644
--- a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json
+++ b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json
@@ -4,66 +4,60 @@
   "$ref": "#/definitions/CmSubscriptionNcmpOutEvent",
   "definitions": {
     "CmSubscriptionNcmpOutEvent": {
-      "description": "The payload for avc subscription event outcome message.",
       "type": "object",
-      "javaType": "org.onap.cps.ncmp.events.cmsubscription1_0_0.ncmp_to_client.CmSubscriptionNcmpOutEvent",
+      "description": "The payload applied cm subscription merge event coming out from NCMP.",
+      "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.ncmp_to_client.CmSubscriptionNcmpOutEvent",
       "additionalProperties": false,
       "properties": {
         "data": {
-          "$ref": "#/definitions/data"
+          "$ref": "#/definitions/Data"
         }
       },
       "required": [
         "data"
-      ]
+      ],
+      "title": "CmSubscriptionNcmpOutEvent"
     },
-    "data": {
+    "Data": {
       "type": "object",
-      "description": "The actual data containing information about the pending and rejected targets",
+      "description": "Information about the targets and subscription",
       "additionalProperties": false,
       "properties": {
-        "statusCode": {
-          "type": "integer"
+        "subscriptionId": {
+          "type": "string",
+          "description": "The unique subscription id"
         },
-        "statusMessage": {
-          "type": "string"
+        "accepted-targets": {
+          "type": "array",
+          "description": "List of accepted targets",
+          "items": {
+            "type": "string"
+          }
         },
-        "additionalInfo": {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "rejected": {
-              "$ref": "#/definitions/additionalInfoDetails"
-            },
-            "pending": {
-              "$ref": "#/definitions/additionalInfoDetails"
-            }
+        "rejected-targets": {
+          "type": "array",
+          "description": "List of rejected targets",
+          "items": {
+            "type": "string"
           }
-        }
-      },
-      "required": [
-        "statusCode",
-        "statusMessage"
-      ]
-    },
-    "additionalInfoDetails": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "description": "Details for the target cmhandles",
-        "additionalProperties": false,
-        "properties": {
-          "details": {
+        },
+        "pending-targets": {
+          "type": "array",
+          "description": "List of pending targets",
+          "items": {
             "type": "string"
-          },
-          "targets": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
           }
         }
-      }
+      },
+      "required": [
+        "accepted-targets",
+        "pending-targets",
+        "rejected-targets",
+        "subscriptionId"
+      ],
+      "title": "Data"
     }
   }
+
+
 }
\ No newline at end of file