From abb2045f4ed82ac2969cb97f2330cdb06ebc259f Mon Sep 17 00:00:00 2001 From: seanbeirne Date: Tue, 28 Jan 2025 10:16:34 +0000 Subject: [PATCH] Organise NCMP & CPS Event Schema Folders -Directories will reflect application.yml topic topology Issue-ID: CPS-2590 Change-Id: I42bfa10c54ae79726b5ad0b4d60a0d9e826a34d5 Signed-off-by: seanbeirne --- .../cps-data-updated-event-schema-1.0.0.json | 0 .../schemas/{dmidataavc => dmi/cm-events}/avc-event-schema-1.0.0.json | 0 .../device-heartbeat}/device-trust-level-event-schema-1.0.0.json | 0 .../{async => ncmp/async-m2m}/data-operation-event-schema-1.0.0.json | 0 .../{ => ncmp/async-m2m}/dmi-async-request-response-event-schema-v1.json | 1 + .../async-m2m}/ncmp-async-request-response-event-schema-v1.json | 1 + .../schemas/{ncmpdataavc => ncmp/avc}/avc-event-schema-1.0.0.json | 0 .../avc}/dmi-in-event-schema-1.0.0.json | 0 .../avc}/dmi-out-event-schema-1.0.0.json | 0 .../avc}/ncmp-in-event-schema-1.0.0.json | 0 .../avc}/ncmp-out-event-schema-1.0.0.json | 0 11 files changed, 2 insertions(+) rename cps-events/src/main/resources/schemas/{updatenode => cps.dataupdated}/cps-data-updated-event-schema-1.0.0.json (100%) rename cps-ncmp-events/src/main/resources/schemas/{dmidataavc => dmi/cm-events}/avc-event-schema-1.0.0.json (100%) rename cps-ncmp-events/src/main/resources/schemas/{trustlevel => dmi/device-heartbeat}/device-trust-level-event-schema-1.0.0.json (100%) rename cps-ncmp-events/src/main/resources/schemas/{async => ncmp/async-m2m}/data-operation-event-schema-1.0.0.json (100%) rename cps-ncmp-events/src/main/resources/schemas/{ => ncmp/async-m2m}/dmi-async-request-response-event-schema-v1.json (97%) rename cps-ncmp-events/src/main/resources/schemas/{ => ncmp/async-m2m}/ncmp-async-request-response-event-schema-v1.json (98%) rename cps-ncmp-events/src/main/resources/schemas/{ncmpdataavc => ncmp/avc}/avc-event-schema-1.0.0.json (100%) rename cps-ncmp-events/src/main/resources/schemas/{cmnotificationsubscription => ncmp/avc}/dmi-in-event-schema-1.0.0.json (100%) rename cps-ncmp-events/src/main/resources/schemas/{cmnotificationsubscription => ncmp/avc}/dmi-out-event-schema-1.0.0.json (100%) rename cps-ncmp-events/src/main/resources/schemas/{cmnotificationsubscription => ncmp/avc}/ncmp-in-event-schema-1.0.0.json (100%) rename cps-ncmp-events/src/main/resources/schemas/{cmnotificationsubscription => ncmp/avc}/ncmp-out-event-schema-1.0.0.json (100%) diff --git a/cps-events/src/main/resources/schemas/updatenode/cps-data-updated-event-schema-1.0.0.json b/cps-events/src/main/resources/schemas/cps.dataupdated/cps-data-updated-event-schema-1.0.0.json similarity index 100% rename from cps-events/src/main/resources/schemas/updatenode/cps-data-updated-event-schema-1.0.0.json rename to cps-events/src/main/resources/schemas/cps.dataupdated/cps-data-updated-event-schema-1.0.0.json diff --git a/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/dmi/cm-events/avc-event-schema-1.0.0.json similarity index 100% rename from cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-1.0.0.json rename to cps-ncmp-events/src/main/resources/schemas/dmi/cm-events/avc-event-schema-1.0.0.json diff --git a/cps-ncmp-events/src/main/resources/schemas/trustlevel/device-trust-level-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/dmi/device-heartbeat/device-trust-level-event-schema-1.0.0.json similarity index 100% rename from cps-ncmp-events/src/main/resources/schemas/trustlevel/device-trust-level-event-schema-1.0.0.json rename to cps-ncmp-events/src/main/resources/schemas/dmi/device-heartbeat/device-trust-level-event-schema-1.0.0.json diff --git a/cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/ncmp/async-m2m/data-operation-event-schema-1.0.0.json similarity index 100% rename from cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json rename to cps-ncmp-events/src/main/resources/schemas/ncmp/async-m2m/data-operation-event-schema-1.0.0.json diff --git a/cps-ncmp-events/src/main/resources/schemas/dmi-async-request-response-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/ncmp/async-m2m/dmi-async-request-response-event-schema-v1.json similarity index 97% rename from cps-ncmp-events/src/main/resources/schemas/dmi-async-request-response-event-schema-v1.json rename to cps-ncmp-events/src/main/resources/schemas/ncmp/async-m2m/dmi-async-request-response-event-schema-v1.json index 2340a4bc4c..4db07bec95 100644 --- a/cps-ncmp-events/src/main/resources/schemas/dmi-async-request-response-event-schema-v1.json +++ b/cps-ncmp-events/src/main/resources/schemas/ncmp/async-m2m/dmi-async-request-response-event-schema-v1.json @@ -6,6 +6,7 @@ "DmiAsyncRequestResponseEvent": { "description": "The payload for NCMP async request response event.", "type": "object", + "javaType" : "org.onap.cps.ncmp.event.model.DmiAsyncRequestResponseEvent", "properties": { "eventId": { "description": "The unique id identifying the event generated by DMI.", diff --git a/cps-ncmp-events/src/main/resources/schemas/ncmp-async-request-response-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/ncmp/async-m2m/ncmp-async-request-response-event-schema-v1.json similarity index 98% rename from cps-ncmp-events/src/main/resources/schemas/ncmp-async-request-response-event-schema-v1.json rename to cps-ncmp-events/src/main/resources/schemas/ncmp/async-m2m/ncmp-async-request-response-event-schema-v1.json index 51c2cf4d40..32b7becd05 100644 --- a/cps-ncmp-events/src/main/resources/schemas/ncmp-async-request-response-event-schema-v1.json +++ b/cps-ncmp-events/src/main/resources/schemas/ncmp/async-m2m/ncmp-async-request-response-event-schema-v1.json @@ -6,6 +6,7 @@ "NcmpAsyncRequestResponseEvent": { "description": "The payload for CPS async request response event.", "type": "object", + "javaType" : "org.onap.cps.ncmp.event.model.NcmpAsyncRequestResponseEvent", "properties": { "eventId": { "description": "The unique id identifying the event generated by DMI.", diff --git a/cps-ncmp-events/src/main/resources/schemas/ncmpdataavc/avc-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/ncmp/avc/avc-event-schema-1.0.0.json similarity index 100% rename from cps-ncmp-events/src/main/resources/schemas/ncmpdataavc/avc-event-schema-1.0.0.json rename to cps-ncmp-events/src/main/resources/schemas/ncmp/avc/avc-event-schema-1.0.0.json diff --git a/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/dmi-in-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/ncmp/avc/dmi-in-event-schema-1.0.0.json similarity index 100% rename from cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/dmi-in-event-schema-1.0.0.json rename to cps-ncmp-events/src/main/resources/schemas/ncmp/avc/dmi-in-event-schema-1.0.0.json diff --git a/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/dmi-out-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/ncmp/avc/dmi-out-event-schema-1.0.0.json similarity index 100% rename from cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/dmi-out-event-schema-1.0.0.json rename to cps-ncmp-events/src/main/resources/schemas/ncmp/avc/dmi-out-event-schema-1.0.0.json diff --git a/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/ncmp-in-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/ncmp/avc/ncmp-in-event-schema-1.0.0.json similarity index 100% rename from cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/ncmp-in-event-schema-1.0.0.json rename to cps-ncmp-events/src/main/resources/schemas/ncmp/avc/ncmp-in-event-schema-1.0.0.json diff --git a/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/ncmp-out-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/ncmp/avc/ncmp-out-event-schema-1.0.0.json similarity index 100% rename from cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/ncmp-out-event-schema-1.0.0.json rename to cps-ncmp-events/src/main/resources/schemas/ncmp/avc/ncmp-out-event-schema-1.0.0.json -- 2.16.6