From 25810405da56db7dbccf2e09c124d4387d82a2a0 Mon Sep 17 00:00:00 2001 From: Hans-Peter Klett Date: Mon, 7 Apr 2014 17:24:20 -0600 Subject: [PATCH] Fixed the expected response codes for the Delete Object and Delete Bucket responses. --- .../spectralogic/ds3client/commands/DeleteBucketResponse.java | 2 +- .../spectralogic/ds3client/commands/DeleteObjectResponse.java | 2 +- src/test/java/com/spectralogic/ds3client/Ds3Client_Test.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/spectralogic/ds3client/commands/DeleteBucketResponse.java b/src/main/java/com/spectralogic/ds3client/commands/DeleteBucketResponse.java index 4326fc738..ea3c3baf2 100644 --- a/src/main/java/com/spectralogic/ds3client/commands/DeleteBucketResponse.java +++ b/src/main/java/com/spectralogic/ds3client/commands/DeleteBucketResponse.java @@ -11,6 +11,6 @@ public DeleteBucketResponse(CloseableHttpResponse response) throws IOException { @Override protected void processResponse() throws IOException { - checkStatusCode(200); + checkStatusCode(204); } } diff --git a/src/main/java/com/spectralogic/ds3client/commands/DeleteObjectResponse.java b/src/main/java/com/spectralogic/ds3client/commands/DeleteObjectResponse.java index e441fa022..dc15b28aa 100644 --- a/src/main/java/com/spectralogic/ds3client/commands/DeleteObjectResponse.java +++ b/src/main/java/com/spectralogic/ds3client/commands/DeleteObjectResponse.java @@ -11,6 +11,6 @@ public DeleteObjectResponse(CloseableHttpResponse response) throws IOException { @Override protected void processResponse() throws IOException { - checkStatusCode(200); + checkStatusCode(204); } } diff --git a/src/test/java/com/spectralogic/ds3client/Ds3Client_Test.java b/src/test/java/com/spectralogic/ds3client/Ds3Client_Test.java index 3d0d30768..6baa3cb3e 100644 --- a/src/test/java/com/spectralogic/ds3client/Ds3Client_Test.java +++ b/src/test/java/com/spectralogic/ds3client/Ds3Client_Test.java @@ -139,7 +139,7 @@ void validate(PutBucketRequest request) { public void deleteBucket() throws IOException, SignatureException { new NonStrictExpectations() {{ netClient.getResponse(withInstanceOf(DeleteBucketRequest.class)); - result = new MockedResponse("", 200).getMockInstance(); + result = new MockedResponse("", 204).getMockInstance(); forEachInvocation = new Object() { void validate(DeleteBucketRequest request) { assertThat(request.getPath(), is("/bucketName")); @@ -154,7 +154,7 @@ void validate(DeleteBucketRequest request) { public void deleteObject() throws IOException, SignatureException { new NonStrictExpectations() {{ netClient.getResponse(withInstanceOf(DeleteObjectRequest.class)); - result = new MockedResponse("", 200).getMockInstance(); + result = new MockedResponse("", 204).getMockInstance(); forEachInvocation = new Object() { void validate(DeleteObjectRequest request) { assertThat(request.getPath(), is("/bucketName/my/file.txt"));