Add DMaaP plugin support

- Update blueprint with DMaaP plugin support.
- Update configuration with new DMaaP plugin format.
- Move Configuration tests to correct package.
- Add latest-staging Docker image tag to pom.
- Change file endings in some files to LF.
- Remove publishing to non authenticated topic.
- Fix some tests which were not executing correctly.
- Fix some Sonar smells.

Issue-ID: DCAEGEN2-1581
Change-Id: I37fbb662419179e3fe9fb8bdf710d6a6e8f0308a
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>

21 files changed, 881 insertions, 92 deletions

diff --git a/src/test/resources/invalid_configs/empty_filter_object.json b/src/test/resources/invalid_configs/empty_filter_object.json
new file mode 100644
index 0000000..8c72b83
--- /dev/null
+++ b/src/test/resources/invalid_configs/empty_filter_object.json
@@ -0,0 +1,35 @@
+{
+  "pm-mapper-filter": {},
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/invalid_filter_object.json b/src/test/resources/invalid_configs/invalid_filter_object.json
new file mode 100644
index 0000000..1b7b0e3
--- /dev/null
+++ b/src/test/resources/invalid_configs/invalid_filter_object.json
@@ -0,0 +1,41 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9"
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_aaf_identity.json b/src/test/resources/invalid_configs/null_aaf_identity.json
new file mode 100644
index 0000000..8f9c7ef
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_aaf_identity.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": null,
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_aaf_password.json b/src/test/resources/invalid_configs/null_aaf_password.json
new file mode 100644
index 0000000..d54d825
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_aaf_password.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": null,
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_client_role.json b/src/test/resources/invalid_configs/null_client_role.json
new file mode 100644
index 0000000..40471de
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_client_role.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": null,
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json b/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json
new file mode 100644
index 0000000..d86de5e
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": null,
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_dr_location.json b/src/test/resources/invalid_configs/null_dr_location.json
new file mode 100644
index 0000000..79bd05d
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_dr_location.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": null,
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_dr_password.json b/src/test/resources/invalid_configs/null_dr_password.json
new file mode 100644
index 0000000..365b328
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_dr_password.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": null,
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_dr_subscriber_id.json b/src/test/resources/invalid_configs/null_dr_subscriber_id.json
new file mode 100644
index 0000000..c6c2a45
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_dr_subscriber_id.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": null
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_dr_username.json b/src/test/resources/invalid_configs/null_dr_username.json
new file mode 100644
index 0000000..511dd35
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_dr_username.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": null,
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_filter.json b/src/test/resources/invalid_configs/null_filter.json
new file mode 100644
index 0000000..7eb6af0
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_filter.json
@@ -0,0 +1,35 @@
+{
+  "pm-mapper-filter": null,
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_filter_array.json b/src/test/resources/invalid_configs/null_filter_array.json
new file mode 100644
index 0000000..3d2df14
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_filter_array.json
@@ -0,0 +1,37 @@
+{
+  "pm-mapper-filter": {
+    "filters": null
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_key_store_pass_path.json b/src/test/resources/invalid_configs/null_key_store_pass_path.json
new file mode 100644
index 0000000..2145e01
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_key_store_pass_path.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": null,
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_key_store_path.json b/src/test/resources/invalid_configs/null_key_store_path.json
new file mode 100644
index 0000000..8f6f831
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_key_store_path.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": null,
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_location.json b/src/test/resources/invalid_configs/null_location.json
new file mode 100644
index 0000000..b7d9266
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_location.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": null,
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_topic_url.json b/src/test/resources/invalid_configs/null_topic_url.json
new file mode 100644
index 0000000..faea169
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_topic_url.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": null,
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_trust_store_pass_path.json b/src/test/resources/invalid_configs/null_trust_store_pass_path.json
new file mode 100644
index 0000000..c98274e
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_trust_store_pass_path.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",
+  "trust_store_pass_path": null,
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/invalid_configs/null_trust_store_path.json b/src/test/resources/invalid_configs/null_trust_store_path.json
new file mode 100644
index 0000000..2673fb9
--- /dev/null
+++ b/src/test/resources/invalid_configs/null_trust_store_path.json
@@ -0,0 +1,47 @@
+{
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
+  },
+  "key_store_path": "src/test/resources/testkeystore.jks.b64",
+  "key_store_pass_path": "src/test/resources/password",
+  "trust_store_path": null,
+  "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
+  "enable_http": false,
+  "streams_publishes": {
+    "dmaap_publisher": {
+      "type": "message_router",
+      "dmaap_info": {
+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",
+        "client_role": "org.onap.dcae.pmPublisher",
+        "location": "san-francisco",
+        "client_id": "1562763644939"
+      }
+    }
+  },
+  "streams_subscribes": {
+    "dmaap_subscriber": {
+      "type": "data_router",
+      "dmaap_info": {
+        "username": "username",
+        "password": "password",
+        "location": "san-francisco",
+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+        "subscriber_id": 1
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/multiple_filter_mapper_config.json b/src/test/resources/multiple_filter_mapper_config.json
index 251beb2..72aa1f0 100644
--- a/src/test/resources/multiple_filter_mapper_config.json
+++ b/src/test/resources/multiple_filter_mapper_config.json
@@ -1,37 +1,33 @@
 {
-  "pm-mapper-filter": {"filters":[{"pmDefVsn": "V8","nfType": "LTE","vendor": "Ericsson","measTypes": [ "A", "B" ]},{"pmDefVsn": "V9","nfType": "NrRadio","vendor": "Ericsson","measTypes": [ "A", "B" ]}]},
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "type": "data_router",
-      "aaf_username": null,
-      "aaf_password": null,
-      "dmaap_info": {
-        "location": "location",
-        "delivery_url": "delivery_url",
-        "username": "username",
-        "password": "password",
-        "subscriber_id": "subscriber_id"
-      }
-    }
-  },
-  "streams_publishes": {
-    "dmaap_publisher": {
-      "type": "message_router",
-      "aaf_password": null,
-      "dmaap_info": {
-        "topic_url": "https://message-router.onap.svc.cluster.local:3904/events/some-topic",
-        "client_role": null,
-        "location": null,
-        "client_id": null
+  "pm-mapper-filter": {
+    "filters": [
+      {
+        "pmDefVsn": "V8",
+        "nfType": "LTE",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
       },
-      "aaf_username": null
-    }
+      {
+        "pmDefVsn": "V9",
+        "nfType": "NrRadio",
+        "vendor": "Ericsson",
+        "measTypes": [
+          "A",
+          "B"
+        ]
+      }
+    ]
   },
-  "dmaap_dr_delete_endpoint": "http://dmaap-dr-node.onap.svc.cluster.local:8443/delete",
-  "services_calls": {},
   "key_store_path": "src/test/resources/testkeystore.jks.b64",
   "key_store_pass_path": "src/test/resources/password",
   "trust_store_path": "src/test/resources/testkeystore.jks.b64",
   "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
   "enable_http": false
 }
\ No newline at end of file
diff --git a/src/test/resources/no_filter_mapper_config.json b/src/test/resources/no_filter_mapper_config.json
index 87fc021..0f24f90 100644
--- a/src/test/resources/no_filter_mapper_config.json
+++ b/src/test/resources/no_filter_mapper_config.json
@@ -1,37 +1,14 @@
 {
-  "pm-mapper-filter": {"filters":[]},
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "type": "data_router",
-      "aaf_username": null,
-      "aaf_password": null,
-      "dmaap_info": {
-        "location": "location",
-        "delivery_url": "delivery_url",
-        "username": "username",
-        "password": "password",
-        "subscriber_id": "subscriber_id"
-      }
-    }
+  "pm-mapper-filter": {
+    "filters": []
   },
-  "streams_publishes": {
-    "dmaap_publisher": {
-      "type": "message_router",
-      "aaf_password": null,
-      "dmaap_info": {
-        "topic_url": "https://message-router.onap.svc.cluster.local:3904/events/some-topic",
-        "client_role": null,
-        "location": null,
-        "client_id": null
-      },
-      "aaf_username": null
-    }
-  },
-  "dmaap_dr_delete_endpoint": "http://dmaap-dr-node.onap.svc.cluster.local:8443/delete",
-  "services_calls": {},
   "key_store_path": "src/test/resources/testkeystore.jks.b64",
   "key_store_pass_path": "src/test/resources/password",
   "trust_store_path": "src/test/resources/testkeystore.jks.b64",
   "trust_store_pass_path": "src/test/resources/password",
+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+  "dmaap_dr_feed_name": "bulk_pm_feed",
+  "aaf_identity": "dcae@dcae.onap.org",
+  "aaf_password": "iheartrainbows44",
   "enable_http": false
 }
\ No newline at end of file
diff --git a/src/test/resources/valid_mapper_config.json b/src/test/resources/valid_mapper_config.json
index 3d9d707..39d4ee6 100644
--- a/src/test/resources/valid_mapper_config.json
+++ b/src/test/resources/valid_mapper_config.json
@@ -1,37 +1,47 @@
 {

-    "pm-mapper-filter": {"filters":[{"pmDefVsn": "V9","nfType": "NrRadio","vendor": "Ericsson","measTypes": [ "A", "B" ]}]},

-    "streams_subscribes": {

-        "dmaap_subscriber": {

-            "type": "data_router",

-            "aaf_username": null,

-            "aaf_password": null,

-            "dmaap_info": {

-                "location": "location",

-                "delivery_url": "delivery_url",

-                "username": "username",

-                "password": "password",

-                "subscriber_id": "subscriber_id"

-            }

-        }

-    },

-    "streams_publishes": {

-        "dmaap_publisher": {

-            "type": "message_router",

-            "aaf_password": null,

-            "dmaap_info": {

-                "topic_url": "https://message-router.onap.svc.cluster.local:3904/events/some-topic",

-                "client_role": null,

-                "location": null,

-                "client_id": null

-            },

-            "aaf_username": null

-        }

-    },

-    "dmaap_dr_delete_endpoint": "http://dmaap-dr-node.onap.svc.cluster.local:8443/delete",

-    "services_calls": {},

-    "key_store_path": "src/test/resources/testkeystore.jks.b64",

-    "key_store_pass_path": "src/test/resources/password",

-    "trust_store_path": "src/test/resources/testkeystore.jks.b64",

-    "trust_store_pass_path": "src/test/resources/password",

-    "enable_http": false

+  "pm-mapper-filter": {

+    "filters": [

+      {

+        "pmDefVsn": "V9",

+        "nfType": "NrRadio",

+        "vendor": "Ericsson",

+        "measTypes": [

+          "A",

+          "B"

+        ]

+      }

+    ]

+  },

+  "key_store_path": "src/test/resources/testkeystore.jks.b64",

+  "key_store_pass_path": "src/test/resources/password",

+  "trust_store_path": "src/test/resources/testkeystore.jks.b64",

+  "trust_store_pass_path": "src/test/resources/password",

+  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",

+  "dmaap_dr_feed_name": "bulk_pm_feed",

+  "aaf_identity": "dcae@dcae.onap.org",

+  "aaf_password": "iheartrainbows44",

+  "enable_http": false,

+  "streams_publishes": {

+    "dmaap_publisher": {

+      "type": "message_router",

+      "dmaap_info": {

+        "topic_url": "https://message-router:3905/events/org.onap.dmaap.mr.VES_PM",

+        "client_role": "org.onap.dcae.pmPublisher",

+        "location": "san-francisco",

+        "client_id": "1562763644939"

+      }

+    }

+  },

+  "streams_subscribes": {

+    "dmaap_subscriber": {

+      "type": "data_router",

+      "dmaap_info": {

+        "username": "username",

+        "password": "password",

+        "location": "san-francisco",

+        "delivery_url": "https://dcae-pm-mapper:8443/delivery",

+        "subscriber_id": 1

+      }

+    }

+  }

 }
\ No newline at end of file