---

aozarov · aozarov · commit fe360ed7b4b1 · 2015-10-20T08:40:46.000-07:00
yaml --- r: 1343 b: refs/heads/update-datastore c: 9e4692d h: refs/heads/master i: 1341: 20793c2 1339: 86ffbfd 1335: e9755a6 1327: c27b2ed 1311: bec9816 1279: 4d166d8 v: v3
diff --git a/[refs] b/[refs]
@@ -5,4 +5,4 @@ refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: dea33f5d017ff85c14573b4a06c6b1f2c4bbe2b0
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: 241960f2a24d4dbec27288589ccf72f91c431816
+refs/heads/update-datastore: 9e4692d3c7ee17b3f10f4073144fbab780bb63ea
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/update-datastore/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/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java b/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java
@@ -16,7 +16,6 @@
 
 package com.google.gcloud.datastore;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 
 /**
@@ -29,14 +28,14 @@ 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) {
     super(projectId);
     namespace(namespace);
     this.pi = projectId;
-    this.ns = MoreObjects.firstNonNull(namespace,  "");
+    this.ns = namespace;
   }
 
   public IncompleteKey newKey() {
diff --git a/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Validator.java b/branches/update-datastore/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`