Repository: jclouds-labs-openstack Updated Branches: refs/heads/master 34a2499ef -> ee86e2a42
Align deleteIfEmpty with BlobStore expectations Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/ee86e2a4 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/ee86e2a4 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/ee86e2a4 Branch: refs/heads/master Commit: ee86e2a422ab7020d3e3874d114bfdc2790c6ce8 Parents: 34a2499 Author: Andrew Gaul <[email protected]> Authored: Sun Jul 27 21:42:32 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Jul 28 08:31:36 2014 -0700 ---------------------------------------------------------------------- .../org/jclouds/openstack/swift/v1/features/ContainerApi.java | 5 +++-- .../openstack/swift/v1/features/ContainerApiMockTest.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/ee86e2a4/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java index 11ce7d7..eb33d7c 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java @@ -33,6 +33,7 @@ import javax.ws.rs.PathParam; import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.Fallbacks.TrueOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; import org.jclouds.openstack.swift.v1.binders.BindMetadataToHeaders.BindContainerMetadataToHeaders; @@ -206,13 +207,13 @@ public interface ContainerApi { * @param containerName * corresponds to {@link Container#getName()}. * - * @return {@code false} if the container was not present. + * @return {@code true} if the container was deleted or not present. * * @throws IllegalStateException if the container was not empty. */ @Named("container:deleteIfEmpty") @DELETE - @Fallback(FalseOnNotFoundOr404.class) + @Fallback(TrueOnNotFoundOr404.class) @Path("/{containerName}") boolean deleteIfEmpty(@PathParam("containerName") String containerName) throws IllegalStateException; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/ee86e2a4/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java index 20707c7..73cf6b3 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java @@ -322,7 +322,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - assertFalse(api.getContainerApiForRegion("DFW").deleteIfEmpty("myContainer")); + assertTrue(api.getContainerApiForRegion("DFW").deleteIfEmpty("myContainer")); assertEquals(server.getRequestCount(), 2); assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
