Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-844: Atmos putBlob ACLs

This commit is contained in:
Andrew Gaul 2015-12-21 17:48:16 -08:00
parent c0d72b6f53
commit cc0d0d40c5
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java
View File

@ -231,14 +231,7 @@ public class AtmosBlobStore extends BaseBlobStore {
*/
@Override
public String putBlob(final String container, final Blob blob) {
final org.jclouds.atmos.options.PutOptions options = new org.jclouds.atmos.options.PutOptions();
try {
if (isPublic.getUnchecked(container + "/"))
options.publicRead();
} catch (CacheLoader.InvalidCacheLoadException e) {
// nulls not permitted
}
return AtmosUtils.putBlob(sync, crypto, blob2Object, container, blob, options);
return putBlob(container, blob, PutOptions.NONE);
}
/**
@ -248,8 +241,22 @@ public class AtmosBlobStore extends BaseBlobStore {
*/
@Override
public String putBlob(String container, Blob blob, PutOptions options) {
// TODO implement options
return putBlob(container, blob);
if (options.isMultipart()) {
throw new UnsupportedOperationException("Atmos does not support multipart uploads");
}
org.jclouds.atmos.options.PutOptions atmosOptions = new org.jclouds.atmos.options.PutOptions();
atmosOptions.publicNone();
try {
// TODO: not needed
if (isPublic.getUnchecked(container + "/"))
atmosOptions.publicRead();
} catch (CacheLoader.InvalidCacheLoadException e) {
// nulls not permitted
}
if (options.getBlobAccess() == BlobAccess.PUBLIC_READ) {
atmosOptions.publicRead();
}
return AtmosUtils.putBlob(sync, crypto, blob2Object, container, blob, atmosOptions);
}
/**
@ -289,7 +296,7 @@ public class AtmosBlobStore extends BaseBlobStore {
}
@Override
public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata) {
public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata, PutOptions options) {
throw new UnsupportedOperationException("Atmos does not support multipart uploads");
}

6
apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosIntegrationLiveTest.java
View File

@ -150,4 +150,10 @@ public class AtmosIntegrationLiveTest extends BaseBlobIntegrationTest {
public void testPutMultipartInputStream() throws Exception {
throw new SkipException("Atmos does not support multipart uploads");
}
@Override
@Test(groups = { "integration", "live" }, expectedExceptions = UnsupportedOperationException.class)
public void testPutBlobAccessMultipart() throws Exception {
super.testPutBlobAccessMultipart();
}
}