JCLOUDS-930: Add prefix option to OpenStack Swift.

Plumbs the prefix option to the openstack-swift provider. In the process, the support for the recursive option is modified to avoid setting the _path_ parameter, but rather use the delimiter if required (setting the delimiter is sufficient for a non-recursive listing).
rackspace · Jun 30, 2015 · 1cb0822 · 1cb0822
1 parent c409c19
commit 1cb0822
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/.../main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java b/.../main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java
@@ -28,19 +28,22 @@ public class ToListContainerOptions implements
    @Override
    public org.jclouds.openstack.swift.v1.options.ListContainerOptions apply(ListContainerOptions from) {
       checkNotNull(from, "set options to instance NONE instead of passing null");
-      org.jclouds.openstack.swift.v1.options.ListContainerOptions options = new org.jclouds.openstack.swift.v1.options.ListContainerOptions();
-      if ((from.getDir() == null) && (from.isRecursive())) {
-         options.prefix("");
+      if (from.getDir() != null && from.getPrefix() != null) {
+         throw new IllegalArgumentException("Cannot set both directory and prefix");
       }
-      if ((from.getDir() == null) && (!from.isRecursive())) {
-         options.path("");
+      org.jclouds.openstack.swift.v1.options.ListContainerOptions options = new org.jclouds.openstack.swift.v1.options.ListContainerOptions();
+      if (from.getDir() == null && !from.isRecursive()) {
+         options.delimiter('/');
       }
       if ((from.getDir() != null) && (from.isRecursive())) {
          options.prefix(from.getDir().endsWith("/") ? from.getDir() : from.getDir() + "/");
       }
       if ((from.getDir() != null) && (!from.isRecursive())) {
          options.path(from.getDir());
       }
+      if (from.getPrefix() != null) {
+         options.prefix(from.getPrefix());
+      }
       if (from.getMarker() != null) {
          options.marker(from.getMarker());
       }

diff --git a/...est/java/org/jclouds/openstack/swift/v1/blobstore/integration/SwiftContainerLiveTest.java b/...est/java/org/jclouds/openstack/swift/v1/blobstore/integration/SwiftContainerLiveTest.java
@@ -21,7 +21,6 @@
 import java.util.Properties;
 
 import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest;
-import org.testng.SkipException;
 import org.testng.annotations.Test;
 
 @Test(groups = "live", testName = "SwiftContainerLiveTest")
@@ -37,9 +36,4 @@ protected Properties setupProperties() {
       setIfTestSystemPropertyPresent(props, CREDENTIAL_TYPE);
       return props;
    }
-
-   @Override
-   public void testContainerListWithPrefix() {
-      throw new SkipException("Prefix option has not been plumbed down to Swift");
-   }
 }