JCLOUDS-844: Portable putBlob ACLs

apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java

@@ -264,7 +264,6 @@ public class S3BlobStore extends BaseBlobStore {
          return putMultipartBlob(container, blob, overrides);
       }
 
-      // TODO: Make use of options overrides
       PutObjectOptions options = new PutObjectOptions();
       return sync.putObject(container, blob2Object.apply(blob), options);
    }

blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java

@@ -333,7 +333,7 @@ public interface BlobStore {
    long countBlobs(String container, ListContainerOptions options);
 
    @Beta
-   MultipartUpload initiateMultipartUpload(String container, BlobMetadata blob);
+   MultipartUpload initiateMultipartUpload(String container, BlobMetadata blob, PutOptions options);
 
    @Beta
    // TODO: take parts?

blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java

@@ -750,9 +750,9 @@ public final class LocalBlobStore implements BlobStore {
    }
 
    @Override
-   public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata) {
+   public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata, PutOptions options) {
       return MultipartUpload.create(container, blobMetadata.getName(), UUID.randomUUID().toString(),
-            blobMetadata);
+            blobMetadata, options);
    }
 
    @Override
@@ -809,6 +809,8 @@ public final class LocalBlobStore implements BlobStore {
          storageStrategy.removeBlob(mpu.containerName(), mpu.blobName() + "-" + part.partNumber());
       }
 
+      setBlobAccess(mpu.containerName(), mpu.blobName(), mpu.putOptions().getBlobAccess());
+
       return eTag;
    }
 

blobstore/src/main/java/org/jclouds/blobstore/domain/MultipartUpload.java

@@ -17,6 +17,8 @@
 
 package org.jclouds.blobstore.domain;
 
+import org.jclouds.blobstore.options.PutOptions;
+
 import com.google.auto.value.AutoValue;
 
 @AutoValue
