Merge "Eliminate cmhandle-properties tag"

diff --git a/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json
index 4ddffea..05a0e93 100644 (file)
--- a/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json
+++ b/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json
@@ -72,6 +72,7 @@
         "cmhandle-properties": {
           "description": "cmHandle properties as json object.",
           "type": "object",
+          "default": null,
           "existingJavaType": "java.util.List<java.util.Map<String,String>>",
           "additionalProperties": false
         }

diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/NcmpEventsCreatorSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/NcmpEventsCreatorSpec.groovy
index 04eb0bf..ae38714 100644 (file)
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/NcmpEventsCreatorSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/NcmpEventsCreatorSpec.groovy
@@ -45,8 +45,8 @@ class NcmpEventsCreatorSpec extends Specification {
             assert result.eventCorrelationId == cmHandleId
         and: 'event payload is mapped correctly'
             assert result.event.operation == operation
-            assert result.event.cmhandleProperties.size() == cmHandlePropertiesListSize
-            assert result.event.cmhandleProperties[0] == cmHandleProperties
+            assert (result.event.cmhandleProperties != null) ? result.event.cmhandleProperties.size() : 0 == cmHandlePropertiesListSize
+            assert (result.event.cmhandleProperties != null) ? result.event.cmhandleProperties[0] : null == cmHandleProperties
         where: 'the following operations are used'
             operation | cmHandlePropertiesListSize | cmHandleProperties
             CREATE    | 1                          | ['publicProperty1': 'value1', 'publicProperty2': 'value2']