Consistently call IOException.getMessage when reporting IO related er…

…rors. Also make sure Zip exceptions are handled explicitly for better error message. PiperOrigin-RevId: 733472483
google · Mar 4, 2025 · 0c8bae6 · 0c8bae6
1 parent cc038b8
commit 0c8bae6
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 20 deletions.
diff --git a/tools/java/com/google/j2cl/tools/gwtincompatible/GwtIncompatibleStripper.java b/tools/java/com/google/j2cl/tools/gwtincompatible/GwtIncompatibleStripper.java
@@ -70,7 +70,7 @@ private static void preprocessFiles(
         String fileContent = MoreFiles.asCharSource(Paths.get(fileInfo.sourcePath()), UTF_8).read();
         processedFileContent = strip(fileContent, annotationNames);
       } catch (IOException e) {
-        problems.fatal(FatalError.CANNOT_OPEN_FILE, e.toString());
+        problems.fatal(FatalError.CANNOT_OPEN_FILE, e.getMessage());
         return;
       }
 

diff --git a/tools/java/com/google/j2cl/tools/rta/BazelJ2clRta.java b/tools/java/com/google/j2cl/tools/rta/BazelJ2clRta.java
@@ -92,15 +92,15 @@ private static void writeToFile(String filePath, List<String> lines, Problems pr
     try {
       outputSink.writeLines(lines);
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.getMessage());
     }
   }
 
   private static void writeToFile(String filePath, CodeRemovalInfo results, Problems problems) {
     try (OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(filePath))) {
       results.writeTo(outputStream);
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.getMessage());
     }
   }
 

diff --git a/transpiler/java/com/google/j2cl/common/OutputUtils.java b/transpiler/java/com/google/j2cl/common/OutputUtils.java
@@ -70,7 +70,7 @@ private void writeToFile(Path outputPath, byte[] content) {
         Files.write(outputPath, content);
         onFileCreation(outputPath);
       } catch (IOException e) {
-        problems.fatal(FatalError.CANNOT_WRITE_FILE, e.toString());
+        problems.fatal(FatalError.CANNOT_WRITE_FILE, e.getMessage());
       }
     }
 
@@ -84,7 +84,7 @@ private void writeToFile(Path outputPath, ImmutableList<String> chunks) {
         }
         onFileCreation(outputPath);
       } catch (IOException e) {
-        problems.fatal(FatalError.CANNOT_WRITE_FILE, e.toString());
+        problems.fatal(FatalError.CANNOT_WRITE_FILE, e.getMessage());
       }
     }
 
@@ -101,7 +101,7 @@ private void copyToFile(Path from, Path to) {
             from, to, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
         onFileCreation(to);
       } catch (IOException e) {
-        problems.fatal(FatalError.CANNOT_COPY_FILE, e.toString());
+        problems.fatal(FatalError.CANNOT_COPY_FILE, e.getMessage());
       }
     }
 
@@ -202,7 +202,7 @@ public static void writeToFile(Path outputPath, byte[] content, Problems problem
       Files.createDirectories(outputPath.getParent());
       Files.write(outputPath, content);
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.getMessage());
     }
   }
 

diff --git a/transpiler/java/com/google/j2cl/common/Problems.java b/transpiler/java/com/google/j2cl/common/Problems.java
@@ -42,7 +42,7 @@ public enum FatalError {
     FILE_NOT_FOUND("File '%s' not found.", 1),
     UNKNOWN_INPUT_TYPE("Cannot recognize input type for file '%s'.", 1),
     OUTPUT_LOCATION("Output location '%s' must be a directory or .zip file.", 1),
-    CANNOT_EXTRACT_ZIP("Cannot extract zip '%s'.", 1),
+    CANNOT_EXTRACT_ZIP("Cannot extract zip '%s': %s.", 2),
     CANNOT_CREATE_ZIP("Cannot create zip '%s': %s.", 2),
     CANNOT_CLOSE_ZIP("Cannot close zip: %s.", 1),
     CANNOT_CREATE_TEMP_DIR("Cannot create temporary directory: %s.", 1),

diff --git a/transpiler/java/com/google/j2cl/common/SourceUtils.java b/transpiler/java/com/google/j2cl/common/SourceUtils.java
@@ -26,6 +26,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
+import java.util.zip.ZipException;
 import javax.annotation.Nullable;
 
 /** Utilities for tools to process source files. */
@@ -103,8 +104,11 @@ private static ImmutableList<FileInfo> extractZip(
       String zipPath, Path sourcesDir, Problems problems) {
     try {
       return ZipFiles.unzipFile(new File(zipPath), sourcesDir.toFile(), problems);
+    } catch (ZipException e) {
+      problems.fatal(FatalError.CANNOT_EXTRACT_ZIP, zipPath, e.getMessage());
+      return null;
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_EXTRACT_ZIP, zipPath);
+      problems.fatal(FatalError.CANNOT_OPEN_FILE, e.getMessage());
       return null;
     }
   }

diff --git a/transpiler/java/com/google/j2cl/transpiler/BazelJ2wasmBundler.java b/transpiler/java/com/google/j2cl/transpiler/BazelJ2wasmBundler.java
@@ -590,7 +590,7 @@ private static void writeToFile(String filePath, List<String> contents, Problems
     try {
       Files.asCharSink(new File(filePath), UTF_8).writeLines(contents);
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.getMessage());
     }
   }
 

