Refactor Prov DB handling

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / utils / 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/utils/Poker.java
similarity index 94%
rename from datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Poker.java
rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/Poker.java
index 5f421b0..84c6e31 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/utils/Poker.java
@@ -21,7 +21,7 @@
  * *\r
  ******************************************************************************/\r
 \r
  * *\r
  ******************************************************************************/\r
 \r

-package org.onap.dmaap.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning.utils;\r

 \r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r


@@ -42,6 +42,7 @@ import org.json.JSONException;
 import org.json.JSONObject;\r
 import org.json.JSONTokener;\r
 \r
 import org.json.JSONObject;\r
 import org.json.JSONTokener;\r
 \r

+import org.onap.dmaap.datarouter.provisioning.ProvRunner;\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
 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


@@ -49,7 +50,7 @@ import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute;
 import org.onap.dmaap.datarouter.provisioning.beans.NetworkRoute;\r
 import org.onap.dmaap.datarouter.provisioning.beans.Parameters;\r
 import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r
 import org.onap.dmaap.datarouter.provisioning.beans.NetworkRoute;\r
 import org.onap.dmaap.datarouter.provisioning.beans.Parameters;\r
 import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r

-import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.BaseServlet;\r

 \r
 /**\r
  * This class handles the two timers (described in R1 Design Notes), and takes care of issuing the GET to each node of\r
 \r
 /**\r
  * This class handles the two timers (described in R1 Design Notes), and takes care of issuing the GET to each node of\r


@@ -185,7 +186,8 @@ public class Poker extends TimerTask {
 \r
     private void pokeNode(final String nodename) {\r
         logger.debug("PROV0012 Poking node " + nodename + " ...");\r
 \r
     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
+        String nodeUrl = String.format(POKE_URL_TEMPLATE, nodename + ":" + ProvRunner.getProvProperties().get(\r
+            "org.onap.dmaap.datarouter.provserver.http.port"), "8080");\r

         Runnable runn = () -> {\r
             try {\r
                 URL url = new URL(nodeUrl);\r
         Runnable runn = () -> {\r
             try {\r
                 URL url = new URL(nodeUrl);\r