aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMukesh Paliwal <mukesh.paliwal1@huawei.com>2021-08-09 21:25:48 +0530
committerMukesh Paliwal <mukesh.paliwal1@huawei.com>2021-08-09 21:25:48 +0530
commit50d561bbdafada631cf96268b5c69976c87039dd (patch)
tree912f7c6cc8b727ba4fc00e7a24e6680a31fc23f6
parentb9f0e8feb92df1c9e2906f23a9a613150b4c91b4 (diff)
VES-mapper - Switch CBS client library to 1.8.6 or higher
Issue-ID: DCAEGEN2-2858 Signed-off-by: Mukesh Paliwal <mukesh.paliwal1@huawei.com> Change-Id: If016527346d911189f2a5fc87b49315590890df5
-rw-r--r--UniversalVesAdapter/pom.xml2
-rw-r--r--UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java4
-rw-r--r--UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java4
3 files changed, 5 insertions, 5 deletions
diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml
index b5b04fc..604c1b2 100644
--- a/UniversalVesAdapter/pom.xml
+++ b/UniversalVesAdapter/pom.xml
@@ -57,7 +57,7 @@
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
<!-- DCAE SDK version -->
- <sdk.version>1.1.6</sdk.version>
+ <sdk.version>1.8.7</sdk.version>
</properties>
<dependencies>
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
index 85c5f42..01da983 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
@@ -38,7 +38,7 @@ import org.json.simple.JSONObject;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClientFactory;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsRequests;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsRequest;
-import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.EnvProperties;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsClientConfiguration;
import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
import org.onap.universalvesadapter.utils.CollectorConfigPropertyRetrieval;
import org.onap.universalvesadapter.utils.FetchDynamicConfig;
@@ -71,7 +71,7 @@ public class VESAdapterInitializer implements CommandLineRunner, Ordered {
final CbsRequest request = CbsRequests.getConfiguration(diagnosticContext);
// Read necessary properties from the environment
- final EnvProperties env = EnvProperties.fromEnvironment();
+ final CbsClientConfiguration env = CbsClientConfiguration.fromEnvironment();
// Polling properties :
final Duration initialDelay = Duration.ofSeconds(5);
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java
index 0c6155c..b8fa00f 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java
@@ -38,7 +38,7 @@ import org.json.JSONObject;
import org.json.JSONTokener;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsRequests;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsRequest;
-import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.EnvProperties;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsClientConfiguration;
import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +66,7 @@ public class FetchDynamicConfig {
final CbsRequest request = CbsRequests.getConfiguration(diagnosticContext);
// Read necessary properties from the environment
- static final EnvProperties env = EnvProperties.fromEnvironment();
+ static final CbsClientConfiguration env = CbsClientConfiguration.fromEnvironment();
public FetchDynamicConfig() {