Fetch configuration from CBS

- Fix memory leak.
- Add reactive configuration fetching from Consul. Now configuration is updated when any change in VES configuration has been done in Consul.

Change-Id: I9cd42e04844c9e99d4d03951185523b569dc9483
Issue-ID: DCAEGEN2-2495
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>

1 files changed, 0 insertions, 60 deletions

diff --git a/src/main/java/org/onap/dcae/configuration/cbs/CbsClientConfigurationResolver.java b/src/main/java/org/onap/dcae/configuration/cbs/CbsClientConfigurationResolver.java
deleted file mode 100644
index dc02131e..00000000
--- a/src/main/java/org/onap/dcae/configuration/cbs/CbsClientConfigurationResolver.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.onap.dcaegen2.collectors.ves
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.onap.dcae.configuration.cbs;
-
-import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsClientConfiguration;
-import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.ImmutableCbsClientConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class CbsClientConfigurationResolver {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CbsClientConfigurationResolver.class);
-
-    private final String defaultProtocol = "http";
-    private final String defaultHostname = "config-binding-service";
-    private final int defaultPort = 10000;
-    private final String defaultAppName = "dcae-ves-collector";
-
-    CbsClientConfiguration resolveCbsClientConfiguration() {
-        try {
-            return CbsClientConfiguration.fromEnvironment();
-        } catch (Exception e) {
-            LOGGER.warn("Failed resolving CBS client configuration from system environments: " + e);
-        }
-        LOGGER.info("Falling back to use default CBS client configuration properties");
-        return getFallbackConfiguration();
-    }
-
-    private ImmutableCbsClientConfiguration getFallbackConfiguration() {
-        LOGGER.info("Falling back to use default CBS client configuration");
-        return createCbsClientConfiguration(defaultProtocol, defaultHostname, defaultAppName, defaultPort);
-    }
-
-    private ImmutableCbsClientConfiguration createCbsClientConfiguration(String protocol, String hostname,
-        String appName, Integer port) {
-        return ImmutableCbsClientConfiguration.builder()
-            .protocol(protocol)
-            .hostname(hostname)
-            .port(port)
-            .appName(appName)
-            .build();
-    }
-}
\ No newline at end of file