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
Remove critical code smells Bean classes
[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
..
cbddbf4
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
@@
-33,7
+33,9
@@
import java.sql.SQLException;
import java.sql.Types;
\r
import java.text.ParseException;
\r
import java.util.Iterator;
\r
import java.sql.Types;
\r
import java.text.ParseException;
\r
import java.util.Iterator;
\r
-import org.apache.log4j.Logger;
\r
+
\r
+import com.att.eelf.configuration.EELFLogger;
\r
+import com.att.eelf.configuration.EELFManager;
\r
import org.onap.dmaap.datarouter.provisioning.utils.DB;
\r
import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet;
\r
\r
import org.onap.dmaap.datarouter.provisioning.utils.DB;
\r
import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet;
\r
\r
@@
-53,7
+55,7
@@
public class LogRecord extends BaseLogRecord {
* @param bs the {@link RLEBitSet} listing the record IDs to print
\r
* @throws IOException
\r
*/
\r
* @param bs the {@link RLEBitSet} listing the record IDs to print
\r
* @throws IOException
\r
*/
\r
- private static
Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.beans
");
\r
+ private static
EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog
");
\r
\r
public static void printLogRecords(OutputStream os, RLEBitSet bs) throws IOException {
\r
final String sql = "select * from LOG_RECORDS where RECORD_ID >= ? AND RECORD_ID <= ?";
\r
\r
public static void printLogRecords(OutputStream os, RLEBitSet bs) throws IOException {
\r
final String sql = "select * from LOG_RECORDS where RECORD_ID >= ? AND RECORD_ID <= ?";
\r
@@
-75,7
+77,7
@@
public class LogRecord extends BaseLogRecord {
}
\r
}
\r
} catch (SQLException e) {
\r
}
\r
}
\r
} catch (SQLException e) {
\r
- intlogger.error("
SQLException: " + e.getMessage()
);
\r
+ intlogger.error("
PROV0001 printLogRecords: " + e.getMessage(), e
);
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-91,6
+93,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
+112,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
+131,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
+181,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
+194,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
+207,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
+220,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
+233,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