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 2015/08/20 21:42:39 UTC
[3/7] jclouds git commit: JCLOUDS-992: Handle directories as blobs in
S3.
JCLOUDS-992: Handle directories as blobs in S3.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a2d8dfcb
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a2d8dfcb
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a2d8dfcb
Branch: refs/heads/master
Commit: a2d8dfcb277c2c5b5bf6c4f66475124724bf3c19
Parents: 2c417c8
Author: Timur Alperovich <ti...@gmail.com>
Authored: Tue Aug 18 11:34:02 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Thu Aug 20 12:42:11 2015 -0700
----------------------------------------------------------------------
.../s3/blobstore/functions/ObjectToBlobMetadata.java | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a2d8dfcb/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 ca6ee3c..dedb879 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
@@ -22,7 +22,6 @@ import javax.inject.Singleton;
import org.jclouds.blobstore.domain.MutableBlobMetadata;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
-import org.jclouds.blobstore.strategy.IfDirectoryReturnNameStrategy;
import org.jclouds.domain.Location;
import org.jclouds.http.HttpUtils;
import org.jclouds.s3.domain.AccessControlList;
@@ -36,14 +35,12 @@ import com.google.common.cache.LoadingCache;
@Singleton
public class ObjectToBlobMetadata implements Function<ObjectMetadata, MutableBlobMetadata> {
- private final IfDirectoryReturnNameStrategy ifDirectoryReturnName;
private final LoadingCache<String, AccessControlList> bucketAcls;
private final Function<String, Location> locationOfBucket;
@Inject
- public ObjectToBlobMetadata(IfDirectoryReturnNameStrategy ifDirectoryReturnName,
- LoadingCache<String, AccessControlList> bucketAcls, Function<String, Location> locationOfBucket) {
- this.ifDirectoryReturnName = ifDirectoryReturnName;
+ public ObjectToBlobMetadata(LoadingCache<String, AccessControlList> bucketAcls, Function<String,
+ Location> locationOfBucket) {
this.bucketAcls = bucketAcls;
this.locationOfBucket = locationOfBucket;
}
@@ -67,13 +64,7 @@ public class ObjectToBlobMetadata implements Function<ObjectMetadata, MutableBlo
to.setLastModified(from.getLastModified());
to.setUserMetadata(from.getUserMetadata());
to.setLocation(locationOfBucket.apply(from.getBucket()));
- String directoryName = ifDirectoryReturnName.execute(to);
- if (directoryName != null) {
- to.setName(directoryName);
- to.setType(StorageType.RELATIVE_PATH);
- } else {
- to.setType(StorageType.BLOB);
- }
+ to.setType(StorageType.BLOB);
to.setSize(from.getContentMetadata().getContentLength());
return to;
}