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

Author: maxxbw

lib/utils/DiffUtil.java

@@ -53,12 +53,10 @@ public static int getChangedLineCount(String diffStr, String mode) {
 		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("+")) {
@@ -73,7 +71,6 @@ public static List<Integer> getChangedLineNumListInNewVersion(String diffFilePat
 			}
 		} catch (Exception e) {
 			// TODO: handle exception
-			System.out.println(diffFilePath);
 			e.printStackTrace();
 		}
 		return changedLineNumList;

lib/utils/FileUtil.java

@@ -155,20 +155,20 @@ 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 copyDirectory(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) {
@@ -263,7 +263,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();
@@ -280,11 +280,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!");

lib/utils/GitUtil.java

@@ -14,7 +14,7 @@ public static Boolean clone(String repoName, String usrName, Path targetDir) {
 		}
 		targetDir.toFile().mkdirs();
 
-		String cmd = "timeout 300 git clone https://github.com/" + repoName + "/" + usrName + " " + targetDir;
+		String cmd = "timeout 600 git clone https://github.com/" + repoName + "/" + usrName + " " + targetDir;
 
 		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, targetDir, 0);
 		if (pr.exitCode == 0) {
@@ -166,13 +166,18 @@ public static Boolean checkout(Path repoDir, String com, Boolean ifForce) {
 		ProcessUtil.ProcessReporter pr = new ProcessUtil.ProcessReporter();
 
 		if (ifForce) {
-			String resetCMD = "timeout 300 git reset --hard";
+			String resetCMD = "timeout 600 git reset --hard";
 			pr = ProcessUtil.executeCMD(resetCMD, null, repoDir, 0);
 		}
 
+		String defaultBranchNameString = getDefaultBranch(repoDir);
+		if (defaultBranchNameString == null || defaultBranchNameString == "") {
+			defaultBranchNameString = "master";
+		}
+
 		String checkoutCMD = null;
 		if (com == null) { // checkout latest if null
-			checkoutCMD = "timeout 300 git checkout master";
+			checkoutCMD = "timeout 300 git checkout " + defaultBranchNameString;
 		} else {
 			checkoutCMD = "timeout 300 git checkout " + com;
 		}
@@ -207,4 +212,13 @@ public static Boolean checkout(Path repoDir, String com, Boolean ifForce) {
 		}
 	}
 
+	private static String getDefaultBranch(Path gitDirPath) {
+		// TODO Auto-generated method stub
+		String cmdString = "git symbolic-ref refs/remotes/origin/HEAD";
+		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmdString, null, gitDirPath, 0);
+		// output refs/remotes/origin/master
+		return pr.out.trim().split("refs/remotes/origin/")[1].trim();
+
+	}
+
 }

lib/utils/SRCUtil.java

@@ -21,6 +21,25 @@ public static void changePackage(String oriSRCPath, String dstSRCPath, String ne
 		FileUtil.writeStringToFile(dstSRCPath, wrtStr);
 
 	}
+	
+	
+	public static void changePackage(String srcPath, String newPackName) {
+		List<String> srcStrList = FileUtil.readFileToLineList(srcPath);
+
+		Boolean ifchanged = false;
+		String wrtStr = "";
+		for (int i = 0; i < srcStrList.size(); i++) {
+			String line = srcStrList.get(i);
+			if (line.trim().startsWith("package ") && !ifchanged) {
+				line = "package " + newPackName + ";";
+				ifchanged = true;
+			}
+			wrtStr += (line + "\n");
+		}
+
+		FileUtil.writeStringToFile(srcPath, wrtStr);
+
+	}
 
 	public static void main(String[] args) {
 		/*