---

Ajay Kannan · Ajay Kannan · commit 729b252157a5 · 2016-03-06T08:54:43.000-08:00
yaml --- r: 7019 b: refs/heads/tswast-patch-1 c: c486452 h: refs/heads/master i: 7017: 099fd14 7015: ba79eca
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: 7eb957d29adba95dc310d5854899baef4f7d0583
+refs/heads/tswast-patch-1: c486452b4c81da7f077e2573b1f29dee3994bd86
 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
@@ -243,6 +243,33 @@ public RestorableState<AuthCredentials> capture() {
     }
   }
 
+  public static class NoAuthCredentials extends AuthCredentials {
+
+    private static final AuthCredentials INSTANCE = new NoAuthCredentials();
+    private static final NoAuthCredentialsState STATE = new NoAuthCredentialsState();
+
+    private static class NoAuthCredentialsState
+        implements RestorableState<AuthCredentials>, Serializable {
+
+      private static final long serialVersionUID = -4022100563954640465L;
+
+      @Override
+      public AuthCredentials restore() {
+        return INSTANCE;
+      }
+    }
+
+    @Override
+    public GoogleCredentials credentials() {
+      return null;
+    }
+
+    @Override
+    public RestorableState<AuthCredentials> capture() {
+      return STATE;
+    }
+  }
+
   public abstract GoogleCredentials credentials();
 
   public static AuthCredentials createForAppEngine() {
@@ -281,6 +308,13 @@ public static ServiceAccountAuthCredentials createFor(String account, PrivateKey
     return new ServiceAccountAuthCredentials(account, privateKey);
   }
 
+  /**
+   * Creates a placeholder denoting that no credentials should be used.
+   */
+  public static AuthCredentials noAuth() {
+    return NoAuthCredentials.INSTANCE;
+  }
+
   /**
    * Creates Service Account Credentials given a stream for credentials in JSON format.
    *
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -523,9 +523,10 @@ public RetryParams retryParams() {
    * options.
    */
   public HttpRequestInitializer httpRequestInitializer() {
-    final HttpRequestInitializer delegate = authCredentials() != null
-        ? new HttpCredentialsAdapter(authCredentials().credentials().createScoped(scopes()))
-        : null;
+    final HttpRequestInitializer delegate =
+        authCredentials() != null && authCredentials.credentials() != null
+            ? new HttpCredentialsAdapter(authCredentials().credentials().createScoped(scopes()))
+            : null;
     return new HttpRequestInitializer() {
       @Override
       public void initialize(HttpRequest httpRequest) throws IOException {
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/branches/tswast-patch-1/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -32,6 +32,7 @@
 import com.google.api.services.datastore.DatastoreV1.RunQueryResponse;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
+import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.datastore.Query.ResultType;
 import com.google.gcloud.datastore.StructuredQuery.OrderBy;
@@ -128,6 +129,7 @@ public void setUp() {
     options = DatastoreOptions.builder()
         .projectId(PROJECT_ID)
         .host("http://localhost:" + PORT)
+        .authCredentials(AuthCredentials.noAuth())
         .retryParams(RetryParams.noRetries())
         .build();
     datastore = options.service();
diff --git a/branches/tswast-patch-1/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java b/branches/tswast-patch-1/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
@@ -12,6 +12,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.ByteStreams;
+import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.resourcemanager.ResourceManagerOptions;
 
 import com.sun.net.httpserver.Headers;
@@ -550,17 +551,21 @@ private LocalResourceManagerHelper() {
   }
 
   /**
-   * Creates a LocalResourceManagerHelper object that listens to requests on the local machine.
+   * Creates a {@code LocalResourceManagerHelper} object that listens to requests on the local
+   * machine.
    */
   public static LocalResourceManagerHelper create() {
     return new LocalResourceManagerHelper();
   }
 
   /**
-   * Returns a ResourceManagerOptions instance that sets the host to use the mock server.
+   * Returns a {@link ResourceManagerOptions} instance that sets the host to use the mock server.
    */
   public ResourceManagerOptions options() {
-    return ResourceManagerOptions.builder().host("http://localhost:" + port).build();
+    return ResourceManagerOptions.builder()
+        .host("http://localhost:" + port)
+        .authCredentials(AuthCredentials.noAuth())
+        .build();
   }
 
   /**
