From d53a0d0a584dc4f382f8f1dddd67c4e145c30ee2 Mon Sep 17 00:00:00 2001 From: huyx Date: Wed, 8 Jan 2025 15:32:23 +0800 Subject: [PATCH 1/2] codecheck Signed-off-by: huyx --- .../com/kh/scan/dialog/ApiScanDialogPane.java | 19 +++++++++---------- .../src/com/sk/gn/dialog/GenDialogPane.java | 9 +++------ .../src/com/sk/gn/utils/FileUtil.java | 4 ++-- .../dialog/ServiceGenerateDialogPane.java | 14 +++++++------- .../com/sk/ts/dialog/GenerateDialogPane.java | 13 +++++++------ .../src/com/sk/dialog/GenerateDialogPane.java | 14 +++++++------- 6 files changed, 35 insertions(+), 38 deletions(-) diff --git a/hdc/api/api_scan_IntelliJ_plugin/src/com/kh/scan/dialog/ApiScanDialogPane.java b/hdc/api/api_scan_IntelliJ_plugin/src/com/kh/scan/dialog/ApiScanDialogPane.java index 796f0323..91781d6b 100755 --- a/hdc/api/api_scan_IntelliJ_plugin/src/com/kh/scan/dialog/ApiScanDialogPane.java +++ b/hdc/api/api_scan_IntelliJ_plugin/src/com/kh/scan/dialog/ApiScanDialogPane.java @@ -270,7 +270,7 @@ public class ApiScanDialogPane extends JDialog { * @param bs 字节内容 * @throws IOException exception */ - private void writeTmpFile(String path, byte[] bs) throws IOException { + private void writeTmpFile(String path, byte[] bs) { File file = new File(path); if (!file.exists()) { boolean isNewFile = file.createNewFile(); @@ -278,9 +278,11 @@ public class ApiScanDialogPane extends JDialog { LOG.info("writeTmpFile createNewFile error"); } } - FileOutputStream fw = new FileOutputStream(file); - fw.write(bs, 0, bs.length); - fw.close(); + try (FileOutputStream fw = new FileOutputStream(file)) { + fw.write(bs, 0, bs.length); + } catch (IOException e) { + LOG.error(" write file error" + e); + } } /** @@ -364,9 +366,7 @@ public class ApiScanDialogPane extends JDialog { @Override public void run() { - try { - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = new BufferedReader(isr); + try (BufferedReader br = new BufferedReader(new InputStreamReader(is))){ String line; while ((line = br.readLine()) != null) { LOG.info(line); @@ -391,9 +391,8 @@ public class ApiScanDialogPane extends JDialog { @Override public void run() { - BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream())); - genResultLog(process); - try { + try (BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()))){ + genResultLog(process); while (br.readLine() != null) { LOG.info(" callExtProcess "); } diff --git a/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java b/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java index ddf1bd5c..d5d7a099 100755 --- a/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java +++ b/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java @@ -505,9 +505,7 @@ public class GenDialogPane extends JDialog implements SelectOutDirAction.SelectP @Override public void run() { - try { - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = new BufferedReader(isr); + try (BufferedReader br = new BufferedReader(new InputStreamReader(is))){ String line; while ((line = br.readLine()) != null) { LOG.error("StreamConsumer" + line); @@ -532,9 +530,8 @@ public class GenDialogPane extends JDialog implements SelectOutDirAction.SelectP @Override public void run() { - BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream())); - genResultLog(process); - try { + try (BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()))) { + genResultLog(process); while (br.readLine() != null) { LOG.info(" callExtProcess "); } diff --git a/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/FileUtil.java b/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/FileUtil.java index 8f771c19..f4fdd102 100755 --- a/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/FileUtil.java +++ b/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/FileUtil.java @@ -152,7 +152,8 @@ public class FileUtil { */ public static void writeTmpFile(String path, String oldPath, Project project) { File file = new File(path); - try (InputStream inputStream = FileUtil.class.getClassLoader().getResourceAsStream(oldPath)) { + try (InputStream inputStream = FileUtil.class.getClassLoader().getResourceAsStream(oldPath); + FileOutputStream fw = new FileOutputStream(file)) { if (inputStream == null) { throw new IOException("exec File InputStream is Null"); } @@ -162,7 +163,6 @@ public class FileUtil { if (!isNewFile) { LOG.info("writeTmpFile createNewFile error"); } - FileOutputStream fw = new FileOutputStream(file); fw.write(bs, 0, bs.length); fw.close(); } catch (IOException e) { diff --git a/hdc/service/service_IntelliJ_plugin/src/com/sk/service/dialog/ServiceGenerateDialogPane.java b/hdc/service/service_IntelliJ_plugin/src/com/sk/service/dialog/ServiceGenerateDialogPane.java index 39b0931c..f8f75c89 100755 --- a/hdc/service/service_IntelliJ_plugin/src/com/sk/service/dialog/ServiceGenerateDialogPane.java +++ b/hdc/service/service_IntelliJ_plugin/src/com/sk/service/dialog/ServiceGenerateDialogPane.java @@ -276,7 +276,7 @@ public class ServiceGenerateDialogPane extends JDialog { * @param bs 字节内容 * @throws IOException exception */ - private void writeTmpFile(String path, byte[] bs) throws IOException { + private void writeTmpFile(String path, byte[] bs){ File file = new File(path); if (!file.exists()) { boolean isNewFile = file.createNewFile(); @@ -284,9 +284,11 @@ public class ServiceGenerateDialogPane extends JDialog { LOG.info("writeTmpFile createNewFile error"); } } - FileOutputStream fw = new FileOutputStream(file); - fw.write(bs, 0, bs.length); - fw.close(); + try (FileOutputStream fw = new FileOutputStream(file)) { + fw.write(bs, 0, bs.length); + } catch (IOException e){ + LOG.error(" write file error" + e); + } } /** @@ -370,9 +372,7 @@ public class ServiceGenerateDialogPane extends JDialog { @Override public void run() { - try { - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = new BufferedReader(isr); + try (BufferedReader br = new BufferedReader(new InputStreamReader(is))){ String line; while ((line = br.readLine()) != null) { LOG.error("StreamConsumer" + line); diff --git a/hdc/ts/ts_IntelliJ_plugin/src/com/sk/ts/dialog/GenerateDialogPane.java b/hdc/ts/ts_IntelliJ_plugin/src/com/sk/ts/dialog/GenerateDialogPane.java index 676c9d67..ad1b9bfa 100644 --- a/hdc/ts/ts_IntelliJ_plugin/src/com/sk/ts/dialog/GenerateDialogPane.java +++ b/hdc/ts/ts_IntelliJ_plugin/src/com/sk/ts/dialog/GenerateDialogPane.java @@ -320,9 +320,11 @@ public class GenerateDialogPane extends JDialog { LOG.info("writeTmpFile createNewFile error"); } } - FileOutputStream fw = new FileOutputStream(file); - fw.write(bs, 0, bs.length); - fw.close(); + try (FileOutputStream fw = new FileOutputStream(file)) { + fw.write(bs, 0, bs.length); + } catch (IOException e) { + LOG.error(" write file error" + e); + } } /** @@ -406,9 +408,8 @@ public class GenerateDialogPane extends JDialog { @Override public void run() { - try { - InputStreamReader inputStreamReader = new InputStreamReader(is); - BufferedReader bufferedReader = new BufferedReader(inputStreamReader); + try (InputStreamReader inputStreamReader = new InputStreamReader(is); + BufferedReader bufferedReader = new BufferedReader(inputStreamReader)){ String readLine; while ((readLine = bufferedReader.readLine()) != null) { LOG.error("StreamConsumer" + readLine); diff --git a/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java b/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java index d3c781bf..4e59dffa 100644 --- a/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java +++ b/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java @@ -566,7 +566,7 @@ public class GenerateDialogPane extends JDialog { * @param bs 字节内容 * @throws IOException exception */ - private void writeTmpFile(String path, byte[] bs) throws IOException { + private void writeTmpFile(String path, byte[] bs) { File file = new File(path); if (!file.exists()) { boolean isNewFile = file.createNewFile(); @@ -574,9 +574,11 @@ public class GenerateDialogPane extends JDialog { LOG.info("writeTmpFile createNewFile error"); } } - FileOutputStream fw = new FileOutputStream(file); - fw.write(bs, 0, bs.length); - fw.close(); + try (FileOutputStream fw = new FileOutputStream(file)) { + fw.write(bs, 0, bs.length); + } catch (IOException e) { + LOG.error(" write file error" + e); + } } /** @@ -660,9 +662,7 @@ public class GenerateDialogPane extends JDialog { @Override public void run() { - try { - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = new BufferedReader(isr); + try (BufferedReader br = new BufferedReader(new InputStreamReader(is))){ String line; while ((line = br.readLine()) != null) { LOG.error("StreamConsumer" + line); -- Gitee From 0dce2fbc7fe7c677409911a52bfc9a10d8ace4c6 Mon Sep 17 00:00:00 2001 From: huyx Date: Wed, 8 Jan 2025 17:47:45 +0800 Subject: [PATCH 2/2] codecheck Signed-off-by: huyx --- .../src/com/kh/scan/dialog/ApiScanDialogPane.java | 4 ++-- .../src/com/sk/gn/dialog/GenDialogPane.java | 2 +- .../com/sk/service/dialog/ServiceGenerateDialogPane.java | 6 +++--- .../src/com/sk/ts/dialog/GenerateDialogPane.java | 2 +- .../src/com/sk/dialog/GenerateDialogPane.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hdc/api/api_scan_IntelliJ_plugin/src/com/kh/scan/dialog/ApiScanDialogPane.java b/hdc/api/api_scan_IntelliJ_plugin/src/com/kh/scan/dialog/ApiScanDialogPane.java index 91781d6b..c034d104 100755 --- a/hdc/api/api_scan_IntelliJ_plugin/src/com/kh/scan/dialog/ApiScanDialogPane.java +++ b/hdc/api/api_scan_IntelliJ_plugin/src/com/kh/scan/dialog/ApiScanDialogPane.java @@ -366,7 +366,7 @@ public class ApiScanDialogPane extends JDialog { @Override public void run() { - try (BufferedReader br = new BufferedReader(new InputStreamReader(is))){ + try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) { String line; while ((line = br.readLine()) != null) { LOG.info(line); @@ -391,7 +391,7 @@ public class ApiScanDialogPane extends JDialog { @Override public void run() { - try (BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()))){ + try (BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()))) { genResultLog(process); while (br.readLine() != null) { LOG.info(" callExtProcess "); diff --git a/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java b/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java index d5d7a099..a6d66e46 100755 --- a/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java +++ b/hdc/gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java @@ -505,7 +505,7 @@ public class GenDialogPane extends JDialog implements SelectOutDirAction.SelectP @Override public void run() { - try (BufferedReader br = new BufferedReader(new InputStreamReader(is))){ + try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) { String line; while ((line = br.readLine()) != null) { LOG.error("StreamConsumer" + line); diff --git a/hdc/service/service_IntelliJ_plugin/src/com/sk/service/dialog/ServiceGenerateDialogPane.java b/hdc/service/service_IntelliJ_plugin/src/com/sk/service/dialog/ServiceGenerateDialogPane.java index f8f75c89..7ca3496a 100755 --- a/hdc/service/service_IntelliJ_plugin/src/com/sk/service/dialog/ServiceGenerateDialogPane.java +++ b/hdc/service/service_IntelliJ_plugin/src/com/sk/service/dialog/ServiceGenerateDialogPane.java @@ -276,7 +276,7 @@ public class ServiceGenerateDialogPane extends JDialog { * @param bs 字节内容 * @throws IOException exception */ - private void writeTmpFile(String path, byte[] bs){ + private void writeTmpFile(String path, byte[] bs) { File file = new File(path); if (!file.exists()) { boolean isNewFile = file.createNewFile(); @@ -286,7 +286,7 @@ public class ServiceGenerateDialogPane extends JDialog { } try (FileOutputStream fw = new FileOutputStream(file)) { fw.write(bs, 0, bs.length); - } catch (IOException e){ + } catch (IOException e) { LOG.error(" write file error" + e); } } @@ -372,7 +372,7 @@ public class ServiceGenerateDialogPane extends JDialog { @Override public void run() { - try (BufferedReader br = new BufferedReader(new InputStreamReader(is))){ + try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) { String line; while ((line = br.readLine()) != null) { LOG.error("StreamConsumer" + line); diff --git a/hdc/ts/ts_IntelliJ_plugin/src/com/sk/ts/dialog/GenerateDialogPane.java b/hdc/ts/ts_IntelliJ_plugin/src/com/sk/ts/dialog/GenerateDialogPane.java index ad1b9bfa..4480935d 100644 --- a/hdc/ts/ts_IntelliJ_plugin/src/com/sk/ts/dialog/GenerateDialogPane.java +++ b/hdc/ts/ts_IntelliJ_plugin/src/com/sk/ts/dialog/GenerateDialogPane.java @@ -409,7 +409,7 @@ public class GenerateDialogPane extends JDialog { @Override public void run() { try (InputStreamReader inputStreamReader = new InputStreamReader(is); - BufferedReader bufferedReader = new BufferedReader(inputStreamReader)){ + BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) { String readLine; while ((readLine = bufferedReader.readLine()) != null) { LOG.error("StreamConsumer" + readLine); diff --git a/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java b/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java index 4e59dffa..b4183a4c 100644 --- a/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java +++ b/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java @@ -662,7 +662,7 @@ public class GenerateDialogPane extends JDialog { @Override public void run() { - try (BufferedReader br = new BufferedReader(new InputStreamReader(is))){ + try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) { String line; while ((line = br.readLine()) != null) { LOG.error("StreamConsumer" + line); -- Gitee