From eac1d9bb4ac15877270bb811a8d06019c932c669 Mon Sep 17 00:00:00 2001
From: Niranjana <niranjana.y60@wipro.com>
Date: Fri, 11 Jun 2021 08:58:11 +0000
Subject: Update sdk version to load policies from a file mounted by policy
 sidecar container

Issue-ID: DCAEGEN2-2711
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: Id8be505c941d17cd62f981978a0e4111c362dbe8
---
 pom.xml                                                     |  4 ++--
 .../services/sonhms/controller/ConfigFetchFromCbs.java      | 13 +++++++------
 version.properties                                          |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 431137b..95aa1af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 	<groupId>org.onap.dcaegen2.services.son-handler</groupId>
 	<artifactId>son-handler</artifactId>
 	<name>dcaegen2-services-son-handler</name>
-	<version>2.1.3-SNAPSHOT</version>
+	<version>2.1.4-SNAPSHOT</version>
 
 	<!--parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId>
 		<version>2.0.4.RELEASE</version> </parent -->
@@ -41,7 +41,7 @@
 
 
 	<properties>
-		<sdk.version>1.1.4</sdk.version>
+		<sdk.version>1.8.6</sdk.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/controller/ConfigFetchFromCbs.java b/src/main/java/org/onap/dcaegen2/services/sonhms/controller/ConfigFetchFromCbs.java
index 448ac27..afd5092 100644
--- a/src/main/java/org/onap/dcaegen2/services/sonhms/controller/ConfigFetchFromCbs.java
+++ b/src/main/java/org/onap/dcaegen2/services/sonhms/controller/ConfigFetchFromCbs.java
@@ -2,7 +2,7 @@
  *  ============LICENSE_START=======================================================
  *  son-handler
  *  ================================================================================
- *   Copyright (C) 2019-2020 Wipro Limited.
+ *   Copyright (C) 2019-2021 Wipro Limited.
  *   ==============================================================================
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -32,7 +32,8 @@ import java.util.Map;
 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.ImmutableRequestDiagnosticContext;
 import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
 import org.onap.dcaegen2.services.sonhms.ConfigPolicy;
 import org.onap.dcaegen2.services.sonhms.Configuration;
@@ -65,8 +66,8 @@ public class ConfigFetchFromCbs implements Runnable {
         log.info("getAppconfig start ..");
         RequestDiagnosticContext diagnosticContext = RequestDiagnosticContext.create();
         // Read necessary properties from the environment
-        final EnvProperties env = EnvProperties.fromEnvironment();
-        log.debug("environments {}", env);
+        final CbsClientConfiguration cbsClientConfiguration = CbsClientConfiguration.fromEnvironment();
+        log.debug("environments {}", cbsClientConfiguration);
         ConfigPolicy configPolicy = ConfigPolicy.getInstance();
 
         // Polling properties
@@ -75,7 +76,7 @@ public class ConfigFetchFromCbs implements Runnable {
 
         // Create the client and use it to get the configuration
         final CbsRequest request = CbsRequests.getAll(diagnosticContext);
-        return CbsClientFactory.createCbsClient(env)
+        return CbsClientFactory.createCbsClient(cbsClientConfiguration)
                 .flatMapMany(cbsClient -> cbsClient.updates(request, initialDelay, period)).subscribe(jsonObject -> {
                     log.info("configuration and policy from CBS {}", jsonObject);
                     JsonObject config = jsonObject.getAsJsonObject("config");
@@ -120,4 +121,4 @@ public class ConfigFetchFromCbs implements Runnable {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/version.properties b/version.properties
index 544d052..a1b17e4 100644
--- a/version.properties
+++ b/version.properties
@@ -20,7 +20,7 @@
 ###############################################################################
 major=2
 minor=1
-patch=3
+patch=4
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg