Improve error message when path relativization fails #68

blutorange · Sep 1, 2024 · 6db54de · 6db54de
1 parent 975ed0a
commit 6db54de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ See also the [closure compiler changelog](https://github.com/google/closure-comp
 ## 2.31.0
 
 * Update to closure compiler `v20240317`
+* Improve error message when path relativization fails #68
 
 ## 2.30.0
 

diff --git a/src/main/java/com/github/blutorange/maven/plugin/closurecompiler/common/FileHelper.java b/src/main/java/com/github/blutorange/maven/plugin/closurecompiler/common/FileHelper.java
@@ -28,14 +28,18 @@ private FileHelper() {
    * @return The path of the given {@code target}, relative to the specified {@code base} file.
    */
   public static String relativizePath(File base, File target) throws IOException {
-    final Path targetPath = Paths.get(target.getCanonicalPath());
-    if (base == null) {
-      return targetPath.toString();
+    try {
+      final var targetPath = Paths.get(target.getCanonicalPath());
+      if (base == null) {
+        return targetPath.toString();
+      } else {
+        final var basePath = base.getCanonicalFile().toPath();
+        final var relativePath = basePath.relativize(targetPath).toString();
+        return relativePath;
+      }
     }
-    else {
-      final Path basePath = base.getCanonicalFile().toPath();
-      final String relativePath = basePath.relativize(targetPath).toString();
-      return relativePath;
+    catch (final IOException e) {
+      throw new IOException("Failed to relativize path <" + target + "> against base directory <" + base +">");
     }
   }