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 2015/03/30 20:29:50 UTC
[3/3] jclouds-labs-google git commit: Use GCS simple upload in
sequential upload strategy
Use GCS simple upload in sequential upload strategy
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/cd19b9f7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/cd19b9f7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/cd19b9f7
Branch: refs/heads/1.9.x
Commit: cd19b9f78b78a0007c4e5f84b198623c6f23f518
Parents: 77c34da
Author: snotling <da...@gmail.com>
Authored: Fri Mar 27 10:33:46 2015 +0100
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Mar 30 11:29:29 2015 -0700
----------------------------------------------------------------------
.../internal/SequentialMultipartUploadStrategy.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cd19b9f7/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java
index 5e3a909..065f002 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java
@@ -29,6 +29,7 @@ import org.jclouds.googlecloudstorage.blobstore.functions.BlobMetadataToObjectTe
import org.jclouds.googlecloudstorage.domain.GoogleCloudStorageObject;
import org.jclouds.googlecloudstorage.domain.templates.ComposeObjectTemplate;
import org.jclouds.googlecloudstorage.domain.templates.ObjectTemplate;
+import org.jclouds.googlecloudstorage.options.InsertObjectOptions;
import org.jclouds.io.Payload;
import org.jclouds.io.PayloadSlicer;
@@ -78,11 +79,12 @@ public final class SequentialMultipartUploadStrategy extends MultipartUploadStra
int partNum = algorithm.getNextPart();
String partName = namingStrategy.getPartName(key, partNum, partCount);
long partSize = ((partCount + 1) == partNum) ? algorithm.getRemaining() : algorithm.getChunkSize();
- Blob blobPart = blobBuilders.get().name(partName).payload(part).contentDisposition(partName)
- .contentLength(partSize).contentType(blob.getMetadata().getContentMetadata().getContentType())
- .build();
- GoogleCloudStorageObject object = api.getObjectApi().multipartUpload(container,
- blob2ObjectTemplate.apply(blobPart.getMetadata()), part);
+
+ InsertObjectOptions insertOptions = new InsertObjectOptions().name(partName);
+
+ GoogleCloudStorageObject object = api.getObjectApi().simpleUpload(container,
+ blob.getMetadata().getContentMetadata().getContentType(), partSize, part, insertOptions);
+
sourceList.add(object);
}
ComposeObjectTemplate template = ComposeObjectTemplate.create(sourceList, destination);