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/09 08:21:37 UTC

[07/16] jclouds git commit: JCLOUDS-651: Ensure copy replaces user metadata

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/c87e2052
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/c87e2052
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/c87e2052

Branch: refs/heads/1.9.x
Commit: c87e2052acee357c3174f077e5982a64e55408c8
Parents: 70eac74
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri Apr 3 17:50:33 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Wed Apr 8 23:13:52 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/c87e2052/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);