add a few more annotations

Author: kolea2

datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java

@@ -20,6 +20,7 @@
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
+import com.google.api.core.BetaApi;
 import java.util.Arrays;
 import java.util.List;
 
@@ -107,6 +108,7 @@ public Builder projectId(String projectId) {
     }
 
     /** Sets the database ID used to access Cloud Datastore. */
+    @BetaApi
     public Builder databaseId(String databaseId) {
       this.databaseId = databaseId;
       return this;

google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
@@ -106,6 +107,7 @@ public static Builder newBuilder(String projectId, String kind) {
     return new Builder(projectId, kind);
   }
 
+  @BetaApi
   public static Builder newBuilderWithDatabaseId(String projectId, String kind, String databaseId) {
     return new Builder(projectId, kind, databaseId);
   }

google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java

@@ -18,6 +18,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import com.google.api.core.BetaApi;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.TextFormat;
@@ -179,6 +180,7 @@ public static Builder newBuilder(String projectId, String kind, String name) {
     return new Builder(projectId, kind, name);
   }
 
+  @BetaApi
   public static Builder newBuilder(String projectId, String kind, String name, String databaseId) {
     return new Builder(projectId, kind, name, databaseId);
   }
@@ -187,6 +189,7 @@ public static Builder newBuilder(String projectId, String kind, long id) {
     return new Builder(projectId, kind, id);
   }
 
+  @BetaApi
   public static Builder newBuilder(String projectId, String kind, long id, String databaseId) {
     return new Builder(projectId, kind, id, databaseId);
   }

google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore;
 
+import com.google.api.core.BetaApi;
 import com.google.common.collect.ImmutableList;
 
 /**
@@ -36,6 +37,7 @@ public KeyFactory(String projectId, String namespace) {
     this(projectId, namespace, "");
   }
 
+  @BetaApi
   public KeyFactory(String projectId, String namespace, String databaseId) {
     super(projectId);
     setNamespace(namespace);

google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java

@@ -219,10 +219,6 @@ public DatastoreOptions.Builder setNamespace(String namespace) {
     return optionsBuilder.setNamespace(namespace);
   }
 
-  public DatastoreOptions.Builder setDatabaseId(String databaseId) {
-    return optionsBuilder.setDatabaseId(databaseId);
-  }
-
   /** Returns the consistency setting for the local Datastore emulator. */
   public double getConsistency() {
     return consistency;

google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.datastore.testing;
 
+import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.datastore.Datastore;
@@ -78,6 +79,7 @@ public static RemoteDatastoreHelper create() {
   }
 
   /** Creates a {@code RemoteStorageHelper} object. */
+  @BetaApi
   public static RemoteDatastoreHelper create(String databaseId) {
     HttpTransportOptions transportOptions = DatastoreOptions.getDefaultHttpTransportOptions();
     transportOptions =