Creating a separate function to delete directories

Small refactoring to reuse some code.
jclouds · Apr 22, 2014 · c6cb169 · c6cb169
1 parent b2be149
commit c6cb169
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java
@@ -177,6 +177,25 @@ private PageSet<? extends StorageMetadata> getListing(
       return listing;
    }
 
+   private ListenableFuture<Void> deleteDirectory(final ListContainerOptions options,
+         final String containerName, final String dirName) {
+      ListenableFuture<Void> blobDelFuture;
+
+      if (options.isRecursive()) {
+         blobDelFuture = executorService.submit(new Callable<Void>() {
+            @Override
+            public Void call() {
+               blobStore.deleteDirectory(containerName, dirName);
+               return null;
+            }
+         });
+      } else {
+         blobDelFuture = null;
+      }
+
+      return blobDelFuture;
+   }
+
    /**
     * Delete the blobs from a given PageSet. The PageSet may contain blobs or
     * directories. If there are directories, they are expected to be empty.
@@ -235,30 +254,11 @@ public Void call() {
             });
             break;
          case FOLDER:
-            if (options.isRecursive()) {
-               blobDelFuture = executorService.submit(new Callable<Void>() {
-                  @Override
-                  public Void call() {
-                     blobStore.deleteDirectory(containerName, fullPath);
-                     return null;
-                  }
-               });
-            } else {
-               blobDelFuture = null;
-            }
+            blobDelFuture = deleteDirectory(options, containerName, fullPath);
             break;
          case RELATIVE_PATH:
-            if (options.isRecursive()) {
-               blobDelFuture = executorService.submit(new Callable<Void>() {
-                  @Override
-                  public Void call() {
-                     blobStore.deleteDirectory(containerName, md.getName());
-                     return null;
-                  }
-               });
-            } else {
-               blobDelFuture = null;
-            }
+            blobDelFuture = deleteDirectory(options, containerName,
+                  md.getName());
             break;
          case CONTAINER:
             throw new IllegalArgumentException("Container type not supported");