Sync Integ to Master

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / ZipUtil.java

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/ZipUtil.java b/catalog-be/src/test/java/org/openecomp/sdc/ZipUtil.java
index c3f211f..9ee123a 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/ZipUtil.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/ZipUtil.java
@@ -20,6 +20,9 @@
 
 package org.openecomp.sdc;
 
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.output.ByteArrayOutputStream;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -30,100 +33,97 @@ import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.io.output.ByteArrayOutputStream;
-
 public class ZipUtil {
 
-       public static void main(String[] args) {
+    public static void main(String[] args) {
 
-               String zipFileName = "/src/test/resources/config/config.zip";
+        String zipFileName = "/src/test/resources/config/config.zip";
 
-               zipFileName = "C:\\Git_work\\D2-SDnC\\catalog-be\\src\\test\\resources\\config\\config.zip";
-               zipFileName = "src/test/resources/config/config.zip";
+        zipFileName = "C:\\Git_work\\D2-SDnC\\catalog-be\\src\\test\\resources\\config\\config.zip";
+        zipFileName = "src/test/resources/config/config.zip";
 
-               Path path = Paths.get(zipFileName);
+        Path path = Paths.get(zipFileName);
 
-               try {
-                       byte[] zipAsBytes = Files.readAllBytes(path);
-                       // encode to base
+        try {
+            byte[] zipAsBytes = Files.readAllBytes(path);
+            // encode to base
 
-                       byte[] decodedMd5 = Base64.encodeBase64(zipAsBytes);
-                       String decodedStr = new String(decodedMd5);
+            byte[] decodedMd5 = Base64.encodeBase64(zipAsBytes);
+            String decodedStr = new String(decodedMd5);
 
-                       zipAsBytes = Base64.decodeBase64(decodedStr.getBytes());
+            zipAsBytes = Base64.decodeBase64(decodedStr.getBytes());
 
-                       // String str = new String(zipAsBytes);
+            // String str = new String(zipAsBytes);
 
-                       // readZip(str.getBytes());
-                       readZip(zipAsBytes);
+            // readZip(str.getBytes());
+            readZip(zipAsBytes);
 
-               } catch (IOException e) {
-                       e.printStackTrace();
-               }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
 
-       }
+    }
 
-       private static Map<String, byte[]> readZip(byte[] zipAsBytes) {
+    private static Map<String, byte[]> readZip(byte[] zipAsBytes) {
 
-               Map<String, byte[]> fileNameToByteArray = new HashMap<String, byte[]>();
+        Map<String, byte[]> fileNameToByteArray = new HashMap<String, byte[]>();
 
-               byte[] buffer = new byte[1024];
-               ZipInputStream zis = null;
-               try {
+        byte[] buffer = new byte[1024];
+        ZipInputStream zis = null;
+        try {
 
-                       zis = new ZipInputStream(new ByteArrayInputStream(zipAsBytes));
-                       // get the zipped file list entry
-                       ZipEntry ze = zis.getNextEntry();
+            zis = new ZipInputStream(new ByteArrayInputStream(zipAsBytes));
+            // get the zipped file list entry
+            ZipEntry ze = zis.getNextEntry();
 
-                       while (ze != null) {
+            while (ze != null) {
 
-                               String fileName = ze.getName();
+                String fileName = ze.getName();
 
-                               if (false == ze.isDirectory()) {
+                if (false == ze.isDirectory()) {
 
-                                       ByteArrayOutputStream os = new ByteArrayOutputStream();
-                                       try {
-                                               int len;
-                                               while ((len = zis.read(buffer)) > 0) {
-                                                       os.write(buffer, 0, len);
-                                               }
+                    ByteArrayOutputStream os = new ByteArrayOutputStream();
+                    try {
+                        int len;
+                        while ((len = zis.read(buffer)) > 0) {
+                            os.write(buffer, 0, len);
+                        }
 
-                                               // aClass.outputStreamMethod(os);
-                                               String aString = new String(os.toByteArray(), "UTF-8");
+                        // aClass.outputStreamMethod(os);
+                        String aString = new String(os.toByteArray(), "UTF-8");
 
-                                               fileNameToByteArray.put(fileName, os.toByteArray());
+                        fileNameToByteArray.put(fileName, os.toByteArray());
 
-                                       } finally {
-                                               if (os != null) {
-                                                       os.close();
-                                               }
-                                       }
-                               }
-                               ze = zis.getNextEntry();
+                    } finally {
+                        if (os != null) {
+                            os.close();
+                        }
+                    }
+                }
+                ze = zis.getNextEntry();
 
-                       }
+            }
 
-                       zis.closeEntry();
-                       zis.close();
+            zis.closeEntry();
+            zis.close();
 
-               } catch (IOException ex) {
-                       ex.printStackTrace();
-                       return null;
-               } finally {
-                       if (zis != null) {
-                               try {
-                                       zis.closeEntry();
-                                       zis.close();
-                               } catch (IOException e) {
-                                       // TODO: add log
-                               }
+        } catch (IOException ex) {
+            ex.printStackTrace();
+            return null;
+        } finally {
+            if (zis != null) {
+                try {
+                    zis.closeEntry();
+                    zis.close();
+                } catch (IOException e) {
+                    // TODO: add log
+                }
 
-                       }
-               }
+            }
+        }
 
-               return fileNameToByteArray;
+        return fileNameToByteArray;
 
-       }
+    }
 
 }