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 2017/05/08 18:10:19 UTC
[17/50] jclouds git commit: JCLOUDS-992: do not use RELATIVE_PATH for
BLOBs.
JCLOUDS-992: do not use RELATIVE_PATH for BLOBs.
Changes the Google storage provider to be inline with the other
providers in not returning RELATIVE_PATH for objects that are BLOBs.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/efdc715b
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/efdc715b
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/efdc715b
Branch: refs/heads/master
Commit: efdc715b88ed3e60d6eb63caf200d2eb6a38ffb6
Parents: 428d909
Author: Timur Alperovich <ti...@gmail.com>
Authored: Thu Aug 20 14:29:20 2015 -0700
Committer: Timur Alperovich <ti...@gmail.com>
Committed: Thu Aug 20 14:30:38 2015 -0700
----------------------------------------------------------------------
.../blobstore/functions/ObjectToBlobMetadata.java | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/efdc715b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/ObjectToBlobMetadata.java
----------------------------------------------------------------------
diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/ObjectToBlobMetadata.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/ObjectToBlobMetadata.java
index 93f9959..4a6cf7d 100644
--- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/ObjectToBlobMetadata.java
+++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/functions/ObjectToBlobMetadata.java
@@ -16,12 +16,10 @@
*/
package org.jclouds.googlecloudstorage.blobstore.functions;
-import javax.inject.Inject;
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.googlecloudstorage.domain.GoogleCloudStorageObject;
import org.jclouds.javax.annotation.Nullable;
@@ -30,11 +28,6 @@ import com.google.common.hash.HashCode;
import com.google.common.io.BaseEncoding;
public class ObjectToBlobMetadata implements Function<GoogleCloudStorageObject, MutableBlobMetadata> {
- private final IfDirectoryReturnNameStrategy ifDirectoryReturnName;
-
- @Inject public ObjectToBlobMetadata(IfDirectoryReturnNameStrategy ifDirectoryReturnName) {
- this.ifDirectoryReturnName = ifDirectoryReturnName;
- }
public MutableBlobMetadata apply(GoogleCloudStorageObject from) {
if (from == null) {
@@ -55,14 +48,7 @@ public class ObjectToBlobMetadata implements Function<GoogleCloudStorageObject,
to.setUri(from.selfLink());
to.setId(from.id());
to.setPublicUri(from.mediaLink());
-
- 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.size());
return to;
}