---

mziccard · mziccard · commit 142c75cfd54f · 2015-10-14T12:07:15.000+02:00
yaml --- r: 6291 b: refs/heads/tswast-patch-1 c: 41da3aa h: refs/heads/master i: 6289: 20002b1 6287: 6526604
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 8b89ba37f3fe7edb8e9b5bfee575513de8642909
+refs/heads/tswast-patch-1: 41da3aa4c4be58d11580401f882b2179f3f1a73c
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -197,6 +197,23 @@ public Blob update(BlobInfo blobInfo, BlobTargetOption... options) {
     return new Blob(storage, storage.update(blobInfo, options));
   }
 
+  /**
+   * Copies this blob to the specified target. Possibly copying also some of the metadata
+   * (e.g. content-type).
+   *
+   * @param targetBlob target blob's id
+   * @param options source blob options
+   * @return the copied blob
+   * @throws StorageException upon failure
+   */
+  public Blob copyTo(BlobId targetBlob, BlobSourceOption... options) {
+    BlobInfo updatedInfo = info.toBuilder().blobId(targetBlob).build();
+    CopyRequest copyRequest =
+        CopyRequest.builder().source(info.bucket(), info.name())
+            .sourceOptions(convert(info, options)).target(updatedInfo).build();
+    return new Blob(storage, storage.copy(copyRequest));
+  }
+
   /**
    * Deletes this blob.
    *
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java b/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
@@ -143,6 +143,20 @@ public void testCopyTo() throws Exception {
     assertSame(storage, targetBlob.storage());
   }
 
+  @Test
+  public void testCopyToBlobId() throws Exception {
+    BlobId targetId = BlobId.of("bt", "nt");
+    BlobInfo target = BLOB_INFO.toBuilder().blobId(targetId).build();
+    Capture<CopyRequest> capturedCopyRequest = Capture.newInstance();
+    expect(storage.copy(capture(capturedCopyRequest))).andReturn(target);
+    replay(storage);
+    Blob targetBlob = blob.copyTo(targetId);
+    assertEquals(target, targetBlob.info());
+    assertEquals(capturedCopyRequest.getValue().source(), blob.id());
+    assertEquals(capturedCopyRequest.getValue().target(), target);
+    assertSame(storage, targetBlob.storage());
+  }
+
   @Test
   public void testReader() throws Exception {
     BlobReadChannel channel = createMock(BlobReadChannel.class);
