Remove try with resources.

Author: nicolasstucki

src/com/google/javascript/jscomp/AbstractCommandLineRunner.java

@@ -573,13 +573,16 @@ public FlagUsageException(String message) {
 
   public List<JsonFileSpec> parseJsonFilesFromInputStream() throws IOException {
     List<JsonFileSpec> jsonFiles = new ArrayList<JsonFileSpec>();
-    try (JsonReader reader = new JsonReader(new InputStreamReader(this.in, inputCharset))) {
+    JsonReader reader = new JsonReader(new InputStreamReader(this.in, inputCharset));
+    try {
       reader.beginArray();
       while (reader.hasNext()) {
         JsonFileSpec jsonFile = gson.fromJson(reader, JsonFileSpec.class);
         jsonFiles.add(jsonFile);
       }
       reader.endArray();
+    } finally {
+      reader.close();
     }
     return jsonFiles;
   }
@@ -1216,8 +1219,11 @@ int processResults(Result result, List<JSModule> modules, B options) throws IOEx
 
       // Output the externs if required.
       if (options.externExportsPath != null) {
-        try (Writer eeOut = openExternExportsStream(options, config.jsOutputFile)) {
+        Writer eeOut = openExternExportsStream(options, config.jsOutputFile);
+        try {
           eeOut.append(result.externExport);
+        } finally {
+          eeOut.close();
         }
       }
 
@@ -1289,8 +1295,9 @@ JsonFileSpec createJsonFile(B options, String outputMarker,
   }
 
   void outputJsonStream() throws IOException {
-    try (JsonWriter jsonWriter =
-            new JsonWriter(new BufferedWriter(new OutputStreamWriter(defaultJsOutput, "UTF-8")))) {
+    JsonWriter jsonWriter =
+        new JsonWriter(new BufferedWriter(new OutputStreamWriter(defaultJsOutput, "UTF-8")));
+    try {
       jsonWriter.beginArray();
       for (JsonFileSpec jsonFile : this.filesToStreamOut) {
         jsonWriter.beginObject();
@@ -1302,6 +1309,8 @@ void outputJsonStream() throws IOException {
         jsonWriter.endObject();
       }
       jsonWriter.endArray();
+    } finally {
+      jsonWriter.close();
     }
   }
 
@@ -1335,14 +1344,17 @@ private DiagnosticType outputModuleBinaryAndSourceMaps(List<JSModule> modules, B
         }
 
         String moduleFilename = getModuleOutputFileName(m);
-        try (Writer writer = fileNameToLegacyOutputWriter(moduleFilename)) {
+        Writer writer = fileNameToLegacyOutputWriter(moduleFilename);
+        try {
           if (options.sourceMapOutputPath != null) {
             compiler.getSourceMap().reset();
           }
           writeModuleOutput(writer, m);
           if (options.sourceMapOutputPath != null) {
             compiler.getSourceMap().appendTo(mapFileOut, moduleFilename);
           }
+        } finally {
+          writer.close();
         }
 
         if (shouldGenerateMapPerModule(options) && mapFileOut != null) {
@@ -1595,8 +1607,11 @@ private void outputSourceMap(B options, String associatedName)
 
     String outName = expandSourceMapPath(options, null);
     maybeCreateDirsForPath(outName);
-    try (Writer out = fileNameToOutputWriter2(outName)) {
+    Writer out = fileNameToOutputWriter2(outName);
+    try {
       compiler.getSourceMap().appendTo(out, associatedName);
+    } finally {
+      out.close();
     }
   }
 
@@ -1689,10 +1704,13 @@ private void outputNameMaps() throws IOException {
 
     if (functionInformationMapOutputPath != null
         && compiler.getFunctionalInformationMap() != null) {
-      try (final OutputStream file = filenameToOutputStream(functionInformationMapOutputPath)) {
+      final OutputStream file = filenameToOutputStream(functionInformationMapOutputPath);
+      try {
         CodedOutputStream outputStream = CodedOutputStream.newInstance(file);
         compiler.getFunctionalInformationMap().writeTo(outputStream);
         outputStream.flush();
+      } finally {
+        file.close();
       }
     }
   }
@@ -1803,17 +1821,21 @@ private void outputManifestOrBundle(List<String> outputFiles,
         JSModuleGraph graph = compiler.getDegenerateModuleGraph();
         Iterable<JSModule> modules = graph.getAllModules();
         for (JSModule module : modules) {
-          try (Writer out = fileNameToOutputWriter2(expandCommandLinePath(output, module))) {
+          Writer out = fileNameToOutputWriter2(expandCommandLinePath(output, module));
+          try {
             if (isManifest) {
               printManifestTo(module.getInputs(), out);
             } else {
               printBundleTo(module.getInputs(), out);
             }
+          } finally {
+            out.close();
           }
         }
       } else {
         // Generate a single file manifest or bundle.
-        try (Writer out = fileNameToOutputWriter2(expandCommandLinePath(output, null))) {
+        Writer out = fileNameToOutputWriter2(expandCommandLinePath(output, null));
+        try {
           if (config.module.isEmpty()) {
             if (isManifest) {
               printManifestTo(compiler.getInputsInOrder(), out);
@@ -1824,6 +1846,8 @@ private void outputManifestOrBundle(List<String> outputFiles,
             printModuleGraphManifestOrBundleTo(
                 compiler.getDegenerateModuleGraph(), out, isManifest);
           }
+        } finally {
+          out.close();
         }
       }
     }
@@ -1835,8 +1859,11 @@ private void outputManifestOrBundle(List<String> outputFiles,
   private void outputModuleGraphJson() throws IOException {
     if (config.outputModuleDependencies != null &&
         config.outputModuleDependencies.length() != 0) {
-      try (Writer out = fileNameToOutputWriter2(config.outputModuleDependencies)) {
+      Writer out = fileNameToOutputWriter2(config.outputModuleDependencies);
+      try {
         printModuleGraphJsonTo(out);
+      } finally {
+        out.close();
       }
     }
   }

src/com/google/javascript/jscomp/CommandLineRunner.java

@@ -1566,8 +1566,9 @@ protected CompilerOptions createOptions() {
     if (!flags.instrumentationFile.isEmpty()) {
       String instrumentationPb;
       Instrumentation.Builder builder = Instrumentation.newBuilder();
-      try (BufferedReader br =
-          new BufferedReader(Files.newReader(new File(flags.instrumentationFile), UTF_8))) {
+      BufferedReader br = null;
+      try {
+        br = new BufferedReader(Files.newReader(new File(flags.instrumentationFile), UTF_8));
         StringBuilder sb = new StringBuilder();
         String line = br.readLine();
 
@@ -1584,6 +1585,12 @@ protected CompilerOptions createOptions() {
 
       } catch (IOException e) {
         throw new RuntimeException("Error reading instrumentation template", e);
+      } finally {
+        try {
+          if (br != null) br.close();
+        } catch (IOException e) {
+          throw new RuntimeException("Error reading instrumentation template", e);
+        }
       }
     }
 

src/com/google/javascript/jscomp/SourceFile.java

@@ -352,7 +352,8 @@ public static List<SourceFile> fromZipFile(String zipName, Charset inputCharset)
     final String absoluteZipPath = new File(zipName).getAbsolutePath();
     List<SourceFile> sourceFiles = new ArrayList<SourceFile>();
 
-    try (ZipFile zipFile = new ZipFile(absoluteZipPath)) {
+    ZipFile zipFile = new ZipFile(absoluteZipPath);
+    try {
       Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
 
       while (zipEntries.hasMoreElements()) {
@@ -368,6 +369,8 @@ public static List<SourceFile> fromZipFile(String zipName, Charset inputCharset)
                 .withOriginalPath(zipName + "!/" + zipEntry.getName())
                 .buildFromUrl(zipEntryUrl));
       }
+    } finally {
+      zipFile.close();
     }
     return sourceFiles;
   }

src/com/google/javascript/jscomp/WhitelistWarningsGuard.java

@@ -242,8 +242,11 @@ public void report(CheckLevel level, JSError error) {
      * can read back later.
      */
     public void writeWhitelist(File out) throws IOException {
-      try (PrintStream stream = new PrintStream(out)) {
+      PrintStream stream = new PrintStream(out);
+      try {
         appendWhitelist(stream);
+      } finally {
+        stream.close();
       }
     }
 

test/com/google/javascript/jscomp/CommandLineRunnerTest.java

@@ -2087,11 +2087,14 @@ private static FlagEntry<JsSourceType> createZipFile(Map<String, String> entryCo
     File tempZipFile = File.createTempFile("testdata", ".js.zip",
         java.nio.file.Files.createTempDirectory("jscomp").toFile());
 
-    try (ZipOutputStream zipOutputStream = new ZipOutputStream(new FileOutputStream(tempZipFile))) {
+    ZipOutputStream zipOutputStream = new ZipOutputStream(new FileOutputStream(tempZipFile));
+    try {
       for (Entry<String, String> entry : entryContentsByName.entrySet()) {
         zipOutputStream.putNextEntry(new ZipEntry(entry.getKey()));
         zipOutputStream.write(entry.getValue().getBytes(java.nio.charset.StandardCharsets.UTF_8));
       }
+    } finally {
+      zipOutputStream.close();
     }
 
     return new FlagEntry<JsSourceType>(JsSourceType.JS_ZIP, tempZipFile.getAbsolutePath());
@@ -2101,8 +2104,11 @@ private FlagEntry<JsSourceType> createJsFile(String filename, String fileContent
       throws IOException {
     File tempJsFile = File.createTempFile(filename, ".js",
         java.nio.file.Files.createTempDirectory("jscomp").toFile());
-    try (FileOutputStream fileOutputStream = new FileOutputStream(tempJsFile)) {
+    FileOutputStream fileOutputStream = new FileOutputStream(tempJsFile);
+    try {
       fileOutputStream.write(fileContent.getBytes(java.nio.charset.StandardCharsets.UTF_8));
+    } finally {
+      fileOutputStream.close();
     }
 
     return new FlagEntry<JsSourceType>(JsSourceType.JS, tempJsFile.getAbsolutePath());