Checkstyle fixes for datarouter prov

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / Poker.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Poker.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Poker.java
index f1660f9..5f421b0 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Poker.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Poker.java
@@ -23,6 +23,8 @@
 \r
 package org.onap.dmaap.datarouter.provisioning;\r
 \r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
 import java.io.IOException;\r
 import java.net.HttpURLConnection;\r
 import java.net.InetAddress;\r
@@ -36,12 +38,10 @@ import java.util.Set;
 import java.util.Timer;\r
 import java.util.TimerTask;\r
 import java.util.TreeSet;\r
-\r
-import com.att.eelf.configuration.EELFLogger;\r
-import com.att.eelf.configuration.EELFManager;\r
 import org.json.JSONException;\r
 import org.json.JSONObject;\r
 import org.json.JSONTokener;\r
+\r
 import org.onap.dmaap.datarouter.provisioning.beans.EgressRoute;\r
 import org.onap.dmaap.datarouter.provisioning.beans.Feed;\r
 import org.onap.dmaap.datarouter.provisioning.beans.Group;\r
@@ -58,10 +58,11 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
  * @author Robert Eby\r
  * @version $Id: Poker.java,v 1.11 2014/01/08 16:13:47 eby Exp $\r
  */\r
+\r
 public class Poker extends TimerTask {\r
 \r
     /**\r
-     * Template used to generate the URL to issue the GET against\r
+     * Template used to generate the URL to issue the GET against.\r
      */\r
     private static final String POKE_URL_TEMPLATE = "http://%s/internal/fetchProv";\r
 \r
@@ -69,7 +70,7 @@ public class Poker extends TimerTask {
     private static final String CARRIAGE_RETURN = "\n],\n";\r
 \r
     /**\r
-     * This is a singleton -- there is only one Poker object in the server\r
+     * This is a singleton -- there is only one Poker object in the server.\r
      */\r
     private static Poker poker;\r
     private long timer1;\r
@@ -81,7 +82,6 @@ public class Poker extends TimerTask {
 \r
     private Poker() {\r
         timer1 = timer2 = 0;\r
-        Timer rolex = new Timer();\r
         logger = EELFManager.getInstance().getLogger("InternalLog");\r
         try {\r
             thisPod = InetAddress.getLocalHost().getHostName();\r
@@ -90,7 +90,7 @@ public class Poker extends TimerTask {
             logger.info("UnknownHostException: Setting thisPod to \"*UNKNOWN_POD*\"", e);\r
         }\r
         provString = buildProvisioningString();\r
-\r
+        Timer rolex = new Timer();\r
         rolex.scheduleAtFixedRate(this, 0L, 1000L);    // Run once a second to check the timers\r
     }\r
 \r
@@ -186,7 +186,7 @@ public class Poker extends TimerTask {
     private void pokeNode(final String nodename) {\r
         logger.debug("PROV0012 Poking node " + nodename + " ...");\r
         String nodeUrl = String.format(POKE_URL_TEMPLATE, nodename + ":" + DB.getHttpPort());\r
-        Runnable r = () -> {\r
+        Runnable runn = () -> {\r
             try {\r
                 URL url = new URL(nodeUrl);\r
                 HttpURLConnection conn = (HttpURLConnection) url.openConnection();\r
@@ -203,7 +203,7 @@ public class Poker extends TimerTask {
                         .getMessage(), e);\r
             }\r
         };\r
-        r.run();\r
+        runn.run();\r
     }\r
 \r
     private String buildProvisioningString() {\r
@@ -251,15 +251,15 @@ public class Poker extends TimerTask {
             ivals.addAll(Arrays.asList(intv.split("\\|")));\r
         }\r
         for (String key : new TreeSet<String>(props.keySet())) {\r
-            String v = props.get(key);\r
+            String val = props.get(key);\r
             sb.append(pfx);\r
             sb.append("  \"").append(key).append("\": ");\r
             if (ivals.contains(key)) {\r
                 // integer value\r
-                sb.append(v);\r
+                sb.append(val);\r
             } else if (key.endsWith("S")) {\r
                 // Split and append array of strings\r
-                String[] pp = v.split("\\|");\r
+                String[] pp = val.split("\\|");\r
                 String p2 = "";\r
                 sb.append("[");\r
                 for (String t : pp) {\r
@@ -268,7 +268,7 @@ public class Poker extends TimerTask {
                 }\r
                 sb.append("]");\r
             } else {\r
-                sb.append("\"").append(quote(v)).append("\"");\r
+                sb.append("\"").append(quote(val)).append("\"");\r
             }\r
             pfx = ",\n";\r
         }\r
@@ -288,9 +288,9 @@ public class Poker extends TimerTask {
         sb.append("\"egress\": {");\r
         for (EgressRoute eg : EgressRoute.getAllEgressRoutes()) {\r
             sb.append(pfx);\r
-            String t = eg.asJSONObject().toString();\r
-            t = t.substring(1, t.length() - 1);\r
-            sb.append(t);\r
+            String str = eg.asJSONObject().toString();\r
+            str = str.substring(1, str.length() - 1);\r
+            sb.append(str);\r
             pfx = ",\n";\r
         }\r
         sb.append("\n},\n");\r
@@ -315,9 +315,9 @@ public class Poker extends TimerTask {
         return tempProvString;\r
     }\r
 \r
-    private String quote(String s) {\r
+    private String quote(String str) {\r
         StringBuilder sb = new StringBuilder();\r
-        for (char ch : s.toCharArray()) {\r
+        for (char ch : str.toCharArray()) {\r
             if (ch == '\\' || ch == '"') {\r
                 sb.append('\\');\r
             }\r