From 4704cdfc9441679baf1b178c3d9846cba03b4de5 Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Sun, 30 Sep 2018 14:50:18 +0300
Subject: exception is thrown on import normative

Change-Id: I26cd77466d4c79836665929066d2bff5b6ead92b
Issue-ID: SDC-1796
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---
 .../org/openecomp/sdc/common/util/ZipUtil.java     | 45 ++++++++--------------
 1 file changed, 15 insertions(+), 30 deletions(-)

(limited to 'common-app-api/src/main/java')

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/util/ZipUtil.java b/common-app-api/src/main/java/org/openecomp/sdc/common/util/ZipUtil.java
index 2711a290cb..2036e2332d 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/util/ZipUtil.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/util/ZipUtil.java
@@ -20,11 +20,11 @@
 
 package org.openecomp.sdc.common.util;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
+import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -41,20 +41,20 @@ public class ZipUtil {
 	private ZipUtil() {
 	}
 
-	public static Map<String, byte[]> readZip(byte[] zipAsBytes) {
-
-		ZipInputStream zis = null;
-		zis = new ZipInputStream(new ByteArrayInputStream(zipAsBytes));
-
-		return readZip(zis);
-	}
-
-	public static Map<String, byte[]> readZip(ZipInputStream zis) {
+	public static Map<String, byte[]> readZip(File file) {
+        try(InputStream fileInputStream = new FileInputStream(file)){
+	        return readZip(IOUtils.toByteArray(fileInputStream));
+        } catch (IOException e) {
+            log.info("close File stream failed - {}" , e);
+            return null;
+        }
+    }
 
+	public static Map<String, byte[]> readZip(byte[] zipAsBytes) {
 		Map<String, byte[]> fileNameToByteArray = new HashMap<>();
-
 		byte[] buffer = new byte[1024];
-		try {
+        try(ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(zipAsBytes);
+			ZipInputStream zis = new ZipInputStream(byteArrayInputStream)) {
 			// get the zipped file list entry
 			ZipEntry ze = zis.getNextEntry();
 
@@ -75,25 +75,10 @@ public class ZipUtil {
 					}
 				}
 				ze = zis.getNextEntry();
-
 			}
-
-			zis.closeEntry();
-			zis.close();
-
 		} catch (IOException ex) {
-			log.info("close Byte stream failed - {}" , ex);
+			log.info("close Byte stream failed" , ex);
 			return null;
-		} finally {
-			if (zis != null) {
-				try {
-					zis.closeEntry();
-					zis.close();
-				} catch (IOException e) {
-					log.info("Close ZipInputStream failed - {}" , e);
-				}
-
-			}
 		}
 
 		return fileNameToByteArray;
@@ -115,7 +100,7 @@ public class ZipUtil {
 			ZipUtil.readZip(zipAsBytes);
 
 		} catch (IOException e) {
-			log.info("close Byte stream failed - {}" , e);
+			log.info("close Byte stream failed" , e);
 		}
 
 	}
-- 
cgit 1.2.3-korg