[WFLY-3012] don't report a conflict for empty directories

Author: Emanuel Muckenhuber

patching/src/main/java/org/jboss/as/patching/runner/AbstractFileTask.java

@@ -34,6 +34,7 @@
 import org.jboss.as.patching.PatchMessages;
 import org.jboss.as.patching.metadata.ContentModification;
 import org.jboss.as.patching.metadata.MiscContentItem;
+import org.jboss.as.patching.metadata.ModificationType;
 
 /**
  * Base {@linkplain PatchingTask} for misc file updates.
@@ -79,7 +80,7 @@ byte[] backup(PatchingTaskContext context) throws IOException {
     byte[] apply(PatchingTaskContext context, PatchContentLoader loader) throws IOException {
         final MiscContentItem item = contentItem;
         if(item.isDirectory()) {
-            if(! target.mkdir() && ! target.isDirectory()) {
+            if(! target.mkdirs() && ! target.isDirectory()) {
                 throw PatchMessages.MESSAGES.cannotCreateDirectory(target.getAbsolutePath());
             }
             return NO_CONTENT;

patching/src/main/java/org/jboss/as/patching/runner/AbstractPatchingTask.java

@@ -123,7 +123,7 @@ public boolean prepare(final PatchingTaskContext context) throws IOException {
         final byte[] contentHash = contentItem.getContentHash();
         if(Arrays.equals(backupHash, contentHash)) {
             // Skip execute for misc items only
-            skipExecution = contentItem.getContentType() == ContentType.MISC;
+            skipExecution = contentItem.getContentType() == ContentType.MISC && backupHash != NO_CONTENT;
             return true;
         }
         // See if the content matches our expected target

patching/src/main/java/org/jboss/as/patching/runner/FileRemoveTask.java

@@ -74,8 +74,16 @@ public boolean prepare(PatchingTaskContext context) throws IOException {
         backup(target, backup, Arrays.asList(item.getPath()), rollback, context);
         // See if the hash matches the metadata
 
+        boolean isEmptyDirectory = false;
+        if (target.isDirectory()) {
+            final File[] children = target.listFiles();
+            if (children == null || children.length == 0) {
+                isEmptyDirectory = true;
+            }
+        }
+
         final byte[] expected = description.getModification().getTargetHash();
-        final byte[] actual = HashUtils.hashFile(target);
+        final byte[] actual = isEmptyDirectory ? NO_CONTENT : HashUtils.hashFile(target);
         return Arrays.equals(expected, actual);
     }
 

patching/src/test/java/org/jboss/as/patching/runner/AbstractTaskTestCase.java

@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javafx.scene.layout.Pane;
 import org.jboss.as.patching.DirectoryStructure;
 import org.jboss.as.patching.IoUtils;
 import org.jboss.as.patching.PatchingException;
@@ -101,8 +102,12 @@ protected PatchingResult rollback(String patchId) throws IOException, PatchingEx
     }
 
     protected PatchingResult rollback(String patchId, final boolean rollbackTo) throws IOException, PatchingException {
+        return rollback(patchId, rollbackTo, ContentVerificationPolicy.STRICT);
+    }
+
+    protected PatchingResult rollback(String patchId, boolean rollbackTo, ContentVerificationPolicy policy) throws IOException, PatchingException {
         final PatchTool tool = newPatchTool();
-        final PatchingResult result = tool.rollback(patchId, ContentVerificationPolicy.STRICT, rollbackTo, true);
+        final PatchingResult result = tool.rollback(patchId, policy, rollbackTo, true);
         result.commit();
         return result;
     }

patching/src/test/java/org/jboss/as/patching/runner/FileTaskTestCase.java

@@ -23,6 +23,7 @@
 package org.jboss.as.patching.runner;
 
 import static org.jboss.as.patching.HashUtils.hashFile;
+import static org.jboss.as.patching.IoUtils.NO_CONTENT;
 import static org.jboss.as.patching.IoUtils.mkdir;
 import static org.jboss.as.patching.runner.PatchingAssert.assertFileContent;
 import static org.jboss.as.patching.runner.PatchingAssert.assertFileDoesNotExist;
@@ -41,9 +42,13 @@
 import java.io.File;
 
 import org.jboss.as.patching.installation.Identity;
+import org.jboss.as.patching.metadata.ContentItem;
 import org.jboss.as.patching.metadata.ContentModification;
+import org.jboss.as.patching.metadata.MiscContentItem;
+import org.jboss.as.patching.metadata.ModificationType;
 import org.jboss.as.patching.metadata.Patch;
 import org.jboss.as.patching.metadata.PatchBuilder;
+import org.jboss.as.patching.tool.ContentVerificationPolicy;
 import org.jboss.as.patching.tool.PatchingResult;
 import org.junit.Test;
 
@@ -225,5 +230,40 @@ public void testRemoveDirectoryAndRollback() throws Exception {
         assertTrue(subTwo.isFile());
     }
 
+    @Test
+    public void testAddDirectory() throws Exception {
+
+        final ContentItem item = new MiscContentItem("dir", new String[] { "test"}, NO_CONTENT, true, false);
+        final ContentModification addDir = new ContentModification(item, NO_CONTENT, ModificationType.ADD);
+
+        final String patchID = randomString();
+        final Patch patch = PatchBuilder.create()
+                .setPatchId(patchID)
+                .setDescription(randomString())
+                .oneOffPatchIdentity(productConfig.getProductName(), productConfig.getProductVersion())
+                .getParent()
+                .addContentModification(addDir)
+                .build();
+
+        // create the patch
+        final File patchDir = mkdir(tempDir, patch.getPatchId());
+        createPatchXMLFile(patchDir, patch);
+        final File zippedPatch = createZippedPatchFile(patchDir, patch.getPatchId());
+
+        // Apply
+        PatchingResult result = executePatch(zippedPatch);
+        assertPatchHasBeenApplied(result, patch);
+
+        final File test = new File(env.getInstalledImage().getJbossHome(), "test");
+        assertTrue(test.exists());
+        assertTrue(test.isDirectory());
+        final File dir = new File(test, "dir");
+        assertTrue(dir.exists());
+        assertTrue(dir.isDirectory());
+
+        rollback(patchID);
+
+    }
+
 }