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

JCLOUDS-992: Handle directories as blobs in S3.

This commit is contained in:
Timur Alperovich 2015-08-18 11:34:02 -07:00 committed by Andrew Gaul
parent 2c417c83a6
commit a2d8dfcb27
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java
View File

@ -22,7 +22,6 @@ import javax.inject.Singleton;
import org.jclouds.blobstore.domain.MutableBlobMetadata; import org.jclouds.blobstore.domain.MutableBlobMetadata;
import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl; import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
import org.jclouds.blobstore.strategy.IfDirectoryReturnNameStrategy;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.http.HttpUtils; import org.jclouds.http.HttpUtils;
import org.jclouds.s3.domain.AccessControlList; import org.jclouds.s3.domain.AccessControlList;
@ -36,14 +35,12 @@ import com.google.common.cache.LoadingCache;
@Singleton @Singleton
public class ObjectToBlobMetadata implements Function<ObjectMetadata, MutableBlobMetadata> { public class ObjectToBlobMetadata implements Function<ObjectMetadata, MutableBlobMetadata> {
private final IfDirectoryReturnNameStrategy ifDirectoryReturnName;
private final LoadingCache<String, AccessControlList> bucketAcls; private final LoadingCache<String, AccessControlList> bucketAcls;
private final Function<String, Location> locationOfBucket; private final Function<String, Location> locationOfBucket;
@Inject @Inject
public ObjectToBlobMetadata(IfDirectoryReturnNameStrategy ifDirectoryReturnName, public ObjectToBlobMetadata(LoadingCache<String, AccessControlList> bucketAcls, Function<String,
LoadingCache<String, AccessControlList> bucketAcls, Function<String, Location> locationOfBucket) { Location> locationOfBucket) {
this.ifDirectoryReturnName = ifDirectoryReturnName;
this.bucketAcls = bucketAcls; this.bucketAcls = bucketAcls;
this.locationOfBucket = locationOfBucket; this.locationOfBucket = locationOfBucket;
} }
@ -67,13 +64,7 @@ public class ObjectToBlobMetadata implements Function<ObjectMetadata, MutableBlo
to.setLastModified(from.getLastModified()); to.setLastModified(from.getLastModified());
to.setUserMetadata(from.getUserMetadata()); to.setUserMetadata(from.getUserMetadata());
to.setLocation(locationOfBucket.apply(from.getBucket())); 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()); to.setSize(from.getContentMetadata().getContentLength());
return to; return to;
} }