---

mziccard · mziccard · commit 11944b94fdb2 · 2015-11-11T21:39:44.000+01:00
yaml --- r: 2443 b: refs/heads/update-datastore c: d7845b8 h: refs/heads/master i: 2441: cf33994 2439: d6bf07d
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: 3125167ad845cc5f0c5deeeffa215a56e9fff896
+refs/heads/update-datastore: d7845b86bcc38abc5a444fd8f08ec98a0d73d0c5
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/README.md b/branches/update-datastore/README.md
@@ -121,7 +121,7 @@ import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
 import com.google.gcloud.datastore.KeyFactory;
 
-Datastore datastore = DatastoreOptions.getDefaultInstance().service();
+Datastore datastore = DatastoreOptions.defaultInstance().service();
 KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
 Key key = keyFactory.newKey(keyName);
 Entity entity = datastore.get(key);
diff --git a/branches/update-datastore/gcloud-java-datastore/README.md b/branches/update-datastore/gcloud-java-datastore/README.md
@@ -66,7 +66,7 @@ import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
 import com.google.gcloud.datastore.KeyFactory;
 
-Datastore datastore = DatastoreOptions.getDefaultInstance().service();
+Datastore datastore = DatastoreOptions.defaultInstance().service();
 KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
 Key key = keyFactory.newKey(keyName);
 Entity entity = datastore.get(key);
diff --git a/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -174,7 +174,7 @@ public String namespace() {
   /**
    * Returns a default {@code DatastoreOptions} instance.
    */
-  public static DatastoreOptions getDefaultInstance() {
+  public static DatastoreOptions defaultInstance() {
     return builder().build();
   }
 
diff --git a/branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java b/branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
@@ -114,7 +114,7 @@ public String pathDelimiter() {
   /**
    * Returns a default {@code StorageOptions} instance.
    */
-  public static StorageOptions getDefaultInstance() {
+  public static StorageOptions defaultInstance() {
     return builder().build();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public String namespace() {`
`174`	`174`	`/**`
`175`	`175`	`* Returns a default {@code DatastoreOptions} instance.`
`176`	`176`	`*/`
`177`		`- public static DatastoreOptions getDefaultInstance() {`
	`177`	`+ public static DatastoreOptions defaultInstance() {`
`178`	`178`	`return builder().build();`
`179`	`179`	`}`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public String pathDelimiter() {`
`114`	`114`	`/**`
`115`	`115`	`* Returns a default {@code StorageOptions} instance.`
`116`	`116`	`*/`
`117`		`- public static StorageOptions getDefaultInstance() {`
	`117`	`+ public static StorageOptions defaultInstance() {`
`118`	`118`	`return builder().build();`
`119`	`119`	`}`
`120`	`120`