---

mziccard · aozarov · commit 02964a65f750 · 2016-04-18T09:40:21.000-07:00
yaml --- r: 4835 b: refs/heads/logging-alpha c: 5e0de55 h: refs/heads/master i: 4833: 19d6523 4831: b91326c
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: d18e7bbc505505f00ed0ac666f5f867f3119475a
+refs/heads/logging-alpha: 5e0de55a546770228b07fe82029b7d822efe91b7
 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-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java b/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
@@ -75,6 +75,9 @@ public DatastoreOptions build() {
       return new DatastoreOptions(this);
     }
 
+    /**
+     * Sets the default namespace to be used by the datastore service.
+     */
     public Builder namespace(String namespace) {
       this.namespace = validateNamespace(namespace);
       return this;
@@ -112,6 +115,9 @@ protected DatastoreRpcFactory defaultRpcFactory() {
     return DefaultDatastoreRpcFactory.INSTANCE;
   }
 
+  /**
+   * Returns the default namespace to be used by the datastore service.
+   */
   public String namespace() {
     return namespace;
   }
diff --git a/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
@@ -556,17 +556,28 @@ private static int findAvailablePort() {
     }
   }
 
+  private DatastoreOptions.Builder optionsBuilder() {
+    return DatastoreOptions.builder()
+        .projectId(projectId)
+        .host("localhost:" + Integer.toString(port))
+        .authCredentials(AuthCredentials.noAuth())
+        .retryParams(RetryParams.noRetries());
+  }
+
   /**
    * Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator on
    * localhost.
    */
   public DatastoreOptions options() {
-    return DatastoreOptions.builder()
-        .projectId(projectId)
-        .host("localhost:" + Integer.toString(port))
-        .authCredentials(AuthCredentials.noAuth())
-        .retryParams(RetryParams.noRetries())
-        .build();
+    return optionsBuilder().build();
+  }
+
+  /**
+   * Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator on
+   * localhost. The default namespace is set to {@code namespace}.
+   */
+  public DatastoreOptions options(String namespace) {
+    return optionsBuilder().namespace(namespace).build();
   }
 
   /**
diff --git a/branches/logging-alpha/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java b/branches/logging-alpha/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore.testing;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
@@ -31,6 +32,7 @@ public class LocalDatastoreHelperTest {
 
   private static final double TOLERANCE = 0.00001;
   private static final String PROJECT_ID_PREFIX = "test-project-";
+  private static final String NAMESPACE = "namespace";
 
   @Test
   public void testCreate() {
@@ -49,5 +51,10 @@ public void testOptions() {
     assertTrue(options.projectId().startsWith(PROJECT_ID_PREFIX));
     assertTrue(options.host().startsWith("localhost:"));
     assertSame(AuthCredentials.noAuth(), options.authCredentials());
+    options = helper.options(NAMESPACE);
+    assertTrue(options.projectId().startsWith(PROJECT_ID_PREFIX));
+    assertTrue(options.host().startsWith("localhost:"));
+    assertSame(AuthCredentials.noAuth(), options.authCredentials());
+    assertEquals(NAMESPACE, options.namespace());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,9 @@ public DatastoreOptions build() {`
`75`	`75`	`return new DatastoreOptions(this);`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ /**`
	`79`	`+ * Sets the default namespace to be used by the datastore service.`
	`80`	`+ */`
`78`	`81`	`public Builder namespace(String namespace) {`
`79`	`82`	`this.namespace = validateNamespace(namespace);`
`80`	`83`	`return this;`
`@@ -112,6 +115,9 @@ protected DatastoreRpcFactory defaultRpcFactory() {`
`112`	`115`	`return DefaultDatastoreRpcFactory.INSTANCE;`
`113`	`116`	`}`
`114`	`117`
	`118`	`+ /**`
	`119`	`+ * Returns the default namespace to be used by the datastore service.`
	`120`	`+ */`
`115`	`121`	`public String namespace() {`
`116`	`122`	`return namespace;`
`117`	`123`	`}`