Refactor Prov DB handling

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