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
adding FILENAME value to LOG_RECORDS table.
[dmaap/datarouter.git]
/
datarouter-prov
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
provisioning
/
beans
/
LogRecord.java
diff --git
a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
index
1791bdc
..
b7b8272
100644
(file)
--- a/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
+++ b/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
@@
-91,6
+91,7
@@
public class LogRecord extends BaseLogRecord {
private final String reason;
\r
private final long record_id;
\r
private final long clength2;
\r
private final String reason;
\r
private final long record_id;
\r
private final long clength2;
\r
+ private final String fileName;
\r
\r
public LogRecord(ResultSet rs) throws SQLException {
\r
super(rs);
\r
\r
public LogRecord(ResultSet rs) throws SQLException {
\r
super(rs);
\r
@@
-109,6
+110,7
@@
public class LogRecord extends BaseLogRecord {
\r
this.record_id = rs.getLong("RECORD_ID");
\r
this.clength2 = rs.getLong("CONTENT_LENGTH_2");
\r
\r
this.record_id = rs.getLong("RECORD_ID");
\r
this.clength2 = rs.getLong("CONTENT_LENGTH_2");
\r
+ this.fileName = rs.getString("FILENAME");
\r
}
\r
\r
public LogRecord(String[] pp) throws ParseException {
\r
}
\r
\r
public LogRecord(String[] pp) throws ParseException {
\r
@@
-127,7
+129,8
@@
public class LogRecord extends BaseLogRecord {
this.reason = pp[17];
\r
\r
this.record_id = Long.parseLong(pp[18]);
\r
this.reason = pp[17];
\r
\r
this.record_id = Long.parseLong(pp[18]);
\r
- this.clength2 = (pp.length == 20) ? Long.parseLong(pp[19]) : 0;
\r
+ this.clength2 = (pp.length == 21) ? Long.parseLong(pp[19]) : 0;
\r
+ this.fileName = pp[20];
\r
}
\r
\r
public long getRecordId() {
\r
}
\r
\r
public long getRecordId() {
\r
@@
-176,6
+179,7
@@
public class LogRecord extends BaseLogRecord {
ps.setNull(17, Types.VARCHAR);
\r
ps.setLong(18, record_id);
\r
ps.setNull(19, Types.BIGINT);
\r
ps.setNull(17, Types.VARCHAR);
\r
ps.setLong(18, record_id);
\r
ps.setNull(19, Types.BIGINT);
\r
+ ps.setString(20, fileName);
\r
} else if (type.equals("del")) {
\r
ps.setNull(9, Types.VARCHAR);
\r
ps.setNull(10, Types.VARCHAR);
\r
} else if (type.equals("del")) {
\r
ps.setNull(9, Types.VARCHAR);
\r
ps.setNull(10, Types.VARCHAR);
\r
@@
-188,6
+192,7
@@
public class LogRecord extends BaseLogRecord {
ps.setNull(17, Types.VARCHAR);
\r
ps.setLong(18, record_id);
\r
ps.setNull(19, Types.BIGINT);
\r
ps.setNull(17, Types.VARCHAR);
\r
ps.setLong(18, record_id);
\r
ps.setNull(19, Types.BIGINT);
\r
+ ps.setString(20, fileName);
\r
} else if (type.equals("exp")) {
\r
ps.setNull(9, Types.VARCHAR);
\r
ps.setNull(10, Types.VARCHAR);
\r
} else if (type.equals("exp")) {
\r
ps.setNull(9, Types.VARCHAR);
\r
ps.setNull(10, Types.VARCHAR);
\r
@@
-200,6
+205,7
@@
public class LogRecord extends BaseLogRecord {
ps.setString(17, reason);
\r
ps.setLong(18, record_id);
\r
ps.setNull(19, Types.BIGINT);
\r
ps.setString(17, reason);
\r
ps.setLong(18, record_id);
\r
ps.setNull(19, Types.BIGINT);
\r
+ ps.setString(20, fileName);
\r
} else if (type.equals("pbf")) {
\r
ps.setString(9, feedFileid);
\r
ps.setString(10, remoteAddr);
\r
} else if (type.equals("pbf")) {
\r
ps.setString(9, feedFileid);
\r
ps.setString(10, remoteAddr);
\r
@@
-212,6
+218,7
@@
public class LogRecord extends BaseLogRecord {
ps.setNull(17, Types.VARCHAR);
\r
ps.setLong(18, record_id);
\r
ps.setLong(19, clength2);
\r
ps.setNull(17, Types.VARCHAR);
\r
ps.setLong(18, record_id);
\r
ps.setLong(19, clength2);
\r
+ ps.setString(20, fileName);
\r
} else if (type.equals("dlx")) {
\r
ps.setNull(9, Types.VARCHAR);
\r
ps.setNull(10, Types.VARCHAR);
\r
} else if (type.equals("dlx")) {
\r
ps.setNull(9, Types.VARCHAR);
\r
ps.setNull(10, Types.VARCHAR);
\r
@@
-224,6
+231,7
@@
public class LogRecord extends BaseLogRecord {
ps.setNull(17, Types.VARCHAR);
\r
ps.setLong(18, record_id);
\r
ps.setLong(19, clength2);
\r
ps.setNull(17, Types.VARCHAR);
\r
ps.setLong(18, record_id);
\r
ps.setLong(19, clength2);
\r
+ ps.setString(20, fileName);
\r
}
\r
}
\r
\r
}
\r
}
\r
\r