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

2 files changed, 28 insertions, 15 deletions

diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java
index 1b13457a..1ab2b5ab 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Intel. All rights reserved.
  *  Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
+ *  Modifications Copyright (C) 2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,13 +36,8 @@ public class SdcConfiguration implements IConfiguration {
     private SdcReceptionHandlerConfigurationParameterGroup configParameters;
 
     @Override
-    public String getAsdcAddress() {
-        return configParameters.getAsdcAddress();
-    }
-
-    @Override
-    public List<String> getMsgBusAddress() {
-        return configParameters.getMessageBusAddress();
+    public String getSdcAddress() {
+        return configParameters.getSdcAddress();
     }
 
     @Override
@@ -105,12 +101,27 @@ public class SdcConfiguration implements IConfiguration {
     }
 
     @Override
-    public Boolean isUseHttpsWithDmaap() {
-        return configParameters.isUseHttpsWithDmaap();
+    public String getHttpProxyHost() {
+        return configParameters.getHttpProxyHost();
+    }
+
+    @Override
+    public int getHttpProxyPort() {
+        return configParameters.getHttpProxyPort();
+    }
+
+    @Override
+    public String getHttpsProxyHost() {
+        return configParameters.getHttpsProxyHost();
+    }
+
+    @Override
+    public int getHttpsProxyPort() {
+        return configParameters.getHttpsProxyPort();
     }
 
     @Override
     public Boolean isUseHttpsWithSDC() {
-        return configParameters.isUseHttpsWithSdc();
+        return configParameters.getIsUseHttpsWithSdc();
     }
 }
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java
index 485fab06..79a81217 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.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.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,8 +33,7 @@ import org.onap.policy.distribution.reception.parameters.ReceptionHandlerConfigu
  */
 @Getter
 public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHandlerConfigurationParameterGroup {
-    private @NotNull @NotBlank String asdcAddress;
-    private @NotNull @NotBlank List<String> messageBusAddress;
+    private @NotNull @NotBlank String sdcAddress;
     private @NotNull @NotBlank String user;
     private @NotNull @NotBlank String password;
     private @NotNull @NotBlank int pollingInterval;
@@ -48,8 +47,11 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan
     private String keyStorePassword;
     private boolean activeServerTlsAuth;
     private boolean isFilterInEmptyResources;
-    private boolean isUseHttpsWithDmaap;
-    private boolean isUseHttpsWithSdc;
+    private Boolean isUseHttpsWithSdc;
+    private String httpsProxyHost;
+    private String httpProxyHost;
+    private int httpsProxyPort;
+    private int httpProxyPort;
 
     public SdcReceptionHandlerConfigurationParameterGroup() {
         super(SdcReceptionHandlerConfigurationParameterGroup.class.getSimpleName());