diff --git a/transpiler/java/com/google/j2cl/transpiler/BazelJ2wasmExportsGenerator.java b/transpiler/java/com/google/j2cl/transpiler/BazelJ2wasmExportsGenerator.java
@@ -117,7 +117,7 @@ private List<String> getBinaryNamesOfClassesWithExports(
       try {
         classPathUrls.add(new File(classPathEntry).toURI().toURL());
       } catch (MalformedURLException e) {
-        problems.fatal(FatalError.CANNOT_OPEN_FILE, e.toString());
+        problems.fatal(FatalError.CANNOT_OPEN_FILE, e.getMessage());
       }
     }
 

diff --git a/transpiler/java/com/google/j2cl/transpiler/backend/closure/NativeJavaScriptFileResolver.java b/transpiler/java/com/google/j2cl/transpiler/backend/closure/NativeJavaScriptFileResolver.java
@@ -60,7 +60,7 @@ public static NativeJavaScriptFileResolver create(List<FileInfo> files, Problems
           byFullyQualifiedName.put(nativeFile.getFullyQualifiedName(), nativeFile);
         }
       } catch (IOException e) {
-        problems.fatal(FatalError.CANNOT_OPEN_FILE, e.toString());
+        problems.fatal(FatalError.CANNOT_OPEN_FILE, e.getMessage());
       }
     }
 

diff --git a/transpiler/java/com/google/j2cl/transpiler/backend/closure/OutputGeneratorStage.java b/transpiler/java/com/google/j2cl/transpiler/backend/closure/OutputGeneratorStage.java
@@ -215,7 +215,7 @@ private String renderSourceMap(
       return SourceMapGeneratorStage.generateSourceMaps(
           type, javaSourcePositionByOutputSourcePosition);
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.getMessage());
       return null;
     }
   }

diff --git a/transpiler/java/com/google/j2cl/transpiler/backend/closure/ReadableSourceMapGenerator.java b/transpiler/java/com/google/j2cl/transpiler/backend/closure/ReadableSourceMapGenerator.java
@@ -91,7 +91,7 @@ private static ImmutableMap<String, List<String>> buildSourceLinesByFileName(
           new File(j2clUnitFilePath).getName(),
           java.nio.file.Files.readAllLines(Paths.get(j2clUnitFilePath)));
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_OPEN_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_OPEN_FILE, e.getMessage());
     }
     return contentsByFileNameBuilder.build();
   }

diff --git a/transpiler/java/com/google/j2cl/transpiler/backend/libraryinfo/LibraryInfoBuilder.java b/transpiler/java/com/google/j2cl/transpiler/backend/libraryinfo/LibraryInfoBuilder.java
@@ -360,7 +360,7 @@ public String toJson(Problems problems) {
     try {
       return JsonFormat.printer().print(build());
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.getMessage());
       return null;
     }
   }

diff --git a/transpiler/java/com/google/j2cl/transpiler/backend/wasm/SummaryBuilder.java b/transpiler/java/com/google/j2cl/transpiler/backend/wasm/SummaryBuilder.java
@@ -195,7 +195,7 @@ public String toJson(Problems problems) {
     try {
       return JsonFormat.printer().print(build());
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_WRITE_FILE, e.getMessage());
       return null;
     }
   }

diff --git a/transpiler/java/com/google/j2cl/transpiler/frontend/common/PackageInfoCache.java b/transpiler/java/com/google/j2cl/transpiler/frontend/common/PackageInfoCache.java
@@ -28,6 +28,7 @@
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 import javax.annotation.Nullable;
 import jsinterop.annotations.JsPackage;
@@ -142,8 +143,10 @@ private void indexPackageInfo(List<String> classPathEntries) {
           }
         }
         problems.abortIfCancelled();
+      } catch (ZipException e) {
+        problems.fatal(FatalError.CANNOT_EXTRACT_ZIP, classPathEntry, e.getMessage());
       } catch (IOException e) {
-        problems.fatal(FatalError.CANNOT_OPEN_FILE, e.toString());
+        problems.fatal(FatalError.CANNOT_OPEN_FILE, e.getMessage());
       }
     }
   }
@@ -189,7 +192,7 @@ public void visit(String name, Object value) {
               .setNullMarked(getAnnotation(annotations, NullMarked.class) != null)
               .build());
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_OPEN_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_OPEN_FILE, e.getMessage());
     }
   }
 

diff --git a/transpiler/java/com/google/j2cl/transpiler/frontend/javac/JavacParser.java b/transpiler/java/com/google/j2cl/transpiler/frontend/javac/JavacParser.java
@@ -114,7 +114,7 @@ public Library parseFiles(FrontendOptions options) {
       }
       return Library.newBuilder().setCompilationUnits(compilationUnits.build()).build();
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_OPEN_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_OPEN_FILE, e.getMessage());
       return null;
     }
   }

diff --git a/transpiler/java/com/google/j2cl/transpiler/frontend/jdt/PackageAnnotationsResolver.java b/transpiler/java/com/google/j2cl/transpiler/frontend/jdt/PackageAnnotationsResolver.java
@@ -103,7 +103,7 @@ private static String readSource(FileInfo file, Problems problems) {
     try {
       return Files.readString(Path.of(file.sourcePath()));
     } catch (IOException e) {
-      problems.fatal(FatalError.CANNOT_OPEN_FILE, e.toString());
+      problems.fatal(FatalError.CANNOT_OPEN_FILE, e.getMessage());
       return null;
     }
   }