Updated Branches: refs/heads/master 865b91063 -> e14e23be5
Revert "Add Atmos-specific MD5 checksum header" This reverts commit 98230e60a4e47c94ffe65f50470cf5ad51ca3f67. This succeeded in my tests but integration tests fail. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/e14e23be Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/e14e23be Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/e14e23be Branch: refs/heads/master Commit: e14e23be527be253352e93e1e9be9af8687aade4 Parents: 865b910 Author: Andrew Gaul <[email protected]> Authored: Wed Jul 17 10:29:42 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Wed Jul 17 10:29:42 2013 -0700 ---------------------------------------------------------------------- .../jclouds/atmos/binders/BindMetadataToHeaders.java | 12 ------------ .../java/org/jclouds/atmos/reference/AtmosHeaders.java | 1 - .../atmos/blobstore/AtmosBlobRequestSignerTest.java | 7 +------ 3 files changed, 1 insertion(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/e14e23be/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java b/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java index f0b3d06..ba852b7 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/binders/BindMetadataToHeaders.java @@ -22,10 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Inject; import javax.inject.Singleton; -import com.google.common.io.BaseEncoding; - import org.jclouds.atmos.domain.AtmosObject; -import org.jclouds.atmos.reference.AtmosHeaders; import org.jclouds.http.HttpRequest; import org.jclouds.rest.Binder; @@ -50,15 +47,6 @@ public class BindMetadataToHeaders implements Binder { checkNotNull(object.getPayload(), "object payload"); checkArgument(object.getPayload().getContentMetadata().getContentLength() != null, "contentLength must be set, streaming not supported"); - byte[] contentMD5 = object.getContentMetadata().getContentMD5(); - if (contentMD5 != null) { - // Swizzle Content-MD5 to Atmos-specific header - object.getContentMetadata().setContentMD5(null); - request = (R) request.toBuilder() - .addHeader(AtmosHeaders.CHECKSUM, "MD5/0/" + - BaseEncoding.base64().encode(contentMD5)) - .build(); - } return metaBinder.bindToRequest(request, object.getUserMetadata()); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/e14e23be/apis/atmos/src/main/java/org/jclouds/atmos/reference/AtmosHeaders.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/reference/AtmosHeaders.java b/apis/atmos/src/main/java/org/jclouds/atmos/reference/AtmosHeaders.java index b4d2d3d..41b328f 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/reference/AtmosHeaders.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/reference/AtmosHeaders.java @@ -35,6 +35,5 @@ public interface AtmosHeaders { public static final String GROUP_ACL = "x-emc-groupacl"; public static final String UID = "x-emc-uid"; public static final String TOKEN = "x-emc-token"; - public static final String CHECKSUM = "x-emc-wschecksum"; } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/e14e23be/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java index 5f3ca33..9644406 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java @@ -99,12 +99,7 @@ public class AtmosBlobRequestSignerTest extends BaseAsyncClientTest<AtmosAsyncCl "POST https://accesspoint.atmosonline.com/rest/namespace/container/name HTTP/1.1"); assertNonPayloadHeadersEqual( request, - "Accept: */*\n" + - "Date: Thu, 05 Jun 2008 16:38:19 GMT\n" + - "Expect: 100-continue\n" + - "x-emc-signature: PY3MQyILhoLDVoKfnB6ECTRaCWQ=\n" + - "x-emc-uid: identity\n" + - "x-emc-wschecksum: MD5/0/AAIECA==\n"); + "Accept: */*\nDate: Thu, 05 Jun 2008 16:38:19 GMT\nExpect: 100-continue\nx-emc-signature: 7Cbdnu+YA5rG9J/C9RlHk07mU7w=\nx-emc-uid: identity\n"); assertContentHeadersEqual(request, "text/plain", null, null, null, 2L, new byte[] { 0, 2, 4, 8 }, new Date(1000));
