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 03:00:27 UTC
[1/2] jclouds git commit: JCLOUDS-1042: Remove unneeded ACL swizzling
Repository: jclouds
Updated Branches:
refs/heads/master 688890819 -> 6bc2ff7e0
JCLOUDS-1042: Remove unneeded ACL swizzling
Follow on to 750c5d5316ab96f89fe11ae101fbbb2d18aa1d11.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/68e65391
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/68e65391
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/68e65391
Branch: refs/heads/master
Commit: 68e6539192690a10afc450c1bb6cc623e0e25224
Parents: 6888908
Author: Andrew Gaul <ga...@apache.org>
Authored: Sun Jan 17 17:30:06 2016 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sun Jan 17 17:30:06 2016 -0800
----------------------------------------------------------------------
.../s3/blobstore/functions/ObjectToBlobMetadata.java | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/68e65391/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java
index dedb879..8842363 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java
@@ -25,12 +25,9 @@ import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
import org.jclouds.domain.Location;
import org.jclouds.http.HttpUtils;
import org.jclouds.s3.domain.AccessControlList;
-import org.jclouds.s3.domain.AccessControlList.GroupGranteeURI;
-import org.jclouds.s3.domain.AccessControlList.Permission;
import org.jclouds.s3.domain.ObjectMetadata;
import com.google.common.base.Function;
-import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
@Singleton
@@ -50,13 +47,6 @@ public class ObjectToBlobMetadata implements Function<ObjectMetadata, MutableBlo
return null;
MutableBlobMetadata to = new MutableBlobMetadataImpl();
HttpUtils.copy(from.getContentMetadata(), to.getContentMetadata());
- try {
- AccessControlList bucketAcl = bucketAcls.getUnchecked(from.getBucket());
- if (bucketAcl.hasPermission(GroupGranteeURI.ALL_USERS, Permission.READ))
- to.setPublicUri(from.getUri());
- } catch (CacheLoader.InvalidCacheLoadException e) {
- // nulls not permitted from cache loader
- }
to.setUri(from.getUri());
to.setContainer(from.getBucket());
to.setETag(from.getETag());
[2/2] jclouds git commit: JCLOUDS-1042: Remove unused bucketAcls
Posted by ga...@apache.org.
JCLOUDS-1042: Remove unused bucketAcls
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6bc2ff7e
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6bc2ff7e
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6bc2ff7e
Branch: refs/heads/master
Commit: 6bc2ff7e0059fe0a01871b12a09047086774e174
Parents: 68e6539
Author: Andrew Gaul <ga...@apache.org>
Authored: Sun Jan 17 17:33:48 2016 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sun Jan 17 17:35:12 2016 -0800
----------------------------------------------------------------------
.../src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java | 6 +-----
.../jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java | 7 +------
2 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6bc2ff7e/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java
index fbb481c..7803108 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java
@@ -74,7 +74,6 @@ import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
-import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -91,7 +90,6 @@ public class S3BlobStore extends BaseBlobStore {
private final BlobToObjectMetadata blob2ObjectMetadata;
private final BlobToHttpGetOptions blob2ObjectGetOptions;
private final Provider<FetchBlobMetadata> fetchBlobMetadataProvider;
- private final LoadingCache<String, AccessControlList> bucketAcls;
@Inject
protected S3BlobStore(BlobStoreContext context, BlobUtils blobUtils, Supplier<Location> defaultLocation,
@@ -100,8 +98,7 @@ public class S3BlobStore extends BaseBlobStore {
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);
this.blob2ObjectGetOptions = checkNotNull(blob2ObjectGetOptions, "blob2ObjectGetOptions");
this.sync = checkNotNull(sync, "sync");
@@ -113,7 +110,6 @@ public class S3BlobStore extends BaseBlobStore {
this.object2BlobMd = checkNotNull(object2BlobMd, "object2BlobMd");
this.blob2ObjectMetadata = checkNotNull(blob2ObjectMetadata, "blob2ObjectMetadata");
this.fetchBlobMetadataProvider = checkNotNull(fetchBlobMetadataProvider, "fetchBlobMetadataProvider");
- this.bucketAcls = checkNotNull(bucketAcls, "bucketAcls");
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6bc2ff7e/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java
index 8842363..f8bf9bf 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java
@@ -24,21 +24,16 @@ import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
import org.jclouds.domain.Location;
import org.jclouds.http.HttpUtils;
-import org.jclouds.s3.domain.AccessControlList;
import org.jclouds.s3.domain.ObjectMetadata;
import com.google.common.base.Function;
-import com.google.common.cache.LoadingCache;
@Singleton
public class ObjectToBlobMetadata implements Function<ObjectMetadata, MutableBlobMetadata> {
- private final LoadingCache<String, AccessControlList> bucketAcls;
private final Function<String, Location> locationOfBucket;
@Inject
- public ObjectToBlobMetadata(LoadingCache<String, AccessControlList> bucketAcls, Function<String,
- Location> locationOfBucket) {
- this.bucketAcls = bucketAcls;
+ public ObjectToBlobMetadata(Function<String, Location> locationOfBucket) {
this.locationOfBucket = locationOfBucket;
}