Merge pull request #48 from aozarov/master

change source options and some docs
googleapis · May 9, 2015 · 72bb3ee · 72bb3ee
2 parents 1f6cefe + 92c6df8
commit 72bb3ee
Show file tree

Hide file tree

Showing 7 changed files with 212 additions and 101 deletions.
diff --git a/src/main/java/com/google/gcloud/examples/StorageExample.java b/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -117,14 +117,14 @@ private static class InfoAction extends BlobsAction {
     public void run(StorageService storage, Blob... blobs) {
       if (blobs.length == 1) {
         if (blobs[0].name().isEmpty()) {
-          System.out.println(storage.get(Bucket.of(blobs[0].bucket())));
+          System.out.println(storage.get(blobs[0].bucket()));
         } else {
-          System.out.println(storage.get(blobs[0]));
+          System.out.println(storage.get(blobs[0].bucket(), blobs[0].name()));
         }
       } else {
         BatchRequest.Builder batch = BatchRequest.builder();
         for (Blob blob : blobs) {
-          batch.get(blob);
+          batch.get(blob.bucket(), blob.name());
         }
         BatchResponse response = storage.apply(batch.build());
         System.out.println(response.gets());
@@ -149,11 +149,11 @@ private static class DeleteAction extends BlobsAction {
     @Override
     public void run(StorageService storage, Blob... blobs) {
       if (blobs.length == 1) {
-        System.out.println(storage.delete(blobs[0]));
+        System.out.println(storage.delete(blobs[0].bucket(), blobs[0].name()));
       } else {
         BatchRequest.Builder batch = BatchRequest.builder();
         for (Blob blob : blobs) {
-          batch.delete(blob);
+          batch.delete(blob.bucket(), blob.name());
         }
         BatchResponse response = storage.apply(batch.build());
         System.out.println(response.deletes());
@@ -236,7 +236,7 @@ private static class DownloadAction extends StorageAction<Tuple<Blob, Path>> {
 
     @Override
     public void run(StorageService storage, Tuple<Blob, Path> tuple) throws IOException {
-      Blob blob = storage.get(tuple.x());
+      Blob blob = storage.get(tuple.x().bucket(), tuple.x().name());
       if (blob == null) {
         System.out.println("No such object");
         return;
@@ -246,9 +246,9 @@ public void run(StorageService storage, Tuple<Blob, Path> tuple) throws IOExcept
         writeTo = new PrintStream(new FileOutputStream(tuple.y().toFile()));
       }
       if (blob.size() < 1024) {
-        writeTo.write(storage.load(blob));
+        writeTo.write(storage.load(blob.bucket(), blob.name()));
       } else {
-        try (BlobReadChannel reader = storage.reader(blob)) {
+        try (BlobReadChannel reader = storage.reader(blob.bucket(), blob.name())) {
           WritableByteChannel channel = Channels.newChannel(writeTo);
           ByteBuffer bytes = ByteBuffer.allocate(64 * 1024);
           while (reader.read(bytes) > 0) {
@@ -299,7 +299,7 @@ CopyRequest parse(String... args) {
       if (args.length != 4) {
         throw new IllegalArgumentException();
       }
-      return CopyRequest.of(Blob.of(args[0], args[1]), Blob.of(args[2], args[3]));
+      return CopyRequest.of(args[0], args[1], Blob.of(args[2], args[3]));
     }
 
     @Override

diff --git a/src/main/java/com/google/gcloud/storage/BatchRequest.java b/src/main/java/com/google/gcloud/storage/BatchRequest.java
@@ -46,8 +46,8 @@ private Builder() {}
     /**
      * Delete the given blob.
      */
-    public void delete(Blob blob, BlobSourceOption... options) {
-      toDelete.put(blob, options);
+    public void delete(String bucket, String blob, BlobSourceOption... options) {
+      toDelete.put(Blob.of(bucket, blob), options);
     }
 
     /**
@@ -60,8 +60,8 @@ public void update(Blob blob, BlobTargetOption... options) {
     /**
      * Retrieve metadata for the given blob.
      */
-    public void get(Blob blob, BlobSourceOption... options) {
-      toGet.put(blob, options);
+    public void get(String bucket, String blob, BlobSourceOption... options) {
+      toGet.put(Blob.of(bucket, blob), options);
     }
 
     public BatchRequest build() {

diff --git a/src/main/java/com/google/gcloud/storage/BatchResponse.java b/src/main/java/com/google/gcloud/storage/BatchResponse.java
@@ -27,9 +27,11 @@
  */
 public class BatchResponse implements Serializable {
 
-  private List<Result<Boolean>> deleteResult;
-  private List<Result<Blob>> updateResult;
-  private List<Result<Blob>> getResult;
+  private static final long serialVersionUID = 1057416839397037706L;
+
+  private final List<Result<Boolean>> deleteResult;
+  private final List<Result<Blob>> updateResult;
+  private final List<Result<Blob>> getResult;
 
   public static class Result<T extends Serializable> implements Serializable {
 

diff --git a/src/main/java/com/google/gcloud/storage/Option.java b/src/main/java/com/google/gcloud/storage/Option.java
@@ -36,7 +36,7 @@ class Option implements Serializable {
 
   Option(StorageRpc.Option rpcOption, Object value) {
     this.rpcOption = checkNotNull(rpcOption);
-    this.value = checkNotNull(value);
+    this.value = value;
   }
 
   StorageRpc.Option rpcOption() {