Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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).
This commit is contained in:
Timur Alperovich 2015-06-25 15:16:52 -07:00
parent c409c19ff3
commit 1cb0822972
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java
View File

@ -28,12 +28,12 @@ public class ToListContainerOptions implements
@Override @Override
public org.jclouds.openstack.swift.v1.options.ListContainerOptions apply(ListContainerOptions from) { public org.jclouds.openstack.swift.v1.options.ListContainerOptions apply(ListContainerOptions from) {
checkNotNull(from, "set options to instance NONE instead of passing null"); 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.getPrefix() != null) {
if ((from.getDir() == null) && (from.isRecursive())) { throw new IllegalArgumentException("Cannot set both directory and prefix");
options.prefix("");
} }
if ((from.getDir() == null) && (!from.isRecursive())) { org.jclouds.openstack.swift.v1.options.ListContainerOptions options = new org.jclouds.openstack.swift.v1.options.ListContainerOptions();
options.path(""); if (from.getDir() == null && !from.isRecursive()) {
options.delimiter('/');
} }
if ((from.getDir() != null) && (from.isRecursive())) { if ((from.getDir() != null) && (from.isRecursive())) {
options.prefix(from.getDir().endsWith("/") ? from.getDir() : from.getDir() + "/"); options.prefix(from.getDir().endsWith("/") ? from.getDir() : from.getDir() + "/");
@ -41,6 +41,9 @@ public class ToListContainerOptions implements
if ((from.getDir() != null) && (!from.isRecursive())) { if ((from.getDir() != null) && (!from.isRecursive())) {
options.path(from.getDir()); options.path(from.getDir());
} }
if (from.getPrefix() != null) {
options.prefix(from.getPrefix());
}
if (from.getMarker() != null) { if (from.getMarker() != null) {
options.marker(from.getMarker()); options.marker(from.getMarker());
} }

6
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/integration/SwiftContainerLiveTest.java
View File

@ -21,7 +21,6 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CRED
import java.util.Properties; import java.util.Properties;
import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest;
import org.testng.SkipException;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@Test(groups = "live", testName = "SwiftContainerLiveTest") @Test(groups = "live", testName = "SwiftContainerLiveTest")
@ -37,9 +36,4 @@ public class SwiftContainerLiveTest extends BaseContainerLiveTest {
setIfTestSystemPropertyPresent(props, CREDENTIAL_TYPE); setIfTestSystemPropertyPresent(props, CREDENTIAL_TYPE);
return props; return props;
} }
@Override
public void testContainerListWithPrefix() {
throw new SkipException("Prefix option has not been plumbed down to Swift");
}
} }