Removing clumsy code smells and adding missing JettyFilter test

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/ExpiryRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/ExpiryRecord.java
index 9e6987a..8e841e6 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/ExpiryRecord.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/ExpiryRecord.java
@@ -100,7 +100,7 @@ public class ExpiryRecord 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
         logrecordObj.put("expiryReason", jo.get("expiryReason"));\r
         logrecordObj.put("publishId", jo.get("publishId"));\r
@@ -112,8 +112,7 @@ public class ExpiryRecord extends BaseLogRecord {
         logrecordObj.put("date", jo.get("date"));\r
         logrecordObj.put("contentLength", jo.get("contentLength"));\r
 \r
-        LOGJSONObject newjo = new LOGJSONObject(logrecordObj);\r
-        return newjo;\r
+        return new LOGJSONObject(logrecordObj);\r
     }\r
 \r
     @Override\r
@@ -123,8 +122,7 @@ public class ExpiryRecord extends BaseLogRecord {
         jo.put("expiryReason", reason);\r
         jo.put("attempts", attempts);\r
 \r
-        LOGJSONObject newjo = this.reOrderObject(jo);\r
-        return newjo;\r
+        return this.reOrderObject(jo);\r
     }\r
 \r
     @Override\r