---

mziccard · mziccard · commit fed83137613c · 2015-09-25T14:51:18.000+02:00
yaml --- r: 6139 b: refs/heads/tswast-patch-1 c: 210355d h: refs/heads/master i: 6137: 030178b 6135: abfecc0
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: 1318e333c2d7bae7d3de3655e9b8737fb13dd80a
+refs/heads/tswast-patch-1: 210355d0089e8740a186de0dd48d86f9f4f7fee3
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -30,6 +30,7 @@
 import com.google.auth.oauth2.GoogleCredentials;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
@@ -133,7 +134,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
       try {
         computeCredential = getComputeCredential();
       } catch (GeneralSecurityException e) {
-       throw new IOException(e);
+        throw new IOException(e);
       }
     }
 
@@ -156,7 +157,7 @@ private static class ApplicationDefaultAuthCredentials extends AuthCredentials {
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
       in.defaultReadObject();
-      googleCredentials =  GoogleCredentials.getApplicationDefault();
+      googleCredentials = GoogleCredentials.getApplicationDefault();
     }
 
     @Override
@@ -183,8 +184,8 @@ public static AuthCredentials createForComputeEngine()
    *
    * <p>Returns the Application Default Credentials which are credentials that identify and
    * authorize the whole application. This is the built-in service account if running on
-   * Google Compute Engine or the credentials file from the path in the environment variable
-   * GOOGLE_APPLICATION_CREDENTIALS.
+   * Google Compute Engine or the credentials file can be read from the path in the environment
+   * variable GOOGLE_APPLICATION_CREDENTIALS.
    * </p>
    *
    * @return the credentials instance.
@@ -194,10 +195,41 @@ public static AuthCredentials createApplicationDefaults() throws IOException {
     return new ApplicationDefaultAuthCredentials();
   }
 
+  /**
+   * Creates Service Account Credentials given an account id and a private key.
+   *
+   * <p>For details on how to obtain Service Account Credentials see
+   * <a href="https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts">Service
+   * Account Authentication</a>.
+   * </p>
+   *
+   * @param account id of the Service Account
+   * @param privateKey private key associated to the account
+   * @return the credentials instance.
+   */
   public static ServiceAccountAuthCredentials createFor(String account, PrivateKey privateKey) {
     return new ServiceAccountAuthCredentials(account, privateKey);
   }
 
+  /**
+   * Creates Service Account Credentials given a stream for credentials in JSON format.
+   *
+   * <p>For details on how to obtain Service Account Credentials in JSON format see
+   * <a href="https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts">Service
+   * Account Authentication</a>.
+   * </p>
+   *
+   * @param jsonCredentialStream stream for Service Account Credentials in JSON format
+   * @return the credentials instance.
+   * @throws IOException if the credentials cannot be created from the stream.
+   */
+  public static ServiceAccountAuthCredentials createForJson(InputStream jsonCredentialStream)
+      throws IOException {
+    GoogleCredential tempCredentials = GoogleCredential.fromStream(jsonCredentialStream);
+    return new ServiceAccountAuthCredentials(tempCredentials.getServiceAccountId(),
+        tempCredentials.getServiceAccountPrivateKey());
+  }
+
   public static AuthCredentials noCredentials() {
     return ServiceAccountAuthCredentials.NO_CREDENTIALS;
   }
