#19646 Log error nicely (#20419)

* #19646 Log error nicely * remove import * Rename AddFileNotPossibleException to FileCreationException
dotCMS · May 20, 2021 · 7853e4b · 7853e4b
1 parent 991255a
commit 7853e4b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 13 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/publishing/output/BundleOutput.java b/dotCMS/src/main/java/com/dotcms/publishing/output/BundleOutput.java
@@ -5,7 +5,6 @@
 import com.dotcms.publishing.PublisherConfig;
 import com.dotmarketing.util.Config;
 
-import com.dotmarketing.util.Logger;
 import com.liferay.util.FileUtil;
 
 import java.io.*;
@@ -29,7 +28,7 @@ public BundleOutput(final PublisherConfig publisherConfig){
      * @return
      * @throws IOException
      */
-    public abstract OutputStream addFile(String filePath) throws IOException;
+    public abstract OutputStream addFile(String filePath) throws FileCreationException;
 
     /**
      * Add a new file into the output
@@ -38,7 +37,7 @@ public BundleOutput(final PublisherConfig publisherConfig){
      * @return
      * @throws IOException
      */
-    public OutputStream addFile(File file) throws IOException {
+    public OutputStream addFile(File file) throws FileCreationException {
         return addFile(file.getPath());
     }
 

diff --git a/dotCMS/src/main/java/com/dotcms/publishing/output/DirectoryBundleOutput.java b/dotCMS/src/main/java/com/dotcms/publishing/output/DirectoryBundleOutput.java
@@ -2,13 +2,8 @@
 
 import com.dotcms.publishing.BundlerUtil;
 import com.dotcms.publishing.PublisherConfig;
-import com.dotmarketing.beans.Host;
-import com.dotmarketing.util.WebKeys;
 import com.google.common.annotations.VisibleForTesting;
 import com.liferay.util.FileUtil;
-import io.vavr.Lazy;
-import io.vavr.control.Try;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -58,15 +53,19 @@ public void setLastModified(final String filePath, final long timeInMillis) {
     }
 
     @Override
-    public OutputStream addFile(final String filePath) throws IOException {
+    public OutputStream addFile(final String filePath) throws FileCreationException {
         final File fileAbsolute = getRealFile(filePath);
         fileAbsolute.getParentFile().mkdirs();
 
-        if (!fileAbsolute.exists()) {
-            fileAbsolute.createNewFile();
-        }
+        try {
+            if (!fileAbsolute.exists()) {
+                fileAbsolute.createNewFile();
+            }
 
-        return Files.newOutputStream( fileAbsolute.toPath());
+            return Files.newOutputStream(fileAbsolute.toPath());
+        } catch (IOException e) {
+            throw new FileCreationException(e, filePath);
+        }
     }
 
     private File getRealFile(final String path) {

diff --git a/dotCMS/src/main/java/com/dotcms/publishing/output/FileCreationException.java b/dotCMS/src/main/java/com/dotcms/publishing/output/FileCreationException.java
@@ -0,0 +1,25 @@
+package com.dotcms.publishing.output;
+
+
+import java.io.IOException;
+
+public class FileCreationException extends IOException {
+
+    private String filePath;
+
+    public FileCreationException(final Throwable cause, final String filePath) {
+        super(cause);
+        this.filePath = filePath;
+    }
+
+    @Override
+    public String getMessage(){
+        final Throwable cause = this.getCause();
+
+        final String message = cause.getMessage().contains("Not a directory") ?
+                "At least one subfolder already exists as a file" : cause.getMessage();
+
+        return String.format("It is not possible create the File: %s because: %s", filePath,
+                message);
+    }
+}