1 files changed, 80 insertions, 84 deletions
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;
+	}
 
 }