X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FRouteServlet.java;h=383798fb16ab9164b49ead98cb853523e1519f0f;hb=9c6f3aa2db3c3bc632038f69ff680f48b5f28ec2;hp=12699a49d8e146783d1cf5c8e63e19d0b54a0a39;hpb=585e50efa6503595ae245a8f07ba042d2ba6a3f4;p=dmaap%2Fdatarouter.git diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java index 12699a49..383798fb 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java @@ -129,6 +129,7 @@ import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.send */ @SuppressWarnings("serial") public class RouteServlet extends ProxyServlet { + /** * DELETE route table entries by deleting part of the route table tree. */ @@ -136,10 +137,10 @@ public class RouteServlet extends ProxyServlet { public void doDelete(HttpServletRequest req, HttpServletResponse resp) { EventLogRecord elr = new EventLogRecord(req); if (!isAuthorizedForInternal(req)) { - elr.setMessage("Unauthorized."); + elr.setMessage(UNAUTHORIZED); elr.setResult(HttpServletResponse.SC_FORBIDDEN); - eventlogger.info(elr); - sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger); + eventlogger.error(elr.toString()); + sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, UNAUTHORIZED, eventlogger); return; } if (isProxyOK(req) && isProxyServer()) { @@ -150,7 +151,7 @@ public class RouteServlet extends ProxyServlet { String path = req.getPathInfo(); String[] parts = path.substring(1).split("/"); Deleteable[] d = null; - if (parts[0].equals("ingress")) { + if ("ingress".equals(parts[0])) { if (parts.length == 4) { // /internal/route/ingress/// try { @@ -179,7 +180,7 @@ public class RouteServlet extends ProxyServlet { sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "Invalid number of arguments in 'delete ingress' command.", eventlogger); return; } - } else if (parts[0].equals("egress")) { + } else if ("egress".equals(parts[0])) { if (parts.length == 2) { // /internal/route/egress/ try { @@ -198,7 +199,7 @@ public class RouteServlet extends ProxyServlet { sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "Invalid number of arguments in 'delete egress' command.", eventlogger); return; } - } else if (parts[0].equals("network")) { + } else if ("network".equals(parts[0])) { if (parts.length == 3) { // /internal/route/network// try {// @@ -208,7 +209,9 @@ public class RouteServlet extends ProxyServlet { ); d = new Deleteable[] { nr }; } catch (IllegalArgumentException e) { - sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "The specified network route does not exist.", eventlogger); + String message = "The specified network route does not exist."; + eventlogger.error(message, e); + sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger); return; } } else { @@ -217,7 +220,7 @@ public class RouteServlet extends ProxyServlet { } } if (d == null) { - sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "Bad URL.", eventlogger); + sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, BAD_URL, eventlogger); return; } boolean rv = true; @@ -226,14 +229,14 @@ public class RouteServlet extends ProxyServlet { } if (rv) { elr.setResult(HttpServletResponse.SC_OK); - eventlogger.info(elr); + eventlogger.info(elr.toString()); resp.setStatus(HttpServletResponse.SC_OK); provisioningDataChanged(); provisioningParametersChanged(); } else { // Something went wrong with the DELETE elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - eventlogger.info(elr); + eventlogger.error(elr.toString()); sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, eventlogger); } } @@ -244,10 +247,10 @@ public class RouteServlet extends ProxyServlet { public void doGet(HttpServletRequest req, HttpServletResponse resp) { EventLogRecord elr = new EventLogRecord(req); if (!isAuthorizedForInternal(req)) { - elr.setMessage("Unauthorized."); + elr.setMessage(UNAUTHORIZED); elr.setResult(HttpServletResponse.SC_FORBIDDEN); - eventlogger.info(elr); - sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger); + eventlogger.error(elr.toString()); + sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, UNAUTHORIZED, eventlogger); return; } if (isProxyOK(req) && isProxyServer()) { @@ -258,14 +261,14 @@ public class RouteServlet extends ProxyServlet { String path = req.getPathInfo(); if (!path.endsWith("/")) path += "/"; - if (!path.equals("/") && !path.equals("/ingress/") && !path.equals("/egress/") && !path.equals("/network/")) { - sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "Bad URL.", eventlogger); + if (!"/".equals(path) && !INGRESS.equals(path) && !EGRESS.equals(path) && !NETWORK.equals(path)) { + sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, BAD_URL, eventlogger); return; } StringBuilder sb = new StringBuilder("{\n"); String px2 = ""; - if (path.equals("/") || path.equals("/ingress/")) { + if ("/".equals(path) || INGRESS.equals(path)) { String pfx = "\n"; sb.append("\"ingress\": ["); for (IngressRoute in : IngressRoute.getAllIngressRoutes()) { @@ -277,7 +280,7 @@ public class RouteServlet extends ProxyServlet { px2 = ",\n"; } - if (path.equals("/") || path.equals("/egress/")) { + if ("/".equals(path) || EGRESS.equals(path)) { String pfx = "\n"; sb.append(px2); sb.append("\"egress\": {"); @@ -289,7 +292,7 @@ public class RouteServlet extends ProxyServlet { try { sb.append("\"").append(jx.getString(key)).append("\""); } catch (JSONException je) { - eventlogger.error("JSONException" + je.getMessage()); + eventlogger.error("PROV0161 RouteServlet.doGet: " + je.getMessage(), je); } pfx = ",\n"; } @@ -298,7 +301,7 @@ public class RouteServlet extends ProxyServlet { px2 = ",\n"; } - if (path.equals("/") || path.equals("/network/")) { + if ("/".equals(path) || NETWORK.equals(path)) { String pfx = "\n"; sb.append(px2); sb.append("\"routing\": ["); @@ -315,7 +318,7 @@ public class RouteServlet extends ProxyServlet { try { resp.getOutputStream().print(sb.toString()); } catch (IOException ioe) { - eventlogger.error("IOException" + ioe.getMessage()); + eventlogger.error("PROV0162 RouteServlet.doGet: " + ioe.getMessage(), ioe); } } /** @@ -325,13 +328,13 @@ public class RouteServlet extends ProxyServlet { public void doPut(HttpServletRequest req, HttpServletResponse resp) { EventLogRecord elr = new EventLogRecord(req); if (!isAuthorizedForInternal(req)) { - elr.setMessage("Unauthorized."); + elr.setMessage(UNAUTHORIZED); elr.setResult(HttpServletResponse.SC_FORBIDDEN); - eventlogger.info(elr); - sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger); + eventlogger.error(elr.toString()); + sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, UNAUTHORIZED, eventlogger); return; } - sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "Bad URL.", eventlogger); + sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, BAD_URL, eventlogger); } /** * POST - modify existing route table entries in the route table tree specified by the URL path. @@ -340,10 +343,10 @@ public class RouteServlet extends ProxyServlet { public void doPost(HttpServletRequest req, HttpServletResponse resp) { EventLogRecord elr = new EventLogRecord(req); if (!isAuthorizedForInternal(req)) { - elr.setMessage("Unauthorized."); + elr.setMessage(UNAUTHORIZED); elr.setResult(HttpServletResponse.SC_FORBIDDEN); - eventlogger.info(elr); - sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger); + eventlogger.error(elr.toString()); + sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, UNAUTHORIZED, eventlogger); return; } if (isProxyOK(req) && isProxyServer()) { @@ -352,7 +355,7 @@ public class RouteServlet extends ProxyServlet { } String path = req.getPathInfo(); Insertable[] ins = null; - if (path.startsWith("/ingress/")) { + if (path.startsWith(INGRESS)) { // /internal/route/ingress/?feed=%s&user=%s&subnet=%s&nodepatt=%s try { // Although it probably doesn't make sense, you can install two identical routes in the IRT @@ -368,11 +371,11 @@ public class RouteServlet extends ProxyServlet { int seq = (t != null) ? Integer.parseInt(t) : (IngressRoute.getMaxSequence() + 100); ins = new Insertable[] { new IngressRoute(seq, feedid, user, subnet, NodeClass.lookupNodeNames(nodepatt)) }; } catch (Exception e) { - intlogger.info(e); + intlogger.info(e.toString(), e); sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments in 'add ingress' command.", intlogger); return; } - } else if (path.startsWith("/egress/")) { + } else if (path.startsWith(EGRESS)) { // /internal/route/egress/?sub=%s&node=%s try { int subid = Integer.parseInt(req.getParameter("sub")); @@ -384,11 +387,11 @@ public class RouteServlet extends ProxyServlet { String node = NodeClass.normalizeNodename(req.getParameter("node")); ins = new Insertable[] { new EgressRoute(subid, node) }; } catch (Exception e) { - intlogger.info(e); + intlogger.info(e.toString(), e); sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments in 'add egress' command.", intlogger); return; } - } else if (path.startsWith("/network/")) { + } else if (path.startsWith(NETWORK)) { // /internal/route/network/?from=%s&to=%s&via=%s try { String nfrom = req.getParameter("from"); @@ -410,13 +413,13 @@ public class RouteServlet extends ProxyServlet { } ins = new Insertable[] { nr }; } catch (IllegalArgumentException e) { - intlogger.info(e); + intlogger.info(e.toString(), e); sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments in 'add network' command.", intlogger); return; } } if (ins == null) { - sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "Bad URL.", intlogger); + sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, BAD_URL, intlogger); return; } boolean rv = true; @@ -425,14 +428,14 @@ public class RouteServlet extends ProxyServlet { } if (rv) { elr.setResult(HttpServletResponse.SC_OK); - eventlogger.info(elr); + eventlogger.info(elr.toString()); resp.setStatus(HttpServletResponse.SC_OK); provisioningDataChanged(); provisioningParametersChanged(); } else { // Something went wrong with the INSERT elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - eventlogger.info(elr); + eventlogger.error(elr.toString()); sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger); } }