Code Improvement

Change-Id: I703aabf234cb656b1faea3b5c0776d034d8ec807
Signed-off-by: xg353y <xg353y@intl.att.com>
Issue-ID: CLAMP-54

3 files changed, 1 insertions, 176 deletions

diff --git a/src/test/resources/example/model-properties/modelBpmn.json b/src/test/resources/example/model-properties/modelBpmn.json
index 823641c73..8f7b8e61a 100644
--- a/src/test/resources/example/model-properties/modelBpmn.json
+++ b/src/test/resources/example/model-properties/modelBpmn.json
@@ -1,16 +1,4 @@
 {
-  "collector": [
-    {
-      "id": "Collector_1c72ct5",
-      "from": "StartEvent_1"
-    }
-  ],
-  "stringMatch": [
-    {
-      "id": "StringMatch_05arstl",
-      "from": "Collector_1c72ct5"
-    }
-  ],
   "policy": [
     {
       "id": "Policy_0honxgv",
@@ -32,7 +20,7 @@
   "vesCollector": [
     {
       "id": "VesCollector_0orydnh",
-      "from": "StringMatch_05arstl"
+      "from": "StartEvent_1"
     }
   ]
 }
diff --git a/src/test/resources/example/model-properties/modelBpmnProp.json b/src/test/resources/example/model-properties/modelBpmnProp.json
index 3b86ad79b..a521ba7d7 100644
--- a/src/test/resources/example/model-properties/modelBpmnProp.json
+++ b/src/test/resources/example/model-properties/modelBpmnProp.json
@@ -1,90 +1,4 @@
 {
-  "Collector_1c72ct5": [
-    {
-      "name": "topicPublishes",
-      "value": "DCAE-COLLECTOR-UCSNMP"
-    }
-  ],
-  "StringMatch_05arstl": {
-    "group1": [
-      {
-        "name": "rgname",
-        "value": "1505133578560"
-      },
-      {
-        "name": "rgfriendlyname",
-        "value": "group1"
-      },
-      {
-        "name": "policyName",
-        "value": "policy1"
-      },
-      {
-        "name": "policyId",
-        "value": "0"
-      },
-      {
-        "serviceConfigurations": [
-          [
-            {
-              "name": "aaiMatchingFields",
-              "value": [
-                "complex.city"
-              ]
-            },
-            {
-              "name": "aaiSendFields",
-              "value": [
-                "cloud-region.identity-url"
-              ]
-            },
-            {
-              "name": "timeWindow",
-              "value": [
-                "0"
-              ]
-            },
-            {
-              "name": "ageLimit",
-              "value": [
-                "1600"
-              ]
-            },
-            {
-              "name": "createClosedLoopEventId",
-              "value": [
-                "Initial"
-              ]
-            },
-            {
-              "name": "outputEventName",
-              "value": [
-                ""
-              ]
-            },
-            {
-              "stringSet": [
-                {
-                },
-                {
-                  "name": "eventSeverity",
-                  "value": [
-                    "NORMAL"
-                  ]
-                },
-                {
-                  "name": "eventSourceType",
-                  "value": [
-                    ""
-                  ]
-                }
-              ]
-            }
-          ]
-        ]
-      }
-    ]
-  },
   "Policy_0honxgv": {
     "policy1": [
       {
diff --git a/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json b/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json
index fba99c6f4..3030adfb3 100644
--- a/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json
+++ b/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json
@@ -1,81 +1,4 @@
 {
-  "collector": {
-    "topicPublishes": {
-      "DCAE-COLLECTOR-UCSNMP": "DCAE-COLLECTOR-UCSNMP",
-      "GFP-IP-AIC-SNMP-TRAPS": "GFP-IP-AIC-SNMP-TRAPS",
-      "AIC-SNMP-TRAPS": "AIC-SNMP-TRAPS"
-    }
-  },
-  "string_match": {
-    "topicPublishes": {
-      "DCAE-CL-EVENT": "DCAE-CL-EVENT"
-    },
-    "aaiMatchingFields": {
-      "cloud-region.identity-url": "cloud-region.identity-url",
-      "complex.city": "complex.city",
-      "complex.physical-location-id": "complex.physical-location-id",
-      "complex.state": "complex.state",
-      "generic-vnf.service-id": "generic-vnf.service-id",
-      "generic-vnf.vnf-name": "generic-vnf.vnf-name",
-      "generic-vnf.vnf-type": "generic-vnf.vnf-type",
-      "tenant.tenant-id": "tenant.tenant-id",
-      "vserver.in-maint": "vserver.in-maint",
-      "vserver.is-closed-loop-disabled": "vserver.is-closed-loop-disabled",
-      "vserver.l-interface.interface-name": "vserver.l-interface.interface-name",
-      "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address": "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address",
-      "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address": "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address",
-      "vserver.l-interface.network-name": "vserver.l-interface.network-name",
-      "vserver.prov-status": "vserver.prov-status",
-      "vserver.selflink": "vserver.selflink",
-      "vserver.vserver-id": "vserver.vserver-id",
-      "vserver.vserver-name": "vserver.vserver-name"
-    },
-    "aaiSendFields": {
-      "cloud-region.identity-url": "cloud-region.identity-url",
-      "complex.city": "complex.city",
-      "complex.physical-location-id": "complex.physical-location-id",
-      "complex.state": "complex.state",
-      "generic-vnf.service-id": "generic-vnf.service-id",
-      "generic-vnf.vnf-name": "generic-vnf.vnf-name",
-      "generic-vnf.vnf-type": "generic-vnf.vnf-type",
-      "tenant.tenant-id": "tenant.tenant-id",
-      "vserver.in-maint": "vserver.in-maint",
-      "vserver.is-closed-loop-disabled": "vserver.is-closed-loop-disabled",
-      "vserver.l-interface.interface-name": "vserver.l-interface.interface-name",
-      "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address": "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address",
-      "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address": "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address",
-      "vserver.l-interface.network-name": "vserver.l-interface.network-name",
-      "vserver.prov-status": "vserver.prov-status",
-      "vserver.selflink": "vserver.selflink",
-      "vserver.vserver-id": "vserver.vserver-id",
-      "vserver.vserver-name": "vserver.vserver-name"
-    },
-    "eventSourceType": {
-      "f5BigIP": "f5BigIP",
-      "vSBG_Alarms": "vSBG_Alarms",
-      "vCTS_Alarms": "vCTS_Alarms"
-    },
-    "eventSeverity": {
-      "NORMAL": "NORMAL",
-      "not-NORMAL": "not-NORMAL",
-      "OK": "OK",
-      "WARNING": "WARNING",
-      "MINOR": "MINOR",
-      "MAJOR": "MAJOR",
-      "CRITICAL": "CRITICAL"
-    },
-    "timeWindow": 0,
-    "ageLimit": 1600,
-    "outputEventName": {
-      "": "",
-      "ONSET": "ONSET",
-      "ABATED": "ABATED"
-    },
-    "createClosedLoopEventId": {
-      "Initial": "Initial",
-      "Close": "Close"
-    }
-  },
   "tca": {
     "tname": "New_Set",
     "tcaInt": "1",