From 53055f62062719606edbe4bad0d8ecbbe8dc19ae Mon Sep 17 00:00:00 2001
From: Igor Bernstein <igorbernstein@google.com>
Date: Mon, 15 Jul 2019 14:10:14 -0400
Subject: [PATCH] Bigtable: Fix stale docs

---
 google-cloud-clients/google-cloud-bigtable/README.md  |  4 ++--
 .../admin/v2/BigtableInstanceAdminClient.java         | 11 ++++++-----
 .../bigtable/admin/v2/BigtableTableAdminClient.java   |  8 +++++---
 .../cloud/bigtable/data/v2/BigtableDataClient.java    |  9 ++++++---
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigtable/README.md b/google-cloud-clients/google-cloud-bigtable/README.md
index 84b37e572aed..d91d40a3ae99 100644
--- a/google-cloud-clients/google-cloud-bigtable/README.md
+++ b/google-cloud-clients/google-cloud-bigtable/README.md
@@ -112,8 +112,8 @@ import com.google.cloud.bigtable.data.v2.models.Row;
 Then, to make a query to Bigtable, use the following code:
 ```java
 // Instantiates a client
-String projectId = "my-instance";
-String instanceId = "my-database";
+String projectId = "my-project";
+String instanceId = "my-instance";
 String tableId = "my-table";
 
 // Create the client
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
index ed00e779244b..dd6e7487d9e9 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
@@ -89,12 +89,13 @@
  * To customize the endpoint:
  *
  * <pre>{@code
- * BigtableInstanceAdminSettings settings = BigtableInstanceAdminSettings.newBuilder()
- *   .setProjectId("my-project")
- *   .setEndpoint(myEndpoint)
- *   .build();
+ * BigtableInstanceAdminSettings.Builder settingsBuilder = BigtableInstanceAdminSettings.newBuilder()
+ *   .setProjectId("my-project");
  *
- * BigtableInstanceAdminClient client = BigtableInstanceAdminClient.create(settings);
+ * settingsBuilder.stubSettings()
+ *   .setEndpoint(myEndpoint);
+ *
+ * BigtableInstanceAdminClient client = BigtableInstanceAdminClient.create(settingsBuilder.build());
  * }</pre>
  */
 public final class BigtableInstanceAdminClient implements AutoCloseable {
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
index 984d829ede1e..a4f46240e6ba 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
@@ -85,12 +85,14 @@
  * To customize the endpoint:
  *
  * <pre>{@code
- * BigtableTableAdminSettings tableAdminSettings = BigtableTableAdminSettings.newBuilder()
+ * BigtableTableAdminSettings.Builder tableAdminSettingsBuilder = BigtableTableAdminSettings.newBuilder()
  *   .setProjectId("[PROJECT]")
- *   .setInstanceId("[INSTANCE]")
+ *   .setInstanceId("[INSTANCE]");
+ *
+ * tableAdminSettingsBuilder.stubSettings()
  *   .setEndpoint(myEndpoint).build();
  *
- * BigtableTableAdminClient client = BigtableTableAdminClient.create(tableAdminSettings);
+ * BigtableTableAdminClient client = BigtableTableAdminClient.create(tableAdminSettingsBuilder.build());
  * }</pre>
  */
 public final class BigtableTableAdminClient implements AutoCloseable {
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java
index 578842629b4a..b342bdd1f67b 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java
@@ -99,12 +99,15 @@
  * To customize the endpoint:
  *
  * <pre>{@code
- * BigtableDataSettings bigtableDataSettings =
+ * BigtableDataSettings.Builder bigtableDataSettingsBuilder =
  *     BigtableDataSettings.newBuilder()
  *       .setProjectId("[PROJECT]")
- *       .setInstanceId("[INSTANCE]")
+ *       .setInstanceId("[INSTANCE]");
+ *
+ * bigtableDataSettingsBuilder.stubSettings()
  *       .setEndpoint(myEndpoint).build();
- * try(BigtableDataClient bigtableDataClient = BigtableDataClient.create(bigtableDataSettings)) {
+ *
+ * try(BigtableDataClient bigtableDataClient = BigtableDataClient.create(bigtableDataSettingsBuilder.build())) {
  *   // ..
  * }
  * }</pre>