DMAAP-1195 [DR] Remove DR code smells

[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 51c162e..b26e551 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
@@ -57,44 +57,13 @@ public class LogRecord extends BaseLogRecord {
      * @throws IOException in case of I/O error\r
      */\r
     private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");\r
-\r
-    /**\r
-     * Get Log Records.\r
-     * @param os outputstream\r
-     * @param bs RLEBitSet object\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
-                    }\r
-                }\r
-            }\r
-        } catch (SQLException e) {\r
-            intlogger.error("PROV0001 printLogRecords: " + e.getMessage(), e);\r
-        }\r
-    }\r
-\r
     private final String type;\r
-    private final String feedFileid;\r
+    private final String feedFileID;\r
     private final String remoteAddr;\r
     private final String user;\r
     private final int status;\r
-    private final int subid;\r
-    private final String fileid;\r
+    private final int subID;\r
+    private final String fileID;\r
     private final int result;\r
     private final int attempts;\r
     private final String reason;\r
@@ -110,13 +79,13 @@ public class LogRecord extends BaseLogRecord {
     public LogRecord(ResultSet rs) throws SQLException {\r
         super(rs);\r
         this.type = rs.getString("TYPE");\r
-        this.feedFileid = rs.getString("FEED_FILEID");\r
+        this.feedFileID = rs.getString("FEED_FILEID");\r
         this.remoteAddr = rs.getString("REMOTE_ADDR");\r
         this.user = rs.getString("USER");\r
         this.status = rs.getInt("STATUS");\r
 \r
-        this.subid = rs.getInt("DELIVERY_SUBID");\r
-        this.fileid = rs.getString("DELIVERY_FILEID");\r
+        this.subID = rs.getInt("DELIVERY_SUBID");\r
+        this.fileID = rs.getString("DELIVERY_FILEID");\r
         this.result = rs.getInt("RESULT");\r
 \r
         this.attempts = rs.getInt("ATTEMPTS");\r
@@ -135,13 +104,13 @@ public class LogRecord extends BaseLogRecord {
     public LogRecord(String[] pp) throws ParseException {\r
         super(pp);\r
         this.type = pp[8];\r
-        this.feedFileid = pp[9];\r
+        this.feedFileID = pp[9];\r
         this.remoteAddr = pp[10];\r
         this.user = pp[11];\r
         this.status = Integer.parseInt(pp[12]);\r
 \r
-        this.subid = Integer.parseInt(pp[13]);\r
-        this.fileid = pp[14];\r
+        this.subID = Integer.parseInt(pp[13]);\r
+        this.fileID = pp[14];\r
         this.result = Integer.parseInt(pp[15]);\r
 \r
         this.attempts = Integer.parseInt(pp[16]);\r
@@ -152,6 +121,36 @@ public class LogRecord extends BaseLogRecord {
         this.fileName = pp[20];\r
     }\r
 \r
+    /**\r
+     * Get Log Records.\r
+     * @param os outputstream\r
+     * @param bs RLEBitSet object\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
+                    }\r
+                }\r
+            }\r
+        } catch (SQLException e) {\r
+            intlogger.error("PROV0001 printLogRecords: " + e.getMessage(), e);\r
+        }\r
+    }\r
+\r
     public long getRecordId() {\r
         return recordId;\r
     }\r
@@ -168,12 +167,12 @@ public class LogRecord extends BaseLogRecord {
                         + getContentType() + "|"\r
                         + getContentLength() + "|"\r
                         + type + "|"\r
-                        + feedFileid + "|"\r
+                        + feedFileID + "|"\r
                         + remoteAddr + "|"\r
                         + user + "|"\r
                         + status + "|"\r
-                        + subid + "|"\r
-                        + fileid + "|"\r
+                        + subID + "|"\r
+                        + fileID + "|"\r
                         + result + "|"\r
                         + attempts + "|"\r
                         + reason + "|"\r
@@ -187,7 +186,7 @@ public class LogRecord extends BaseLogRecord {
         ps.setString(1, type);\r
         super.load(ps);                // loads fields 2-8\r
         if (type.equals("pub")) {\r
-            ps.setString(9, feedFileid);\r
+            ps.setString(9, feedFileID);\r
             ps.setString(10, remoteAddr);\r
             ps.setString(11, user);\r
             ps.setInt(12, status);\r
@@ -204,8 +203,8 @@ public class LogRecord extends BaseLogRecord {
             ps.setNull(10, Types.VARCHAR);\r
             ps.setString(11, user);\r
             ps.setNull(12, Types.INTEGER);\r
-            ps.setInt(13, subid);\r
-            ps.setString(14, fileid);\r
+            ps.setInt(13, subID);\r
+            ps.setString(14, fileID);\r
             ps.setInt(15, result);\r
             ps.setNull(16, Types.INTEGER);\r
             ps.setNull(17, Types.VARCHAR);\r
@@ -217,8 +216,8 @@ public class LogRecord extends BaseLogRecord {
             ps.setNull(10, Types.VARCHAR);\r
             ps.setNull(11, Types.VARCHAR);\r
             ps.setNull(12, Types.INTEGER);\r
-            ps.setInt(13, subid);\r
-            ps.setString(14, fileid);\r
+            ps.setInt(13, subID);\r
+            ps.setString(14, fileID);\r
             ps.setNull(15, Types.INTEGER);\r
             ps.setInt(16, attempts);\r
             ps.setString(17, reason);\r
@@ -226,7 +225,7 @@ public class LogRecord extends BaseLogRecord {
             ps.setNull(19, Types.BIGINT);\r
             ps.setString(20, fileName);\r
         } else if (type.equals("pbf")) {\r
-            ps.setString(9, feedFileid);\r
+            ps.setString(9, feedFileID);\r
             ps.setString(10, remoteAddr);\r
             ps.setString(11, user);\r
             ps.setNull(12, Types.INTEGER);\r
@@ -243,7 +242,7 @@ public class LogRecord extends BaseLogRecord {
             ps.setNull(10, Types.VARCHAR);\r
             ps.setNull(11, Types.VARCHAR);\r
             ps.setNull(12, Types.INTEGER);\r
-            ps.setInt(13, subid);\r
+            ps.setInt(13, subID);\r
             ps.setNull(14, Types.VARCHAR);\r
             ps.setNull(15, Types.INTEGER);\r
             ps.setNull(16, Types.INTEGER);\r