\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
+\r
import java.io.IOException;\r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-import java.util.List;\r
+import java.util.*;\r
import javax.servlet.ServletConfig;\r
import javax.servlet.ServletException;\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
+\r
+import org.apache.commons.lang3.StringUtils;\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
@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
- private static EELFLogger eelflogger = EELFManager.getInstance()\r
- .getLogger("org.onap.dmaap.datarouter.provisioning.PublishServlet");\r
+ private static EELFLogger eelfLogger = EELFManager.getInstance()\r
+ .getLogger(PublishServlet.class);\r
private static final Object lock = new Object();\r
\r
\r
@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
- setIpAndFqdnForEelf("doDelete");\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
- redirect(req, resp);\r
+ public void doDelete(HttpServletRequest req, HttpServletResponse resp) {\r
+ setUpEelfForPublishServlet(req, "doDelete");\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
+ try {\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ redirect(req, resp);\r
+ } finally {\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
+ }\r
}\r
\r
@Override\r
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
- setIpAndFqdnForEelf("doGet");\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
+ setUpEelfForPublishServlet(req, "doGet");\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
+ try {\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
redirect(req, resp);\r
+ } finally {\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
+ }\r
}\r
\r
@Override\r
- public void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
- setIpAndFqdnForEelf("doPut");\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
+ setUpEelfForPublishServlet(req, "doPut");\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
+ try {\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
redirect(req, resp);\r
+ } finally {\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
+ }\r
}\r
\r
@Override\r
- public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {\r
- setIpAndFqdnForEelf("doPost");\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
+ public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
+ setUpEelfForPublishServlet(req, "doPost");\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
+ try {\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
redirect(req, resp);\r
+ } finally {\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
+ }\r
+\r
+ }\r
\r
+ private void setUpEelfForPublishServlet(HttpServletRequest req, String method) {\r
+ if (StringUtils.isBlank(req.getHeader("X-ONAP-RequestID")) || StringUtils.isBlank(req.getHeader("X-InvocationID"))) {\r
+ setIpFqdnForEelf(method);\r
+ } else {\r
+ setIpFqdnRequestIDandInvocationIDForEelf(method, req);\r
+ }\r
}\r
\r
private void redirect(HttpServletRequest req, HttpServletResponse resp) {\r
: "Invalid request - Missing file ID.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
\r
resp.sendError(HttpServletResponse.SC_NOT_FOUND, message);\r
} else {\r
String message = "Redirected to: " + newurl;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_MOVED_PERMANENTLY);\r
- eventlogger.info(elr);\r
+ eventlogger.info(elr.toString());\r
\r
resp.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);\r
resp.setHeader("Location", newurl);\r
}\r
}\r
} catch (IOException ioe) {\r
- intlogger.error("IOException" + ioe.getMessage());\r
-\r
+ intlogger.error("PROV0151 PublishServlet.redirect: " + ioe.getMessage(), ioe);\r
}\r
}\r
\r
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
\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
}\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
+ intlogger.debug("PROV0152 PublishServlet.checkPath: " + e.getMessage(), e);\r
return -1;\r
}\r
}\r