Code Review
/
dmaap
/
datarouter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Code style cleanup for prov authz and beans
[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
72ad8af
..
4afb61c
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
@@
-40,6
+40,7
@@
import org.onap.dmaap.datarouter.provisioning.utils.LOGJSONObject;
* @author Robert Eby
\r
* @version $Id: PublishRecord.java,v 1.6 2013/10/28 18:06:53 eby Exp $
\r
*/
\r
* @author Robert Eby
\r
* @version $Id: PublishRecord.java,v 1.6 2013/10/28 18:06:53 eby Exp $
\r
*/
\r
+
\r
public class PublishRecord extends BaseLogRecord {
\r
private String feedFileid;
\r
private String remoteAddr;
\r
public class PublishRecord extends BaseLogRecord {
\r
private String feedFileid;
\r
private String remoteAddr;
\r
@@
-47,14
+48,21
@@
public class PublishRecord extends BaseLogRecord {
private int status;
\r
private String fileName;
\r
\r
private int status;
\r
private String fileName;
\r
\r
+ /**
\r
+ * Publish record constructor.
\r
+ * @param pp string array of attributes
\r
+ * @throws ParseException in case of parse error
\r
+ */
\r
public PublishRecord(String[] pp) throws ParseException {
\r
super(pp);
\r
int ix = pp[4].indexOf("/publish/");
\r
public PublishRecord(String[] pp) throws ParseException {
\r
super(pp);
\r
int ix = pp[4].indexOf("/publish/");
\r
- if (ix < 0)
\r
+ if (ix < 0)
{
\r
throw new ParseException("bad pattern", 0);
\r
throw new ParseException("bad pattern", 0);
\r
+ }
\r
ix = pp[4].indexOf('/', ix + 9);
\r
ix = pp[4].indexOf('/', ix + 9);
\r
- if (ix < 0)
\r
+ if (ix < 0)
{
\r
throw new ParseException("bad pattern", 0);
\r
throw new ParseException("bad pattern", 0);
\r
+ }
\r
this.feedFileid = pp[4].substring(ix + 1);
\r
this.remoteAddr = pp[8];
\r
this.user = pp[9];
\r
this.feedFileid = pp[4].substring(ix + 1);
\r
this.remoteAddr = pp[8];
\r
this.user = pp[9];
\r
@@
-62,6
+70,11
@@
public class PublishRecord extends BaseLogRecord {
this.fileName = StringUtils.substringAfterLast(this.getRequestUri(), "/");
\r
}
\r
\r
this.fileName = StringUtils.substringAfterLast(this.getRequestUri(), "/");
\r
}
\r
\r
+ /**
\r
+ * Publish record constructor.
\r
+ * @param rs ResultSet from DB
\r
+ * @throws SQLException in case of SQL error
\r
+ */
\r
public PublishRecord(ResultSet rs) throws SQLException {
\r
super(rs);
\r
this.feedFileid = rs.getString("FEED_FILEID");
\r
public PublishRecord(ResultSet rs) throws SQLException {
\r
super(rs);
\r
this.feedFileid = rs.getString("FEED_FILEID");
\r
@@
-103,11
+116,20
@@
public class PublishRecord extends BaseLogRecord {
this.status = status;
\r
}
\r
\r
this.status = status;
\r
}
\r
\r
- public String getFileName() { return fileName;}
\r
+ public String getFileName() {
\r
+ return fileName;
\r
+ }
\r
\r
\r
- public void setFileName(String fileName) { this.fileName = fileName; }
\r
+ public void setFileName(String fileName) {
\r
+ this.fileName = fileName;
\r
+ }
\r
\r
\r
\r
\r
+ /**
\r
+ * Method to reorder json object.
\r
+ * @param jo LOGJSONObject
\r
+ * @return LOGJSONObject
\r
+ */
\r
public LOGJSONObject reOrderObject(LOGJSONObject jo) {
\r
LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<>();
\r
\r
public LOGJSONObject reOrderObject(LOGJSONObject jo) {
\r
LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<>();
\r
\r
@@
-127,6
+149,7
@@
public class PublishRecord extends BaseLogRecord {
return new LOGJSONObject(logrecordObj);
\r
}
\r
\r
return new LOGJSONObject(logrecordObj);
\r
}
\r
\r
+
\r
@Override
\r
public LOGJSONObject asJSONObject() {
\r
LOGJSONObject jo = super.asJSONObject();
\r
@Override
\r
public LOGJSONObject asJSONObject() {
\r
LOGJSONObject jo = super.asJSONObject();
\r