Fix use try-with-resources issue

Fix sonar issue in DataCleanupTasks.java

Issue-ID: AAI-1368
Change-Id: Ib3135d15926872c0bf1577347e50d419e852b121
Signed-off-by: Parshad Patel <pars.patel@samsung.com>

diff --git a/src/main/java/org/onap/aai/datacleanup/DataCleanupTasks.java b/src/main/java/org/onap/aai/datacleanup/DataCleanupTasks.java
index a3dc708..1931491 100644 (file)
--- a/src/main/java/org/onap/aai/datacleanup/DataCleanupTasks.java
+++ b/src/main/java/org/onap/aai/datacleanup/DataCleanupTasks.java
@@ -25,17 +25,16 @@ import java.io.IOException;
 import java.nio.file.Files;\r
 import java.nio.file.attribute.BasicFileAttributes;\r
 import java.nio.file.attribute.FileTime;\r
-import java.text.DateFormat;\r
-import java.text.ParseException;\r
 import java.text.SimpleDateFormat;\r
-import java.time.ZoneId;\r
-import java.util.ArrayList;\r
 import java.util.Calendar;\r
 import java.util.Date;\r
 import java.util.zip.ZipEntry;\r
 import java.util.zip.ZipOutputStream;\r
 \r
 import org.onap.aai.exceptions.AAIException;\r
+import org.onap.aai.logging.ErrorLogHelper;\r
+import org.onap.aai.util.AAIConfig;\r
+import org.onap.aai.util.AAIConstants;\r
 import org.springframework.context.annotation.PropertySource;\r
 import org.springframework.scheduling.annotation.Scheduled;\r
 import org.springframework.stereotype.Component;\r
@@ -43,14 +42,6 @@ import org.springframework.stereotype.Component;
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
 \r
-import org.onap.aai.logging.ErrorLogHelper;\r
-import org.onap.aai.logging.LoggingContext;\r
-import org.onap.aai.logging.LoggingContext.StatusCode;\r
-import org.onap.aai.util.AAIConfig;\r
-import org.onap.aai.util.AAIConstants;\r
-\r
-import com.att.eelf.configuration.EELFLogger;\r
-\r
 @Component\r
 @PropertySource("file:${server.local.startpath}/etc/appprops/datatoolscrons.properties")\r
 public class DataCleanupTasks {\r
@@ -85,7 +76,7 @@ public class DataCleanupTasks {
                \r
                        boolean exists = directoryExists(logDir);\r
                        logger.info("Directory" + logDir + "exists: " + exists);\r
-                       if(exists == false)\r
+                       if(!exists)\r
                                logger.error("The directory" + logDir +"does not exists");\r
                \r
                        Integer ageZip = AAIConfig.getInt("aai.datagrooming.agezip");\r
@@ -191,20 +182,18 @@ public class DataCleanupTasks {
        \r
                boolean exists = directoryExists(archiveDir);\r
                logger.info("Directory" + archiveDir + "exists: " + exists);            \r
-               if(exists == false) {\r
+               if(!exists) {\r
                        logger.error("The directory" + archiveDir +"does not exists so will create a new archive folder");\r
                        //Create an archive folder if does not exists           \r
                        boolean flag = dataGroomingPath.mkdirs();\r
-                       if(flag == false)\r
+                       if(!flag)\r
                                logger.error("Failed to create ARCHIVE folder");                \r
                }\r
-               try {           \r
-                       FileOutputStream outputstream = new FileOutputStream(zipFile + ".gz");\r
-                       ZipOutputStream zoutputstream = new ZipOutputStream(outputstream);\r
+               try(FileOutputStream outputstream = new FileOutputStream(zipFile + ".gz");\r
+                               ZipOutputStream zoutputstream = new ZipOutputStream(outputstream);\r
+                               FileInputStream inputstream = new FileInputStream(file)) {\r
                        ZipEntry ze = new ZipEntry(file.getName());\r
                        zoutputstream.putNextEntry(ze);\r
-                       //read the file and write to the zipOutputStream\r
-                       FileInputStream inputstream = new FileInputStream(file);\r
                        byte[] buffer = new byte[1024];\r
                        int len;\r
                        while ((len = inputstream.read(buffer)) > 0) {\r
@@ -212,9 +201,6 @@ public class DataCleanupTasks {
                        }                       \r
                        //close all the sources\r
                        zoutputstream.closeEntry();\r
-                       zoutputstream.close();\r
-                       inputstream.close();\r
-                       outputstream.close();\r
                        //Delete the file after been added to archive folder\r
                        delete(file);\r
                        logger.info("The file archived is " + file + " at " + afterArchiveDir );\r
@@ -234,7 +220,7 @@ public class DataCleanupTasks {
        \r
        logger.info("Deleting the file " + file);\r
        boolean deleteStatus = file.delete();\r
-               if(deleteStatus == false){\r
+               if(!deleteStatus){\r
                        logger.error("Failed to delete the file" +file);                        \r
                }\r
     }\r
@@ -266,7 +252,7 @@ public class DataCleanupTasks {
        \r
                boolean exists = directoryExists(logDir);\r
                logger.info("Directory" + logDir + "exists: " + exists);\r
-               if(exists == false)\r
+               if(!exists)\r
                        logger.error("The directory" + logDir +"does not exists");\r
        \r
                Integer ageZipSnapshot = AAIConfig.getInt("aai.datasnapshot.agezip");\r