---

aozarov · aozarov · commit 161a70a41277 · 2015-05-29T12:35:36.000-07:00
yaml --- r: 6049 b: refs/heads/tswast-patch-1 c: 88cbd26 h: refs/heads/master i: 6047: 7a105db
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: 4ebe129805bef27425738cb2bd550be0902fe01b
+refs/heads/tswast-patch-1: 88cbd26835414d8ae2c48f9ebb85b7a846e088d0
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/branches/tswast-patch-1/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -86,7 +86,7 @@ private static abstract class StorageAction<T> {
 
     abstract void run(Storage storage, T request) throws Exception;
 
-    abstract T parse(String... args) throws IllegalArgumentException, IOException;
+    abstract T parse(String... args) throws Exception; 
 
     protected String params() {
       return "";
@@ -406,7 +406,7 @@ public String params() {
    */
   private static class ComposeAction extends StorageAction<ComposeRequest> {
     @Override
-    public void run(StorageService storage, ComposeRequest request) {
+    public void run(Storage storage, ComposeRequest request) {
       Blob composedBlob = storage.compose(request);
       System.out.println("Composed " + composedBlob);
     }
@@ -490,12 +490,12 @@ private static class SignUrlAction extends
     private static final char[] PASSWORD =  "notasecret".toCharArray();
 
     @Override
-    public void run(StorageService storage, Tuple<ServiceAccountAuthCredentials, Blob> tuple)
+    public void run(Storage storage, Tuple<ServiceAccountAuthCredentials, Blob> tuple)
         throws Exception {
       run(storage, tuple.x(), tuple.y());
     }
 
-    private void run(StorageService storage, ServiceAccountAuthCredentials cred, Blob blob)
+    private void run(Storage storage, ServiceAccountAuthCredentials cred, Blob blob)
         throws IOException {
       Calendar cal = Calendar.getInstance();
       cal.add(Calendar.DATE, 1);
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -279,7 +279,7 @@ class ComposeRequest implements Serializable {
 
     private final List<SourceBlob> sourceBlobs;
     private final Blob target;
-    private final List<StorageService.BlobTargetOption> targetOptions;
+    private final List<BlobTargetOption> targetOptions;
 
     public static class SourceBlob implements Serializable {
 
