Don't allow user to set project id or namespace to null

Ajay Kannan · Ajay Kannan · commit 02a56a831bd0 · 2015-10-16T14:51:37.000-07:00
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/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/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java b/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/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Validator.java b/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) {`