DR AAF CADI integration

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / utils / LogfileLoader.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
index 8975f16..6c5a13f 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
@@ -82,7 +82,7 @@ public class LogfileLoader extends Thread {
     /**\r
      * This is a singleton -- there is only one LogfileLoader object in the server\r
      */\r
-    private static LogfileLoader p;\r
+    private static LogfileLoader logfileLoader;\r
 \r
     /**\r
      * Get the singleton LogfileLoader object, and start it if it is not running.\r
@@ -90,17 +90,17 @@ public class LogfileLoader extends Thread {
      * @return the LogfileLoader\r
      */\r
     public static synchronized LogfileLoader getLoader() {\r
-        if (p == null)\r
-            p = new LogfileLoader();\r
-        if (!p.isAlive())\r
-            p.start();\r
-        return p;\r
+        if (logfileLoader == null)\r
+            logfileLoader = new LogfileLoader();\r
+        if (!logfileLoader.isAlive())\r
+            logfileLoader.start();\r
+        return logfileLoader;\r
     }\r
 \r
     /**\r
      * The PreparedStatement which is loaded by a <i>Loadable</i>.\r
      */\r
-    public static final String INSERT_SQL = "insert into LOG_RECORDS values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";\r
+    public static final String INSERT_SQL = "insert into LOG_RECORDS values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";\r
     /**\r
      * Each server can assign this many IDs\r
      */\r
@@ -188,6 +188,7 @@ public class LogfileLoader extends Thread {
                         try {\r
                             Thread.sleep(1000L);\r
                         } catch (InterruptedException e) {\r
+                            Thread.currentThread().interrupt();\r
                         }\r
                         idle = false;\r
                     } else {\r
@@ -213,12 +214,11 @@ public class LogfileLoader extends Thread {
                 }\r
             } catch (Exception e) {\r
                 logger.warn("PROV0020: Caught exception in LogfileLoader: " + e);\r
-                e.printStackTrace();\r
             }\r
         }\r
     }\r
 \r
-    private boolean pruneRecords() {\r
+    boolean pruneRecords() {\r
         boolean did1 = false;\r
         long count = countRecords();\r
         long threshold = DEFAULT_LOG_RETENTION;\r
@@ -274,7 +274,7 @@ public class LogfileLoader extends Thread {
              }\r
             } catch (SQLException e) {\r
                 System.err.println(e);\r
-                e.printStackTrace();\r
+                logger.error(e);\r
             } finally {\r
                 db.release(conn);\r
             }\r
@@ -282,7 +282,7 @@ public class LogfileLoader extends Thread {
         return did1;\r
     }\r
 \r
-    private long countRecords() {\r
+    long countRecords() {\r
         long count = 0;\r
         Connection conn = null;\r
         try {\r
@@ -296,14 +296,14 @@ public class LogfileLoader extends Thread {
            }\r
          } catch (SQLException e) {\r
             System.err.println(e);\r
-            e.printStackTrace();\r
+            logger.error(e);\r
         } finally {\r
             db.release(conn);\r
         }\r
         return count;\r
     }\r
 \r
-    private Map<Long, Long> getHistogram() {\r
+    Map<Long, Long> getHistogram() {\r
         Map<Long, Long> map = new HashMap<Long, Long>();\r
         Connection conn = null;\r
         try {\r
@@ -321,7 +321,7 @@ public class LogfileLoader extends Thread {
             }\r
            } catch (SQLException e) {\r
             System.err.println(e);\r
-            e.printStackTrace();\r
+            logger.error(e);\r
         } finally {\r
             db.release(conn);\r
         }\r
@@ -332,26 +332,25 @@ public class LogfileLoader extends Thread {
         Connection conn = null;\r
         try {\r
             conn = db.getConnection();\r
-            Statement stmt = conn.createStatement();\r
-            // Build a bitset of all records in the LOG_RECORDS table\r
-            // We need to run this SELECT in stages, because otherwise we run out of memory!\r
             RLEBitSet nbs = new RLEBitSet();\r
-            final long stepsize = 6000000L;\r
-            boolean go_again = true;\r
-            for (long i = 0; go_again; i += stepsize) {\r
-                String sql = String.format("select RECORD_ID from LOG_RECORDS LIMIT %d,%d", i, stepsize);\r
-                try(ResultSet rs = stmt.executeQuery(sql)) {\r
-                    go_again = false;\r
-                    while (rs.next()) {\r
-                        long n = rs.getLong("RECORD_ID");\r
-                        nbs.set(n);\r
-                        go_again = true;\r
+            try(Statement stmt = conn.createStatement()) {\r
+                // Build a bitset of all records in the LOG_RECORDS table\r
+                // We need to run this SELECT in stages, because otherwise we run out of memory!\r
+                final long stepsize = 6000000L;\r
+                boolean go_again = true;\r
+                for (long i = 0; go_again; i += stepsize) {\r
+                    String sql = String.format("select RECORD_ID from LOG_RECORDS LIMIT %d,%d", i, stepsize);\r
+                    try (ResultSet rs = stmt.executeQuery(sql)) {\r
+                        go_again = false;\r
+                        while (rs.next()) {\r
+                            long n = rs.getLong("RECORD_ID");\r
+                            nbs.set(n);\r
+                            go_again = true;\r
+                        }\r
                     }\r
                 }\r
             }\r
-            stmt.close();\r
             seq_set = nbs;\r
-\r
             // Compare with the range for this server\r
             // Determine the next ID for this set of record IDs\r
             RLEBitSet tbs = (RLEBitSet) nbs.clone();\r
@@ -376,14 +375,14 @@ public class LogfileLoader extends Thread {
             logger.debug(String.format("initializeNextid, next ID is %d (%x)", nextid, nextid));\r
         } catch (SQLException e) {\r
             System.err.println(e);\r
-            e.printStackTrace();\r
+            logger.error(e);\r
         } finally {\r
             db.release(conn);\r
         }\r
     }\r
 \r
     @SuppressWarnings("resource")\r
-    private int[] process(File f) {\r
+    int[] process(File f) {\r
         int ok = 0, total = 0;\r
         try {\r
             Connection conn = db.getConnection();\r
@@ -417,19 +416,15 @@ public class LogfileLoader extends Thread {
                     } catch (SQLException e) {\r
                         logger.warn("PROV8003 Invalid value in record: " + line);\r
                         logger.debug(e);\r
-                        e.printStackTrace();\r
                     } catch (NumberFormatException e) {\r
                         logger.warn("PROV8004 Invalid number in record: " + line);\r
                         logger.debug(e);\r
-                        e.printStackTrace();\r
                     } catch (ParseException e) {\r
                         logger.warn("PROV8005 Invalid date in record: " + line);\r
                         logger.debug(e);\r
-                        e.printStackTrace();\r
                     } catch (Exception e) {\r
                         logger.warn("PROV8006 Invalid pattern in record: " + line);\r
                         logger.debug(e);\r
-                        e.printStackTrace();\r
                     }\r
                     total++;\r
                 }\r
@@ -447,7 +442,7 @@ public class LogfileLoader extends Thread {
         return new int[]{ok, total};\r
     }\r
 \r
-    private Loadable[] buildRecords(String line) throws ParseException {\r
+    Loadable[] buildRecords(String line) throws ParseException {\r
         String[] pp = line.split("\\|");\r
         if (pp != null && pp.length >= 7) {\r
             String rtype = pp[1].toUpperCase();\r