Code style cleanup for prov authz and beans

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/DeliveryRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/DeliveryRecord.java
index 929c6f9..0bce491 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/DeliveryRecord.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/DeliveryRecord.java
@@ -46,19 +46,31 @@ public class DeliveryRecord extends BaseLogRecord {
     private int result;\r
     private String user;\r
 \r
+    /**\r
+     * Constructor for DeliverRecord.\r
+     * @param pp string array of DeliverRecord attributes\r
+     * @throws ParseException in case of parse error\r
+     */\r
     public DeliveryRecord(String[] pp) throws ParseException {\r
         super(pp);\r
         String fileid = pp[5];\r
-        if (fileid.lastIndexOf('/') >= 0)\r
+        if (fileid.lastIndexOf('/') >= 0) {\r
             fileid = fileid.substring(fileid.lastIndexOf('/') + 1);\r
+        }\r
         this.subid = Integer.parseInt(pp[4]);\r
         this.fileid = fileid;\r
         this.result = Integer.parseInt(pp[10]);\r
         this.user = pp[9];\r
-        if (this.user != null && this.user.length() > 50)\r
+        if (this.user != null && this.user.length() > 50) {\r
             this.user = this.user.substring(0, 50);\r
+        }\r
     }\r
 \r
+    /**\r
+     * DeliverRecord constructor from ResultSet.\r
+     * @param rs ResultSet\r
+     * @throws SQLException in case of get error from SQL statement\r
+     */\r
     public DeliveryRecord(ResultSet rs) throws SQLException {\r
         super(rs);\r
         this.subid = rs.getInt("DELIVERY_SUBID");\r
@@ -99,9 +111,13 @@ public class DeliveryRecord extends BaseLogRecord {
         this.user = user;\r
     }\r
 \r
-\r
+    /**\r
+     * Method to reorder LOGJSONObject.\r
+     * @param jo LOGJSONObject\r
+     * @return new 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
         logrecordObj.put("statusCode", jo.get("statusCode"));\r
         logrecordObj.put("deliveryId", jo.get("deliveryId"));\r
@@ -116,8 +132,7 @@ public class DeliveryRecord extends BaseLogRecord {
         logrecordObj.put("contentLength", jo.get("contentLength"));\r
 \r
 \r
-        LOGJSONObject newjo = new LOGJSONObject(logrecordObj);\r
-        return newjo;\r
+        return new LOGJSONObject(logrecordObj);\r
     }\r
 \r
     @Override\r
@@ -127,8 +142,7 @@ public class DeliveryRecord extends BaseLogRecord {
         jo.put("deliveryId", user);\r
         jo.put("statusCode", result);\r
 \r
-        LOGJSONObject newjo = this.reOrderObject(jo);\r
-        return newjo;\r
+        return this.reOrderObject(jo);\r
     }\r
 \r
     @Override\r