1 files changed, 5 insertions, 31 deletions

diff --git a/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java b/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
index c519d076..a28bca86 100644
--- a/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
+++ b/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
@@ -39,8 +39,8 @@ public class LoadDynamicConfig {
 
     private static final Logger log = LoggerFactory.getLogger(LoadDynamicConfig.class);
 
-    static String propFile = "collector.properties";
-    static String configFile = "/opt/app/KV-Configuration.json";
+    public String propFile = "collector.properties";
+    public String configFile = "/opt/app/KV-Configuration.json";
     static String url;
     static String retString;
 
@@ -60,11 +60,12 @@ public class LoadDynamicConfig {
 
             try {
 
-                String jsonData = readFile(configFile);
+		LoadDynamicConfig lc = new LoadDynamicConfig();
+                String jsonData = readFile(lc.configFile);
                 JSONObject jsonObject = new JSONObject(jsonData);
 
                 PropertiesConfiguration conf;
-                conf = new PropertiesConfiguration(propFile);
+                conf = new PropertiesConfiguration(lc.propFile);
                 conf.setEncoding(null);
 
                 // update properties based on consul dynamic configuration
@@ -103,33 +104,6 @@ public class LoadDynamicConfig {
 
     }
 
-    public static String executecurl(String url) {
-
-        String[] command = {"curl", "-v", url};
-        ProcessBuilder process = new ProcessBuilder(command);
-        Process p;
-        String result = null;
-        try {
-            p = process.start();
-
-            InputStreamReader ipr = new InputStreamReader(p.getInputStream());
-            BufferedReader reader = new BufferedReader(ipr);
-            StringBuilder builder = new StringBuilder();
-            String line = null;
-
-            while ((line = reader.readLine()) != null) {
-                builder.append(line);
-            }
-            result = builder.toString();
-            log.info(result);
-
-        } catch (IOException e) {
-            log.error("error" + e.getLocalizedMessage(), e);
-        }
-        return result;
-
-    }
-
     public static String readFile(String filename) {
         String result = "";
         try (BufferedReader br = new BufferedReader(new FileReader(filename))) {