Removing code smells

[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 6177df2..f1660f9 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
@@ -66,6 +66,7 @@ public class Poker extends TimerTask {
     private static final String POKE_URL_TEMPLATE = "http://%s/internal/fetchProv";\r
 \r
     private static final Object lock = new Object();\r
+    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
@@ -77,15 +78,16 @@ public class Poker extends TimerTask {
     private EELFLogger logger;\r
     private String provString;\r
 \r
+\r
     private Poker() {\r
         timer1 = timer2 = 0;\r
         Timer rolex = new Timer();\r
-        logger = EELFManager.getInstance().getLogger("InternalLog");;\r
+        logger = EELFManager.getInstance().getLogger("InternalLog");\r
         try {\r
             thisPod = InetAddress.getLocalHost().getHostName();\r
         } catch (UnknownHostException e) {\r
-            thisPod = "*UNKNOWN*"; // not a major problem\r
-            logger.info("UnknownHostException: Setting thisPod to \"*UNKNOWN*\"", e);\r
+            thisPod = "*UNKNOWN_POD*"; // not a major problem\r
+            logger.info("UnknownHostException: Setting thisPod to \"*UNKNOWN_POD*\"", e);\r
         }\r
         provString = buildProvisioningString();\r
 \r
@@ -215,7 +217,7 @@ public class Poker extends TimerTask {
             sb.append(f.asJSONObject().toString());\r
             pfx = ",\n";\r
         }\r
-        sb.append("\n],\n");\r
+        sb.append(CARRIAGE_RETURN);\r
 \r
         //Append groups to the string - Rally:US708115  - 1610\r
         pfx = "\n";\r
@@ -225,7 +227,7 @@ public class Poker extends TimerTask {
             sb.append(s.asJSONObject().toString());\r
             pfx = ",\n";\r
         }\r
-        sb.append("\n],\n");\r
+        sb.append(CARRIAGE_RETURN);\r
 \r
         // Append Subscriptions to the string\r
         pfx = "\n";\r
@@ -237,13 +239,13 @@ public class Poker extends TimerTask {
             }\r
             pfx = ",\n";\r
         }\r
-        sb.append("\n],\n");\r
+        sb.append(CARRIAGE_RETURN);\r
 \r
         // Append Parameters to the string\r
         pfx = "\n";\r
         sb.append("\"parameters\": {");\r
         Map<String, String> props = Parameters.getParameters();\r
-        Set<String> ivals = new HashSet<String>();\r
+        Set<String> ivals = new HashSet<>();\r
         String intv = props.get("_INT_VALUES");\r
         if (intv != null) {\r
             ivals.addAll(Arrays.asList(intv.split("\\|")));\r
@@ -280,7 +282,7 @@ public class Poker extends TimerTask {
             sb.append(in.asJSONObject().toString());\r
             pfx = ",\n";\r
         }\r
-        sb.append("\n],\n");\r
+        sb.append(CARRIAGE_RETURN);\r
 \r
         pfx = "\n";\r
         sb.append("\"egress\": {");\r