Remove BootUtils.mkDirs; use IOTools.createDris instead

Author: ethauvin

src/main/java/rife/bld/extension/AbstractBootOperation.java

@@ -58,10 +58,10 @@
 public abstract class AbstractBootOperation<T extends AbstractBootOperation<T>>
         extends AbstractOperation<AbstractBootOperation<T>> {
 
-    protected final Logger logger = Logger.getLogger(getClass().getName());
     private static final String INF_LIBS = "infLibs";
     private static final String LAUNCHER_LIBS = "launcherLibs";
     private static final String SOURCE_DIRECTORIES = "sourceDirectories";
+    protected final Logger logger = Logger.getLogger(getClass().getName());
     private final List<File> infLibs_ = new ArrayList<>();
     private final List<File> launcherLibs_ = new ArrayList<>();
     private final Map<String, String> manifestAttributes_ = new HashMap<>();
@@ -580,7 +580,7 @@ protected void executeCopyBootLoader(File stagingDirectory) throws FileUtilsErro
      */
     protected void executeCopyInfClassesFiles(File stagingInfDirectory) throws IOException {
         var infClassesDir = new File(stagingInfDirectory, "classes");
-        BootUtils.mkDirs(infClassesDir);
+        IOTools.createDirs(infClassesDir);
 
         for (var dir : sourceDirectories_) {
             if (dir.exists()) {
@@ -599,7 +599,7 @@ protected void executeCopyInfClassesFiles(File stagingInfDirectory) throws IOExc
      */
     protected void executeCopyInfLibs(File stagingInfDirectory) throws IOException {
         var infLibDir = stagingInfDirectory.toPath().resolve("lib");
-        BootUtils.mkDirs(infLibDir.toFile());
+        IOTools.createDirs(infLibDir.toFile());
 
         for (var jar : infLibs_) {
             if (jar.exists()) {
@@ -674,7 +674,7 @@ protected File executeCreateArchive(File stagingDirectory) throws IOException {
      */
     protected void executeCreateManifest(File stagingDirectory) throws IOException {
         var metaInfDir = stagingDirectory.toPath().resolve("META-INF");
-        BootUtils.mkDirs(metaInfDir.toFile());
+        IOTools.createDirs(metaInfDir.toFile());
 
         var manifestFile = metaInfDir.resolve("MANIFEST.MF");
 
@@ -722,10 +722,11 @@ protected T mainClass(String className) {
      * {@link #launcherLibs() launcherLibs}) required to create the archive have been provided, throws an
      * {@link IllegalArgumentException} otherwise.
      *
+     * @throws IOException              if the {@link #destinationDirectory() destination directory} could not be created
      * @throws IllegalArgumentException if a required element is missing or invalid
      */
-    @SuppressFBWarnings({"DRE_DECLARED_RUNTIME_EXCEPTION", "EXS_EXCEPTION_SOFTENING_NO_CONSTRAINTS"})
-    protected void verifyExecute() throws IllegalArgumentException {
+    @SuppressFBWarnings("DRE_DECLARED_RUNTIME_EXCEPTION")
+    protected void verifyExecute() throws IllegalArgumentException, IOException {
         if (TextTools.isBlank(mainClass_)) {
             throw new IllegalArgumentException("Project mainClass required.");
         } else if (TextTools.isBlank(launcherClass_)) {
@@ -737,10 +738,9 @@ protected void verifyExecute() throws IllegalArgumentException {
                 throw new IllegalArgumentException("Destination directory required.");
             }
             try {
-                BootUtils.mkDirs(destinationDirectory_);
+                IOTools.createDirs(destinationDirectory_);
             } catch (IOException e) {
-                throw new IllegalArgumentException(
-                        MessageFormat.format("Cannot create directory {0}.", destinationDirectory_), e);
+                throw new IOException("Cannot create destination directory: " + destinationDirectory_, e);
             }
         }
         for (var jar : launcherLibs_) {

src/main/java/rife/bld/extension/BootJarOperation.java

@@ -18,6 +18,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import rife.bld.Project;
+import rife.bld.extension.tools.IOTools;
 import rife.bld.extension.tools.ObjectTools;
 import rife.tools.FileUtils;
 
@@ -58,7 +59,7 @@ public void execute() throws Exception {
 
         try {
             var bootInfDir = new File(stagingDir, "BOOT-INF");
-            BootUtils.mkDirs(bootInfDir);
+            IOTools.createDirs(bootInfDir);
 
             executeCopyInfClassesFiles(bootInfDir);
             executeCopyInfLibs(bootInfDir);

src/main/java/rife/bld/extension/BootUtils.java

@@ -17,10 +17,8 @@
 package rife.bld.extension;
 
 import rife.bld.Project;
-import rife.bld.extension.tools.IOTools;
 
 import java.io.File;
-import java.io.IOException;
 import java.text.DecimalFormat;
 import java.util.regex.Pattern;
 
@@ -78,18 +76,6 @@ public static String launcherClass(Project project, String name) {
         return resolveLauncherPrefix(project) + name;
     }
 
-    /**
-     * Makes a directory for the given path, including any necessary but nonexistent parent directories.
-     *
-     * @param path the directory path
-     * @throws IOException if an error occurs
-     */
-    public static void mkDirs(File path) throws IOException {
-        if (!IOTools.mkdirs(path)) {
-            throw new IOException("Unable to create: " + path.getAbsolutePath());
-        }
-    }
-
     private static String resolveLauncherPrefix(Project project) {
         for (var jar : project.standaloneClasspathJars()) {
             var matcher = LOADER_JAR.matcher(jar.getName());

src/main/java/rife/bld/extension/BootWarOperation.java

@@ -20,6 +20,7 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import rife.bld.Project;
 import rife.bld.extension.tools.CollectionTools;
+import rife.bld.extension.tools.IOTools;
 import rife.bld.extension.tools.ObjectTools;
 import rife.tools.FileUtils;
 
@@ -67,7 +68,7 @@ public void execute() throws Exception {
 
         try {
             var webInfDir = new File(stagingDir, "WEB-INF");
-            BootUtils.mkDirs(webInfDir);
+            IOTools.createDirs(webInfDir);
 
             executeCopyInfClassesFiles(webInfDir);
             executeCopyInfLibs(webInfDir);
@@ -260,7 +261,7 @@ public final BootWarOperation providedLibsStrings(@NonNull Collection<String> ja
      */
     protected void executeCopyWebInfProvidedLib(File stagingWebInfDirectory) throws IOException {
         var libProvidedPath = stagingWebInfDirectory.toPath().resolve("lib-provided");
-        BootUtils.mkDirs(libProvidedPath.toFile());
+        IOTools.createDirs(libProvidedPath.toFile());
 
         for (var lib : providedLibs_) {
             if (lib.exists()) {

src/test/java/rife/bld/extension/BootUtilsTests.java

@@ -19,19 +19,15 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
-import org.junit.jupiter.api.io.TempDir;
 import rife.bld.Project;
 import rife.bld.blueprints.BaseProjectBlueprint;
-import rife.tools.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @SuppressWarnings({"PMD.AvoidDuplicateLiterals"})
 class BootUtilsTests {
@@ -171,31 +167,4 @@ public List<File> standaloneClasspathJars() {
                     BootUtils.launcherClass(project, "JarLauncher"));
         }
     }
-
-    @Nested
-    @DisplayName("MkDirs Tests")
-    class MkDirsTests {
-
-        @TempDir
-        private File tmpDir;
-
-        @Test
-        void mkDirsCreatesDirectories() throws IOException {
-            FileUtils.deleteDirectory(tmpDir);
-            assertFalse(tmpDir.exists());
-
-            BootUtils.mkDirs(tmpDir);
-            assertTrue(tmpDir.exists());
-        }
-
-        @Test
-        @DisabledOnOs(OS.WINDOWS)
-        void mkDirsThrowsIOException() {
-            var tmpFile = new File("/foo/bar.txt");
-            tmpFile.deleteOnExit();
-
-            var exception = assertThrows(IOException.class, () -> BootUtils.mkDirs(tmpFile));
-            assertEquals("Unable to create: " + tmpFile.getAbsolutePath(), exception.getMessage());
-        }
-    }
 }