diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java index d8b23e1a05..0c58d4c995 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java @@ -111,15 +111,6 @@ public class AtmosBlobRequestSigner implements BlobRequestSigner { throw new UnsupportedOperationException(); } - @Deprecated - @Override - public HttpRequest signRemoveBlob(String container, String name) { - checkNotNull(container, "container"); - checkNotNull(name, "name"); - return cleanRequest(processor.apply(Invocation.create(deleteMethod, - ImmutableList. of(getPath(container, name))))); - } - private String getPath(String container, String name) { return checkNotNull(container, "container") + "/" + checkNotNull(name, "name"); } diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java index 883873ae9b..7e3f246429 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java @@ -66,20 +66,6 @@ public class AtmosBlobRequestSignerTest extends BaseRestAnnotationProcessingTest assertEquals(request.getFilters().size(), 0); } - public void testSignRemoveBlob() throws ArrayIndexOutOfBoundsException, SecurityException, IllegalArgumentException, - NoSuchMethodException, IOException { - HttpRequest request = signer.signRemoveBlob("container", "name"); - - assertRequestLineEquals(request, - "DELETE https://accesspoint.atmosonline.com/rest/namespace/container/name HTTP/1.1"); - assertNonPayloadHeadersEqual( - request, - "Accept: */*\nDate: Thu, 05 Jun 2008 16:38:19 GMT\nx-emc-signature: cPnxwSdWfIjChx8sox+43U9oo20=\nx-emc-uid: identity\n"); - assertPayloadEquals(request, null, null, false); - - assertEquals(request.getFilters().size(), 0); - } - public void testSignPutBlob() throws ArrayIndexOutOfBoundsException, SecurityException, IllegalArgumentException, NoSuchMethodException, IOException { HashCode hashCode = HashCode.fromBytes(new byte[16]); diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemBlobStoreTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemBlobStoreTest.java index e23bebd138..71dd4e7bfa 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemBlobStoreTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemBlobStoreTest.java @@ -806,14 +806,6 @@ public class FilesystemBlobStoreTest { .build(); assertEquals(expected, request); - request = signer.signRemoveBlob(containerName, blobName); - expected = HttpRequest.builder() - .method("DELETE") - .endpoint(endPoint) - .headers(request.getHeaders()) - .build(); - assertEquals(expected, request); - Blob blob = blobStore.blobBuilder(blobName).forSigning().build(); request = signer.signPutBlob(containerName, blob); expected = HttpRequest.builder() diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java index d4182d7c2f..cd966fcb54 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java @@ -88,12 +88,6 @@ public class RegionScopedTemporaryUrlBlobSigner implements BlobRequestSigner { return sign("PUT", container, blob.getMetadata().getName(), GetOptions.NONE, timestamp.get() + timeInSeconds); } - @Deprecated - @Override - public HttpRequest signRemoveBlob(String container, String name) { - return sign("DELETE", container, name, GetOptions.NONE, timestamp.get() + DEFAULT_SIGNING_TIMEOUT); - } - private HttpRequest sign(String method, String container, String name, GetOptions options, long expires) { checkNotNull(container, "container"); checkNotNull(name, "name"); diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java index 015b5e621f..9707f4fece 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobRequestSigner.java @@ -95,14 +95,6 @@ public class S3BlobRequestSigner implements BlobRequestSigne return cleanRequest(authSigner.signForTemporaryAccess(request, timeInSeconds)); } - @Deprecated - @Override - public HttpRequest signRemoveBlob(String container, String name) { - checkNotNull(container, "container"); - checkNotNull(name, "name"); - return cleanRequest(processor.apply(Invocation.create(deleteMethod, ImmutableList. of(container, name)))); - } - @Override public HttpRequest signGetBlob(String container, String name, org.jclouds.blobstore.options.GetOptions options) { checkNotNull(container, "container"); diff --git a/blobstore/src/main/java/org/jclouds/blobstore/BlobRequestSigner.java b/blobstore/src/main/java/org/jclouds/blobstore/BlobRequestSigner.java index a86a84a490..d8c62c178a 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/BlobRequestSigner.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/BlobRequestSigner.java @@ -60,20 +60,6 @@ public interface BlobRequestSigner { */ HttpRequest signGetBlob(String container, String name, GetOptions options); - /** - * gets a signed request, including headers as necessary, to delete a blob from an external - * client. - * - * @param container - * container where the blob resides - * @param directory - * full path to the blob - * @throws UnsupportedOperationException - * if not supported by the provider - */ - @Deprecated - HttpRequest signRemoveBlob(String container, String name); - /** * gets a signed request, including headers as necessary, to upload a blob from an external * client. diff --git a/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java b/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java index 13f8520223..c9ba42dbcf 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java @@ -75,14 +75,6 @@ public class LocalBlobRequestSigner implements BlobRequestSigner { throw new UnsupportedOperationException(); } - @Deprecated - @Override - public HttpRequest signRemoveBlob(String container, String name) { - HttpRequest request = HttpRequest.builder().method("DELETE").endpoint(String.format("%s/%s/%s", endpoint.get(), container, - name)).build(); - return basicAuth.filter(request); - } - @Override public HttpRequest signGetBlob(String container, String name, GetOptions options) { HttpRequest request = HttpRequest.builder().method("GET").endpoint( diff --git a/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java b/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java index b3de332f9c..298b044597 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/internal/RequestSigningUnsupported.java @@ -41,12 +41,6 @@ public class RequestSigningUnsupported implements BlobRequestSigner { throw new UnsupportedOperationException(); } - @Deprecated - @Override - public HttpRequest signRemoveBlob(String container, String name) { - throw new UnsupportedOperationException(); - } - @Override public HttpRequest signPutBlob(String container, Blob blob) { throw new UnsupportedOperationException(); diff --git a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java index 633b73774d..028f569a31 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java @@ -61,17 +61,6 @@ public class TransientBlobRequestSignerTest extends BaseRestAnnotationProcessing assertEquals(request.getFilters().size(), 0); } - public void testSignRemoveBlob() throws ArrayIndexOutOfBoundsException, SecurityException, IllegalArgumentException, - NoSuchMethodException, IOException { - HttpRequest request = signer.signRemoveBlob(containerName, blobName); - - assertRequestLineEquals(request, "DELETE " + fullUrl + " HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "Authorization: Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==\n"); - assertPayloadEquals(request, null, null, false); - - assertEquals(request.getFilters().size(), 0); - } - public void testSignPutBlob() throws ArrayIndexOutOfBoundsException, SecurityException, IllegalArgumentException, NoSuchMethodException, IOException { HashCode hashCode = HashCode.fromBytes(new byte[16]); diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java index 8ec0434d17..56c1167483 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java @@ -193,26 +193,6 @@ public class BaseBlobSignerLiveTest extends BaseBlobStoreIntegrationTest { testSignPutUrlWithTime(-getSignedUrlTimeout()); } - @Test - public void testSignRemoveUrl() throws Exception { - String name = "hello"; - String text = "fooooooooooooooooooooooo"; - - Blob blob = view.getBlobStore().blobBuilder(name).payload(text).contentType("text/plain").build(); - String container = getContainerName(); - try { - view.getBlobStore().putBlob(container, blob); - awaitConsistency(); - assertConsistencyAwareContainerSize(container, 1); - HttpRequest request = view.getSigner().signRemoveBlob(container, name); - assertEquals(request.getFilters().size(), 0); - view.utils().http().invoke(request); - assert !view.getBlobStore().blobExists(container, name); - } finally { - returnContainer(container); - } - } - protected void awaitConsistency() { if (view.getConsistencyModel() == ConsistencyModel.EVENTUAL) { Uninterruptibles.sleepUninterruptibly(AWAIT_CONSISTENCY_TIMEOUT_SECONDS, TimeUnit.SECONDS); diff --git a/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java b/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java index e6234223ca..39c49b9483 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java @@ -78,12 +78,6 @@ public abstract class BaseBlobSignerExpectTest extends BaseRestApiExpectTest