---

aozarov · aozarov · commit 43df74329c09 · 2015-03-18T16:41:06.000-07:00
yaml --- r: 5903 b: refs/heads/tswast-patch-1 c: f09cae4 h: refs/heads/master i: 5901: 77b7d25 5899: 9a0986a 5895: fbe0845 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: 65b21ade01220a72b3b02ce1e9ec6271a20184bb
+refs/heads/tswast-patch-1: f09cae4bb0578b98df815695b0aefd49af5db1bb
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/pom.xml b/branches/tswast-patch-1/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.gcloud</groupId>
   <artifactId>gcloud-java</artifactId>
   <packaging>jar</packaging>
-  <version>0.0.2</version>
+  <version>0.0.3</version>
   <name>GCloud Java</name>
   <url>https://github.com/GoogleCloudPlatform/gcloud-java</url>
   <description>
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -75,7 +75,7 @@ public B httpTransport(HttpTransport httpTransport) {
       return self();
     }
 
-    public B authConfig(AuthCredentials authCredentials) {
+    public B authCredentials(AuthCredentials authCredentials) {
       this.authCredentials = authCredentials;
       return self();
     }
@@ -89,7 +89,7 @@ public B retryParams(RetryParams retryParams) {
   protected ServiceOptions(Builder<?> builder) {
     host = firstNonNull(builder.host, DEFAULT_HOST);
     httpTransport = firstNonNull(builder.httpTransport, defaultHttpTransport());
-    authCredentials = firstNonNull(builder.authCredentials, defaultAuthConfig());
+    authCredentials = firstNonNull(builder.authCredentials, defaultAuthCredentials());
     retryParams = builder.retryParams;
   }
 
@@ -111,7 +111,7 @@ private static HttpTransport defaultHttpTransport() {
     return new NetHttpTransport();
   }
 
-  public static AuthCredentials defaultAuthConfig() {
+  private static AuthCredentials defaultAuthCredentials() {
     // Consider App Engine. This will not be needed once issue #21 is fixed.
     if (appEngineAppId() != null) {
       try {
@@ -183,7 +183,7 @@ public HttpTransport httpTransport() {
     return httpTransport;
   }
 
-  public AuthCredentials authConfig() {
+  public AuthCredentials authCredentials() {
     return authCredentials;
   }
 
@@ -192,7 +192,7 @@ public RetryParams retryParams() {
   }
 
   public HttpRequestInitializer httpRequestInitializer() {
-    return authConfig().httpRequestInitializer(httpTransport, scopes());
+    return authCredentials().httpRequestInitializer(httpTransport, scopes());
   }
 
   public abstract Builder<?> toBuilder();
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/BaseEntity.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/BaseEntity.java
@@ -127,7 +127,7 @@ public B remove(String name) {
       return self();
     }
 
-    public B set(String name, Value<?> value) {
+    public B set(String name, Value value) {
       properties.put(name, value);
       return self();
     }
diff --git a/branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/DatastoreServiceOptionsTest.java b/branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/DatastoreServiceOptionsTest.java
@@ -82,6 +82,6 @@ public void testToBuilder() throws Exception {
     assertEquals(original.host(), copy.host());
     assertEquals(original.force(), copy.force());
     assertEquals(original.retryParams(), copy.retryParams());
-    assertEquals(original.authConfig(), copy.authConfig());
+    assertEquals(original.authCredentials(), copy.authCredentials());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public B httpTransport(HttpTransport httpTransport) {`
`75`	`75`	`return self();`
`76`	`76`	`}`
`77`	`77`
`78`		`- public B authConfig(AuthCredentials authCredentials) {`
	`78`	`+ public B authCredentials(AuthCredentials authCredentials) {`
`79`	`79`	`this.authCredentials = authCredentials;`
`80`	`80`	`return self();`
`81`	`81`	`}`
`@@ -89,7 +89,7 @@ public B retryParams(RetryParams retryParams) {`
`89`	`89`	`protected ServiceOptions(Builder<?> builder) {`
`90`	`90`	`host = firstNonNull(builder.host, DEFAULT_HOST);`
`91`	`91`	`httpTransport = firstNonNull(builder.httpTransport, defaultHttpTransport());`
`92`		`- authCredentials = firstNonNull(builder.authCredentials, defaultAuthConfig());`
	`92`	`+ authCredentials = firstNonNull(builder.authCredentials, defaultAuthCredentials());`
`93`	`93`	`retryParams = builder.retryParams;`
`94`	`94`	`}`
`95`	`95`
`@@ -111,7 +111,7 @@ private static HttpTransport defaultHttpTransport() {`
`111`	`111`	`return new NetHttpTransport();`
`112`	`112`	`}`
`113`	`113`
`114`		`- public static AuthCredentials defaultAuthConfig() {`
	`114`	`+ private static AuthCredentials defaultAuthCredentials() {`
`115`	`115`	`// Consider App Engine. This will not be needed once issue #21 is fixed.`
`116`	`116`	`if (appEngineAppId() != null) {`
`117`	`117`	`try {`
`@@ -183,7 +183,7 @@ public HttpTransport httpTransport() {`
`183`	`183`	`return httpTransport;`
`184`	`184`	`}`
`185`	`185`
`186`		`- public AuthCredentials authConfig() {`
	`186`	`+ public AuthCredentials authCredentials() {`
`187`	`187`	`return authCredentials;`
`188`	`188`	`}`
`189`	`189`
`@@ -192,7 +192,7 @@ public RetryParams retryParams() {`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`public HttpRequestInitializer httpRequestInitializer() {`
`195`		`- return authConfig().httpRequestInitializer(httpTransport, scopes());`
	`195`	`+ return authCredentials().httpRequestInitializer(httpTransport, scopes());`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`public abstract Builder<?> toBuilder();`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public B remove(String name) {`
`127`	`127`	`return self();`
`128`	`128`	`}`
`129`	`129`
`130`		`- public B set(String name, Value<?> value) {`
	`130`	`+ public B set(String name, Value value) {`
`131`	`131`	`properties.put(name, value);`
`132`	`132`	`return self();`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,6 @@ public void testToBuilder() throws Exception {`
`82`	`82`	`assertEquals(original.host(), copy.host());`
`83`	`83`	`assertEquals(original.force(), copy.force());`
`84`	`84`	`assertEquals(original.retryParams(), copy.retryParams());`
`85`		`- assertEquals(original.authConfig(), copy.authConfig());`
	`85`	`+ assertEquals(original.authCredentials(), copy.authCredentials());`
`86`	`86`	`}`
`87`	`87`	`}`