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%2FLogServlet.java;h=762ab4e5d2dee0dd10712b209ddfc45dac885b7a;hp=c58bda8e0714b0a69f558897444e488afd5cd9d3;hb=9c6f3aa2db3c3bc632038f69ff680f48b5f28ec2;hpb=c112367f5a49647d3ae962dd77d61d82193a4b3a

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
index c58bda8e..762ab4e5 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
@@ -64,10 +64,16 @@ import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.send
 @SuppressWarnings("serial")
 public class LogServlet extends BaseServlet {
     //Adding EELF Logger Rally:US664892
-    private static EELFLogger eelflogger = EELFManager.getInstance().getLogger(LogServlet.class);
+    private static EELFLogger eelfLogger = EELFManager.getInstance().getLogger(LogServlet.class);
     private static final long TWENTYFOUR_HOURS = (24 * 60 * 60 * 1000L);
     private static final String FMT_1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";
     private static final String FMT_2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+    private static final String PUBLISHSQL = "publishSQL";
+    private static final String STATUSSQL = "statusSQL";
+    private static final String RESULTSQL = "resultSQL";
+    private static final String FILENAMESQL = "filenameSQL";
+    private static final String TIMESQL = "timeSQL";
+    private static final String LOG_RECORDSSQL = "select * from LOG_RECORDS where FEEDID = ";
 
     private final boolean isfeedlog;
 
@@ -148,17 +154,17 @@ public class LogServlet extends BaseServlet {
     @Override
     public void doDelete(HttpServletRequest req, HttpServletResponse resp) {
         setIpFqdnRequestIDandInvocationIDForEelf("doDelete", req);
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
             String message = "DELETE not allowed for the logURL.";
             EventLogRecord elr = new EventLogRecord(req);
             elr.setMessage(message);
             elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-            eventlogger.info(elr);
+            eventlogger.error(elr.toString());
             sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);
         } finally {
-        eelflogger.info(EelfMsgs.EXIT);
+        eelfLogger.info(EelfMsgs.EXIT);
     }
     }
     /**
@@ -168,9 +174,9 @@ public class LogServlet extends BaseServlet {
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) {
         setIpFqdnRequestIDandInvocationIDForEelf("doGet", req);
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
             int id = getIdFromPath(req);
             if (id < 0) {
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Missing or bad feed/subscription number.", eventlogger);
@@ -226,10 +232,10 @@ public class LogServlet extends BaseServlet {
                 }
                 out.print("]");
             } catch (IOException ioe) {
-                eventlogger.error("IOException: " + ioe.getMessage());
+                eventlogger.error("PROV0141 LogServlet.doGet: " + ioe.getMessage(), ioe);
             }
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
     }
     /**
@@ -238,17 +244,17 @@ public class LogServlet extends BaseServlet {
     @Override
     public void doPut(HttpServletRequest req, HttpServletResponse resp) {
         setIpFqdnRequestIDandInvocationIDForEelf("doPut", req);
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER),getIdFromPath(req)+"");
+        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER),getIdFromPath(req)+"");
         String message = "PUT not allowed for the logURL.";
         EventLogRecord elr = new EventLogRecord(req);
         elr.setMessage(message);
         elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-        eventlogger.info(elr);
+        eventlogger.error(elr.toString());
         sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
     }
     /**
@@ -257,17 +263,17 @@ public class LogServlet extends BaseServlet {
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) {
         setIpFqdnRequestIDandInvocationIDForEelf("doPost", req);
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));
+        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));
         String message = "POST not allowed for the logURL.";
         EventLogRecord elr = new EventLogRecord(req);
         elr.setMessage(message);
         elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
-        eventlogger.info(elr);
+        eventlogger.error(elr.toString());
         sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
     }
 
@@ -275,7 +281,7 @@ public class LogServlet extends BaseServlet {
         Map<String, String> map = new HashMap<>();
         String s = req.getParameter("type");
         if (s != null) {
-            if (s.equals("pub") || s.equals("del") || s.equals("exp")) {
+            if ("pub".equals(s) || "del".equals(s) || "exp".equals(s)) {
                 map.put("type", s);
             } else {
                 map.put("err", "bad type");
@@ -284,11 +290,11 @@ public class LogServlet extends BaseServlet {
         } else {
             map.put("type", "all");
         }
-        map.put("publishSQL", "");
-        map.put("statusSQL", "");
-        map.put("resultSQL", "");
-        map.put("reasonSQL", "");
-        map.put("filenameSQL", "");
+        map.put(PUBLISHSQL, "");
+        map.put(STATUSSQL, "");
+        map.put(RESULTSQL, "");
+        map.put(REASON_SQL, "");
+        map.put(FILENAMESQL, "");
 
         s = req.getParameter("publishId");
         if (s != null) {
@@ -296,22 +302,22 @@ public class LogServlet extends BaseServlet {
                 map.put("err", "bad publishId");
                 return map;
             }
-            map.put("publishSQL", " AND PUBLISH_ID = '"+s+"'");
+            map.put(PUBLISHSQL, " AND PUBLISH_ID = '"+s+"'");
         }
 
         s = req.getParameter("filename");
         if (s != null) {
-            map.put("filenameSQL", " AND FILENAME = '"+s+"'");
+            map.put(FILENAMESQL, " AND FILENAME = '"+s+"'");
         }
 
         s = req.getParameter("statusCode");
         if (s != null) {
             String sql = null;
-            if (s.equals("success")) {
+            if ("success".equals(s)) {
                 sql = " AND STATUS >= 200 AND STATUS < 300";
-            } else if (s.equals("redirect")) {
+            } else if ("redirect".equals(s)) {
                 sql = " AND STATUS >= 300 AND STATUS < 400";
-            } else if (s.equals("failure")) {
+            } else if ("failure".equals(s)) {
                 sql = " AND STATUS >= 400";
             } else {
                 try {
@@ -325,21 +331,21 @@ public class LogServlet extends BaseServlet {
                 map.put("err", "bad statusCode");
                 return map;
             }
-            map.put("statusSQL", sql);
-            map.put("resultSQL", sql.replaceAll("STATUS", "RESULT"));
+            map.put(STATUSSQL, sql);
+            map.put(RESULTSQL, sql.replaceAll("STATUS", "RESULT"));
         }
 
         s = req.getParameter("expiryReason");
         if (s != null) {
             map.put("type", "exp");
-            if (s.equals("notRetryable")) {
-                map.put("reasonSQL", " AND REASON = 'notRetryable'");
-            } else if (s.equals("retriesExhausted")) {
-                map.put("reasonSQL", " AND REASON = 'retriesExhausted'");
-            } else if (s.equals("diskFull")) {
-                map.put("reasonSQL", " AND REASON = 'diskFull'");
-            } else if (s.equals("other")) {
-                map.put("reasonSQL", " AND REASON = 'other'");
+            if ("notRetryable".equals(s)) {
+                map.put(REASON_SQL, " AND REASON = 'notRetryable'");
+            } else if ("retriesExhausted".equals(s)) {
+                map.put(REASON_SQL, " AND REASON = 'retriesExhausted'");
+            } else if ("diskFull".equals(s)) {
+                map.put(REASON_SQL, " AND REASON = 'diskFull'");
+            } else if ("other".equals(s)) {
+                map.put(REASON_SQL, " AND REASON = 'other'");
             } else {
                 map.put("err", "bad expiryReason");
                 return map;
@@ -364,7 +370,7 @@ public class LogServlet extends BaseServlet {
         } else if (etime == 0) {
             etime = stime + TWENTYFOUR_HOURS;
         }
-        map.put("timeSQL", String.format(" AND EVENT_TIME >= %d AND EVENT_TIME <= %d", stime, etime));
+        map.put(TIMESQL, String.format(" AND EVENT_TIME >= %d AND EVENT_TIME <= %d", stime, etime));
         return map;
     }
     private long getTimeFromParam(final String s) {
@@ -381,8 +387,7 @@ public class LogServlet extends BaseServlet {
         }
         try {
             // Also allow a long (in ms); useful for testing
-            long n = Long.parseLong(s);
-            return n;
+            return Long.parseLong(s);
         } catch (NumberFormatException numberFormatException) {
             intlogger.error("Exception in getting Time :- "+numberFormatException.getMessage(),numberFormatException);
         }
@@ -392,51 +397,51 @@ public class LogServlet extends BaseServlet {
 
     private void getPublishRecordsForFeed(int feedid, RowHandler rh, Map<String, String> map) {
         String type = map.get("type");
-        if (type.equals("all") || type.equals("pub")) {
-            String sql = "select * from LOG_RECORDS where FEEDID = "+feedid
+        if ("all".equals(type) || "pub".equals(type)) {
+            String sql = LOG_RECORDSSQL+feedid
                 + " AND TYPE = 'pub'"
-                + map.get("timeSQL") + map.get("publishSQL") + map.get("statusSQL") + map.get("filenameSQL");
+                + map.get(TIMESQL) + map.get(PUBLISHSQL) + map.get(STATUSSQL) + map.get(FILENAMESQL);
             getRecordsForSQL(sql, rh);
         }
     }
     private void getDeliveryRecordsForFeed(int feedid, RowHandler rh, Map<String, String> map) {
         String type = map.get("type");
-        if (type.equals("all") || type.equals("del")) {
-            String sql = "select * from LOG_RECORDS where FEEDID = "+feedid
+        if ("all".equals(type) || "del".equals(type)) {
+            String sql = LOG_RECORDSSQL+feedid
                 + " AND TYPE = 'del'"
-                + map.get("timeSQL") + map.get("publishSQL") + map.get("resultSQL");
+                + map.get(TIMESQL) + map.get(PUBLISHSQL) + map.get(RESULTSQL);
             getRecordsForSQL(sql, rh);
         }
     }
     private void getDeliveryRecordsForSubscription(int subid, RowHandler rh, Map<String, String> map) {
         String type = map.get("type");
-        if (type.equals("all") || type.equals("del")) {
+        if ("all".equals(type) || "del".equals(type)) {
             String sql = "select * from LOG_RECORDS where DELIVERY_SUBID = "+subid
                 + " AND TYPE = 'del'"
-                + map.get("timeSQL") + map.get("publishSQL") + map.get("resultSQL");
+                + map.get(TIMESQL) + map.get(PUBLISHSQL) + map.get(RESULTSQL);
             getRecordsForSQL(sql, rh);
         }
     }
     private void getExpiryRecordsForFeed(int feedid, RowHandler rh, Map<String, String> map) {
         String type = map.get("type");
-        if (type.equals("all") || type.equals("exp")) {
-            String st = map.get("statusSQL");
+        if ("all".equals(type) || "exp".equals(type)) {
+            String st = map.get(STATUSSQL);
             if (st == null || st.length() == 0) {
-                String sql = "select * from LOG_RECORDS where FEEDID = "+feedid
+                String sql = LOG_RECORDSSQL+feedid
                     + " AND TYPE = 'exp'"
-                    + map.get("timeSQL") + map.get("publishSQL") + map.get("reasonSQL");
+                    + map.get(TIMESQL) + map.get(PUBLISHSQL) + map.get(REASON_SQL);
                 getRecordsForSQL(sql, rh);
             }
         }
     }
     private void getExpiryRecordsForSubscription(int subid, RowHandler rh, Map<String, String> map) {
         String type = map.get("type");
-        if (type.equals("all") || type.equals("exp")) {
-            String st = map.get("statusSQL");
+        if ("all".equals(type) || "exp".equals(type)) {
+            String st = map.get(STATUSSQL);
             if (st == null || st.length() == 0) {
                 String sql = "select * from LOG_RECORDS where DELIVERY_SUBID = "+subid
                     + " AND TYPE = 'exp'"
-                    + map.get("timeSQL") + map.get("publishSQL") + map.get("reasonSQL");
+                    + map.get(TIMESQL) + map.get(PUBLISHSQL) + map.get(REASON_SQL);
                 getRecordsForSQL(sql, rh);
             }
         }