X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FLogRecord.java;h=0d027033d8367663ca0eaaa919165aa32029c1b4;hp=b26e551b3a66e13977c665f212ad08e1696454fb;hb=68a9ca240970fceaf12bbe91b7bad8e1d98ecd93;hpb=f3b3e701a48d529ee6dc88e3a867448498e23d36

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 b26e551b..0d027033 100644
--- 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
@@ -35,8 +35,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.text.ParseException;
 import java.util.Iterator;
-
-import org.onap.dmaap.datarouter.provisioning.utils.DB;
+import org.onap.dmaap.datarouter.provisioning.utils.ProvDbUtils;
 import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet;
 
 
@@ -49,13 +48,6 @@ import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet;
  */
 public class LogRecord extends BaseLogRecord {
 
-    /**
-     * Print all log records whose RECORD_IDs are in the bit set provided.
-     *
-     * @param os the {@link OutputStream} to print the records on
-     * @param bs the {@link RLEBitSet} listing the record IDs to print
-     * @throws IOException in case of I/O error
-     */
     private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");
     private final String type;
     private final String feedFileID;
@@ -76,7 +68,7 @@ public class LogRecord extends BaseLogRecord {
      * @param rs ResultSet from SQL statement
      * @throws SQLException in case of SQL error
      */
-    public LogRecord(ResultSet rs) throws SQLException {
+    private LogRecord(ResultSet rs) throws SQLException {
         super(rs);
         this.type = rs.getString("TYPE");
         this.feedFileID = rs.getString("FEED_FILEID");
@@ -122,28 +114,27 @@ public class LogRecord extends BaseLogRecord {
     }
 
     /**
-     * Get Log Records.
-     * @param os outputstream
-     * @param bs RLEBitSet object
+     * Print all log records whose RECORD_IDs are in the bit set provided.
+     *
+     * @param os the {@link OutputStream} to print the records on
+     * @param bs the {@link RLEBitSet} listing the record IDs to print
      * @throws IOException in case of I/O error
      */
     public static void printLogRecords(OutputStream os, RLEBitSet bs) throws IOException {
-        final String sql = "select * from LOG_RECORDS where RECORD_ID >= ? AND RECORD_ID <= ?";
-        DB db = new DB();
-        try (Connection conn = db.getConnection()) {
-            Iterator<Long[]> iter = bs.getRangeIterator();
-            try (PreparedStatement ps = conn.prepareStatement(sql)) {
-                while (iter.hasNext()) {
-                    Long[] nxt = iter.next();
-                    ps.setLong(1, nxt[0]);
-                    ps.setLong(2, nxt[1]);
-                    try (ResultSet rs = ps.executeQuery()) {
-                        while (rs.next()) {
-                            LogRecord lr = new LogRecord(rs);
-                            os.write(lr.toString().getBytes());
-                        }
-                        ps.clearParameters();
+        Iterator<Long[]> iter = bs.getRangeIterator();
+        try (Connection conn = ProvDbUtils.getInstance().getConnection();
+            PreparedStatement ps = conn.prepareStatement(
+                "select * from LOG_RECORDS where RECORD_ID >= ? AND RECORD_ID <= ?")) {
+            while (iter.hasNext()) {
+                Long[] nxt = iter.next();
+                ps.setLong(1, nxt[0]);
+                ps.setLong(2, nxt[1]);
+                try (ResultSet rs = ps.executeQuery()) {
+                    while (rs.next()) {
+                        LogRecord lr = new LogRecord(rs);
+                        os.write(lr.toString().getBytes());
                     }
+                    ps.clearParameters();
                 }
             }
         } catch (SQLException e) {
@@ -158,27 +149,27 @@ public class LogRecord extends BaseLogRecord {
     @Override
     public String toString() {
         return
-                sdf.format(getEventTime()) + "|"
-                        + "LOG|"
-                        + getPublishId() + "|"
-                        + getFeedid() + "|"
-                        + getRequestUri() + "|"
-                        + getMethod() + "|"
-                        + getContentType() + "|"
-                        + getContentLength() + "|"
-                        + type + "|"
-                        + feedFileID + "|"
-                        + remoteAddr + "|"
-                        + user + "|"
-                        + status + "|"
-                        + subID + "|"
-                        + fileID + "|"
-                        + result + "|"
-                        + attempts + "|"
-                        + reason + "|"
-                        + recordId + "|"
-                        + clength2
-                        + "\n";
+            sdf.format(getEventTime()) + "|"
+                + "LOG|"
+                + getPublishId() + "|"
+                + getFeedid() + "|"
+                + getRequestUri() + "|"
+                + getMethod() + "|"
+                + getContentType() + "|"
+                + getContentLength() + "|"
+                + type + "|"
+                + feedFileID + "|"
+                + remoteAddr + "|"
+                + user + "|"
+                + status + "|"
+                + subID + "|"
+                + fileID + "|"
+                + result + "|"
+                + attempts + "|"
+                + reason + "|"
+                + recordId + "|"
+                + clength2
+                + "\n";
     }
 
     @Override