Repository: jclouds-labs Updated Branches: refs/heads/2.1.x f7b8c2caf -> 49de835e8
Do not allow options in filesystem clearContainer This requires some additional logic to query by prefix. Test regression from 22ce5484a412bc06ef62995675c07e7a85f66bdf. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/49de835e Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/49de835e Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/49de835e Branch: refs/heads/2.1.x Commit: 49de835e8a85518af91d51c3d8c2bff7cbaaedec Parents: f7b8c2c Author: Andrew Gaul <[email protected]> Authored: Wed Nov 14 16:36:57 2018 -0800 Committer: Andrew Gaul <[email protected]> Committed: Wed Nov 14 16:38:24 2018 -0800 ---------------------------------------------------------------------- .../h2/jdbc/blobstore/H2JdbcContainerIntegrationTest.java | 5 +++++ .../java/org/jclouds/jdbc/strategy/JdbcStorageStrategy.java | 2 ++ .../jdbc/integration/EclipselinkH2ContainerIntegrationTest.java | 5 +++++ .../integration/HibernateHsqldbContainerIntegrationTest.java | 5 +++++ 4 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/49de835e/h2-jdbc/src/test/java/org/jclouds/h2/jdbc/blobstore/H2JdbcContainerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/h2-jdbc/src/test/java/org/jclouds/h2/jdbc/blobstore/H2JdbcContainerIntegrationTest.java b/h2-jdbc/src/test/java/org/jclouds/h2/jdbc/blobstore/H2JdbcContainerIntegrationTest.java index dbc5e26..09549ad 100644 --- a/h2-jdbc/src/test/java/org/jclouds/h2/jdbc/blobstore/H2JdbcContainerIntegrationTest.java +++ b/h2-jdbc/src/test/java/org/jclouds/h2/jdbc/blobstore/H2JdbcContainerIntegrationTest.java @@ -37,4 +37,9 @@ public class H2JdbcContainerIntegrationTest extends BaseContainerIntegrationTest public void testSetContainerAccess() throws Exception { throw new SkipException("jdbc does not support anonymous access"); } + + @Override + public void testClearWithOptions() throws InterruptedException { + throw new SkipException("jdbc does not support clear with options"); + } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/49de835e/jdbc/src/main/java/org/jclouds/jdbc/strategy/JdbcStorageStrategy.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/jclouds/jdbc/strategy/JdbcStorageStrategy.java b/jdbc/src/main/java/org/jclouds/jdbc/strategy/JdbcStorageStrategy.java index 286d478..1dc33b8 100644 --- a/jdbc/src/main/java/org/jclouds/jdbc/strategy/JdbcStorageStrategy.java +++ b/jdbc/src/main/java/org/jclouds/jdbc/strategy/JdbcStorageStrategy.java @@ -47,6 +47,7 @@ import org.jclouds.jdbc.predicates.validators.JdbcBlobKeyValidator; import org.jclouds.jdbc.predicates.validators.JdbcContainerNameValidator; import org.jclouds.jdbc.service.JdbcService; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; /** @@ -185,6 +186,7 @@ public class JdbcStorageStrategy implements LocalStorageStrategy { */ @Override public void clearContainer(String container, ListContainerOptions options) { + Preconditions.checkArgument(options.getPrefix() == null, "prefix not yet implemented"); if (options.getDir() != null) { jdbcService.deleteBlobsByDirectory(container, options.getDir(), true); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/49de835e/jdbc/src/test/java/org/jclouds/jdbc/integration/EclipselinkH2ContainerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/jclouds/jdbc/integration/EclipselinkH2ContainerIntegrationTest.java b/jdbc/src/test/java/org/jclouds/jdbc/integration/EclipselinkH2ContainerIntegrationTest.java index e61bcf1..871bfd2 100644 --- a/jdbc/src/test/java/org/jclouds/jdbc/integration/EclipselinkH2ContainerIntegrationTest.java +++ b/jdbc/src/test/java/org/jclouds/jdbc/integration/EclipselinkH2ContainerIntegrationTest.java @@ -39,4 +39,9 @@ public class EclipselinkH2ContainerIntegrationTest extends BaseContainerIntegrat public void testSetContainerAccess() throws Exception { throw new SkipException("jdbc does not support anonymous access"); } + + @Override + public void testClearWithOptions() throws InterruptedException { + throw new SkipException("jdbc does not support clear with options"); + } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/49de835e/jdbc/src/test/java/org/jclouds/jdbc/integration/HibernateHsqldbContainerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/jclouds/jdbc/integration/HibernateHsqldbContainerIntegrationTest.java b/jdbc/src/test/java/org/jclouds/jdbc/integration/HibernateHsqldbContainerIntegrationTest.java index ddbdb14..c6abbc8 100644 --- a/jdbc/src/test/java/org/jclouds/jdbc/integration/HibernateHsqldbContainerIntegrationTest.java +++ b/jdbc/src/test/java/org/jclouds/jdbc/integration/HibernateHsqldbContainerIntegrationTest.java @@ -46,4 +46,9 @@ public class HibernateHsqldbContainerIntegrationTest extends BaseContainerIntegr public void testSetContainerAccess() throws Exception { throw new SkipException("jdbc does not support anonymous access"); } + + @Override + public void testClearWithOptions() throws InterruptedException { + throw new SkipException("jdbc does not support clear with options"); + } }
