Skip to content
Permalink
Browse files
JCLOUDS-641 fix return code for deleteIfEmpty
  • Loading branch information
Adrian Cole authored and Adrian Cole committed Oct 8, 2014
1 parent 389a3d8 commit cc00dee92a3075fa26b4fef307d79f571ad9de73
Showing 3 changed files with 46 additions and 4 deletions.
@@ -0,0 +1,43 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jclouds.openstack.swift.v1;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.equalTo;
import static com.google.common.base.Throwables.propagate;
import static org.jclouds.http.HttpUtils.contains404;
import static org.jclouds.http.HttpUtils.returnValueOnCodeOrNull;

import org.jclouds.Fallback;

public final class SwiftFallbacks {

public static final class TrueOn404FalseOn409 implements Fallback<Boolean> {
@Override
public Boolean createOrPropagate(Throwable t) throws Exception {
if (contains404(checkNotNull(t, "throwable")))
return true;
if (returnValueOnCodeOrNull(t, false, equalTo(409)) != null)
return false;
throw propagate(t);
}
}

private SwiftFallbacks() {
throw new AssertionError("intentionally unimplemented");
}
}
@@ -17,6 +17,7 @@
package org.jclouds.openstack.swift.v1.features;

import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static org.jclouds.openstack.swift.v1.SwiftFallbacks.TrueOn404FalseOn409;

import java.util.Map;

@@ -33,7 +34,6 @@
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;
@@ -209,7 +209,7 @@ boolean deleteMetadata(@PathParam("containerName") String containerName,
@Named("container:deleteIfEmpty")
@DELETE
@Path("/{containerName}")
@Fallback(TrueOnNotFoundOr404.class)
@Fallback(TrueOn404FalseOn409.class)
boolean deleteIfEmpty(@PathParam("containerName") String containerName) throws IllegalStateException;

}
@@ -334,15 +334,14 @@ public void testAlreadyDeleted() throws Exception {
}
}

@Test(expectedExceptions = IllegalStateException.class)
public void testDeleteWhenNotEmpty() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(409)));

try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
api.getContainerApi("DFW").deleteIfEmpty("myContainer");
assertFalse(api.getContainerApi("DFW").deleteIfEmpty("myContainer"));

} finally {
assertEquals(server.getRequestCount(), 2);

0 comments on commit cc00dee

Please sign in to comment.