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/06/13 01:18:08 UTC
[1/2] jclouds-labs-google git commit: Update ObjectApi and getBlob,
fix testGetRangeOutOfRange
Repository: jclouds-labs-google
Updated Branches:
refs/heads/1.9.x 75dacfd60 -> 074d8fa47
Update ObjectApi and getBlob, fix testGetRangeOutOfRange
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/dbb59495
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/dbb59495
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/dbb59495
Branch: refs/heads/1.9.x
Commit: dbb59495c01a0faaf21c7eec8e3548baaade8f82
Parents: 75dacfd
Author: Daniel Broudy <br...@google.com>
Authored: Tue Jun 9 12:52:00 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Jun 12 16:14:22 2015 -0700
----------------------------------------------------------------------
.../blobstore/GoogleCloudStorageBlobStore.java | 9 +++++++--
.../org/jclouds/googlecloudstorage/features/ObjectApi.java | 5 +++--
.../googlecloudstorage/options/GetObjectOptions.java | 4 ++--
.../googlecloudstorage/features/ObjectApiMockTest.java | 4 +++-
4 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/dbb59495/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java
index dcc1d5a..98b47c2 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java
@@ -36,6 +36,7 @@ import org.jclouds.blobstore.domain.PageSet;
import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.blobstore.domain.internal.BlobImpl;
import org.jclouds.blobstore.domain.internal.PageSetImpl;
+import org.jclouds.blobstore.functions.BlobToHttpGetOptions;
import org.jclouds.blobstore.internal.BaseBlobStore;
import org.jclouds.blobstore.options.CreateContainerOptions;
import org.jclouds.blobstore.options.GetOptions;
@@ -87,6 +88,7 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore {
private final BlobStoreListContainerOptionsToListObjectOptions listContainerOptionsToListObjectOptions;
private final Provider<MultipartUploadStrategy> multipartUploadStrategy;
private final Supplier<String> projectId;
+ private final BlobToHttpGetOptions blob2ObjectGetOptions;
@Inject GoogleCloudStorageBlobStore(BlobStoreContext context, BlobUtils blobUtils, Supplier<Location> defaultLocation,
@Memoized Supplier<Set<? extends Location>> locations, GoogleCloudStorageApi api,
@@ -95,7 +97,8 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore {
Provider<FetchBlobMetadata> fetchBlobMetadataProvider,
BlobMetadataToObjectTemplate blobMetadataToObjectTemplate,
BlobStoreListContainerOptionsToListObjectOptions listContainerOptionsToListObjectOptions,
- Provider<MultipartUploadStrategy> multipartUploadStrategy, @CurrentProject Supplier<String> projectId) {
+ Provider<MultipartUploadStrategy> multipartUploadStrategy, @CurrentProject Supplier<String> projectId,
+ BlobToHttpGetOptions blob2ObjectGetOptions) {
super(context, blobUtils, defaultLocation, locations);
this.api = api;
this.bucketToStorageMetadata = bucketToStorageMetadata;
@@ -106,6 +109,7 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore {
this.listContainerOptionsToListObjectOptions = listContainerOptionsToListObjectOptions;
this.projectId = projectId;
this.multipartUploadStrategy = multipartUploadStrategy;
+ this.blob2ObjectGetOptions = checkNotNull(blob2ObjectGetOptions, "blob2ObjectGetOptions");
}
@Override
@@ -246,10 +250,11 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore {
if (gcsObject == null) {
return null;
}
+ org.jclouds.http.options.GetOptions httpOptions = blob2ObjectGetOptions.apply(options);
MutableBlobMetadata metadata = objectToBlobMetadata.apply(gcsObject);
Blob blob = new BlobImpl(metadata);
// TODO: Does getObject not get the payload?!
- Payload payload = api.getObjectApi().download(container, name).getPayload();
+ Payload payload = api.getObjectApi().download(container, name, httpOptions).getPayload();
payload.setContentMetadata(metadata.getContentMetadata()); // Doing this first retains it on setPayload.
blob.setPayload(payload);
return blob;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/dbb59495/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java
index 29bbd57..119aece 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java
@@ -45,6 +45,7 @@ import org.jclouds.googlecloudstorage.options.InsertObjectOptions;
import org.jclouds.googlecloudstorage.options.ListObjectOptions;
import org.jclouds.googlecloudstorage.options.UpdateObjectOptions;
import org.jclouds.googlecloudstorage.parser.ParseToPayloadEnclosing;
+import org.jclouds.http.options.HttpRequestOptions;
import org.jclouds.io.Payload;
import org.jclouds.io.PayloadEnclosing;
import org.jclouds.javax.annotation.Nullable;
@@ -123,7 +124,7 @@ public interface ObjectApi {
@Fallback(NullOnNotFoundOr404.class)
@Nullable
GoogleCloudStorageObject getObject(@PathParam("bucket") String bucketName, @PathParam("object") String objectName,
- GetObjectOptions options);
+ HttpRequestOptions options);
/**
* Retrieve an object or their metadata
@@ -163,7 +164,7 @@ public interface ObjectApi {
@ResponseParser(ParseToPayloadEnclosing.class)
@Fallback(NullOnNotFoundOr404.class)
@Nullable PayloadEnclosing download(@PathParam("bucket") String bucketName, @PathParam("object") String objectName,
- GetObjectOptions options);
+ HttpRequestOptions options);
/**
* Stores a new object. Object metadata setting is not supported with simple uploads
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/dbb59495/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/options/GetObjectOptions.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/options/GetObjectOptions.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/options/GetObjectOptions.java
index a4446e6..2d307bc 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/options/GetObjectOptions.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/options/GetObjectOptions.java
@@ -19,12 +19,12 @@ package org.jclouds.googlecloudstorage.options;
import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Projection;
-import org.jclouds.http.options.BaseHttpRequestOptions;
+import org.jclouds.http.options.GetOptions;
/**
* Allows to optionally specify generation,ifGenerationMatch,ifGenerationNotMatch, ifMetagenerationMatch,ifMetagenerationNotMatch and projection which used in Bucket
*/
-public class GetObjectOptions extends BaseHttpRequestOptions {
+public class GetObjectOptions extends GetOptions {
public GetObjectOptions ifGenerationMatch(Long ifGenerationMatch) {
this.queryParameters.put("ifGenerationMatch", checkNotNull(ifGenerationMatch, "ifGenerationMatch") + "");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/dbb59495/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiMockTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiMockTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiMockTest.java
index d95b078..af224d4 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiMockTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiMockTest.java
@@ -81,10 +81,12 @@ public class ObjectApiMockTest extends BaseGoogleCloudStorageApiMockTest {
server.enqueue(jsonResponse("/object_get.json"));
GetObjectOptions options = new GetObjectOptions().ifGenerationMatch((long) 1000);
+ options.range(0, 1023);
assertEquals(objectApi().getObject("test", "file_name", options),
new ParseGoogleCloudStorageObject().expected());
- assertSent(server, "GET", "/storage/v1/b/test/o/file_name?ifGenerationMatch=1000");
+ RecordedRequest request = assertSent(server, "GET", "/storage/v1/b/test/o/file_name?ifGenerationMatch=1000");
+ assertEquals(request.getHeader("Range"), "bytes=0-1023");
}
public void simpleUpload() throws Exception {
[2/2] jclouds-labs-google git commit: fix javadoc
Posted by ga...@apache.org.
fix javadoc
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/074d8fa4
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/074d8fa4
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/074d8fa4
Branch: refs/heads/1.9.x
Commit: 074d8fa4772ca2499f0ec73c76889d1fdcd50123
Parents: dbb5949
Author: Daniel Broudy <br...@google.com>
Authored: Fri Jun 12 14:26:50 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Jun 12 16:14:38 2015 -0700
----------------------------------------------------------------------
.../org/jclouds/googlecloudstorage/features/ObjectApi.java | 6 ++++--
.../jclouds/googlecloudstorage/options/GetObjectOptions.java | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/074d8fa4/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java
index 119aece..f91a410 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/features/ObjectApi.java
@@ -113,7 +113,8 @@ public interface ObjectApi {
* @param objectName
* Name of the object
* @param options
- * Supply {@link GetObjectOptions} with optional query parameters
+ * A class that implements {@link HttpRequestOptions}
+ * such as {@link GetObjectOptions} with optional query parameters
*
* @return a {@link GoogleCloudStorageObject}
*/
@@ -153,7 +154,8 @@ public interface ObjectApi {
* @param objectName
* Name of the object
* @param options
- * Supply {@link GetObjectOptions} with optional query parameters
+ * A class that implements {@link HttpRequestOptions}
+ * such as {@link GetObjectOptions} with optional query parameters
*
* @return a {@link GoogleCloudStorageObject}
*/
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/074d8fa4/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/options/GetObjectOptions.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/options/GetObjectOptions.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/options/GetObjectOptions.java
index 2d307bc..5fd9b0f 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/options/GetObjectOptions.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/options/GetObjectOptions.java
@@ -22,7 +22,8 @@ import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Projection
import org.jclouds.http.options.GetOptions;
/**
- * Allows to optionally specify generation,ifGenerationMatch,ifGenerationNotMatch, ifMetagenerationMatch,ifMetagenerationNotMatch and projection which used in Bucket
+ * Allows to optionally specify generation, ifGenerationMatch, ifGenerationNotMatch, ifMetagenerationMatch,
+ * ifMetagenerationNotMatch and projection, in addition to the values in {@link GetOptions}.
*/
public class GetObjectOptions extends GetOptions {