Allow publishing while DB is down

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
index 8229ee5..3ae63bb 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
@@ -35,10 +35,10 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 import org.json.JSONArray;\r
+import org.json.JSONException;\r
 import org.json.JSONObject;\r
 import org.json.JSONTokener;\r
 import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
-import org.onap.dmaap.datarouter.provisioning.beans.Feed;\r
 import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute;\r
 import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
 import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
@@ -54,7 +54,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
 @SuppressWarnings("serial")\r
 public class PublishServlet extends BaseServlet {\r
 \r
-    private int next_node;\r
+    private int nextNode;\r
     private String provstring;\r
     private List<IngressRoute> irt;\r
     //Adding EELF Logger Rally:US664892\r
@@ -66,35 +66,35 @@ public class PublishServlet extends BaseServlet {
     @Override\r
     public void init(ServletConfig config) throws ServletException {\r
         super.init(config);\r
-        next_node = 0;\r
+        nextNode = 0;\r
         provstring = "";\r
-        irt = new ArrayList<IngressRoute>();\r
+        irt = new ArrayList<>();\r
 \r
     }\r
 \r
     @Override\r
-    public void doDelete(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+    public void doDelete(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpAndFqdnForEelf("doDelete");\r
         eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
         redirect(req, resp);\r
     }\r
 \r
     @Override\r
-    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpAndFqdnForEelf("doGet");\r
         eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
         redirect(req, resp);\r
     }\r
 \r
     @Override\r
-    public void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+    public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpAndFqdnForEelf("doPut");\r
         eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
         redirect(req, resp);\r
     }\r
 \r
     @Override\r
-    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpAndFqdnForEelf("doPost");\r
         eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
         redirect(req, resp);\r
@@ -155,7 +155,7 @@ public class PublishServlet extends BaseServlet {
                 provstring = s;\r
                 JSONObject jo = new JSONObject(new JSONTokener(provstring));\r
                 JSONArray ja = jo.getJSONArray("ingress");\r
-                List<IngressRoute> newlist = new ArrayList<IngressRoute>();\r
+                List<IngressRoute> newlist = new ArrayList<>();\r
                 for (int i = 0; i < ja.length(); i++) {\r
                     IngressRoute iroute = new IngressRoute(ja.getJSONObject(i));\r
                     newlist.add(iroute);\r
@@ -179,11 +179,11 @@ public class PublishServlet extends BaseServlet {
 \r
         // No IRT rule matches, do round robin of all active nodes\r
         String[] nodes = getNodes();\r
-        if (next_node >= nodes.length)    // The list of nodes may have grown/shrunk\r
+        if (nextNode >= nodes.length)    // The list of nodes may have grown/shrunk\r
         {\r
-            next_node = 0;\r
+            nextNode = 0;\r
         }\r
-        return nodes[next_node++];\r
+        return nodes[nextNode++];\r
     }\r
 \r
     private int checkPath(HttpServletRequest req) {\r
@@ -198,11 +198,15 @@ public class PublishServlet extends BaseServlet {
         }\r
         try {\r
             int feedid = Integer.parseInt(path.substring(0, ix));\r
-            if (!Feed.isFeedValid(feedid)) {\r
-                return -1;\r
+            String provData = Poker.getPoker().getProvisioningString();\r
+            JSONArray feeds = new JSONObject(provData).getJSONArray("feeds");\r
+            for (int n = 0; n < feeds.length(); ++n) {\r
+                if (feeds.getJSONObject(n).getInt("feedid") == feedid) {\r
+                    return feedid;\r
+                }\r
             }\r
-            return feedid;\r
-        } catch (NumberFormatException e) {\r
+            return -1;\r
+        } catch (NumberFormatException | JSONException e) {\r
             return -1;\r
         }\r
     }\r