1 files changed, 56 insertions, 36 deletions

diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/config/ConfigHandler.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/config/ConfigHandler.java
index ae185f4..6c93d2f 100644
--- a/src/main/java/org/onap/dcaegen2/services/pmmapper/config/ConfigHandler.java
+++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/config/ConfigHandler.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation.
+ *  Copyright (C) 2022 Nokia.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,19 +20,19 @@
  */
 package org.onap.dcaegen2.services.pmmapper.config;
 
-import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import org.onap.dcaegen2.services.pmmapper.exceptions.CBSServerError;
 import org.onap.dcaegen2.services.pmmapper.exceptions.EnvironmentConfigException;
 import org.onap.dcaegen2.services.pmmapper.exceptions.MapperConfigException;
-import org.onap.dcaegen2.services.pmmapper.utils.EnvironmentConfig;
 import org.onap.dcaegen2.services.pmmapper.model.MapperConfig;
-import org.onap.dcaegen2.services.pmmapper.utils.RequestSender;
 import org.onap.dcaegen2.services.pmmapper.utils.RequiredFieldDeserializer;
 
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsRequest;
+
 import org.onap.logging.ref.slf4j.ONAPLogAdapter;
 import org.slf4j.LoggerFactory;
 import com.google.gson.GsonBuilder;
+import reactor.core.publisher.Mono;
 
 /**
  * Handles the retrieval of the component spec-based PM-Mapper Configuration
@@ -39,24 +40,22 @@ import com.google.gson.GsonBuilder;
  */
 
 public class ConfigHandler {
+
     private static final ONAPLogAdapter logger = new ONAPLogAdapter(LoggerFactory.getLogger(ConfigHandler.class));
-    private RequestSender sender;
-    private EnvironmentConfig environmentConfig;
 
-    /**
-     * Creates a ConfigHandler.
-     */
-    public ConfigHandler() {
-        this(new RequestSender(), new EnvironmentConfig());
-    }
+    private final CbsClient cbsClient;
+    private final CbsRequest cbsRequest;
+
+    private MapperConfig mapperConfig;
 
     /**
-     * @see ConfigHandler#ConfigHandler()
-     * @param sender A RequestSender
+     * Creates a ConfigHandler based on Cbs Client and Cbs Request provided by DCAE SDK
+     * @param CbsClient A Cbs Client
+     * @param CbsRequest A Cbs Request
      */
-    public ConfigHandler(RequestSender sender, EnvironmentConfig environmentConfig) {
-        this.sender = sender;
-        this.environmentConfig = environmentConfig;
+    public ConfigHandler(CbsClient cbsClient, CbsRequest cbsRequest){
+        this.cbsClient = cbsClient;
+        this.cbsRequest = cbsRequest;
     }
 
     /**
@@ -65,32 +64,53 @@ public class ConfigHandler {
      * @throws EnvironmentConfigException
      */
     public MapperConfig getMapperConfig() throws EnvironmentConfigException {
-        String mapperConfigJson = "";
-        String cbsSocketAddress = this.environmentConfig.getCBSHostName() + ":" + this.environmentConfig.getCBSPort();
-        String requestURL = "http://" + cbsSocketAddress + "/service_component/" + this.environmentConfig.getServiceName();
-        try {
-            logger.unwrap().info("Fetching pm-mapper configuration from Configbinding Service");
-            mapperConfigJson = sender.send(requestURL);
-        } catch (Exception exception) {
-            throw new CBSServerError("Error connecting to Configbinding Service: ", exception);
+
+        Mono.just(cbsClient)
+            .flatMap(client -> client.get(cbsRequest))
+            .subscribe(
+                this::handleConfigurationFromConsul,
+                this::handleError
+            );
+
+        if (mapperConfig == null) {
+            logger.unwrap().error("Mapper configuration is not initialized");
+            throw new EnvironmentConfigException("Mapper configuration is not initialized");
         }
-        return convertMapperConfigToObject(mapperConfigJson);
+        return mapperConfig;
     }
 
-    private MapperConfig convertMapperConfigToObject(String mapperConfigJson) {
-        MapperConfig mapperConfig;
+    /**
+     * Retrieves Initial PM-Mapper Configuration from DCAE's ConfigBinding Service.
+     *
+     * @throws MapperConfigException
+     */
+    public MapperConfig getInitialConfiguration() {
+        logger.unwrap().info("Attempt to get initial configuration");
+            JsonObject jsonObject = Mono.just(cbsClient)
+                .flatMap(client -> client.get(cbsRequest))
+                .block();
+            handleConfigurationFromConsul(jsonObject);
+        return mapperConfig;
+    }
+
+    void handleConfigurationFromConsul(JsonObject jsonObject) {
+        logger.unwrap().info("Attempt to process configuration object");
+
         try {
-            JsonObject config = new Gson().fromJson(mapperConfigJson, JsonObject.class);
             mapperConfig = new GsonBuilder()
-                    .registerTypeAdapter(MapperConfig.class, new RequiredFieldDeserializer<MapperConfig>())
-                    .create()
-                    .fromJson(config, MapperConfig.class);
+                .registerTypeAdapter(MapperConfig.class, new RequiredFieldDeserializer<MapperConfig>())
+                .create()
+                .fromJson(jsonObject, MapperConfig.class);
         } catch (Exception exception) {
-            String exceptionMessage = "Error parsing configuration, mapper config:\n" + mapperConfigJson;
+            String exceptionMessage = "Error parsing configuration, mapper config:\n" + mapperConfig;
+            logger.unwrap().error(exceptionMessage);
             throw new MapperConfigException(exceptionMessage, exception);
         }
-        logger.unwrap().info("Received pm-mapper configuration from ConfigBinding Service");
-        logger.unwrap().debug("Mapper configuration:\n{}", mapperConfig);
-        return mapperConfig;
+        logger.unwrap().info("PM-mapper configuration processed successful");
+        logger.unwrap().info("Mapper configuration:\n{}", mapperConfig);
+    }
+
+    private void handleError(Throwable throwable) {
+        logger.unwrap().error("Unexpected error occurred during fetching configuration", throwable);
     }
 }