use CBS SDK in PRH (II)

-remove unused classes
-fix junit tests
-use cbs
-patch project version updated

Change-Id: I5fb63408b33b07632eab579d028070eb3a025865
Issue-ID: DCAEGEN2-1360
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

3 files changed, 139 insertions, 165 deletions

diff --git a/prh-app-server/src/test/resources/correct_config.json b/prh-app-server/src/test/resources/correct_config.json
index 9ef75122..ec3ebee4 100644
--- a/prh-app-server/src/test/resources/correct_config.json
+++ b/prh-app-server/src/test/resources/correct_config.json
@@ -1,67 +1,74 @@
 {
-  "configs": {
-    "aai": {
-      "aaiClientConfiguration": {
-        "pnfUrl": "https://localhost:8080/aai/v11/network/pnfs/pnf",
-        "aaiHost": "localhost",
-        "aaiPort": 8080,
-        "aaiIgnoreSslCertificateErrors": true,
-        "aaiProtocol": "https",
-        "aaiUserName": "admin",
-        "aaiUserPassword": "admin",
-        "aaiBasePath": "/aai/v11",
-        "aaiPnfPath": "/network/pnfs/pnf",
-        "aaiServiceInstancePath": "/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}",
-        "aaiHeaders": {
-          "X-FromAppId": "prh",
-          "X-TransactionId": "9999",
-          "Accept": "application/json",
-          "Real-Time": "true",
-          "Content-Type": "application/merge-patch+json",
-          "Authorization": "Basic QUFJOkFBSQ=="
-        }
-      }
+  "config":{
+    "dmaap.dmaapConsumerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT",
+    "dmaap.dmaapConsumerConfiguration.dmaapHostName":"dmaap-mr",
+    "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2223,
+    "dmaap.dmaapConsumerConfiguration.dmaapTopicName":"events/unauthenticated.VES_PNFREG_OUTPUT",
+    "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"http",
+    "dmaap.dmaapConsumerConfiguration.dmaapUserName":"admin",
+    "dmaap.dmaapConsumerConfiguration.dmaapUserPassword":"admin",
+    "dmaap.dmaapConsumerConfiguration.dmaapContentType":"application/json",
+    "dmaap.dmaapConsumerConfiguration.consumerId":"c12",
+    "dmaap.dmaapConsumerConfiguration.consumerGroup":"OpenDCAE-c12",
+    "dmaap.dmaapConsumerConfiguration.timeoutMs":-1,
+    "dmaap.dmaapConsumerConfiguration.messageLimit":-1,
+    "dmaap.dmaapProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY",
+    "dmaap.dmaapProducerConfiguration.dmaapHostName":"dmaap-mr",
+    "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2223,
+    "dmaap.dmaapProducerConfiguration.dmaapTopicName":"events/unauthenticated.PNF_READY",
+    "dmaap.dmaapProducerConfiguration.dmaapProtocol":"http",
+    "dmaap.dmaapProducerConfiguration.dmaapUserName":"admin",
+    "dmaap.dmaapProducerConfiguration.dmaapUserPassword":"admin",
+    "dmaap.dmaapProducerConfiguration.dmaapContentType":"application/json",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName":"dmaap-mr",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber":2223,
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName":"events/unauthenticated.PNF_UPDATE",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol":"http",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapUserName":"admin",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword":"admin",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapContentType":"application/json",
+    "aai.aaiClientConfiguration.pnfUrl":"https://aai:3333/aai/v12/network/pnfs/pnf",
+    "aai.aaiClientConfiguration.aaiHost":"aai",
+    "aai.aaiClientConfiguration.aaiHostPortNumber":3334,
+    "aai.aaiClientConfiguration.aaiProtocol":"https",
+    "aai.aaiClientConfiguration.aaiUserName":"DCAE",
+    "aai.aaiClientConfiguration.aaiUserPassword":"DCAE",
+    "aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors":true,
+    "aai.aaiClientConfiguration.aaiBasePath":"/aai/v12",
+    "aai.aaiClientConfiguration.aaiPnfPath":"/network/pnfs/pnf",
+    "aai.aaiClientConfiguration.aaiServiceInstancePath":"/business/customers/customer//service-subscriptions/service-subscription//service-instances/service-instance/",
+    "aai.aaiClientConfiguration.aaiHeaders":{
+      "X-FromAppId":"prh",
+      "X-TransactionId":"9999",
+      "Accept":"application/json",
+      "Real-Time":"true",
+      "Authorization":"Basic QUFJOkFBSQ=="
     },
-    "dmaap": {
-      "dmaapConsumerConfiguration": {
-        "consumerGroup": "other",
-        "consumerId": "1",
-        "dmaapContentType": "application/json",
-        "dmaapHostName": "localhost",
-        "dmaapPortNumber": 2222,
-        "dmaapProtocol": "http",
-        "dmaapTopicName": "temp",
-        "dmaapUserName": "admin",
-        "dmaapUserPassword": "admin",
-        "messageLimit": 1000,
-        "timeoutMs": 1000
-      },
-      "dmaapProducerConfiguration": {
-        "dmaapContentType": "application/json",
-        "dmaapHostName": "localhost",
-        "dmaapPortNumber": 2223,
-        "dmaapProtocol": "http",
-        "dmaapTopicName": "temp",
-        "dmaapUserName": "admin",
-        "dmaapUserPassword": "admin"
+    "security.trustStorePath":"change it",
+    "security.trustStorePasswordPath":"change it",
+    "security.keyStorePath":"change it",
+    "security.keyStorePasswordPath":"change it",
+    "security.enableAaiCertAuth":false,
+    "security.enableDmaapCertAuth":false,
+    "streams_publishes":{
+      "pnf-update":{
+        "dmaap_info":{
+          "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE"
+        }
       },
-      "dmaapUpdateProducerConfiguration": {
-        "dmaapContentType": "application/json",
-        "dmaapHostName": "localhost",
-        "dmaapPortNumber": 2223,
-        "dmaapProtocol": "http",
-        "dmaapTopicName": "temp2",
-        "dmaapUserName": "admin",
-        "dmaapUserPassword": "admin"
+      "pnf-ready":{
+        "dmaap_info":{
+          "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY"
+        }
       }
     },
-    "security": {
-      "trustStorePath": "/opt/app/prh/local/org.onap.prh.trust.jks",
-      "trustStorePasswordPath": "change it",
-      "keyStorePath": "/opt/app/prh/local/org.onap.prh.p12",
-      "keyStorePasswordPath": "change it",
-      "enableAaiCertAuth": "false",
-      "enableDmaapCertAuth": "false"
+    "streams_subscribes":{
+      "ves-reg-output":{
+        "dmaap_info":{
+          "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT"
+        }
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/prh-app-server/src/test/resources/flattened_configuration.json b/prh-app-server/src/test/resources/flattened_configuration.json
index 48b45a80..7eb140bc 100644
--- a/prh-app-server/src/test/resources/flattened_configuration.json
+++ b/prh-app-server/src/test/resources/flattened_configuration.json
@@ -1,42 +1,76 @@
 {
-  "config": {
-    "aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors": true,
-    "dmaap.dmaapProducerConfiguration.dmaapTopicName": "/events/unauthenticated.PNF_READY",
-    "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName": "/events/unauthenticated.PNF_UPDATE",
-    "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-    "dmaap.dmaapConsumerConfiguration.dmaapHostName": "message-router.onap.svc.cluster.local",
-    "aai.aaiClientConfiguration.pnfUrl": "https://aai.onap.svc.cluster.local:8443/aai/v12/network/pnfs/pnf",
-    "aai.aaiClientConfiguration.aaiPnfPath": "/network/pnfs/pnf",
-    "aai.aaiClientConfiguration.aaiServiceInstancePath": "/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}",
-    "aai.aaiClientConfiguration.aaiUserPassword": "AAI",
-    "dmaap.dmaapConsumerConfiguration.dmaapUserName": "admin",
-    "aai.aaiClientConfiguration.aaiBasePath": "/aai/v12",
-    "dmaap.dmaapProducerConfiguration.dmaapPortNumber": 3904,
-    "aai.aaiClientConfiguration.aaiHost": "aai.onap.svc.cluster.local",
-    "dmaap.dmaapConsumerConfiguration.dmaapUserPassword": "admin",
-    "dmaap.dmaapProducerConfiguration.dmaapProtocol": "http",
-    "dmaap.dmaapProducerConfiguration.dmaapContentType": "application/json",
-    "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol": "http",
-    "dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json",
-    "dmaap.dmaapConsumerConfiguration.dmaapTopicName": "/events/unauthenticated.SEC_OTHER_OUTPUT",
-    "dmaap.dmaapConsumerConfiguration.dmaapPortNumber": 3904,
-    "dmaap.dmaapConsumerConfiguration.dmaapContentType": "application/json",
-    "dmaap.dmaapConsumerConfiguration.messageLimit": -1,
-    "dmaap.dmaapConsumerConfiguration.dmaapProtocol": "http",
-    "aai.aaiClientConfiguration.aaiUserName": "AAI",
-    "dmaap.dmaapConsumerConfiguration.consumerId": "c12",
-    "dmaap.dmaapProducerConfiguration.dmaapHostName": "message-router.onap.svc.cluster.local",
-    "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName": "message-router.onap.svc.cluster.local",
-    "aai.aaiClientConfiguration.aaiHostPortNumber": 8443,
-    "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDCAE-c12",
-    "aai.aaiClientConfiguration.aaiProtocol": "https",
-    "dmaap.dmaapProducerConfiguration.dmaapUserName": "admin",
-    "dmaap.dmaapProducerConfiguration.dmaapUserPassword": "admin",
-    "security.trustStorePath": "/opt/app/prh/local/org.onap.prh.trust.jks",
-    "security.trustStorePasswordPath": "change_it",
-    "security.keyStorePath": "/opt/app/prh/local/org.onap.prh.p12",
-    "security.keyStorePasswordPath": "change_it",
-    "security.enableAaiCertAuth": false,
-    "security.enableDmaapCertAuth": false
+  "config":{
+    "dmaap.dmaapConsumerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT",
+    "dmaap.dmaapConsumerConfiguration.dmaapHostName":"message-router.onap.svc.cluster.local",
+    "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":3904,
+    "dmaap.dmaapConsumerConfiguration.dmaapTopicName":"/events/unauthenticated.SEC_OTHER_OUTPUT",
+    "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"http",
+    "dmaap.dmaapConsumerConfiguration.dmaapUserName":"admin",
+    "dmaap.dmaapConsumerConfiguration.dmaapUserPassword":"admin",
+    "dmaap.dmaapConsumerConfiguration.dmaapContentType":"application/json",
+    "dmaap.dmaapConsumerConfiguration.consumerId":"c12",
+    "dmaap.dmaapConsumerConfiguration.consumerGroup":"OpenDCAE-c12",
+    "dmaap.dmaapConsumerConfiguration.timeoutMs":-1,
+    "dmaap.dmaapConsumerConfiguration.messageLimit":-1,
+
+    "dmaap.dmaapProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY",
+    "dmaap.dmaapProducerConfiguration.dmaapHostName":"message-router.onap.svc.cluster.local",
+    "dmaap.dmaapProducerConfiguration.dmaapPortNumber":3904,
+    "dmaap.dmaapProducerConfiguration.dmaapTopicName":"/events/unauthenticated.PNF_READY",
+    "dmaap.dmaapProducerConfiguration.dmaapProtocol":"http",
+    "dmaap.dmaapProducerConfiguration.dmaapUserName":"admin",
+    "dmaap.dmaapProducerConfiguration.dmaapUserPassword":"admin",
+    "dmaap.dmaapProducerConfiguration.dmaapContentType":"application/json",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName":"dmaap-mr",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber":2223,
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName":"events/unauthenticated.PNF_UPDATE",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol":"http",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapUserName":"admin",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword":"admin",
+    "dmaap.dmaapUpdateProducerConfiguration.dmaapContentType":"application/json",
+
+    "aai.aaiClientConfiguration.pnfUrl":"https://aai.onap.svc.cluster.local:8443/aai/v12/network/pnfs/pnf",
+    "aai.aaiClientConfiguration.aaiHost":"aai.onap.svc.cluster.local",
+    "aai.aaiClientConfiguration.aaiHostPortNumber":8443,
+    "aai.aaiClientConfiguration.aaiProtocol":"https",
+    "aai.aaiClientConfiguration.aaiUserName":"AAI",
+    "aai.aaiClientConfiguration.aaiUserPassword":"AAI",
+    "aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors":true,
+    "aai.aaiClientConfiguration.aaiBasePath":"/aai/v12",
+    "aai.aaiClientConfiguration.aaiPnfPath":"/network/pnfs/pnf",
+    "aai.aaiClientConfiguration.aaiServiceInstancePath":"/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}",
+    "aai.aaiClientConfiguration.aaiHeaders":{
+      "X-FromAppId":"prh",
+      "X-TransactionId":"9999",
+      "Accept":"application/json",
+      "Real-Time":"true",
+      "Authorization":"Basic QUFJOkFBSQ=="
+    },
+    "security.trustStorePath":"/opt/app/prh/local/org.onap.prh.trust.jks",
+    "security.trustStorePasswordPath":"change_it",
+    "security.keyStorePath":"/opt/app/prh/local/org.onap.prh.p12",
+    "security.keyStorePasswordPath":"change_it",
+    "security.enableAaiCertAuth":false,
+    "security.enableDmaapCertAuth":false,
+    "streams_publishes":{
+      "pnf-update":{
+        "dmaap_info":{
+          "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE"
+        }
+      },
+      "pnf-ready":{
+        "dmaap_info":{
+          "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY"
+        }
+      }
+    },
+    "streams_subscribes":{
+      "ves-reg-output":{
+        "dmaap_info":{
+          "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT"
+        }
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/prh-app-server/src/test/resources/incorrect_config.json b/prh-app-server/src/test/resources/incorrect_config.json
deleted file mode 100644
index 89f72485..00000000
--- a/prh-app-server/src/test/resources/incorrect_config.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "configs": {
-    "aai": {
-      "aaiClientConfiguration": {
-        "pnfUrl": "https://localhost:8080/aai/v11/network/pnfs/pnf",
-        "aaiHost": "localhost",
-        "aaiPort": 8080,
-        "aaiIgnoreSslCertificateErrors": true,
-        "aaiProtocol": "https",
-        "aaiUserName": "admin",
-        "aaiUserPassword": "admin",
-        "aaiBasePath": "/aai/v11",
-        "aaiPnfPath": "/network/pnfs/pnf",
-        "aaiServiceInstancePath": "/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}",
-        "aaiHeaders": {
-          "X-FromAppId": "prh",
-          "X-TransactionId": "9999",
-          "Accept": "application/json",
-          "Real-Time": "true",
-          "Content-Type": "application/merge-patch+json",
-          "Authorization": "Basic QUFJOkFBSQ=="
-        }
-      }
-    },
-    "dmaap": {
-      "dmaapConsumerConfiguration": {
-        "consumerGroup": "other",
-        "consumerId": "1",
-        "dmaapContentType": "application/json",
-        "dmaapHostName": "localhost",
-        "dmaapPortNumber": 2222,
-        "dmaapProtocol": "http",
-        "dmaapTopicName": "temp",
-        "dmaapUserName": "admin",
-        "dmaapUserPassword": "admin",
-        "messageLimit": 1000,
-        "timeoutMs": 1000
-      },
-      "dmaapProducerConfiguration": {
-        "dmaapContentType": "application/json",
-        "dmaapHostName": "localhost",
-        "dmaapPortNumber": 2223,
-        "dmaapProtocol": "http",
-        "dmaaptopicName": "temp",
-        "dmaapuserName": "admin",
-        "dmaapuserPassword": "admin"
-      },
-      "dmaapUpdateProducerConfiguration": {
-        "dmaapContentType": "application/json",
-        "dmaapHostName": "localhost",
-        "dmaapPortNumber": 2223,
-        "dmaapProtocol": "http",
-        "dmaaptopicName": "temp2",
-        "dmaapuserName": "admin",
-        "dmaapuserPassword": "admin"
-      }
-    },
-    "security": {
-      "trustStorePath": "/opt/app/prh/local/org.onap.prh.trust.jks",
-      "trustStorePasswordPath": "change it",
-      "keyStorePath": "/opt/app/prh/local/org.onap.prh.p12",
-      "keyStorePasswordPath": "change it",
-      "enableAaiCertAuth": "false",
-      "enableDmaapCertAuth": "false"
-    }
-  }
-}
\ No newline at end of file