@@ -25,8 +27,10 @@ public abstract class MultipartUpload {
    public abstract String blobName();
    public abstract String id();
    public abstract BlobMetadata blobMetadata();
+   public abstract PutOptions putOptions();
 
-   public static MultipartUpload create(String containerName, String blobName, String id, BlobMetadata blobMetadata) {
+   public static MultipartUpload create(String containerName, String blobName, String id, BlobMetadata blobMetadata,
-      return new AutoValue_MultipartUpload(containerName, blobName, id, blobMetadata);
+         PutOptions putOptions) {
+      return new AutoValue_MultipartUpload(containerName, blobName, id, blobMetadata, putOptions);
    }
 }

blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java

@@ -290,7 +290,7 @@ public abstract class BaseBlobStore implements BlobStore {
    // TODO: parallel uploads
    @Beta
    protected String putMultipartBlob(String container, Blob blob, PutOptions overrides) {
-      MultipartUpload mpu = initiateMultipartUpload(container, blob.getMetadata());
+      MultipartUpload mpu = initiateMultipartUpload(container, blob.getMetadata(), overrides);
       List<MultipartPart> parts = Lists.newArrayList();
       long contentLength = blob.getMetadata().getContentMetadata().getContentLength();
       MultipartUploadSlicingAlgorithm algorithm = new MultipartUploadSlicingAlgorithm(

blobstore/src/main/java/org/jclouds/blobstore/options/PutOptions.java

@@ -16,6 +16,10 @@
  */
 package org.jclouds.blobstore.options;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.jclouds.blobstore.domain.BlobAccess;
+
 /**
  * Contains options supported in the put blob operation. <h2>
  * Usage</h2> The recommended way to instantiate a PutOptions object is to statically import
@@ -30,6 +34,7 @@ public class PutOptions implements Cloneable {
 
    public static final ImmutablePutOptions NONE = new ImmutablePutOptions(new PutOptions());
 
+   private BlobAccess blobAccess = BlobAccess.PRIVATE;
    private boolean multipart = false;
 
    public PutOptions() {
@@ -46,6 +51,16 @@ public class PutOptions implements Cloneable {
          this.delegate = delegate;
       }
 
+      @Override
+      public BlobAccess getBlobAccess() {
+         return delegate.getBlobAccess();
+      }
+
+      @Override
+      public PutOptions setBlobAccess(BlobAccess blobAccess) {
+         throw new UnsupportedOperationException();
+      }
+
       @Override
       public boolean isMultipart() {
          return delegate.isMultipart();
@@ -68,6 +83,15 @@ public class PutOptions implements Cloneable {
 
    }
 
+   public BlobAccess getBlobAccess() {
+      return blobAccess;
+   }
+
+   public PutOptions setBlobAccess(BlobAccess blobAccess) {
+      this.blobAccess = checkNotNull(blobAccess);
+      return this;
+   }
+
    public boolean isMultipart() {
       return multipart;
    }
@@ -115,6 +139,6 @@ public class PutOptions implements Cloneable {
 
    @Override
    public String toString() {
-      return "[multipart=" + multipart + "]";
+      return "[multipart=" + multipart + ", blobAccess=" + blobAccess + "]";
    }
 }

blobstore/src/main/java/org/jclouds/blobstore/util/ForwardingBlobStore.java

@@ -220,8 +220,8 @@ public abstract class ForwardingBlobStore extends ForwardingObject
    }
 
    @Override
-   public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata) {
+   public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata, PutOptions options) {
-      return delegate().initiateMultipartUpload(container, blobMetadata);
+      return delegate().initiateMultipartUpload(container, blobMetadata, options);
    }
 
    @Override

blobstore/src/main/java/org/jclouds/blobstore/util/ReadOnlyBlobStore.java

@@ -136,7 +136,7 @@ public final class ReadOnlyBlobStore extends ForwardingBlobStore {
    }
 
    @Override
-   public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata) {
+   public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata, PutOptions options) {
       throw new UnsupportedOperationException("Read-only BlobStore");
    }
 

blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java

@@ -674,6 +674,44 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
       }
    }
 
+   @Test(groups = { "integration", "live" })
+   public void testPutBlobAccess() throws Exception {
+      BlobStore blobStore = view.getBlobStore();
+      String containerName = getContainerName();
+      try {
+         String blobNamePrivate = "put-access-blob-name-private";
+         Blob blobPrivate = blobStore.blobBuilder(blobNamePrivate).payload(new byte[1]).build();
+         blobStore.putBlob(containerName, blobPrivate, new PutOptions().setBlobAccess(BlobAccess.PRIVATE));
+         assertThat(blobStore.getBlobAccess(containerName, blobNamePrivate)).isEqualTo(BlobAccess.PRIVATE);
+
+         String blobNamePublic = "put-access-blob-name-public";
+         Blob blobPublic = blobStore.blobBuilder(blobNamePublic).payload(new byte[1]).build();
+         blobStore.putBlob(containerName, blobPublic, new PutOptions().setBlobAccess(BlobAccess.PUBLIC_READ));
+         assertThat(blobStore.getBlobAccess(containerName, blobNamePublic)).isEqualTo(BlobAccess.PUBLIC_READ);
+      } finally {
+         returnContainer(containerName);
+      }
+   }
+
+   @Test(groups = { "integration", "live" })
+   public void testPutBlobAccessMultipart() throws Exception {
+      BlobStore blobStore = view.getBlobStore();
+      String containerName = getContainerName();
+      try {
+         String blobNamePrivate = "put-access-blob-name-private";
+         Blob blobPrivate = blobStore.blobBuilder(blobNamePrivate).payload(new byte[1]).build();
+         blobStore.putBlob(containerName, blobPrivate, new PutOptions().setBlobAccess(BlobAccess.PRIVATE).multipart(true));
+         assertThat(blobStore.getBlobAccess(containerName, blobNamePrivate)).isEqualTo(BlobAccess.PRIVATE);
+
+         String blobNamePublic = "put-access-blob-name-public";
+         Blob blobPublic = blobStore.blobBuilder(blobNamePublic).payload(new byte[1]).build();
+         blobStore.putBlob(containerName, blobPublic, new PutOptions().setBlobAccess(BlobAccess.PUBLIC_READ).multipart(true));
+         assertThat(blobStore.getBlobAccess(containerName, blobNamePublic)).isEqualTo(BlobAccess.PUBLIC_READ);
+      } finally {
+         returnContainer(containerName);
+      }
+   }
+
    protected void checkUserMetadata(Map<String, String> userMetadata1, Map<String, String> userMetadata2) {
       assertThat(userMetadata1).isEqualTo(userMetadata2);
    }
@@ -900,7 +938,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
       try {
          String name = "blob-name";
          Blob blob = blobStore.blobBuilder(name).build();
-         MultipartUpload mpu = blobStore.initiateMultipartUpload(container, blob.getMetadata());
+         MultipartUpload mpu = blobStore.initiateMultipartUpload(container, blob.getMetadata(), new PutOptions());
 
          List<MultipartPart> parts = blobStore.listMultipartUpload(mpu);
          assertThat(parts).isEqualTo(ImmutableList.of());
@@ -926,7 +964,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
                .payload(new byte[0]);
          addContentMetadata(blobBuilder);
          Blob blob = blobBuilder.build();
-         MultipartUpload mpu = blobStore.initiateMultipartUpload(container, blob.getMetadata());
+         MultipartUpload mpu = blobStore.initiateMultipartUpload(container, blob.getMetadata(), new PutOptions());
 
          ByteSource byteSource = TestUtils.randomByteSource().slice(0, 1);
          Payload payload = Payloads.newByteSourcePayload(byteSource);
@@ -960,7 +998,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
                .payload(new byte[0]);
          addContentMetadata(blobBuilder);
          Blob blob = blobBuilder.build();
-         MultipartUpload mpu = blobStore.initiateMultipartUpload(container, blob.getMetadata());
+         MultipartUpload mpu = blobStore.initiateMultipartUpload(container, blob.getMetadata(), new PutOptions());
 
          ByteSource byteSource = TestUtils.randomByteSource().slice(0, blobStore.getMinimumMultipartPartSize() + 1);
          ByteSource byteSource1 = byteSource.slice(0, blobStore.getMinimumMultipartPartSize());