Check contentType != null before adding object to rewrite

mziccard · mziccard · commit f90e70c4e978 · 2015-10-28T17:13:44.000+01:00
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -376,16 +376,15 @@ public void run(Storage storage, CopyRequest request) {
 
     @Override
     CopyRequest parse(String... args) {
-      if (args.length != 5) {
+      if (args.length != 4) {
         throw new IllegalArgumentException();
       }
-      return CopyRequest.of(args[0], args[1],
-          BlobInfo.builder(args[2], args[3]).contentType(args[4]).build());
+      return CopyRequest.of(args[0], args[1], BlobInfo.builder(args[2], args[3]).build());
     }
 
     @Override
     public String params() {
-      return "<from_bucket> <from_path> <to_bucket> <to_path> <to_content_type>";
+      return "<from_bucket> <from_path> <to_bucket> <to_path>";
     }
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -539,7 +539,7 @@ private RewriteResponse rewrite(RewriteRequest req, String token) throws Storage
           ? req.megabytesRewrittenPerCall * MEGABYTE : null;
       com.google.api.services.storage.model.RewriteResponse rewriteReponse = storage.objects()
           .rewrite(req.source.getBucket(), req.source.getName(), req.target.getBucket(),
-              req.target.getName(), req.target)
+              req.target.getName(), req.target.getContentType() != null ? req.target : null)
           .setRewriteToken(token)
           .setMaxBytesRewrittenPerCall(maxBytesRewrittenPerCall)
           .setProjection(DEFAULT_PROJECTION)
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -655,6 +655,16 @@ public static CopyRequest of(BlobId sourceBlobId, BlobInfo target) {
       return builder().source(sourceBlobId).target(target).build();
     }
 
+    public static CopyRequest of(String sourceBucket, String sourceBlob, String targetBlob) {
+      return of(sourceBucket, sourceBlob,
+          BlobInfo.builder(BlobId.of(sourceBucket, targetBlob)).build());
+    }
+
+    public static CopyRequest of(BlobId sourceBlobId, String targetBlob) {
+      return of(sourceBlobId,
+          BlobInfo.builder(BlobId.of(sourceBlobId.bucket(), targetBlob)).build());
+    }
+
     public static Builder builder() {
       return new Builder();
     }

Original file line number	Diff line number	Diff line change
`@@ -376,16 +376,15 @@ public void run(Storage storage, CopyRequest request) {`
`376`	`376`
`377`	`377`	`@Override`
`378`	`378`	`CopyRequest parse(String... args) {`
`379`		`- if (args.length != 5) {`
	`379`	`+ if (args.length != 4) {`
`380`	`380`	`throw new IllegalArgumentException();`
`381`	`381`	`}`
`382`		`- return CopyRequest.of(args[0], args[1],`
`383`		`- BlobInfo.builder(args[2], args[3]).contentType(args[4]).build());`
	`382`	`+ return CopyRequest.of(args[0], args[1], BlobInfo.builder(args[2], args[3]).build());`
`384`	`383`	`}`
`385`	`384`
`386`	`385`	`@Override`
`387`	`386`	`public String params() {`
`388`		`- return "<from_bucket> <from_path> <to_bucket> <to_path> <to_content_type>";`
	`387`	`+ return "<from_bucket> <from_path> <to_bucket> <to_path>";`
`389`	`388`	`}`
`390`	`389`	`}`
`391`	`390`