From a2d8dfcb277c2c5b5bf6c4f66475124724bf3c19 Mon Sep 17 00:00:00 2001
From: Timur Alperovich <timur.alperovich@gmail.com>
Date: Tue, 18 Aug 2015 11:34:02 -0700
Subject: [PATCH] JCLOUDS-992: Handle directories as blobs in S3.

---
 .../blobstore/functions/ObjectToBlobMetadata.java | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

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 ca6ee3c6e1..dedb879979 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;
    }