Handle empty prefix on Atmos
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/17c8e315 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/17c8e315 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/17c8e315 Branch: refs/heads/2.0.x Commit: 17c8e315467bf31fa8e0c11e71cc6cdc1b60bd1d Parents: 57dceaf Author: Andrew Gaul <[email protected]> Authored: Sat Oct 28 11:06:25 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Nov 24 19:25:34 2017 -0800 ---------------------------------------------------------------------- .../src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java | 3 +++ .../blobstore/functions/BlobStoreListOptionsToListOptions.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/17c8e315/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java index a75fee2..1550932 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java @@ -16,6 +16,7 @@ */ package org.jclouds.atmos.blobstore; +import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.atmos.options.PutOptions.Builder.publicRead; @@ -58,6 +59,7 @@ import org.jclouds.http.options.GetOptions; import org.jclouds.io.Payload; import org.jclouds.io.PayloadSlicer; +import com.google.common.base.Strings; import com.google.common.base.Supplier; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -218,6 +220,7 @@ public class AtmosBlobStore extends BaseBlobStore { @Override public PageSet<? extends StorageMetadata> list(String container, org.jclouds.blobstore.options.ListContainerOptions options) { + checkArgument(Strings.isNullOrEmpty(options.getPrefix()), "does not support prefixes"); container = AtmosUtils.adjustContainerIfDirOptionPresent(container, options); ListOptions nativeOptions = container2ContainerListOptions.apply(options); // until includeMeta() option works for namespace interface http://git-wip-us.apache.org/repos/asf/jclouds/blob/17c8e315/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobStoreListOptionsToListOptions.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobStoreListOptionsToListOptions.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobStoreListOptionsToListOptions.java index b6a1e9d..13882f9 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobStoreListOptionsToListOptions.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/BlobStoreListOptionsToListOptions.java @@ -23,6 +23,7 @@ import javax.inject.Singleton; import org.jclouds.blobstore.options.ListContainerOptions; import com.google.common.base.Function; +import com.google.common.base.Strings; @Singleton public class BlobStoreListOptionsToListOptions implements @@ -31,7 +32,7 @@ public class BlobStoreListOptionsToListOptions implements public org.jclouds.atmos.options.ListOptions apply(ListContainerOptions from) { checkNotNull(from, "set options to instance NONE instead of passing null"); org.jclouds.atmos.options.ListOptions httpOptions = new org.jclouds.atmos.options.ListOptions(); - if (from.getMarker() != null) { + if (!Strings.isNullOrEmpty(from.getMarker())) { httpOptions.token(from.getMarker()); } if (from.getMaxResults() != null) {
