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

Handle empty delimiter/prefix in FS store. 

When delimiter/prefix is an empty string, jclouds filesystem blobstore
should treat them as not being set.
This commit is contained in:
Timur Alperovich 2017-06-29 00:17:27 -07:00 committed by Andrew Gaul
parent 78881d2f53
commit 8ab58f075f
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
View File

@ -90,6 +90,7 @@ import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.base.Strings;
import com.google.common.base.Supplier;
import com.google.common.base.Throwables;
import com.google.common.collect.FluentIterable;
@ -266,7 +267,7 @@ public final class LocalBlobStore implements BlobStore {
if (options != null) {
if (options.getDir() != null && !options.getDir().isEmpty()) {
contents = filterDirectory(contents, options);
} else if (options.getPrefix() != null) {
} else if (!Strings.isNullOrEmpty(options.getPrefix())) {
contents = filterPrefix(contents, options);
} else if (!options.isRecursive() || (options.getDelimiter() != null)) {
String delimiter = options.getDelimiter() == null ? storageStrategy.getSeparator() : options.getDelimiter();
@ -349,6 +350,9 @@ public final class LocalBlobStore implements BlobStore {
private SortedSet<StorageMetadata> extractCommonPrefixes(SortedSet<StorageMetadata> contents, String delimiter,
String prefix) {
if (Strings.isNullOrEmpty(delimiter)) {
return contents;
}
SortedSet<String> commonPrefixes = newTreeSet(
transform(contents, new CommonPrefixes(prefix, delimiter)));
commonPrefixes.remove(CommonPrefixes.NO_PREFIX);

26
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
View File

@ -53,6 +53,7 @@ import org.jclouds.http.HttpResponse;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.ByteSource;
@ -595,6 +596,31 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest {
}
}
/** Test that listing with an empty string for prefix and delimiter returns all of the keys. */
@Test(groups = {"integration", "live"})
public void testListEmptyPrefixDelimiter() throws Exception {
final String container = getContainerName();
BlobStore blobStore = view.getBlobStore();
blobStore.createContainerInLocation(null, container);
try {
ImmutableList<String> blobs = ImmutableList.of("a", "b", "c");
for (String blob : blobs) {
blobStore.putBlob(container, blobStore.blobBuilder(blob).payload("").build());
}
ListContainerOptions options = ListContainerOptions.Builder.delimiter("")
.prefix("").afterMarker("");
PageSet<? extends StorageMetadata> rs = blobStore.list(container, options);
ImmutableList.Builder<String> builder = ImmutableList.builder();
for (StorageMetadata sm : rs) {
builder.add(sm.getName());
}
assertThat(builder.build()).containsExactlyElementsOf(blobs);
} finally {
returnContainer(container);
}
}
@DataProvider
public Object[][] getBlobsToEscape() {
ImmutableSet<String> testNames = ImmutableSet.of("%20", "%20 ", " %20", " ", "%", "%%");