fix merge conflicts

googleapis · May 29, 2015 · 19f3350 · 19f3350
1 parent 6081b74
commit 19f3350
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
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
@@ -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/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
@@ -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 {