add try-with-resources statement to unclosed streams (#10641)

OpenAPITools · Oct 21, 2021 · 108e8e5 · 108e8e5
1 parent 0a003c3
commit 108e8e5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java
@@ -136,8 +136,9 @@ public void execute() {
                     parentFolder.mkdirs();
                 }
 
-                try (Writer writer = new BufferedWriter(
-                        new OutputStreamWriter(new FileOutputStream(out), StandardCharsets.UTF_8))) {
+                try (FileOutputStream fileOutputStream = new FileOutputStream(out);
+                     OutputStreamWriter outputStreamWriter = new OutputStreamWriter(fileOutputStream, StandardCharsets.UTF_8);
+                     Writer writer = new BufferedWriter(outputStreamWriter)) {
                     writer.write(sb.toString());
                 }
             } else {

diff --git a/...enapi-generator-online/src/main/java/org/openapitools/codegen/online/service/ZipUtil.java b/...enapi-generator-online/src/main/java/org/openapitools/codegen/online/service/ZipUtil.java
@@ -51,7 +51,8 @@ public class ZipUtil {
     public void compressFiles(List<File> listFiles, String destZipFile)
             throws IOException {
 
-        try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(destZipFile))) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(destZipFile);
+             ZipOutputStream zos = new ZipOutputStream(fileOutputStream)) {
 
             for (File file : listFiles) {
                 if (file.isDirectory()) {
@@ -84,7 +85,8 @@ private void addFolderToZip(File folder, String parentFolder, ZipOutputStream zo
 
             zos.putNextEntry(new ZipEntry(parentFolder + "/" + file.getName()));
 
-            try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file))) {
+            try (FileInputStream fileInputStream = new FileInputStream(file);
+                 BufferedInputStream bis = new BufferedInputStream(fileInputStream)) {
                 byte[] bytesIn = new byte[BUFFER_SIZE];
                 int read;
                 while ((read = bis.read(bytesIn)) != -1) {
@@ -109,7 +111,8 @@ private static void addFileToZip(File file, ZipOutputStream zos) throws FileNotF
             IOException {
         zos.putNextEntry(new ZipEntry(file.getName()));
 
-        try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file))) {
+        try (FileInputStream fileInputStream = new FileInputStream(file);
+             BufferedInputStream bis = new BufferedInputStream(fileInputStream)) {
             byte[] bytesIn = new byte[BUFFER_SIZE];
             int read;
             while ((read = bis.read(bytesIn)) != -1) {

diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java b/...enapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java
@@ -23,7 +23,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.*;
 
@@ -105,7 +105,9 @@ private void loadFromFile(File targetIgnoreFile) {
     }
 
     void loadCodegenRules(final File codegenIgnore) throws IOException {
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(codegenIgnore), Charset.forName("UTF-8")))) {
+        try (FileInputStream fileInputStream = new FileInputStream(codegenIgnore);
+             InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, StandardCharsets.UTF_8);
+             BufferedReader reader = new BufferedReader(inputStreamReader)) {
             String line;
 
             // NOTE: Comments that start with a : (e.g. //:) are pulled from git documentation for .gitignore

diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
@@ -243,7 +243,8 @@ public void postProcessFile(File file, String fileType) {
                 Process p = Runtime.getRuntime().exec(command);
                 int exitValue = p.waitFor();
                 if (exitValue != 0) {
-                    try(BufferedReader br = new BufferedReader(new InputStreamReader(p.getErrorStream(), StandardCharsets.UTF_8))) {
+                    try (InputStreamReader inputStreamReader = new InputStreamReader(p.getErrorStream(), StandardCharsets.UTF_8);
+                         BufferedReader br = new BufferedReader(inputStreamReader)) {
                         StringBuilder sb = new StringBuilder();
                         String line;
                         while ((line = br.readLine()) != null) {

diff --git a/...napi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java b/...napi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java
@@ -875,13 +875,15 @@ public void postProcessFile(File file, String fileType) {
                 Process p = Runtime.getRuntime().exec(command);
                 int exitValue = p.waitFor();
                 if (exitValue != 0) {
-                    BufferedReader br = new BufferedReader(new InputStreamReader(p.getErrorStream(), StandardCharsets.UTF_8));
-                    StringBuilder sb = new StringBuilder();
-                    String line;
-                    while ((line = br.readLine()) != null) {
-                        sb.append(line);
+                    try (InputStreamReader inputStreamReader = new InputStreamReader(p.getErrorStream(), StandardCharsets.UTF_8);
+                         BufferedReader br = new BufferedReader(inputStreamReader)) {
+                        StringBuilder sb = new StringBuilder();
+                        String line;
+                        while ((line = br.readLine()) != null) {
+                            sb.append(line);
+                        }
+                        LOGGER.error("Error running the command ({}). Exit value: {}, Error output: {}", command, exitValue, sb.toString());
                     }
-                    LOGGER.error("Error running the command ({}). Exit value: {}, Error output: {}", command, exitValue, sb.toString());
                 } else {
                     LOGGER.info("Successfully executed: {}", command);
                 }