---

aozarov · aozarov · commit b020cebd6591 · 2015-04-23T17:09:36.000-07:00
yaml --- r: 5951 b: refs/heads/tswast-patch-1 c: 2217787 h: refs/heads/master i: 5949: 7a2aa51 5947: b2d6530 5943: f7189cd 5935: fc0a976 5919: 42ea42a 5887: be8ff24
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: 8bd611cc80dcbc9b9a4224709146c90ae347647c
+refs/heads/tswast-patch-1: 2217787f1d869b1e45eb57df0a3b519150373d5e
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/AuthCredentials.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -30,17 +30,23 @@
 import com.google.auth.oauth2.GoogleCredentials;
 
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
 import java.security.GeneralSecurityException;
 import java.security.PrivateKey;
 import java.util.Set;
 
 /**
  * Credentials for accessing Google Cloud services.
  */
-public abstract class AuthCredentials {
+public abstract class AuthCredentials implements Serializable {
+
+  private static final long serialVersionUID = 236297804453464604L;
 
   private static class AppEngineAuthCredentials extends AuthCredentials {
 
+    private static final long serialVersionUID = 7931300552744202954L;
+
     @Override
     protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
         Set<String> scopes) {
@@ -50,6 +56,7 @@ protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
 
   private static class ServiceAccountAuthCredentials extends AuthCredentials {
 
+    private static final long serialVersionUID = 8007708734318445901L;
     private final String account;
     private final PrivateKey privateKey;
 
@@ -78,23 +85,64 @@ protected HttpRequestInitializer httpRequestInitializer(
     }
   }
 
+  private static class ComputeEngineAuthCredentials extends AuthCredentials {
+
+    private static final long serialVersionUID = -5217355402127260144L;
+
+    private transient ComputeCredential computeCredential;
+
+    ComputeEngineAuthCredentials() throws IOException, GeneralSecurityException {
+      computeCredential = getComputeCredential();
+    }
+
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+      in.defaultReadObject();
+      try {
+        computeCredential = getComputeCredential();
+      } catch (GeneralSecurityException e) {
+       throw new IOException(e);
+      }
+    }
+
+    @Override
+    protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
+        Set<String> scopes) {
+      return computeCredential;
+    }
+  }
+
+  private static class ApplicationDefaultAuthCredentials extends AuthCredentials {
+
+    private static final long serialVersionUID = -8306873864136099893L;
+    
+    private transient GoogleCredentials googleCredentials;
+
+    ApplicationDefaultAuthCredentials() throws IOException {
+      googleCredentials = GoogleCredentials.getApplicationDefault();
+    }
+
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+      in.defaultReadObject();
+      googleCredentials =  GoogleCredentials.getApplicationDefault();
+    }
+
+    @Override
+    protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
+        Set<String> scopes) {
+      return new HttpCredentialsAdapter(googleCredentials);
+    }
+  }
+
   protected abstract HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
       Set<String> scopes);
 
   public static AuthCredentials createForAppEngine() {
     return new AppEngineAuthCredentials();
   }
 
-  public static AuthCredentials createForComputeEngine() throws IOException,
-      GeneralSecurityException {
-    final ComputeCredential cred = getComputeCredential();
-    return new AuthCredentials() {
-      @Override
-      protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
-          Set<String> scopes) {
-        return cred;
-      }
-    };
+  public static AuthCredentials createForComputeEngine()
+      throws IOException, GeneralSecurityException {
+    return new ComputeEngineAuthCredentials();
   }
 
   /**
@@ -111,14 +159,7 @@ protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
    * @throws IOException if the credentials cannot be created in the current environment.
    */
   public static AuthCredentials createApplicationDefaults() throws IOException {
-    final GoogleCredentials credentials = GoogleCredentials.getApplicationDefault();
-    return new AuthCredentials() {
-      @Override
-      protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
-          Set<String> scopes) {
-        return new HttpCredentialsAdapter(credentials);
-      }
-    };
+    return new ApplicationDefaultAuthCredentials();
   }
 
   public static AuthCredentials createFor(String account, PrivateKey privateKey) {
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
