---

aozarov · aozarov · commit 6f503eed7b61 · 2015-10-20T08:40:46.000-07:00
yaml --- r: 4721 b: refs/heads/logging-alpha c: 9e4692d h: refs/heads/master i: 4719: afd1077
diff --git a/[refs] b/[refs]
@@ -12,7 +12,7 @@ refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
 refs/heads/gcs-nio: 283aeaf15efdcf3621eb6859f05e55ad7764375d
-refs/heads/logging-alpha: 241960f2a24d4dbec27288589ccf72f91c431816
+refs/heads/logging-alpha: 9e4692d3c7ee17b3f10f4073144fbab780bb63ea
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
 refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f
diff --git a/branches/logging-alpha/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/logging-alpha/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/logging-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java b/branches/logging-alpha/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/logging-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Validator.java b/branches/logging-alpha/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`