Repository: jclouds Updated Branches: refs/heads/2.1.x 9ede9d3dd -> e59ccbff8
Do not allow options in filesystem clearContainer This requires some additional logic to clean up empty directories. Test regression from 22ce5484a412bc06ef62995675c07e7a85f66bdf. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/e59ccbff Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/e59ccbff Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/e59ccbff Branch: refs/heads/2.1.x Commit: e59ccbff819ddbf5ffcf4a412ed9c75cd0ecef27 Parents: 9ede9d3 Author: Andrew Gaul <[email protected]> Authored: Wed Nov 14 14:42:30 2018 -0800 Committer: Andrew Gaul <[email protected]> Committed: Wed Nov 14 14:49:33 2018 -0800 ---------------------------------------------------------------------- .../strategy/internal/FilesystemStorageStrategyImpl.java | 6 +++--- .../integration/FilesystemContainerIntegrationTest.java | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/e59ccbff/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java ---------------------------------------------------------------------- diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java index cf3b81b..b51124b 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java @@ -16,6 +16,7 @@ */ package org.jclouds.filesystem.strategy.internal; +import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.io.BaseEncoding.base16; @@ -248,9 +249,8 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy { @Override public void clearContainer(String container, ListContainerOptions options) { filesystemContainerNameValidator.validate(container); - if (options.getDir() != null) { - container += denormalize("/" + options.getDir()); - } + // TODO: these require calling removeDirectoriesTreeOfBlobKey + checkArgument(options.getDir() == null || options.getPrefix() == null, "cannot specify directory or prefix"); try { File containerFile = openFolder(container); File[] children = containerFile.listFiles(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e59ccbff/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java index 7dfdd3a..c9fee73 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java @@ -193,4 +193,9 @@ public class FilesystemContainerIntegrationTest extends BaseContainerIntegration public void testSetContainerAccess() throws Exception { throw new SkipException("filesystem does not support anonymous access"); } + + @Override + public void testClearWithOptions() throws InterruptedException { + throw new SkipException("filesystem does not support clear with options"); + } }
