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 2015/04/04 02:52:49 UTC

jclouds git commit: JCLOUDS-651: Ensure copy replaces user metadata

Repository: jclouds
Updated Branches:
  refs/heads/master 67d731f05 -> a6a232a7a


JCLOUDS-651: Ensure copy replaces user metadata

Some object stores have additive semantics for metadata.  As currently
implemented Azure, S3, and Swift consistently replace user metadata
but have different behavior for system metadata, e.g., Content-Type.


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

Branch: refs/heads/master
Commit: a6a232a7a10037b49f44bb93dd8111f5ee9296d4
Parents: 67d731f
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri Apr 3 17:50:33 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Apr 3 17:50:33 2015 -0700

----------------------------------------------------------------------
 .../blobstore/integration/internal/BaseBlobIntegrationTest.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6a232a7/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
----------------------------------------------------------------------
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
index b205e84..0d57fc5 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
@@ -776,6 +776,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
       ByteSource payload = TestUtils.randomByteSource().slice(0, 1024);
       PayloadBlobBuilder blobBuilder = blobStore
             .blobBuilder(fromName)
+            .userMetadata(ImmutableMap.of("key1", "value1", "key2", "value2"))
             .payload(payload)
             .contentLength(payload.size());
       addContentMetadata(blobBuilder);
@@ -785,7 +786,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
       String toContainer = getContainerName();
       try {
          blobStore.putBlob(fromContainer, blob);
-         Map<String, String> userMetadata = ImmutableMap.of("key1", "value1", "key2", "value2");
+         Map<String, String> userMetadata = ImmutableMap.of("key3", "value3", "key4", "value4");
          blobStore.copyBlob(fromContainer, fromName, toContainer, toName,
                CopyOptions.builder().userMetadata(userMetadata).build());
          Blob toBlob = blobStore.getBlob(toContainer, toName);