1 files changed, 77 insertions, 82 deletions
diff --git a/src/main/java/org/onap/dcae/controller/FetchDynamicConfig.java b/src/main/java/org/onap/dcae/controller/FetchDynamicConfig.java
index 655b9755..82d4bba3 100644
--- a/src/main/java/org/onap/dcae/controller/FetchDynamicConfig.java
+++ b/src/main/java/org/onap/dcae/controller/FetchDynamicConfig.java
@@ -34,87 +34,82 @@ import java.util.Map;
 
 public class FetchDynamicConfig {
 
-    private static final Logger log = LoggerFactory.getLogger(FetchDynamicConfig.class);
-
-    static String configFile = "/opt/app/KV-Configuration.json";
-    static String url;
-    static String retString;
-
-    public FetchDynamicConfig() {
-    }
-
-    public static void main(String[] args) {
-        Map<String, String> env = System.getenv();
-        for (Map.Entry<String, String> entry : env.entrySet()) {
-            log.info("%s=%s%n", entry.getKey(), entry.getValue());
-        }
-
-        if (env.containsKey("CONSUL_HOST") && env.containsKey("CONFIG_BINDING_SERVICE")
-            && env.containsKey("HOSTNAME")) {
-            log.info(">>>Dynamic configuration to be fetched from ConfigBindingService");
-            url = env.get("CONSUL_HOST") + ":8500/v1/catalog/service/" + env
-                .get("CONFIG_BINDING_SERVICE");
-
-            retString = executecurl(url);
-            // consul return as array
-            JSONTokener temp = new JSONTokener(retString);
-            JSONObject cbsjobj = (JSONObject) new JSONArray(temp).get(0);
-
-            String urlPart1 = null;
-            if (cbsjobj.has("ServiceAddress") && cbsjobj.has("ServicePort")) {
-                urlPart1 =
-                    cbsjobj.getString("ServiceAddress") + ":" + cbsjobj.getInt("ServicePort");
-            }
-
-            log.info("CONFIG_BINDING_SERVICE DNS RESOLVED:" + urlPart1);
-            url = urlPart1 + "/service_component/" + env.get("HOSTNAME");
-            retString = executecurl(url);
-
-            JSONObject jsonObject = new JSONObject(new JSONTokener(retString));
-            try (FileWriter file = new FileWriter(configFile)) {
-                file.write(jsonObject.toString());
-
-                log.info(
-                    "Successfully Copied JSON Object to file /opt/app/KV-Configuration.json");
-            } catch (IOException e) {
-                log.error(
-                    "Error in writing configuration into file /opt/app/KV-Configuration.json "
-                        + jsonObject, e);
-		e.printStackTrace();
-            }
-        } else {
-            log.info(">>>Static configuration to be used");
-        }
-
-    }
-
-    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;
-
-            while ((line = reader.readLine()) != null) {
-                builder.append(line);
-            }
-            result = builder.toString();
-            log.info(result);
-
-            reader.close();
-            ipr.close();
-        } catch (IOException e) {
-            log.error("error", e);
-            e.printStackTrace();
-        }
-        return result;
-
-    }
+	private static final Logger log = LoggerFactory.getLogger(FetchDynamicConfig.class);
+
+	static String configFile = "/opt/app/KV-Configuration.json";
+	static String url;
+	static String retString;
+
+	public FetchDynamicConfig() {
+	}
+
+	public static void main(String[] args) {
+		Map<String, String> env = System.getenv();
+		for (Map.Entry<String, String> entry : env.entrySet()) {
+			log.info("%s=%s%n", entry.getKey(), entry.getValue());
+		}
+
+		if (env.containsKey("CONSUL_HOST") && env.containsKey("CONFIG_BINDING_SERVICE")
+				&& env.containsKey("HOSTNAME")) {
+			log.info(">>>Dynamic configuration to be fetched from ConfigBindingService");
+			url = env.get("CONSUL_HOST") + ":8500/v1/catalog/service/" + env.get("CONFIG_BINDING_SERVICE");
+
+			retString = executecurl(url);
+			// consul return as array
+			JSONTokener temp = new JSONTokener(retString);
+			JSONObject cbsjobj = (JSONObject) new JSONArray(temp).get(0);
+
+			String urlPart1 = null;
+			if (cbsjobj.has("ServiceAddress") && cbsjobj.has("ServicePort")) {
+				urlPart1 = cbsjobj.getString("ServiceAddress") + ":" + cbsjobj.getInt("ServicePort");
+			}
+
+			log.info("CONFIG_BINDING_SERVICE DNS RESOLVED:" + urlPart1);
+			url = urlPart1 + "/service_component/" + env.get("HOSTNAME");
+			retString = executecurl(url);
+
+			JSONObject jsonObject = new JSONObject(new JSONTokener(retString));
+			try (FileWriter file = new FileWriter(configFile)) {
+				file.write(jsonObject.toString());
+
+				log.info("Successfully Copied JSON Object to file /opt/app/KV-Configuration.json");
+			} catch (IOException e) {
+				log.error("Error in writing configuration into file /opt/app/KV-Configuration.json " + jsonObject, e);
+				e.printStackTrace();
+			}
+		} else {
+			log.info(">>>Static configuration to be used");
+		}
+
+	}
+
+	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;
+
+			while ((line = reader.readLine()) != null) {
+				builder.append(line);
+			}
+			result = builder.toString();
+			log.info(result);
+
+			reader.close();
+			ipr.close();
+		} catch (IOException e) {
+			log.error("error", e);
+			e.printStackTrace();
+		}
+		return result;
+
+	}
 
 }