Repository: jclouds-labs-aws Updated Branches: refs/heads/master 2040dc369 -> 1af587923
JCLOUDS-457: uploadPart return type fix The uploadPart method now returns HashCode instead of String. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/commit/1af58792 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/tree/1af58792 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/diff/1af58792 Branch: refs/heads/master Commit: 1af5879231ac41140007d727e05e7385140e3a84 Parents: 2040dc3 Author: Roman C. Coedo <[email protected]> Authored: Fri Jul 4 00:25:28 2014 +0200 Committer: Andrew Gaul <[email protected]> Committed: Fri Jul 4 13:29:21 2014 -0700 ---------------------------------------------------------------------- .../java/org/jclouds/glacier/GlacierAsyncClient.java | 2 +- .../src/main/java/org/jclouds/glacier/GlacierClient.java | 2 +- .../functions/ParseMultipartUploadTreeHashHeader.java | 11 ++++++----- .../java/org/jclouds/glacier/GlacierClientMockTest.java | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/1af58792/glacier/src/main/java/org/jclouds/glacier/GlacierAsyncClient.java ---------------------------------------------------------------------- diff --git a/glacier/src/main/java/org/jclouds/glacier/GlacierAsyncClient.java b/glacier/src/main/java/org/jclouds/glacier/GlacierAsyncClient.java index 541a3f4..a1c1939 100644 --- a/glacier/src/main/java/org/jclouds/glacier/GlacierAsyncClient.java +++ b/glacier/src/main/java/org/jclouds/glacier/GlacierAsyncClient.java @@ -201,7 +201,7 @@ public interface GlacierAsyncClient extends Closeable { @PUT @Path("/-/vaults/{vault}/multipart-uploads/{uploadId}") @ResponseParser(ParseMultipartUploadTreeHashHeader.class) - ListenableFuture<String> uploadPart( + ListenableFuture<HashCode> uploadPart( @ParamValidators(VaultNameValidator.class) @PathParam("vault") String vaultName, @PathParam("uploadId") String uploadId, @BinderParam(BindContentRangeToHeaders.class) ContentRange range, http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/1af58792/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java ---------------------------------------------------------------------- diff --git a/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java b/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java index da6fe7d..7826370 100644 --- a/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java +++ b/glacier/src/main/java/org/jclouds/glacier/GlacierClient.java @@ -157,7 +157,7 @@ public interface GlacierClient extends Closeable { * upload. * @see <a href="http://docs.aws.amazon.com/amazonglacier/latest/dev/api-upload-part.html"; /> */ - String uploadPart(String vaultName, String uploadId, ContentRange range, Payload payload); + HashCode uploadPart(String vaultName, String uploadId, ContentRange range, Payload payload); /** * Completes the multipart upload. http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/1af58792/glacier/src/main/java/org/jclouds/glacier/functions/ParseMultipartUploadTreeHashHeader.java ---------------------------------------------------------------------- diff --git a/glacier/src/main/java/org/jclouds/glacier/functions/ParseMultipartUploadTreeHashHeader.java b/glacier/src/main/java/org/jclouds/glacier/functions/ParseMultipartUploadTreeHashHeader.java index d779b48..64417c7 100644 --- a/glacier/src/main/java/org/jclouds/glacier/functions/ParseMultipartUploadTreeHashHeader.java +++ b/glacier/src/main/java/org/jclouds/glacier/functions/ParseMultipartUploadTreeHashHeader.java @@ -23,16 +23,17 @@ import org.jclouds.http.HttpException; import org.jclouds.http.HttpResponse; import com.google.common.base.Function; +import com.google.common.hash.HashCode; /** * Parses the tree hash header from the HttpResponse. */ -public class ParseMultipartUploadTreeHashHeader implements Function<HttpResponse, String> { +public class ParseMultipartUploadTreeHashHeader implements Function<HttpResponse, HashCode> { @Override - public String apply(HttpResponse from) { - String id = from.getFirstHeaderOrNull(GlacierHeaders.TREE_HASH); - if (id == null) + public HashCode apply(HttpResponse from) { + String treehash = from.getFirstHeaderOrNull(GlacierHeaders.TREE_HASH); + if (treehash == null) throw new HttpException("Did not receive Tree hash"); - return id; + return HashCode.fromString(treehash); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/1af58792/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java ---------------------------------------------------------------------- diff --git a/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java b/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java index cec3c24..9ae400a 100644 --- a/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java +++ b/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java @@ -89,7 +89,7 @@ public class GlacierClientMockTest { private static final String VAULT_ARN3 = VAULT_ARN_PREFIX + VAULT_NAME3; private static final String ARCHIVE_ID = "NkbByEejwEggmBz2fTHgJrg0XBoDfjP4q6iu87-TjhqG6eGoOY9Z8i1_AUyUsuhPAdTqLHy8pTl5nfCFJmDl2yEZONi5L26Omw12vcs01MNGntHEQL8MBfGlqrEXAMPLEArchiveId"; private static final String ARCHIVE_LOCATION = VAULT_LOCATION + "/archives/" + ARCHIVE_ID; - private static final String TREEHASH = "beb0fe31a1c7ca8c6c04d574ea906e3f97b31fdca7571defb5b44dca89b5af60"; + private static final HashCode TREEHASH = HashCode.fromString("beb0fe31a1c7ca8c6c04d574ea906e3f97b31fdca7571defb5b44dca89b5af60"); private static final String DESCRIPTION = "test description"; private static final String MULTIPART_UPLOAD_LOCATION = VAULT_LOCATION + "/multipart-uploads/" + ARCHIVE_ID; private static final String MULTIPART_UPLOAD_ID = "OW2fM5iVylEpFEMM9_HpKowRapC3vn5sSL39_396UW9zLFUWVrnRHaPjUJddQ5OxSHVXjYtrN47NBZ-khxOjyEXAMPLE";
