---

Ajay Kannan · Ajay Kannan · commit d94ff4f0d142 · 2015-10-16T14:51:37.000-07:00
yaml --- r: 4223 b: refs/heads/gcs-nio c: 02a56a8 h: refs/heads/master i: 4221: 1d80281 4219: 01854b2 4215: 06b73bf 4207: ce3c0bb 4191: 83ba16d 4159: 25f376b 4095: 813d954
diff --git a/[refs] b/[refs]
@@ -11,7 +11,7 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
 refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
-refs/heads/gcs-nio: af6ab8f227fb4a877973bbc03be69770bc38af2c
+refs/heads/gcs-nio: 02a56a831bd04734dd171a553dc569637d2059c6
 refs/heads/logging-alpha: db5312bffa7fccac194f6a7feb8cc3066de16aff
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
diff --git a/branches/gcs-nio/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/gcs-nio/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/gcs-nio/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java b/branches/gcs-nio/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/gcs-nio/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Validator.java b/branches/gcs-nio/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) {`