X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FPoker.java;h=5f421b0f47210b50dc32fe5f72b094364e6e10b0;hp=193485e66a3f035775200793a3285c645310a0fa;hb=6fb37eb225e48b58b1f30fc0423d19046509a54b;hpb=0aa5fa334845e82d4f60eef5f09ac5da3c2cc69c 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 193485e6..5f421b0f 100644 --- 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 @@ package org.onap.dmaap.datarouter.provisioning; +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; import java.io.IOException; import java.net.HttpURLConnection; import java.net.InetAddress; @@ -36,10 +38,10 @@ import java.util.Set; import java.util.Timer; import java.util.TimerTask; import java.util.TreeSet; -import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; + import org.onap.dmaap.datarouter.provisioning.beans.EgressRoute; import org.onap.dmaap.datarouter.provisioning.beans.Feed; import org.onap.dmaap.datarouter.provisioning.beans.Group; @@ -56,37 +58,39 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB; * @author Robert Eby * @version $Id: Poker.java,v 1.11 2014/01/08 16:13:47 eby Exp $ */ + public class Poker extends TimerTask { /** - * Template used to generate the URL to issue the GET against + * Template used to generate the URL to issue the GET against. */ private static final String POKE_URL_TEMPLATE = "http://%s/internal/fetchProv"; private static final Object lock = new Object(); + private static final String CARRIAGE_RETURN = "\n],\n"; /** - * This is a singleton -- there is only one Poker object in the server + * This is a singleton -- there is only one Poker object in the server. */ private static Poker poker; private long timer1; private long timer2; private String thisPod; // DNS name of this machine - private Logger logger; + private EELFLogger logger; private String provString; + private Poker() { timer1 = timer2 = 0; - Timer rolex = new Timer(); - logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); + logger = EELFManager.getInstance().getLogger("InternalLog"); try { thisPod = InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { - thisPod = "*UNKNOWN*"; // not a major problem - logger.info("UnknownHostException: Setting thisPod to \"*UNKNOWN*\""); + thisPod = "*UNKNOWN_POD*"; // not a major problem + logger.info("UnknownHostException: Setting thisPod to \"*UNKNOWN_POD*\"", e); } provString = buildProvisioningString(); - + Timer rolex = new Timer(); rolex.scheduleAtFixedRate(this, 0L, 1000L); // Run once a second to check the timers } @@ -182,7 +186,7 @@ public class Poker extends TimerTask { private void pokeNode(final String nodename) { logger.debug("PROV0012 Poking node " + nodename + " ..."); String nodeUrl = String.format(POKE_URL_TEMPLATE, nodename + ":" + DB.getHttpPort()); - Runnable r = () -> { + Runnable runn = () -> { try { URL url = new URL(nodeUrl); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); @@ -193,13 +197,13 @@ public class Poker extends TimerTask { } catch (MalformedURLException e) { logger.warn( "PROV0013 MalformedURLException Error poking node at " + nodeUrl + " : " + e - .getMessage()); + .getMessage(), e); } catch (IOException e) { logger.warn("PROV0013 IOException Error poking node at " + nodeUrl + " : " + e - .getMessage()); + .getMessage(), e); } }; - r.run(); + runn.run(); } private String buildProvisioningString() { @@ -213,7 +217,7 @@ public class Poker extends TimerTask { sb.append(f.asJSONObject().toString()); pfx = ",\n"; } - sb.append("\n],\n"); + sb.append(CARRIAGE_RETURN); //Append groups to the string - Rally:US708115 - 1610 pfx = "\n"; @@ -223,7 +227,7 @@ public class Poker extends TimerTask { sb.append(s.asJSONObject().toString()); pfx = ",\n"; } - sb.append("\n],\n"); + sb.append(CARRIAGE_RETURN); // Append Subscriptions to the string pfx = "\n"; @@ -235,27 +239,27 @@ public class Poker extends TimerTask { } pfx = ",\n"; } - sb.append("\n],\n"); + sb.append(CARRIAGE_RETURN); // Append Parameters to the string pfx = "\n"; sb.append("\"parameters\": {"); Map props = Parameters.getParameters(); - Set ivals = new HashSet(); + Set ivals = new HashSet<>(); String intv = props.get("_INT_VALUES"); if (intv != null) { ivals.addAll(Arrays.asList(intv.split("\\|"))); } for (String key : new TreeSet(props.keySet())) { - String v = props.get(key); + String val = props.get(key); sb.append(pfx); sb.append(" \"").append(key).append("\": "); if (ivals.contains(key)) { // integer value - sb.append(v); + sb.append(val); } else if (key.endsWith("S")) { // Split and append array of strings - String[] pp = v.split("\\|"); + String[] pp = val.split("\\|"); String p2 = ""; sb.append("["); for (String t : pp) { @@ -264,7 +268,7 @@ public class Poker extends TimerTask { } sb.append("]"); } else { - sb.append("\"").append(quote(v)).append("\""); + sb.append("\"").append(quote(val)).append("\""); } pfx = ",\n"; } @@ -278,15 +282,15 @@ public class Poker extends TimerTask { sb.append(in.asJSONObject().toString()); pfx = ",\n"; } - sb.append("\n],\n"); + sb.append(CARRIAGE_RETURN); pfx = "\n"; sb.append("\"egress\": {"); for (EgressRoute eg : EgressRoute.getAllEgressRoutes()) { sb.append(pfx); - String t = eg.asJSONObject().toString(); - t = t.substring(1, t.length() - 1); - sb.append(t); + String str = eg.asJSONObject().toString(); + str = str.substring(1, str.length() - 1); + sb.append(str); pfx = ",\n"; } sb.append("\n},\n"); @@ -311,9 +315,9 @@ public class Poker extends TimerTask { return tempProvString; } - private String quote(String s) { + private String quote(String str) { StringBuilder sb = new StringBuilder(); - for (char ch : s.toCharArray()) { + for (char ch : str.toCharArray()) { if (ch == '\\' || ch == '"') { sb.append('\\'); }