Repository: jclouds Updated Branches: refs/heads/master 42bfeccdf -> 3757a64ab
JCLOUDS-992: Handle directories as blobs in Swift. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/2c417c83 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/2c417c83 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/2c417c83 Branch: refs/heads/master Commit: 2c417c83a6fe4d3c5fb9f864ba48f5255fbea6c1 Parents: 42bfecc Author: Timur Alperovich <[email protected]> Authored: Tue Aug 18 11:33:08 2015 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu Aug 20 12:42:10 2015 -0700 ---------------------------------------------------------------------- .../openstack/swift/v1/blobstore/functions/ToBlobMetadata.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/2c417c83/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java index 8417e83..952379f 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java @@ -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); }
