Repository: jclouds-labs-google Updated Branches: refs/heads/master 0391f699e -> 2a4ed3c89
JCLOUDS-805: fix GCS MD5 checks Regression from b8670b16e3793fb17255381faee6608d694c387a. 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/2a4ed3c8 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/2a4ed3c8 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/2a4ed3c8 Branch: refs/heads/master Commit: 2a4ed3c89e9f13a13f592896e6a1a36c389239eb Parents: 0391f69 Author: Andrew Gaul <[email protected]> Authored: Thu Jan 15 14:40:46 2015 -0800 Committer: Andrew Gaul <[email protected]> Committed: Thu Jan 15 15:19:59 2015 -0800 ---------------------------------------------------------------------- .../googlecloudstorage/domain/templates/ObjectTemplate.java | 2 +- .../jclouds/googlecloudstorage/features/ObjectApiLiveTest.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2a4ed3c8/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java index 836846e..215ebc0 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java @@ -96,7 +96,7 @@ public class ObjectTemplate { } public ObjectTemplate md5Hash(String md5Hash) { - this.md5Hash = crc32c; + this.md5Hash = md5Hash; return this; } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2a4ed3c8/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java index 2417eec..5a78c44 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java @@ -59,7 +59,6 @@ import org.testng.annotations.Test; import com.beust.jcommander.internal.Lists; import com.google.common.collect.ImmutableMap; -import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; import com.google.common.io.ByteSource; import com.google.common.primitives.Bytes; @@ -396,9 +395,9 @@ public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest { } private void checkHashCodes(GoogleCloudStorageObject gcsObject) { - assertEquals(HashCode.fromBytes(base64().decode(gcsObject.md5Hash())), md5Hash); + assertEquals(gcsObject.md5Hash(), md5Hash); if (crc32c != null) { - assertEquals(HashCode.fromBytes(reverse(base64().decode(gcsObject.crc32c()))), crc32c); + assertEquals(gcsObject.crc32c(), crc32c); } }
