Merge pull request #85 from EMCECS/feature-delete-bucket-policy

added deleteBucketPolicy call

Author: twincitiesguy

src/main/java/com/emc/object/s3/S3Client.java

@@ -192,6 +192,13 @@ public interface S3Client {
      */
     BucketPolicy getBucketPolicy(String bucketName);
 
+    /**
+     * Deletes the bucket policy for <code>bucketName</code>
+     *
+     * @see BucketPolicy
+     */
+    void deleteBucketPolicy(String bucketName);
+
     /**
      * Gets the location of <code>bucketName</code>. This call will return the name of the primary VDC of the bucket
      */

src/main/java/com/emc/object/s3/jersey/S3JerseyClient.java

@@ -140,7 +140,7 @@ public S3JerseyClient(S3Config s3Config) {
     public S3JerseyClient(S3Config config, ClientHandler clientHandler) {
         super(new S3Config(config)); // deep-copy config so that two clients don't share the same host lists (SDK-122)
         s3Config = (S3Config) super.getObjectConfig();
-        if(s3Config.isUseV2Signer())
+        if (s3Config.isUseV2Signer())
             this.signer = new S3SignerV2(s3Config);
         else
             this.signer = new S3SignerV4(s3Config);
@@ -207,7 +207,7 @@ public S3JerseyClient(S3Config config, ClientHandler clientHandler) {
         while (handler instanceof ClientFilter) {
             ClientFilter filter = (ClientFilter) handler;
             if (filter instanceof SmartFilter) {
-                smartFilter = (SmartFilter)filter;
+                smartFilter = (SmartFilter) filter;
                 client.removeFilter(smartFilter);
             }
             handler = filter.getNext();
@@ -219,7 +219,7 @@ public S3JerseyClient(S3Config config, ClientHandler clientHandler) {
         if (s3Config.isRetryEnabled()) client.addFilter(new RetryFilter(s3Config)); // replaces the apache retry handler
         if (s3Config.isChecksumEnabled()) client.addFilter(new ChecksumFilter(s3Config));
         client.addFilter(new AuthorizationFilter(s3Config));
-        if(smartFilter != null) {
+        if (smartFilter != null) {
             client.addFilter(smartFilter);
         }
         if (s3Config.isGeoPinningEnabled()) client.addFilter(new GeoPinningFilter(s3Config));
@@ -412,6 +412,11 @@ public BucketPolicy getBucketPolicy(String bucketName) {
         return executeRequest(client, request, BucketPolicy.class);
     }
 
+    @Override
+    public void deleteBucketPolicy(String bucketName) {
+        executeAndClose(client, new GenericBucketRequest(Method.DELETE, bucketName, "policy"));
+    }
+
     @Override
     public LocationConstraint getBucketLocation(String bucketName) {
         ObjectRequest request = new GenericBucketRequest(Method.GET, bucketName, "location");
@@ -459,7 +464,7 @@ public MetadataSearchList listBucketMetadataSearchKeys(String bucketName) {
     @Override
     public QueryObjectsResult queryObjects(QueryObjectsRequest request) {
         String query = request.getQuery();
-        if(query == null || query.isEmpty()) {
+        if (query == null || query.isEmpty()) {
             throw new IllegalArgumentException("QueryObjectsRequest must contain a query expression.");
         }
         QueryObjectsResult result = executeRequest(client, request, QueryObjectsResult.class);
@@ -687,7 +692,7 @@ public AccessControlList getObjectAcl(GetObjectAclRequest request) {
     }
 
     @Override
-    public void extendRetentionPeriod(String bucketName, String key, Long period){
+    public void extendRetentionPeriod(String bucketName, String key, Long period) {
         ObjectRequest request = new S3ObjectRequest(Method.PUT, bucketName, key, S3Constants.PARAM_RETENTION_UPDATE);
         request.addCustomHeader(RestUtil.EMC_RETENTION_PERIOD, period);
         executeAndClose(client, request);

src/test/java/com/emc/object/s3/S3JerseyClientTest.java

@@ -637,6 +637,15 @@ public void testBucketPolicy() {
         client.setBucketPolicy(getTestBucket(), bucketPolicy);
 
         Assert.assertEquals(bucketPolicy, client.getBucketPolicy(getTestBucket()));
+
+        client.deleteBucketPolicy(getTestBucket());
+        try {
+            client.getBucketPolicy(getTestBucket());
+            Assert.fail("get-policy should have thrown an exception after deleting policy");
+        } catch (S3Exception e) {
+            Assert.assertEquals(404, e.getHttpCode());
+            Assert.assertEquals("NoSuchBucketPolicy", e.getErrorCode());
+        }
     }
 
     @Test