From: Sunder Tattavarada <statta@research.att.com>
Date: Tue, 27 Mar 2018 12:47:13 +0000 (+0000)
Subject: Merge "Sonar Issues for ExtractJar.java"
X-Git-Tag: v2.2.0~30
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c4fa171c0cc8f1e227f6042387fdd2c5b56bd2dd;hp=5a5c1ff3ba2d3ede96c3ca35e5f18e406642833d;p=portal.git

Merge "Sonar Issues for 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 50e2720e..2e651ad1 100644
--- a/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java
+++ b/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java
@@ -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,27 +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 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());
@@ -78,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())
@@ -115,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) {
@@ -144,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) {