You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2016/01/18 08:11:26 UTC
jclouds git commit: JCLOUDS-1042: Remove unused bucketAcls
Repository: jclouds
Updated Branches:
refs/heads/master 6bc2ff7e0 -> 0f6ab3944
JCLOUDS-1042: Remove unused bucketAcls
Follow-on to 6bc2ff7e0059fe0a01871b12a09047086774e174.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0f6ab394
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0f6ab394
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0f6ab394
Branch: refs/heads/master
Commit: 0f6ab3944f4c51b928e553567a55c3f827bbe54e
Parents: 6bc2ff7
Author: Andrew Gaul <ga...@apache.org>
Authored: Sun Jan 17 23:05:08 2016 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sun Jan 17 23:05:08 2016 -0800
----------------------------------------------------------------------
.../aws/s3/blobstore/AWSS3BlobStore.java | 23 ++------------------
1 file changed, 2 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0f6ab394/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java
----------------------------------------------------------------------
diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java
index 546bf34..25351a0 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java
@@ -46,22 +46,16 @@ import org.jclouds.s3.blobstore.functions.BucketToResourceList;
import org.jclouds.s3.blobstore.functions.ContainerToBucketListOptions;
import org.jclouds.s3.blobstore.functions.ObjectToBlob;
import org.jclouds.s3.blobstore.functions.ObjectToBlobMetadata;
-import org.jclouds.s3.domain.AccessControlList;
import org.jclouds.s3.domain.BucketMetadata;
-import org.jclouds.s3.domain.CannedAccessPolicy;
-import org.jclouds.s3.domain.ObjectMetadata;
import com.google.common.base.Function;
import com.google.common.base.Supplier;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
/**
* Provide AWS S3 specific extensions.
*/
public class AWSS3BlobStore extends S3BlobStore {
- private final LoadingCache<String, AccessControlList> bucketAcls;
private final BlobToObject blob2Object;
@Inject
@@ -71,12 +65,10 @@ public class AWSS3BlobStore extends S3BlobStore {
ContainerToBucketListOptions container2BucketListOptions, BucketToResourceList bucket2ResourceList,
ObjectToBlob object2Blob, BlobToHttpGetOptions blob2ObjectGetOptions, BlobToObject blob2Object,
BlobToObjectMetadata blob2ObjectMetadata,
- ObjectToBlobMetadata object2BlobMd, Provider<FetchBlobMetadata> fetchBlobMetadataProvider,
- LoadingCache<String, AccessControlList> bucketAcls) {
+ ObjectToBlobMetadata object2BlobMd, Provider<FetchBlobMetadata> fetchBlobMetadataProvider) {
super(context, blobUtils, defaultLocation, locations, slicer, sync, convertBucketsToStorageMetadata,
container2BucketListOptions, bucket2ResourceList, object2Blob, blob2ObjectGetOptions, blob2Object,
- blob2ObjectMetadata, object2BlobMd, fetchBlobMetadataProvider, bucketAcls);
- this.bucketAcls = bucketAcls;
+ blob2ObjectMetadata, object2BlobMd, fetchBlobMetadataProvider);
this.blob2Object = blob2Object;
}
@@ -95,17 +87,6 @@ public class AWSS3BlobStore extends S3BlobStore {
private String putBlobWithReducedRedundancy(String container, Blob blob) {
AWSS3PutObjectOptions options = new AWSS3PutObjectOptions();
- try {
- AccessControlList acl = bucketAcls.getUnchecked(container);
- if (acl != null && acl.hasPermission(AccessControlList.GroupGranteeURI.ALL_USERS,
- AccessControlList.Permission.READ)) {
- options.withAcl(CannedAccessPolicy.PUBLIC_READ);
- }
- options.storageClass(ObjectMetadata.StorageClass.REDUCED_REDUNDANCY);
-
- } catch (CacheLoader.InvalidCacheLoadException e) {
- // nulls not permitted from cache loader
- }
return getContext().unwrapApi(AWSS3Client.class).putObject(container, blob2Object.apply(blob), options);
}