Update version of SDC-Client to 2.0.0

Signed-off-by: david.mcweeney <david.mcweeney@est.tech>
Issue-ID: DMAAP-1790
Change-Id: I21edcdafe965a3e17b863e5f8766eeb764cf6bc5

5 files changed, 10 insertions, 31 deletions

diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandler.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandler.java
index e7a97a24..7308018d 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandler.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandler.java
@@ -85,7 +85,7 @@ public class TestFileSystemReceptionHandler {
 
     @Test
     public final void testInit() throws IOException {
-        final FileSystemReceptionHandler sypHandler = Mockito.spy(fileSystemHandler);
+        FileSystemReceptionHandler sypHandler = Mockito.spy(fileSystemHandler);
         Mockito.doNothing().when(sypHandler).initFileWatcher(Mockito.isA(String.class),
                 Mockito.anyInt());
         assertThatCode(() -> sypHandler.initializeReception(pssdConfigParameters.getName()))
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java
index 25764f0e..717f635d 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Intel. All rights reserved.
- *  Modifications Copyright (C) 2019-2021 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2022 Nordix Foundation.
  *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -51,9 +51,8 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup {
         final ValidationResult validationResult = configParameters.validate();
         assertTrue(validationResult.isValid());
         final SdcConfiguration config = new SdcConfiguration(configParameters);
-        assertEquals(Arrays.asList("a.com", "b.com", "c.com"), config.getMsgBusAddress());
         assertEquals(Arrays.asList("TOSCA_CSAR", "HEAT"), config.getRelevantArtifactTypes());
-        assertEquals("localhost", config.getAsdcAddress());
+        assertEquals("localhost", config.getSdcAddress());
         assertEquals("policy", config.getUser());
         assertEquals("policy", config.getPassword());
         assertEquals(20, config.getPollingInterval());
@@ -65,7 +64,6 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup {
         assertEquals("null", config.getKeyStorePassword());
         assertEquals(false, config.activateServerTLSAuth());
         assertEquals(true, config.isFilterInEmptyResources());
-        assertEquals(false, config.isUseHttpsWithDmaap());
         assertEquals(false, config.isUseHttpsWithSDC());
     }
 
@@ -84,7 +82,6 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup {
         //if boolean parameters are null they are set to false
         assertEquals(false, config.activateServerTLSAuth());
         assertEquals(false, config.isFilterInEmptyResources());
-        assertEquals(false, config.isUseHttpsWithDmaap());
     }
 
     @Test
diff --git a/plugins/reception-plugins/src/test/resources/handling-sdc-null-parameters.json b/plugins/reception-plugins/src/test/resources/handling-sdc-null-parameters.json
index 6c9301a5..c1f1c6a0 100644
--- a/plugins/reception-plugins/src/test/resources/handling-sdc-null-parameters.json
+++ b/plugins/reception-plugins/src/test/resources/handling-sdc-null-parameters.json
@@ -1,11 +1,6 @@
 {
     "name" : "parameterConfig1",
-    "asdcAddress": "localhost",
-    "messageBusAddress": [
-        "a.com",
-        "b.com",
-        "c.com"
-    ],
+    "sdcAddress": "localhost",
     "user": "policy",
     "password": "policy",
     "pollingInterval":20,
@@ -21,7 +16,6 @@
     "keyStorePath": null,
     "keyStorePassword": null,
     "activeServerTlsAuth": null,
-    "isFilterInEmptyResources": null,
-    "isUseHttpsWithDmaap": null
+    "isFilterInEmptyResources": null
 }
 
diff --git a/plugins/reception-plugins/src/test/resources/handling-sdc.json b/plugins/reception-plugins/src/test/resources/handling-sdc.json
index 8c8a02a4..638a468e 100644
--- a/plugins/reception-plugins/src/test/resources/handling-sdc.json
+++ b/plugins/reception-plugins/src/test/resources/handling-sdc.json
@@ -1,11 +1,6 @@
 {
     "name" : "parameterConfig1",
-    "asdcAddress": "localhost",
-    "messageBusAddress": [
-        "a.com",
-        "b.com",
-        "c.com"
-    ],
+    "sdcAddress": "localhost",
     "user": "policy",
     "password": "policy",
     "pollingInterval":20,
@@ -13,7 +8,7 @@
     "retryDelay":30,
     "consumerId": "policy-id",
     "artifactTypes": [
-        "TOSCA_CSAR", 
+        "TOSCA_CSAR",
         "HEAT"
     ],
     "consumerGroup": "policy-group",
@@ -22,7 +17,6 @@
     "keyStorePassword": "null",
     "activeServerTlsAuth": false,
     "isFilterInEmptyResources": true,
-    "isUseHttpsWithDmaap": false,
     "isUseHttpsWithSdc": false
 }
 
diff --git a/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json b/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json
index 803fc412..d2cffddf 100644
--- a/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json
+++ b/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json
@@ -1,18 +1,13 @@
 {
     "name" : "parameterConfig1",
-    "asdcAddress": "",
-    "messageBusAddress": [
-        "a.com",
-        "b.com",
-        "c.com"
-    ],
+    "sdcAddress": "",
     "user": "tbdsdc-1480",
     "password": "tbdsdc-1480",
     "pollingInterval":-1,
     "pollingTimeout":-2,
     "consumerId": "policy-id",
     "artifactTypes": [
-        "TOSCA_CSAR", 
+        "TOSCA_CSAR",
         "HEAT"
     ],
     "consumerGroup": "policy-group",
@@ -20,7 +15,6 @@
     "keyStorePath": "null",
     "keyStorePassword": "null",
     "activeserverTlsAuth": false,
-    "isFilterInEmptyResources": true,
-    "isUseHttpsWithDmaap": false
+    "isFilterInEmptyResources": true
 }