Merge branch 'master' of https://github.com/Programming-Toolkit/javaToolkit

Author: maxxbw

lib/utils/DiffUtil.java

@@ -1,5 +1,7 @@
 package javaToolkit.lib.utils;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,37 +31,40 @@ public static List<Integer> getChangedLineNumListInOldVersion(String diffStr) {
 		return changedLineNumList;
 	}
 
-	public static Integer getChangedLineCount(String diffStr, String mode) {
+	/**
+	 * the mode can only be "add" or "delete"
+	 * 
+	 * @param diffStr
+	 * @param mode
+	 * @return
+	 */
+	public static int getChangedLineCount(String diffStr, String mode) {
 
 		int count = 0;
 		String symbol = null;
-		try {
-			if ("delete".equals(mode)) {
-				symbol = "-";
-			} else if ("add".equals(mode)) {
-				symbol = "+";
-			} else {
-				throw new Exception("Only have delete or add mode!");
-			}
-			for (String line : diffStr.split("\n")) {
-				if (line.startsWith(symbol) && !line.startsWith("---") && !line.startsWith("+++")) {
+		if ("delete".equals(mode)) {
+			symbol = "-";
+		} else if ("add".equals(mode)) {
+			symbol = "+";
+		}
+		for (String line : diffStr.split("\n")) {
+			if (line.startsWith(symbol) && !line.startsWith("---") && !line.startsWith("+++")) {
+				// if the line is comment
+				if (line.substring(1).trim().startsWith("*") || line.substring(1).trim().startsWith("/*")
+						|| line.substring(1).trim().startsWith("//")) {
+					continue;
+				} else {
 					count++;
 				}
 			}
-		} catch (Exception e) {
-			// TODO: handle exception
-			e.printStackTrace();
-			return null;
 		}
 		return count;
 	}
 
-	public static List<Integer> getChangedLineNumListInNewVersion(String diffFilePath) {
-
+	public static List<Integer> getChangedLineNumListInNewVersion(String diffStr) {
 		List<Integer> changedLineNumList = new ArrayList<>();
 		try {
-			List<String> diffFileStrList = FileUtil.readFileToLineList(diffFilePath);
-			for (String line : diffFileStrList) {
+			for (String line : diffStr.split("\n")) {
 				if (line.startsWith("@@")) {
 					for (String tmp : line.split(" ")) {
 						if (tmp.trim().startsWith("+")) {
@@ -74,16 +79,16 @@ public static List<Integer> getChangedLineNumListInNewVersion(String diffFilePat
 			}
 		} catch (Exception e) {
 			// TODO: handle exception
-			System.out.println(diffFilePath);
 			e.printStackTrace();
 		}
 		return changedLineNumList;
 	}
 
-	public static List<String> getModifiedFileList(String diffFilePath) {
+	public static List<String> getModifiedFileList(String diffFilePathString) {
 		/**
 		 * can to be further improved in future
 		 */
+		Path diffFilePath = Paths.get(diffFilePathString);
 		List<String> modifiedFileRelPathList = new ArrayList<String>();
 		for (String line : FileUtil.readFileToLineList(diffFilePath)) {
 			if (line.startsWith("diff --git ")) {

lib/utils/FileUtil.java

@@ -1,16 +1,13 @@
 package javaToolkit.lib.utils;
 
 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -52,10 +49,10 @@ public boolean accept(File current, String name) {
 		return directories;
 	}
 
-	public static String readFile2Str(String fpath) {
+	public static String readFile2Str(Path fpath) {
 		String content = "";
 		try {
-			content = new String(Files.readAllBytes(Paths.get(fpath)));
+			content = new String(Files.readAllBytes(fpath));
 		} catch (IOException e) {
 			System.out.printf("%s not found!", fpath);
 			e.printStackTrace();
@@ -127,6 +124,22 @@ public static Boolean copyFile2Dir(File f, String DestDir) {
 		return true;
 	}
 
+	public static Boolean copyFile2Dir(Path fPath, Path DestDir) {
+		try {
+			File DestDirFile = DestDir.toFile();
+			if (!DestDirFile.exists()) {
+				DestDirFile.mkdirs();
+			}
+			Path targetFilePath = Paths.get(DestDirFile.getAbsolutePath(), fPath.toFile().getName());
+			FileUtils.copyFile(fPath.toFile(), targetFilePath.toFile());
+		} catch (IOException e) {
+
+			e.printStackTrace();
+			return false;
+		}
+		return true;
+	}
+
 	public static Boolean copyFile2File(File srcFile, File dstFile) {
 		try {
 			// dstfile will be overwrited if exist
@@ -139,50 +152,27 @@ public static Boolean copyFile2File(File srcFile, File dstFile) {
 		return true;
 	}
 
-	public static boolean deleteDirectory(String dirPath) {
-		File directoryToBeDeleted = new File(dirPath);
+	public static boolean deleteDirectory(Path dirPath) {
+		File directoryToBeDeleted = dirPath.toFile();
 		File[] allContents = directoryToBeDeleted.listFiles();
 		if (allContents != null) {
 			for (File file : allContents) {
-				deleteDirectory(file.getAbsolutePath());
+				deleteDirectory(file.toPath());
 			}
 		}
 		return directoryToBeDeleted.delete();
 	}
 
-	public static void copyFolder(String srcDirStr, String destDirStr) {
-		File source = new File(srcDirStr);
-		File dest = new File(destDirStr);
+	public static void copyDirectory(Path srcDirPath, Path destDirPath) {
+		File source = srcDirPath.toFile();
+		File dest = destDirPath.toFile();
 		try {
 			FileUtils.copyDirectory(source, dest);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 	}
 
-	public static void writeStringToFile(String filePath, String dataStr) {
-		BufferedWriter bufferedWriter = null;
-		try {
-			File file = new File(filePath);
-			if (!file.exists()) {
-				file.createNewFile();
-			}
-			Writer writer = new FileWriter(file);
-			bufferedWriter = new BufferedWriter(writer);
-			bufferedWriter.write(dataStr);
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				if (bufferedWriter != null)
-					bufferedWriter.close();
-			} catch (Exception e) {
-				System.out.println("Write file error!");
-				e.printStackTrace();
-			}
-		}
-	}
-
 	public static String readStringFromFile(String filePath) {
 		try {
 			File file = new File(filePath);
@@ -219,14 +209,14 @@ public static String readStringFromFile(String filePath) {
 	 * @param filePath
 	 * @return
 	 */
-	public static List<String> readFileToLineList(String filePath) {
+	public static List<String> readFileToLineList(Path filePath) {
 		ArrayList<String> strList = new ArrayList<String>();
 		try {
-			if (!new File(filePath).exists()) {
+			if (!filePath.toFile().exists()) {
 				System.out.println("File not exists! " + filePath);
 				return null;
 			}
-			BufferedReader reader = new BufferedReader(new FileReader(filePath));
+			BufferedReader reader = new BufferedReader(new FileReader(filePath.toString()));
 			String line = reader.readLine();
 			while (line != null) {
 				strList.add(line);
@@ -247,7 +237,7 @@ public static List<String> readFileToLineList(String filePath) {
 	public static void createFolder(String dirStr, Boolean deleteIfExist) {
 		File dir = new File(dirStr);
 		if (deleteIfExist && dir.exists()) {
-			deleteDirectory(dir.getAbsolutePath());
+			deleteDirectory(dir.toPath());
 			dir.mkdirs();
 		} else if (!dir.exists()) {
 			dir.mkdirs();
@@ -264,11 +254,11 @@ public static boolean deleteDirectory(File directoryToBeDeleted) {
 		return directoryToBeDeleted.delete();
 	}
 
-	public static List<File> findFilePathofSpecifcTypeRecusive(String tarDir, String extension) {
+	public static List<File> findFilePathofSpecifcTypeRecusive(Path tarDir, String extension) {
 
 		List<File> fileList = new ArrayList<File>();
 		try {
-			Files.walk(Paths.get(tarDir)).filter(Files::isRegularFile).forEach((f) -> {
+			Files.walk(tarDir).filter(Files::isRegularFile).forEach((f) -> {
 				String filepath = f.toString();
 				if (filepath.endsWith(extension))
 					// System.out.println(file + " found!");