More unit test coverage and code cleanup

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java
index 8c67e71..c34e954 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java
@@ -24,13 +24,13 @@
 \r
 package org.onap.dmaap.datarouter.provisioning.utils;\r
 \r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
 import java.io.File;\r
+import java.util.Objects;\r
 import java.util.Properties;\r
 import java.util.TimerTask;\r
 \r
-import com.att.eelf.configuration.EELFLogger;\r
-import com.att.eelf.configuration.EELFManager;\r
-\r
 /**\r
  * This class provides a {@link TimerTask} that purges old logfiles (older than the number of days specified by the\r
  * org.onap.dmaap.datarouter.provserver.logretention property).\r
@@ -50,9 +50,7 @@ public class PurgeLogDirTask extends TimerTask {
         Properties p = (new DB()).getProperties();\r
         logdir = p.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir");\r
         String s = p.getProperty("org.onap.dmaap.datarouter.provserver.logretention", "30");\r
-\r
         this.utilsLogger = EELFManager.getInstance().getLogger("UtilsLog");\r
-\r
         long n = 30;\r
         try {\r
             n = Long.parseLong(s);\r
@@ -67,15 +65,19 @@ public class PurgeLogDirTask extends TimerTask {
         try {\r
             File dir = new File(logdir);\r
             if (dir.exists()) {\r
-                long exptime = System.currentTimeMillis() - interval;\r
-                for (File logfile : dir.listFiles()) {\r
-                    if (logfile.lastModified() < exptime) {\r
-                        logfile.delete();\r
-                    }\r
-                }\r
+                purgeLogFiles(dir);\r
             }\r
         } catch (Exception e) {\r
             utilsLogger.error("Exception: " + e.getMessage(), e);\r
         }\r
     }\r
+\r
+    private void purgeLogFiles(File dir) {\r
+        long exptime = System.currentTimeMillis() - interval;\r
+        for (File logfile : Objects.requireNonNull(dir.listFiles())) {\r
+            if (logfile.lastModified() < exptime) {\r
+                logfile.delete();\r
+            }\r
+        }\r
+    }\r
 }\r