1 files changed, 24 insertions, 17 deletions

diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java
index 25e69251..a304b5a6 100644
--- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java
+++ b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfig.java
@@ -20,34 +20,31 @@
 
 package org.onap.aaf.certservice.certification.configuration;
 
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+import javax.annotation.PostConstruct;
 import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.cloud.context.scope.refresh.RefreshScopeRefreshedEvent;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-import org.springframework.context.event.EventListener;
-
 @Configuration
 public class CmpServersConfig {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CmpServersConfig.class);
+    private static final String LOADING_SUCCESS_MESSAGE = "CMP Servers configuration successfully loaded from file {}";
     private static final String CMP_SERVERS_CONFIG_FILENAME = "cmpServers.json";
+    private static final String INIT_CONFIGURATION = "Loading initial configuration";
     private static final String REFRESHING_CONFIGURATION = "Refreshing configuration";
 
-    private String configPath;
-    private List<Cmpv2Server> cmpServers;
+    private final String configPath;
     private final CmpServersConfigLoader cmpServersConfigLoader;
 
+    private List<Cmpv2Server> cmpServers;
+
     @Autowired
     public CmpServersConfig(@Value("${app.config.path}") String configPath,
                             CmpServersConfigLoader cmpServersConfigLoader) {
@@ -56,18 +53,28 @@ public class CmpServersConfig {
     }
 
     @PostConstruct
-    void loadConfiguration() {
-        String configFilePath = configPath + File.separator + CMP_SERVERS_CONFIG_FILENAME;
-        this.cmpServers = Collections.unmodifiableList(cmpServersConfigLoader.load(configFilePath));
+    void init() {
+        LOGGER.info(INIT_CONFIGURATION);
+        try {
+            loadConfiguration();
+        } catch (CmpServersConfigLoadingException e) {
+            LOGGER.error(e.getMessage(), e.getCause());
+        }
     }
 
-    @EventListener
-    public void onRefreshScope(final RefreshScopeRefreshedEvent event) {
+    public void reloadConfiguration() throws CmpServersConfigLoadingException {
         LOGGER.info(REFRESHING_CONFIGURATION);
         loadConfiguration();
     }
 
+    void loadConfiguration() throws CmpServersConfigLoadingException {
+        String configFilePath = configPath + File.separator + CMP_SERVERS_CONFIG_FILENAME;
+        this.cmpServers = Collections.unmodifiableList(cmpServersConfigLoader.load(configFilePath));
+        LOGGER.info(LOADING_SUCCESS_MESSAGE, configFilePath);
+    }
+
     public List<Cmpv2Server> getCmpServers() {
         return cmpServers;
     }
+
 }