X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FPublishRecord.java;h=f5a2000ad790bbc24679294bf4231728bf54b81e;hb=6c78b3e6a0a67c73f931337356a172cc69cee0e8;hp=2cde3971626c74295d1b7536706e7ce5ae69d955;hpb=5da50e90e6c78700d48d7468849d4a1599a249b3;p=dmaap%2Fdatarouter.git

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