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 fbb481c62c..780310866d 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 fetchBlobMetadataProvider; - private final LoadingCache bucketAcls; @Inject protected S3BlobStore(BlobStoreContext context, BlobUtils blobUtils, Supplier 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 fetchBlobMetadataProvider, - LoadingCache bucketAcls) { + ObjectToBlobMetadata object2BlobMd, Provider 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"); } /** 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 884236376d..f8bf9bf374 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 { - private final LoadingCache bucketAcls; private final Function locationOfBucket; @Inject - public ObjectToBlobMetadata(LoadingCache bucketAcls, Function locationOfBucket) { - this.bucketAcls = bucketAcls; + public ObjectToBlobMetadata(Function locationOfBucket) { this.locationOfBucket = locationOfBucket; }