test/arthas
1
0
Fork 0
mirror of https://gitee.com/arthas/arthas.git synced 2024-12-01 19:58:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactored code to adopt JDK 8 style and features. (#2759)

Browse Source
This commit is contained in:
dkbmtb 2023-12-25 13:24:15 +08:00 committed by GitHub
parent 343ac12498
commit eb9596f06a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/taobao/arthas/common/JavaVersionUtils.java
View File

@ -28,19 +28,19 @@ public class JavaVersionUtils {
} }
public static boolean isJava6() { public static boolean isJava6() {
return JAVA_VERSION_STR.equals("1.6"); return "1.6".equals(JAVA_VERSION_STR);
} }
public static boolean isJava7() { public static boolean isJava7() {
return JAVA_VERSION_STR.equals("1.7"); return "1.7".equals(JAVA_VERSION_STR);
} }
public static boolean isJava8() { public static boolean isJava8() {
return JAVA_VERSION_STR.equals("1.8"); return "1.8".equals(JAVA_VERSION_STR);
} }
public static boolean isJava9() { public static boolean isJava9() {
return JAVA_VERSION_STR.equals("9"); return "9".equals(JAVA_VERSION_STR);
} }
public static boolean isLessThanJava9() { public static boolean isLessThanJava9() {

53
core/src/main/java/com/taobao/arthas/core/util/FileUtils.java
View File

@ -42,20 +42,10 @@ public class FileUtils {
* @since IO 2.1 * @since IO 2.1
*/ */
public static void writeByteArrayToFile(File file, byte[] data, boolean append) throws IOException { public static void writeByteArrayToFile(File file, byte[] data, boolean append) throws IOException {
OutputStream out = null; try (OutputStream out = openOutputStream(file, append)) {
try {
out = openOutputStream(file, append);
out.write(data); out.write(data);
out.close(); // don't swallow close Exception if copy completes normally
} finally {
try {
if (out != null) {
out.close();
}
} catch (IOException ioe) {
// ignore
}
} }
// ignore
} }
/** /**
@ -111,10 +101,8 @@ public class FileUtils {
* @param file the file to save the history * @param file the file to save the history
*/ */
public static void saveCommandHistory(List<int[]> history, File file) { public static void saveCommandHistory(List<int[]> history, File file) {
OutputStream out = null; try (OutputStream out = new BufferedOutputStream(openOutputStream(file, false))) {
try { for (int[] command : history) {
out = new BufferedOutputStream(openOutputStream(file, false));
for (int[] command: history) {
String commandStr = Helper.fromCodePoints(command); String commandStr = Helper.fromCodePoints(command);
if (isAuthCommand(commandStr)) { if (isAuthCommand(commandStr)) {
command = AUTH_CODEPOINTS; command = AUTH_CODEPOINTS;
@ -127,20 +115,13 @@ public class FileUtils {
} }
} catch (IOException e) { } catch (IOException e) {
// ignore // ignore
} finally {
try {
if (out != null) {
out.close();
}
} catch (IOException ioe) {
// ignore
}
} }
// ignore
} }
public static List<int[]> loadCommandHistory(File file) { public static List<int[]> loadCommandHistory(File file) {
BufferedReader br = null; BufferedReader br = null;
List<int[]> history = new ArrayList<int[]>(); List<int[]> history = new ArrayList<>();
try { try {
br = new BufferedReader(new InputStreamReader(new FileInputStream(file))); br = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
String line; String line;
@ -167,10 +148,8 @@ public class FileUtils {
* @param file the file to save the history * @param file the file to save the history
*/ */
public static void saveCommandHistoryString(List<String> history, File file) { public static void saveCommandHistoryString(List<String> history, File file) {
OutputStream out = null; try (OutputStream out = new BufferedOutputStream(openOutputStream(file, false))) {
try { for (String command : history) {
out = new BufferedOutputStream(openOutputStream(file, false));
for (String command: history) {
if (!StringUtils.isBlank(command)) { if (!StringUtils.isBlank(command)) {
if (isAuthCommand(command)) { if (isAuthCommand(command)) {
command = ArthasConstants.AUTH; command = ArthasConstants.AUTH;
@ -181,20 +160,13 @@ public class FileUtils {
} }
} catch (IOException e) { } catch (IOException e) {
// ignore // ignore
} finally {
try {
if (out != null) {
out.close();
}
} catch (IOException ioe) {
// ignore
}
} }
// ignore
} }
public static List<String> loadCommandHistoryString(File file) { public static List<String> loadCommandHistoryString(File file) {
BufferedReader br = null; BufferedReader br = null;
List<String> history = new ArrayList<String>(); List<String> history = new ArrayList<>();
try { try {
br = new BufferedReader(new InputStreamReader(new FileInputStream(file), "utf-8")); br = new BufferedReader(new InputStreamReader(new FileInputStream(file), "utf-8"));
String line; String line;
@ -218,8 +190,7 @@ public class FileUtils {
} }
public static String readFileToString(File file, Charset encoding) throws IOException { public static String readFileToString(File file, Charset encoding) throws IOException {
FileInputStream stream = new FileInputStream(file); try (FileInputStream stream = new FileInputStream(file)) {
try {
Reader reader = new BufferedReader(new InputStreamReader(stream, encoding)); Reader reader = new BufferedReader(new InputStreamReader(stream, encoding));
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
char[] buffer = new char[8192]; char[] buffer = new char[8192];
@ -228,8 +199,6 @@ public class FileUtils {
builder.append(buffer, 0, read); builder.append(buffer, 0, read);
} }
return builder.toString(); return builder.toString();
} finally {
stream.close();
} }
} }