Removing clumsy code smells and adding missing JettyFilter test

[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 5e16bac..72ad8af 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
@@ -109,7 +109,7 @@ public class PublishRecord extends BaseLogRecord {
 \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
@@ -124,8 +124,7 @@ public class PublishRecord extends BaseLogRecord {
         logrecordObj.put("contentLength", jo.get("contentLength"));\r
         logrecordObj.put("fileName", jo.get("fileName"));\r
 \r
-        LOGJSONObject newjo = new LOGJSONObject(logrecordObj);\r
-        return newjo;\r
+        return new LOGJSONObject(logrecordObj);\r
     }\r
 \r
     @Override\r
@@ -140,9 +139,7 @@ public class PublishRecord extends BaseLogRecord {
         jo.put("statusCode", status);\r
         jo.put("fileName", fileName);\r
 \r
-        LOGJSONObject newjo = this.reOrderObject(jo);\r
-\r
-        return newjo;\r
+        return this.reOrderObject(jo);\r
     }\r
 \r
     @Override\r