Removing code smells

[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 0bce491..648c4e5 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
@@ -41,6 +41,9 @@ import org.onap.dmaap.datarouter.provisioning.utils.LOGJSONObject;
  * @version $Id: DeliveryRecord.java,v 1.9 2014/03/12 19:45:41 eby Exp $\r
  */\r
 public class DeliveryRecord extends BaseLogRecord {\r
+\r
+    private static final String STATUS_CODE = "statusCode";\r
+    private static final String DELIVERY_ID = "deliveryId";\r
     private int subid;\r
     private String fileid;\r
     private int result;\r
@@ -53,12 +56,12 @@ public class DeliveryRecord extends BaseLogRecord {
      */\r
     public DeliveryRecord(String[] pp) throws ParseException {\r
         super(pp);\r
-        String fileid = pp[5];\r
-        if (fileid.lastIndexOf('/') >= 0) {\r
-            fileid = fileid.substring(fileid.lastIndexOf('/') + 1);\r
+        String thisFileid = pp[5];\r
+        if (thisFileid.lastIndexOf('/') >= 0) {\r
+            thisFileid = thisFileid.substring(thisFileid.lastIndexOf('/') + 1);\r
         }\r
         this.subid = Integer.parseInt(pp[4]);\r
-        this.fileid = fileid;\r
+        this.fileid = thisFileid;\r
         this.result = Integer.parseInt(pp[10]);\r
         this.user = pp[9];\r
         if (this.user != null && this.user.length() > 50) {\r
@@ -119,14 +122,12 @@ public class DeliveryRecord extends BaseLogRecord {
     public LOGJSONObject reOrderObject(LOGJSONObject jo) {\r
         LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<>();\r
 \r
-        logrecordObj.put("statusCode", jo.get("statusCode"));\r
-        logrecordObj.put("deliveryId", jo.get("deliveryId"));\r
+        logrecordObj.put(STATUS_CODE, jo.get(STATUS_CODE));\r
+        logrecordObj.put(DELIVERY_ID, jo.get(DELIVERY_ID));\r
         logrecordObj.put("publishId", jo.get("publishId"));\r
         logrecordObj.put("requestURI", jo.get("requestURI"));\r
-        //logrecordObj.put("sourceIP", jo.get("sourceIP"));\r
         logrecordObj.put("method", jo.get("method"));\r
         logrecordObj.put("contentType", jo.get("contentType"));\r
-        //logrecordObj.put("endpointId", jo.get("endpointId"));\r
         logrecordObj.put("type", jo.get("type"));\r
         logrecordObj.put("date", jo.get("date"));\r
         logrecordObj.put("contentLength", jo.get("contentLength"));\r
@@ -139,8 +140,8 @@ public class DeliveryRecord extends BaseLogRecord {
     public LOGJSONObject asJSONObject() {\r
         LOGJSONObject jo = super.asJSONObject();\r
         jo.put("type", "del");\r
-        jo.put("deliveryId", user);\r
-        jo.put("statusCode", result);\r
+        jo.put(DELIVERY_ID, user);\r
+        jo.put(STATUS_CODE, result);\r
 \r
         return this.reOrderObject(jo);\r
     }\r