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 Swift.

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

5
apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java
View File

@ -21,8 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
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.blobstore.strategy.internal.MarkersIfDirectoryReturnNameStrategy;
import org.jclouds.openstack.swift.v1.domain.Container;
import org.jclouds.openstack.swift.v1.domain.SwiftObject;
import org.jclouds.openstack.swift.v1.functions.ParseObjectListFromResponse;
@ -31,7 +29,6 @@ import com.google.common.base.Function;
public class ToBlobMetadata implements Function<SwiftObject, MutableBlobMetadata> {
private final IfDirectoryReturnNameStrategy ifDirectoryReturnName = new MarkersIfDirectoryReturnNameStrategy();
private final Container container;
public ToBlobMetadata(Container container) {
@ -57,7 +54,7 @@ public class ToBlobMetadata implements Function<SwiftObject, MutableBlobMetadata
to.getContentMetadata().setExpires(from.getPayload().getContentMetadata().getExpires());
to.setUserMetadata(from.getMetadata());
if (eTag != null && eTag.equals(ParseObjectListFromResponse.SUBDIR_ETAG)) {
to.setType(StorageType.RELATIVE_PATH);
to.setType(StorageType.FOLDER);
} else {
to.setType(StorageType.BLOB);
}