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 2013/07/11 22:54:32 UTC

[1/2] git commit: Add Atmos-specific MD5 checksum header

Updated Branches:
  refs/heads/master 0d310f364 -> 1178f47cd


Add Atmos-specific MD5 checksum header

Tested that Atmos Online and Synaptic Atmos both enforce this.


Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/98230e60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/98230e60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/98230e60

Branch: refs/heads/master
Commit: 98230e60a4e47c94ffe65f50470cf5ad51ca3f67
Parents: 0d310f3
Author: Andrew Gaul <ga...@apache.org>
Authored: Thu Jun 20 15:26:23 2013 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Wed Jul 10 22:16:44 2013 -0700

----------------------------------------------------------------------
 .../jclouds/atmos/binders/BindMetadataToHeaders.java    | 12 ++++++++++++
 .../java/org/jclouds/atmos/reference/AtmosHeaders.java  |  1 +
 .../atmos/blobstore/AtmosBlobRequestSignerTest.java     |  7 ++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/98230e60/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 ba852b7..f0b3d06 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,7 +22,10 @@ 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;
 
@@ -47,6 +50,15 @@ 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/98230e60/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 41b328f..b4d2d3d 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,5 +35,6 @@ 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/98230e60/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 9644406..5f3ca33 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,7 +99,12 @@ public class AtmosBlobRequestSignerTest extends BaseAsyncClientTest<AtmosAsyncCl
                "POST https://accesspoint.atmosonline.com/rest/namespace/container/name HTTP/1.1");
       assertNonPayloadHeadersEqual(
                request,
-               "Accept: */*\nDate: Thu, 05 Jun 2008 16:38:19 GMT\nExpect: 100-continue\nx-emc-signature: 7Cbdnu+YA5rG9J/C9RlHk07mU7w=\nx-emc-uid: identity\n");
+               "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");
 
       assertContentHeadersEqual(request, "text/plain", null, null, null, 2L, new byte[] { 0, 2, 4, 8 }, new Date(1000));
 


[2/2] git commit: Upgrade to gson 2.2.4 https://issues.apache.org/jira/browse/JCLOUDS-117

Posted by ga...@apache.org.
Upgrade to gson 2.2.4
https://issues.apache.org/jira/browse/JCLOUDS-117


Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/1178f47c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/1178f47c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/1178f47c

Branch: refs/heads/master
Commit: 1178f47cd7d829c1fd6bedc0f4e13d8073846594
Parents: 98230e6
Author: Zack Shoylev <za...@rackspace.com>
Authored: Tue Jun 25 16:46:40 2013 -0500
Committer: Andrew Gaul <ga...@apache.org>
Committed: Thu Jul 11 13:52:32 2013 -0700

----------------------------------------------------------------------
 core/pom.xml                                                    | 2 +-
 core/src/main/java/org/jclouds/json/config/GsonModule.java      | 3 ++-
 ...alizationConstructorAndReflectiveTypeAdapterFactoryTest.java | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/1178f47c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 44a9404..cea171c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.2.2</version>
+      <version>2.2.4</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/1178f47c/core/src/main/java/org/jclouds/json/config/GsonModule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/json/config/GsonModule.java b/core/src/main/java/org/jclouds/json/config/GsonModule.java
index 3d2e0bf..4be2fd6 100644
--- a/core/src/main/java/org/jclouds/json/config/GsonModule.java
+++ b/core/src/main/java/org/jclouds/json/config/GsonModule.java
@@ -65,6 +65,7 @@ import com.google.gson.FieldAttributes;
 import com.google.gson.FieldNamingStrategy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.InstanceCreator;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.internal.ConstructorConstructor;
@@ -123,7 +124,7 @@ public class GsonModule extends AbstractModule {
             ImmutableSet.of(ConstructorProperties.class, Inject.class), ImmutableSet.of(new ExtractNamed()));
 
       builder.registerTypeAdapterFactory(new DeserializationConstructorAndReflectiveTypeAdapterFactory(
-            new ConstructorConstructor(), serializationPolicy, Excluder.DEFAULT, deserializationPolicy));
+            new ConstructorConstructor(ImmutableMap.<Type, InstanceCreator<?>>of()), serializationPolicy, Excluder.DEFAULT, deserializationPolicy));
 
       // complicated (serializers/deserializers as they need context to operate)
       builder.registerTypeHierarchyAdapter(Enum.class, new EnumTypeAdapterThatReturnsFromValue());

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/1178f47c/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java b/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java
index 004196b..0c57cef 100644
--- a/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java
+++ b/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java
@@ -23,6 +23,7 @@ import static org.testng.Assert.assertNull;
 
 import java.beans.ConstructorProperties;
 import java.io.IOException;
+import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;
 
@@ -36,12 +37,14 @@ import org.testng.annotations.Test;
 
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.FieldNamingStrategy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.InstanceCreator;
 import com.google.gson.TypeAdapter;
 import com.google.gson.internal.ConstructorConstructor;
 import com.google.gson.internal.Excluder;
@@ -65,7 +68,7 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactoryTest
       NamingStrategies.AnnotationConstructorNamingStrategy deserializationPolicy = new NamingStrategies.AnnotationConstructorNamingStrategy(
             ImmutableSet.of(ConstructorProperties.class, Inject.class), ImmutableSet.of(new ExtractNamed()));
 
-      return new DeserializationConstructorAndReflectiveTypeAdapterFactory(new ConstructorConstructor(),
+      return new DeserializationConstructorAndReflectiveTypeAdapterFactory(new ConstructorConstructor(ImmutableMap.<Type, InstanceCreator<?>>of()),
             serializationPolicy, Excluder.DEFAULT, deserializationPolicy);
    }