Revert "refs #84 - actually delete folders when calling remove directory on a bag"

This reverts commit ff2af82.

Author: johnscancella

src/main/java/gov/loc/repository/bagit/impl/AbstractBag.java

@@ -2,19 +2,16 @@
 
 import java.io.Closeable;
 import java.io.File;
-import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -544,25 +541,24 @@ public void removePayloadDirectory(String filepath) {
 			filepath = bagConstants.getDataDirectory() + "/" + filepath;
 		}
 
-		log.debug("remove all the files under " + filepath);
-    //remove all the files. Need to create list so there is no concurrentModificationException
+		if ((bagConstants.getDataDirectory() + "/").equals(filepath)) {
+			return;
+		}
+
+		log.debug("Removing payload directory " + filepath);
+		
 		List<String> deleteFilepaths = new ArrayList<String>();
-    for(BagFile bagFile : this.getPayload()) {
-      if (bagFile.getFilepath().startsWith(filepath)) {
-        deleteFilepaths.add(bagFile.getFilepath());
-      }
-    }
-    for(String deleteFilepath : deleteFilepaths) {
-      log.debug("Removing " + deleteFilepath);
-      this.removeBagFile(deleteFilepath);     
-    }
 
-    //now remove the empty directories
-		try {
-      FileUtils.deleteDirectory(new File(filepath));
-    } catch (IOException e) {
-      log.error("Could not delete payload directory [" + filepath + "]!", e);
-    }
+		for(BagFile bagFile : this.getPayload()) {
+			if (bagFile.getFilepath().startsWith(filepath)) {
+				deleteFilepaths.add(bagFile.getFilepath());
+			}
+		}
+		
+		for(String deleteFilepath : deleteFilepaths) {
+			log.debug("Removing " + deleteFilepath);
+			this.removeBagFile(deleteFilepath);			
+		}
 	}
 
 	@Override
@@ -574,27 +570,21 @@ public void removeTagDirectory(String filepath) {
 		if (filepath.startsWith(bagConstants.getDataDirectory())) {
 			throw new RuntimeException("Trying to remove payload");
 		}
-
-		log.debug("remove all the files under " + filepath);
-		//remove all the files. Need to create list so there is no concurrentModificationException
-		List<String> deleteFilepaths = new ArrayList<String>();
-    for(BagFile bagFile : this.getTags()) {
-      if (bagFile.getFilepath().startsWith(filepath)) {
-        deleteFilepaths.add(bagFile.getFilepath());
-      }
-    }
-    for(String deleteFilepath : deleteFilepaths) {
-      log.debug("Removing " + deleteFilepath);
-      this.removeBagFile(deleteFilepath);     
-    }
 
 		log.debug("Removing tag directory " + filepath);
-		//now remove the empty directories
-		try {
-      FileUtils.deleteDirectory(new File(filepath));
-    } catch (IOException e) {
-      log.error("Could not delete tag directory [" + filepath + "]!", e);
-    }
+		
+		List<String> deleteFilepaths = new ArrayList<String>();
+		
+		for(BagFile bagFile : this.getTags()) {
+			if (bagFile.getFilepath().startsWith(filepath)) {
+				deleteFilepaths.add(bagFile.getFilepath());
+			}
+		}
+		
+		for(String deleteFilepath : deleteFilepaths) {
+			log.debug("Removing " + deleteFilepath);
+			this.removeBagFile(deleteFilepath);			
+		}
 	}
 
 

src/test/java/gov/loc/repository/bagit/impl/AbstractBagImplTest.java

@@ -549,6 +549,9 @@ public void testRemoveDirectory() throws Exception {
 
 			bag.removePayloadDirectory("data/test1.txt");
 			assertNotNull(bag.getBagFile("data/test1.txt"));
+	
+			bag.removePayloadDirectory("data");
+			assertNotNull(bag.getBagFile("data/test1.txt"));
 		} finally {
 			bag.close();
 		}

src/test/java/gov/loc/repository/bagit/v0_96/BagInABagTests.java

@@ -41,6 +41,9 @@ public void testRemoveDirectory() throws Exception
 
 			bag.removePayloadDirectory("data/bag/data/test1.txt");
 			assertNotNull(bag.getBagFile("data/bag/data/test1.txt"));
+	
+			bag.removePayloadDirectory("data");
+			assertNotNull(bag.getBagFile("data/bag/manifest-md5.txt"));
 		} finally {
 			bag.close();
 		}