---

Ajay Kannan · Ajay Kannan · commit 542adc19306e · 2015-10-16T14:51:37.000-07:00
yaml --- r: 7129 b: refs/heads/tswast-patch-1 c: 02a56a8 h: refs/heads/master i: 7127: b8f90ca
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: af6ab8f227fb4a877973bbc03be69770bc38af2c
+refs/heads/tswast-patch-1: 02a56a831bd04734dd171a553dc569637d2059c6
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
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
@@ -122,7 +122,8 @@ protected B self() {
     }
 
     public B projectId(String projectId) {
-      this.projectId = projectId;
+      this.projectId =
+          checkNotNull(projectId, "Project ID cannot be set to null. Leave unset for default.");
       return self();
     }
 
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java b/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java
@@ -29,7 +29,7 @@ public final class KeyFactory extends BaseKey.Builder<KeyFactory> {
   private final String ns;
 
   public KeyFactory(String projectId) {
-    this(projectId, null);
+    this(projectId, "");
   }
 
   public KeyFactory(String projectId, String namespace) {
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Validator.java b/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Validator.java
@@ -45,9 +45,7 @@ static String validateDatabase(String projectId) {
   }
 
   static String validateNamespace(String namespace) {
-    if (Strings.isNullOrEmpty(namespace)) {
-      return "";
-    }
+    checkArgument(namespace != null, "Namespace cannot be null. Leave unset for default.");
     checkArgument(namespace.length() <= MAX_NAMESPACE_LENGTH,
         "namespace must not contain more than 100 characters");
     checkArgument(NAMESPACE_PATTERN.matcher(namespace).matches(),

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,8 @@ protected B self() {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`public B projectId(String projectId) {`
`125`		`- this.projectId = projectId;`
	`125`	`+ this.projectId =`
	`126`	`+ checkNotNull(projectId, "Project ID cannot be set to null. Leave unset for default.");`
`126`	`127`	`return self();`
`127`	`128`	`}`
`128`	`129`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public final class KeyFactory extends BaseKey.Builder<KeyFactory> {`
`29`	`29`	`private final String ns;`
`30`	`30`
`31`	`31`	`public KeyFactory(String projectId) {`
`32`		`- this(projectId, null);`
	`32`	`+ this(projectId, "");`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public KeyFactory(String projectId, String namespace) {`