Sonar Issues for ExtractJar.java

[portal.git] / ecomp-portal-BE-common / src / main / java / jarutil / ExtractJar.java

diff --git a/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java b/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java
index 9721a90..2e651ad 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java
+++ b/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java
@@ -2,11 +2,11 @@
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -38,7 +38,6 @@
 package jarutil;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,43 +47,29 @@ import java.io.Writer;
 import java.net.URL;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ExtractJar {
 
-       public static int bufferSize = 8192;
-       public static String JARFILE = "raptor_upgrade.jar";
+       public static final int bufferSize = 8192;
+       public static final String jarFile = "raptor_upgrade.jar";
+       private static final Logger logger = LoggerFactory.getLogger(ExtractJar.class);
 
        public static void main(String[] args) throws Exception {
                if (args.length > 0 && args[0] != null && args[0].length() > 0)
                        extractFilesFromJar(args[0]);
                else {
-                       System.out.println("Current Directory is taken as webapp path");
+                       logger.info("Current Directory is taken as webapp path");
                        String currentDir = new File(".").getAbsolutePath();
                        extractFilesFromJar(currentDir);
                }
        }
 
-       public static void readJar(File jarFile) throws Exception {
-               JarInputStream in = new JarInputStream(new FileInputStream(jarFile));
-               JarEntry je;
-               while ((je = in.getNextJarEntry()) != null) {
-                       if (je.isDirectory() == false) {
-                               if (je.getName().startsWith("att/raptor/config/")) {
-                                       // while((je=in.getNextJarEntry( ))!=null) {
-                                       System.out.println(je.getName() + " " + je.getTime());
-                                       // }
-
-                               }
-                       }
-               }
-               in.close();
-       }
-
        public static void extractFilesFromJar(String directory) throws IOException {
-               // JarFile jar = new JarFile(jarFile);
+       
                Class clazz = ExtractJar.class;
                String classContainer = clazz.getProtectionDomain().getCodeSource().getLocation().toString();
-               // System.out.println("classContainer ---------> " + classContainer);
                URL jarUrl = clazz.getProtectionDomain().getCodeSource().getLocation();
 
                JarInputStream entryStream = new JarInputStream(jarUrl.openStream());
@@ -94,7 +79,7 @@ public class ExtractJar {
                        if (entry == null)
                                break;
                        if (entry.getName().indexOf("jarutil") < 0) {
-                               System.out.println(entry.getName());
+                               logger.info(entry.getName());
                                File file = new File(directory, entry.getName());
                                if (entry.isDirectory()) {
                                        if (!file.exists())
@@ -131,7 +116,7 @@ public class ExtractJar {
        }
 
        public static void copy(InputStream in, OutputStream out, long byteCount) throws IOException {
-               byte buffer[] = new byte[bufferSize];
+               byte[] buffer = new byte[bufferSize];
                int len = bufferSize;
                if (byteCount >= 0) {
                        while (byteCount > 0) {
@@ -160,7 +145,7 @@ public class ExtractJar {
         * Copy Reader to Writer for byteCount bytes or until EOF or exception.
         */
        public static void copy(Reader in, Writer out, long byteCount) throws IOException {
-               char buffer[] = new char[bufferSize];
+               char[] buffer = new char[bufferSize];
                int len = bufferSize;
                if (byteCount >= 0) {
                        while (byteCount > 0) {