code sync-up updates

Issue-ID: DCAEGEN2-212
Change-Id: Id72d2b1851ff4457295088609c355e19d19e3d73
Signed-off-by: VENKATESH KUMAR <vv770d@att.com>

2 files changed, 157 insertions, 166 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;
+
+	}
 
 }
diff --git a/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java b/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
index 1f77751d..2db4ff42 100644
--- a/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
+++ b/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
@@ -34,91 +34,87 @@ import java.io.InputStreamReader;
 import java.util.Iterator;
 import java.util.Map;
 
-
 public class LoadDynamicConfig {
 
-    private static final Logger log = LoggerFactory.getLogger(LoadDynamicConfig.class);
-
-    public String propFile = "collector.properties";
-    public String configFile = "/opt/app/KV-Configuration.json";
-    static String url;
-    static String retString;
-
-    public LoadDynamicConfig() {
-
-    }
-
-    public static void main(String[] args) {
-        Map<String, String> env = System.getenv();
-
-        //Check again to ensure new controller deployment related config
-        if (env.containsKey("CONSUL_HOST") &&
-            env.containsKey("CONFIG_BINDING_SERVICE") && env.containsKey("HOSTNAME")) {
-
-            try {
-
-		LoadDynamicConfig lc = new LoadDynamicConfig();
-                String jsonData = readFile(lc.configFile);
-                JSONObject jsonObject = new JSONObject(jsonData);
-
-                PropertiesConfiguration conf;
-                conf = new PropertiesConfiguration(lc.propFile);
-                conf.setEncoding(null);
-
-                // update properties based on consul dynamic configuration
-                Iterator<?> keys = jsonObject.keys();
-
-                while (keys.hasNext()) {
-                    String key = (String) keys.next();
-                    // check if any configuration is related to dmaap
-                    // and write into dmaapconfig.json
-                    if (key.startsWith("streams_publishes")) {
-                        //VESCollector only have publish streams
-                        try (FileWriter file = new FileWriter("./etc/DmaapConfig.json")) {
-                            file.write(jsonObject.get(key).toString());
-                            log.info("Successfully written JSON Object to DmaapConfig.json");
-                            file.close();
-                        } catch (IOException e) {
-                            log.info(
-                                "Error in writing dmaap configuration into DmaapConfig.json",
-                                e);
-                        }
-                    } else {
-                        conf.setProperty(key, jsonObject.get(key).toString());
-                    }
-
-                }
-                conf.save();
-
-            } catch (ConfigurationException e) {
-                log.error(e.getLocalizedMessage(), e);
-                e.printStackTrace();
-
-            }
-
-        } else {
-            log.info(">>>Static configuration to be used");
-        }
-
-    }
-
-    public static String readFile(String filename) {
-        String result = "";
-        try (BufferedReader br = new BufferedReader(new FileReader(filename))) {
-            StringBuilder sb = new StringBuilder();
-            String line = br.readLine();
-            while (line != null) {
-                sb.append(line);
-                line = br.readLine();
-            }
-            result = sb.toString();
-            br.close();
-        } catch (Exception e) {
-            log.error(e.getLocalizedMessage(), e);
-	    e.printStackTrace();
-        }
-        return result;
-    }
-
+	private static final Logger log = LoggerFactory.getLogger(LoadDynamicConfig.class);
+
+	public String propFile = "collector.properties";
+	public String configFile = "/opt/app/KV-Configuration.json";
+	static String url;
+	static String retString;
+
+	public LoadDynamicConfig() {
+
+	}
+
+	public static void main(String[] args) {
+		Map<String, String> env = System.getenv();
+
+		// Check again to ensure new controller deployment related config
+		if (env.containsKey("CONSUL_HOST") && env.containsKey("CONFIG_BINDING_SERVICE")
+				&& env.containsKey("HOSTNAME")) {
+
+			try {
+
+				LoadDynamicConfig lc = new LoadDynamicConfig();
+				String jsonData = readFile(lc.configFile);
+				JSONObject jsonObject = new JSONObject(jsonData);
+
+				PropertiesConfiguration conf;
+				conf = new PropertiesConfiguration(lc.propFile);
+				conf.setEncoding(null);
+
+				// update properties based on consul dynamic configuration
+				Iterator<?> keys = jsonObject.keys();
+
+				while (keys.hasNext()) {
+					String key = (String) keys.next();
+					// check if any configuration is related to dmaap
+					// and write into dmaapconfig.json
+					if (key.startsWith("streams_publishes")) {
+						// VESCollector only have publish streams
+						try (FileWriter file = new FileWriter("./etc/DmaapConfig.json")) {
+							file.write(jsonObject.get(key).toString());
+							log.info("Successfully written JSON Object to DmaapConfig.json");
+							file.close();
+						} catch (IOException e) {
+							log.info("Error in writing dmaap configuration into DmaapConfig.json", e);
+						}
+					} else {
+						conf.setProperty(key, jsonObject.get(key).toString());
+					}
+
+				}
+				conf.save();
+
+			} catch (ConfigurationException e) {
+				log.error(e.getLocalizedMessage(), e);
+				e.printStackTrace();
+
+			}
+
+		} else {
+			log.info(">>>Static configuration to be used");
+		}
+
+	}
+
+	public static String readFile(String filename) {
+		String result = "";
+		try (BufferedReader br = new BufferedReader(new FileReader(filename))) {
+			StringBuilder sb = new StringBuilder();
+			String line = br.readLine();
+			while (line != null) {
+				sb.append(line);
+				line = br.readLine();
+			}
+			result = sb.toString();
+			br.close();
+		} catch (Exception e) {
+			log.error(e.getLocalizedMessage(), e);
+			e.printStackTrace();
+		}
+		return result;
+	}
 
 }