From 943a47187dbb1393d720b2fdf0019d48270edb4d Mon Sep 17 00:00:00 2001
From: PawelSzalapski <pawel.szalapski@nokia.com>
Date: Thu, 21 Jun 2018 12:12:30 +0200
Subject: Remove dead code from VESCollector

Many things there are unused or have inproper modifiers,
spelling etc. I run static analysis tool (Intellij code inspect)
and clear those things up. It will be easier to maintain now.
No actual behavior changes were done.

Issue-ID: DCAEGEN2-526
Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
Change-Id: I1a4ad0c896bd32165cba654344ffc5245648c615
---
 .../onap/dcae/controller/FetchDynamicConfig.java    | 21 ++++++---------------
 .../org/onap/dcae/controller/LoadDynamicConfig.java | 10 ++--------
 2 files changed, 8 insertions(+), 23 deletions(-)

(limited to 'src/main/java/org/onap/dcae/controller')

diff --git a/src/main/java/org/onap/dcae/controller/FetchDynamicConfig.java b/src/main/java/org/onap/dcae/controller/FetchDynamicConfig.java
index db4a5ad7..99e269c1 100644
--- a/src/main/java/org/onap/dcae/controller/FetchDynamicConfig.java
+++ b/src/main/java/org/onap/dcae/controller/FetchDynamicConfig.java
@@ -23,20 +23,13 @@ package org.onap.dcae.controller;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-import org.onap.dcae.commonFunction.CommonStartup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -47,16 +40,16 @@ public class FetchDynamicConfig {
 	private static final Logger log = LoggerFactory.getLogger(FetchDynamicConfig.class);
 
 	public static String configFile = "/opt/app/KV-Configuration.json";
-	static String url;
+	private static String url;
 	public static String retString;
 	public static String retCBSString;
-	public static Map<String, String> env;
+	private static Map<String, String> env;
 
 	public FetchDynamicConfig() {
 	}
 
 	public static void main(String[] args) {
-		Boolean areEqual = false;
+		Boolean areEqual;
 		// Call consul api and identify the CBS Service address and port
 		getconsul();
 		// Construct and invoke CBS API to get application Configuration
@@ -73,7 +66,7 @@ public class FetchDynamicConfig {
 		}
 	}
 
-	public static void getconsul() {
+	private static void getconsul() {
 
 		env = System.getenv();
 		for (Map.Entry<String, String> entry : env.entrySet()) {
@@ -107,13 +100,11 @@ public class FetchDynamicConfig {
 				ObjectMapper mapper = new ObjectMapper();
 
 				JsonNode tree1 = mapper.readTree(jsonObject.toString());
-				JsonNode tree2 = mapper.readTree(retCBSString.toString());
+				JsonNode tree2 = mapper.readTree(retCBSString);
 				areEqual = tree1.equals(tree2);
 				log.info("Comparison value:" + areEqual);
 			} else {
 				log.info("First time config file read: " + configFile);
-				// To allow first time file creation
-				areEqual = false;
 			}
 
 		} catch (IOException e) {
@@ -167,7 +158,7 @@ public class FetchDynamicConfig {
 
 	}
 
-	public static String executecurl(String url) {
+	private static String executecurl(String url) {
 
 		String[] command = { "curl", "-v", url };
 		ProcessBuilder process = new ProcessBuilder(command);
diff --git a/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java b/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
index 9184c3e7..a8ecaba0 100644
--- a/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
+++ b/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
@@ -30,7 +30,6 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -40,9 +39,7 @@ public class LoadDynamicConfig {
 
 	public String propFile = "collector.properties";
 	public String configFile = "/opt/app/KV-Configuration.json";
-	static String url;
-	static String retString;
-	public String dmaapoutputfile = "./etc/DmaapConfig.json";
+	public String dMaaPOutputFile = "./etc/DmaapConfig.json";
 
 	public LoadDynamicConfig() {
 
@@ -93,12 +90,10 @@ public class LoadDynamicConfig {
 			// and write into dmaapconfig.json
 			if (key.startsWith("streams_publishes")) {
 				// VESCollector only have publish streams
-				try (FileWriter file = new FileWriter(dmaapoutputfile)) {
-					
+				try (FileWriter file = new FileWriter(dMaaPOutputFile)) {
 					String indentedretstring=(new JSONObject(jsonObject.get(key).toString())).toString(4);
 					file.write(indentedretstring);
 					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);
 				}
@@ -124,7 +119,6 @@ public class LoadDynamicConfig {
 				line = br.readLine();
 			}
 			result = sb.toString();
-			br.close();
 		} catch (Exception e) {
 			log.error(e.getLocalizedMessage(), e);
 			e.printStackTrace();
-- 
cgit 1.2.3-korg