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=72ad8af0f948af588d718c275444d6a524c7c51a;hb=8ebd052e0b1066c432f5dba6ef69599eaf5ec27e;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..72ad8af0 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 @@ -68,7 +68,7 @@ public class PublishRecord extends BaseLogRecord { 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() { @@ -109,7 +109,7 @@ public class PublishRecord extends BaseLogRecord { public LOGJSONObject reOrderObject(LOGJSONObject jo) { - LinkedHashMap logrecordObj = new LinkedHashMap(); + LinkedHashMap logrecordObj = new LinkedHashMap<>(); logrecordObj.put("statusCode", jo.get("statusCode")); @@ -124,8 +124,7 @@ public class PublishRecord extends BaseLogRecord { logrecordObj.put("contentLength", jo.get("contentLength")); logrecordObj.put("fileName", jo.get("fileName")); - LOGJSONObject newjo = new LOGJSONObject(logrecordObj); - return newjo; + return new LOGJSONObject(logrecordObj); } @Override @@ -140,9 +139,7 @@ public class PublishRecord extends BaseLogRecord { jo.put("statusCode", status); jo.put("fileName", fileName); - LOGJSONObject newjo = this.reOrderObject(jo); - - return newjo; + return this.reOrderObject(jo); } @Override