From 3f60b0a2a04174a9b580fab1cd757fbcd1fba85d Mon Sep 17 00:00:00 2001 From: Mateusz Date: Wed, 27 Jan 2016 23:33:53 +0100 Subject: [PATCH] Renamed method to `doesObjectExist` as `InBucket` is implied by parameter name --- .../main/java/com/amazonaws/services/s3/AbstractAmazonS3.java | 2 +- .../src/main/java/com/amazonaws/services/s3/AmazonS3.java | 2 +- .../src/main/java/com/amazonaws/services/s3/AmazonS3Client.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AbstractAmazonS3.java b/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AbstractAmazonS3.java index 46615e66fd30..f265fb186469 100644 --- a/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AbstractAmazonS3.java +++ b/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AbstractAmazonS3.java @@ -921,7 +921,7 @@ public void deleteBucketReplicationConfiguration(DeleteBucketReplicationConfigur } @Override - public boolean doesObjectExistInBucket(String bucketName, String objectName) + public boolean doesObjectExist(String bucketName, String objectName) throws AmazonServiceException, AmazonClientException { throw new UnsupportedOperationException("Extend AbstractAmazonS3 to provide an implementation"); } diff --git a/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3.java b/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3.java index 897677964adf..069603aee8fa 100644 --- a/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3.java +++ b/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3.java @@ -4505,7 +4505,7 @@ void deleteBucketReplicationConfiguration(String bucketName) * If any errors are encountered in the client while making the * request or handling the response. */ - boolean doesObjectExistInBucket(String bucketName, String objectName) + boolean doesObjectExist(String bucketName, String objectName) throws AmazonServiceException, AmazonClientException; } diff --git a/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java b/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java index a1fce6400510..f5f5dd1ad8fe 100644 --- a/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java +++ b/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java @@ -4077,7 +4077,7 @@ private String getBucketRegionViaHeadRequest(String bucketName) { } @Override - public boolean doesObjectExistInBucket(String bucketName, String objectName) throws AmazonServiceException, AmazonClientException { + public boolean doesObjectExist(String bucketName, String objectName) throws AmazonServiceException, AmazonClientException { try { getObjectMetadata(bucketName, objectName); } catch (AmazonS3Exception e) {