Removing code smells

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java
index 2cde397..f5a2000 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java
@@ -40,21 +40,34 @@ import org.onap.dmaap.datarouter.provisioning.utils.LOGJSONObject;
  * @author Robert Eby\r
  * @version $Id: PublishRecord.java,v 1.6 2013/10/28 18:06:53 eby Exp $\r
  */\r
+\r
 public class PublishRecord extends BaseLogRecord {\r
+\r
+    public static final String STATUS_CODE = "statusCode";\r
+    public static final String SOURCE_IP = "sourceIP";\r
+    public static final String ENDPOINT_ID = "endpointId";\r
+    public static final String FILE_NAME = "fileName";\r
     private String feedFileid;\r
     private String remoteAddr;\r
     private String user;\r
     private int status;\r
     private String fileName;\r
 \r
+    /**\r
+     * Publish record constructor.\r
+     * @param pp string array of attributes\r
+     * @throws ParseException in case of parse error\r
+     */\r
     public PublishRecord(String[] pp) throws ParseException {\r
         super(pp);\r
         int ix = pp[4].indexOf("/publish/");\r
-        if (ix < 0)\r
+        if (ix < 0) {\r
             throw new ParseException("bad pattern", 0);\r
+        }\r
         ix = pp[4].indexOf('/', ix + 9);\r
-        if (ix < 0)\r
+        if (ix < 0) {\r
             throw new ParseException("bad pattern", 0);\r
+        }\r
         this.feedFileid = pp[4].substring(ix + 1);\r
         this.remoteAddr = pp[8];\r
         this.user = pp[9];\r
@@ -62,13 +75,18 @@ public class PublishRecord extends BaseLogRecord {
         this.fileName = StringUtils.substringAfterLast(this.getRequestUri(), "/");\r
     }\r
 \r
+    /**\r
+     * Publish record constructor.\r
+     * @param rs ResultSet from DB\r
+     * @throws SQLException in case of SQL error\r
+     */\r
     public PublishRecord(ResultSet rs) throws SQLException {\r
         super(rs);\r
         this.feedFileid = rs.getString("FEED_FILEID");\r
         this.remoteAddr = rs.getString("REMOTE_ADDR");\r
         this.user = rs.getString("USER");\r
         this.status = rs.getInt("STATUS");\r
-        this.fileName = StringUtils.substringAfterLast(this.getRequestUri(), "/");\r
+        this.fileName = rs.getString("FILENAME");\r
     }\r
 \r
     public String getFeedFileid() {\r
@@ -103,31 +121,40 @@ public class PublishRecord extends BaseLogRecord {
         this.status = status;\r
     }\r
 \r
-    public String getFileName() { return fileName;}\r
+    public String getFileName() {\r
+        return fileName;\r
+    }\r
 \r
-    public void setFileName(String fileName) { this.fileName = fileName; }\r
+    public void setFileName(String fileName) {\r
+        this.fileName = fileName;\r
+    }\r
 \r
 \r
+    /**\r
+     * Method to reorder json object.\r
+     * @param jo LOGJSONObject\r
+     * @return LOGJSONObject\r
+     */\r
     public LOGJSONObject reOrderObject(LOGJSONObject jo) {\r
-        LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<String, Object>();\r
+        LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<>();\r
 \r
 \r
-        logrecordObj.put("statusCode", jo.get("statusCode"));\r
+        logrecordObj.put(STATUS_CODE, jo.get(STATUS_CODE));\r
         logrecordObj.put("publishId", jo.get("publishId"));\r
         logrecordObj.put("requestURI", jo.get("requestURI"));\r
-        logrecordObj.put("sourceIP", jo.get("sourceIP"));\r
+        logrecordObj.put(SOURCE_IP, jo.get(SOURCE_IP));\r
         logrecordObj.put("method", jo.get("method"));\r
         logrecordObj.put("contentType", jo.get("contentType"));\r
-        logrecordObj.put("endpointId", jo.get("endpointId"));\r
+        logrecordObj.put(ENDPOINT_ID, jo.get(ENDPOINT_ID));\r
         logrecordObj.put("type", jo.get("type"));\r
         logrecordObj.put("date", jo.get("date"));\r
         logrecordObj.put("contentLength", jo.get("contentLength"));\r
-        logrecordObj.put("fileName", jo.get("fileName"));\r
+        logrecordObj.put(FILE_NAME, jo.get(FILE_NAME));\r
 \r
-        LOGJSONObject newjo = new LOGJSONObject(logrecordObj);\r
-        return newjo;\r
+        return new LOGJSONObject(logrecordObj);\r
     }\r
 \r
+\r
     @Override\r
     public LOGJSONObject asJSONObject() {\r
         LOGJSONObject jo = super.asJSONObject();\r
@@ -135,14 +162,12 @@ public class PublishRecord extends BaseLogRecord {
         jo.put("feedFileid", feedFileid);\r
         jo.put("remoteAddr", remoteAddr);\r
         jo.put("user", user);\r
-        jo.put("sourceIP", remoteAddr);\r
-        jo.put("endpointId", user);\r
-        jo.put("statusCode", status);\r
-        jo.put("fileName", fileName);\r
-\r
-        LOGJSONObject newjo = this.reOrderObject(jo);\r
+        jo.put(SOURCE_IP, remoteAddr);\r
+        jo.put(ENDPOINT_ID, user);\r
+        jo.put(STATUS_CODE, status);\r
+        jo.put(FILE_NAME, fileName);\r
 \r
-        return newjo;\r
+        return this.reOrderObject(jo);\r
     }\r
 \r
     @Override\r