From e32ed04b138233e5b9068e60b36ed5ddc06e3af1 Mon Sep 17 00:00:00 2001 From: "adrian.f.cole" Date: Wed, 6 May 2009 22:11:04 +0000 Subject: [PATCH] typo git-svn-id: http://jclouds.googlecode.com/svn/trunk@419 3d8758e0-26b5-11de-8745-db77d3ebf521 --- .../main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java | 4 ++-- .../java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceTest.java | 2 +- s3/src/main/java/org/jclouds/aws/s3/S3Connection.java | 2 +- .../java/org/jclouds/aws/s3/internal/LiveS3Connection.java | 2 +- s3/src/test/java/org/jclouds/aws/s3/AmazonS3Test.java | 2 +- s3/src/test/java/org/jclouds/aws/s3/S3IntegrationTest.java | 2 +- s3/src/test/java/org/jclouds/aws/s3/StubS3Connection.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java b/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java index 5a6805e18a..35687d2465 100644 --- a/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java +++ b/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java @@ -110,13 +110,13 @@ public class JCloudsS3Service extends S3Service { /** * {@inheritDoc} * - * @see S3Connection#deleteBucketIfNotEmpty(org.jclouds.aws.s3.domain.S3Bucket) + * @see S3Connection#deleteBucketIfEmpty(org.jclouds.aws.s3.domain.S3Bucket) */ @Override protected void deleteBucketImpl(String bucketName) throws S3ServiceException { try { - connection.deleteBucketIfNotEmpty(bucketName).get( + connection.deleteBucketIfEmpty(bucketName).get( requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); } catch (Exception e) { Utils. rethrowIfRuntimeOrSameType(e); diff --git a/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceTest.java b/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceTest.java index 8e79254b4b..40840bf767 100644 --- a/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceTest.java +++ b/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceTest.java @@ -202,7 +202,7 @@ public class JCloudsS3ServiceTest extends S3IntegrationTest { jcBucket.getCanonicalUser().getDisplayName()); } - client.deleteBucketIfNotEmpty(bucketName); + client.deleteBucketIfEmpty(bucketName); } @Test diff --git a/s3/src/main/java/org/jclouds/aws/s3/S3Connection.java b/s3/src/main/java/org/jclouds/aws/s3/S3Connection.java index 307b1980cb..bf13c0e6dc 100644 --- a/s3/src/main/java/org/jclouds/aws/s3/S3Connection.java +++ b/s3/src/main/java/org/jclouds/aws/s3/S3Connection.java @@ -112,7 +112,7 @@ public interface S3Connection { * what to delete * @return false, if the bucket was not empty and therefore not deleted */ - Future deleteBucketIfNotEmpty(String s3Bucket); + Future deleteBucketIfEmpty(String s3Bucket); /** * Copies one object to another bucket diff --git a/s3/src/main/java/org/jclouds/aws/s3/internal/LiveS3Connection.java b/s3/src/main/java/org/jclouds/aws/s3/internal/LiveS3Connection.java index 768066e224..fce0a392a8 100644 --- a/s3/src/main/java/org/jclouds/aws/s3/internal/LiveS3Connection.java +++ b/s3/src/main/java/org/jclouds/aws/s3/internal/LiveS3Connection.java @@ -141,7 +141,7 @@ public class LiveS3Connection implements S3Connection { * * @see DeleteBucket */ - public Future deleteBucketIfNotEmpty(String s3Bucket) { + public Future deleteBucketIfEmpty(String s3Bucket) { DeleteBucket deleteBucket = factory.createDeleteBucket(s3Bucket); client.submit(deleteBucket); return deleteBucket; diff --git a/s3/src/test/java/org/jclouds/aws/s3/AmazonS3Test.java b/s3/src/test/java/org/jclouds/aws/s3/AmazonS3Test.java index 35600a52e2..b84f8bbca8 100644 --- a/s3/src/test/java/org/jclouds/aws/s3/AmazonS3Test.java +++ b/s3/src/test/java/org/jclouds/aws/s3/AmazonS3Test.java @@ -148,7 +148,7 @@ public class AmazonS3Test extends S3IntegrationTest { Boolean deleteBucket() throws Exception { String s3Bucket = bucketPrefix + "adrianjbosstest"; - return client.deleteBucketIfNotEmpty(s3Bucket) + return client.deleteBucketIfEmpty(s3Bucket) .get(10, TimeUnit.SECONDS); } diff --git a/s3/src/test/java/org/jclouds/aws/s3/S3IntegrationTest.java b/s3/src/test/java/org/jclouds/aws/s3/S3IntegrationTest.java index 6401497e45..63532c8a7f 100644 --- a/s3/src/test/java/org/jclouds/aws/s3/S3IntegrationTest.java +++ b/s3/src/test/java/org/jclouds/aws/s3/S3IntegrationTest.java @@ -152,7 +152,7 @@ public class S3IntegrationTest { iterator.next().get(10, TimeUnit.SECONDS); iterator.remove(); } - client.deleteBucketIfNotEmpty(metaDatum.getName()).get(10, + client.deleteBucketIfEmpty(metaDatum.getName()).get(10, TimeUnit.SECONDS); } diff --git a/s3/src/test/java/org/jclouds/aws/s3/StubS3Connection.java b/s3/src/test/java/org/jclouds/aws/s3/StubS3Connection.java index e928bdc08b..d4224ddf71 100644 --- a/s3/src/test/java/org/jclouds/aws/s3/StubS3Connection.java +++ b/s3/src/test/java/org/jclouds/aws/s3/StubS3Connection.java @@ -120,7 +120,7 @@ public class StubS3Connection implements S3Connection { }; } - public Future deleteBucketIfNotEmpty(final String s3Bucket) { + public Future deleteBucketIfEmpty(final String s3Bucket) { return new FutureBase() { public Boolean get() throws InterruptedException, ExecutionException {