Repository: jclouds-labs Updated Branches: refs/heads/master 8ec137391 -> e4cbe223b
JCLOUDS-1005: Do not map "none" SHA1 to null Callers expect that ETag has a non-null value. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/e4cbe223 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/e4cbe223 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/e4cbe223 Branch: refs/heads/master Commit: e4cbe223bd10281bc69f85f1d2ceaf2327c3ed40 Parents: 8ec1373 Author: Andrew Gaul <[email protected]> Authored: Fri Jun 17 07:43:06 2016 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Jun 17 13:11:41 2016 -0700 ---------------------------------------------------------------------- b2/src/main/java/org/jclouds/b2/domain/B2Object.java | 4 ---- .../test/java/org/jclouds/b2/features/MultipartApiMockTest.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e4cbe223/b2/src/main/java/org/jclouds/b2/domain/B2Object.java ---------------------------------------------------------------------- diff --git a/b2/src/main/java/org/jclouds/b2/domain/B2Object.java b/b2/src/main/java/org/jclouds/b2/domain/B2Object.java index 8b99a8e..bb49667 100644 --- a/b2/src/main/java/org/jclouds/b2/domain/B2Object.java +++ b/b2/src/main/java/org/jclouds/b2/domain/B2Object.java @@ -42,10 +42,6 @@ public abstract class B2Object { @SerializedNames({"fileId", "fileName", "accountId", "bucketId", "contentLength", "contentSha1", "contentType", "fileInfo", "action", "uploadTimestamp", "payload"}) public static B2Object create(String fileId, String fileName, @Nullable String accountId, @Nullable String bucketId, @Nullable Long contentLength, @Nullable String contentSha1, @Nullable String contentType, @Nullable Map<String, String> fileInfo, @Nullable Action action, @Nullable Long uploadTimestamp, @Nullable Payload payload) { - if ("none".equals(contentSha1)) { - // large files may have "none" sha1 - contentSha1 = null; - } if (fileInfo != null) { fileInfo = ImmutableMap.copyOf(fileInfo); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e4cbe223/b2/src/test/java/org/jclouds/b2/features/MultipartApiMockTest.java ---------------------------------------------------------------------- diff --git a/b2/src/test/java/org/jclouds/b2/features/MultipartApiMockTest.java b/b2/src/test/java/org/jclouds/b2/features/MultipartApiMockTest.java index 7220b88..147167c 100644 --- a/b2/src/test/java/org/jclouds/b2/features/MultipartApiMockTest.java +++ b/b2/src/test/java/org/jclouds/b2/features/MultipartApiMockTest.java @@ -118,7 +118,7 @@ public final class MultipartApiMockTest { assertThat(response.action()).isEqualTo(Action.UPLOAD); assertThat(response.bucketId()).isEqualTo(BUCKET_ID); assertThat(response.contentLength()).isEqualTo(208158542); - assertThat(response.contentSha1()).isNull(); + assertThat(response.contentSha1()).isEqualTo("none"); assertThat(response.contentType()).isEqualTo(CONTENT_TYPE); assertThat(response.fileId()).isEqualTo(FILE_ID); assertThat(response.fileInfo()).isEqualTo(FILE_INFO);
