Sample code: * *
{@code
- * ApiFuture deleteFuture = client.deleteInstance("my-instance");
+ * ApiFuture deleteFuture = client.deleteInstanceAsync("my-instance");
* deleteFuture.get();
* }
*/
@@ -522,7 +522,7 @@ public Cluster apply(com.google.bigtable.admin.v2.Cluster proto) {
*
* {@code
* try {
- * List clusters = cluster.listClusters("my-instance");
+ * List clusters = client.listClusters("my-instance");
* } catch (PartialListClustersException e) {
* System.out.println("The following zones are unavailable: " + e.getUnavailableZones());
* System.out.println("But the following clusters are reachable: " + e.getClusters())
@@ -610,7 +610,7 @@ public List apply(com.google.bigtable.admin.v2.ListClustersResponse pro
* Sample code:
*
*
{@code
- * Cluster cluster = cluster.resizeCluster("my-instance", "my-cluster", 30);
+ * Cluster cluster = client.resizeCluster("my-instance", "my-cluster", 30);
* }
*/
@SuppressWarnings("WeakerAccess")
@@ -623,7 +623,7 @@ public Cluster resizeCluster(String instanceId, String clusterId, int numServeNo
* a PRODUCTION instance can be resized.
*
* {@code
- * ApiFuture clusterFuture = cluster.resizeCluster("my-instance", "my-cluster", 30);
+ * ApiFuture clusterFuture = client.resizeCluster("my-instance", "my-cluster", 30);
* Cluster cluster = clusterFuture.get();
* }
*/
@@ -1165,7 +1165,7 @@ public List testIamPermission(String instanceId, String... permissions)
* Sample code:
*
*
{@code
- * ApiFuture> grantedPermissionsFuture = client.testIamPermission("my-instance",
+ * ApiFuture> grantedPermissionsFuture = client.testIamPermissionAsync("my-instance",
* "bigtable.tables.readRows", "bigtable.tables.mutateRows");
*
* ApiFutures.addCallback(grantedPermissionsFuture,
@@ -1222,7 +1222,7 @@ public List testIamPermission(ResourceName resourceName, String... permi
* Sample code:
*
*
{@code
- * ApiFuture> grantedPermissionsFuture = client.testIamPermission(
+ * ApiFuture> grantedPermissionsFuture = client.testIamPermissionAsync(
* TableName.of("my-project", "my-instance", "my-table"),
* "bigtable.tables.readRows", "bigtable.tables.mutateRows");
*
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
index eba6a51c4f01..694aa2bc4838 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
@@ -406,7 +406,7 @@ public List listTables() {
* Sample code:
*
*
{@code
- * ApiFuture> listFuture = client.listTables();
+ * ApiFuture> listFuture = client.listTablesAsync();
*
* ApiFutures.addCallback(
* listFuture,
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 4a7a48d33575..59165a764c2e 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
@@ -102,7 +102,7 @@ public class BigtableDataClient implements AutoCloseable {
private final EnhancedBigtableStub stub;
/**
- * Constructs an instance of BigtableClient with default settings.
+ * Constructs an instance of BigtableDataClient with default settings.
*
* @param instanceName The instance to connect to.
* @return A new client.
@@ -136,10 +136,10 @@ public static BigtableDataClient create(BigtableDataSettings settings) throws IO
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* String tableId = "[TABLE]";
*
- * ApiFuture result = bigtableClient.readRow(tableId, "key");
+ * ApiFuture result = bigtableDataClient.readRowAsync(tableId, "key");
* }
* }
*/
@@ -155,10 +155,10 @@ public ApiFuture readRowAsync(String tableId, String rowKey) {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* String tableId = "[TABLE]";
*
- * ApiFuture result = bigtableClient.readRow(tableId, ByteString.copyFromUtf8("key"));
+ * ApiFuture result = bigtableDataClient.readRowAsync(tableId, ByteString.copyFromUtf8("key"));
* }
* }
*/
@@ -176,7 +176,7 @@ public ApiFuture readRowAsync(String tableId, ByteString rowKey) {
* import static com.google.cloud.bigtable.data.v2.models.Filters.FILTERS;
*
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* String tableId = "[TABLE]";
*
* Query query = Query.create(tableId)
@@ -184,7 +184,7 @@ public ApiFuture readRowAsync(String tableId, ByteString rowKey) {
* .filter(FILTERS.qualifier().regex("[COLUMN PREFIX].*"));
*
* // Iterator style
- * for(Row row : bigtableClient.readRows(query)) {
+ * for(Row row : bigtableDataClient.readRows(query)) {
* // Do something with row
* }
* }
@@ -205,14 +205,14 @@ public ServerStream readRows(Query query) {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* String tableId = "[TABLE]";
*
* Query query = Query.create(tableId)
* .range("[START KEY]", "[END KEY]")
* .filter(FILTERS.qualifier().regex("[COLUMN PREFIX].*"));
*
- * client.readRowsAsync(query, new ResponseObserver() {
+ * bigtableDataClient.readRowsAsync(query, new ResponseObserver() {
* public void onStart(StreamController controller) { }
* public void onResponse(Row response) {
* // Do something with Row
@@ -239,7 +239,7 @@ public void readRowsAsync(Query query, ResponseObserver observer) {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* String tableId = "[TABLE]";
*
* Query query = Query.create(tableId)
@@ -247,12 +247,12 @@ public void readRowsAsync(Query query, ResponseObserver observer) {
* .filter(FILTERS.qualifier().regex("[COLUMN PREFIX].*"));
*
* // Iterator style
- * for(Row row : bigtableClient.readRowsCallable().call(query)) {
+ * for(Row row : bigtableDataClient.readRowsCallable().call(query)) {
* // Do something with row
* }
*
* // Point look up
- * ApiFuture rowFuture = bigtableClient.readRowsCallable().first().futureCall(query);
+ * ApiFuture rowFuture = bigtableDataClient.readRowsCallable().first().futureCall(query);
*
* // etc
* }
@@ -274,7 +274,7 @@ public ServerStreamingCallable readRowsCallable() {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* String tableId = "[TABLE]";
*
* Query query = Query.create(tableId)
@@ -282,7 +282,7 @@ public ServerStreamingCallable readRowsCallable() {
* .filter(FILTERS.qualifier().regex("[COLUMN PREFIX].*"));
*
* // Iterator style
- * for(CustomRow row : bigtableClient.readRowsCallable(new CustomRowAdapter()).call(query)) {
+ * for(CustomRow row : bigtableDataClient.readRowsCallable(new CustomRowAdapter()).call(query)) {
* // Do something with row
* }
* }
@@ -305,8 +305,8 @@ public ServerStreamingCallable readRowsCallable(RowAdapter{@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
- * ApiFuture> keyOffsets = bigtableClient.sampleRowKeysAsync("[TABLE]");
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
+ * ApiFuture> keyOffsets = bigtableDataClient.sampleRowKeysAsync("[TABLE]");
* }
* }
*/
@@ -324,12 +324,12 @@ public ApiFuture> sampleRowKeysAsync(String tableId) {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* // Synchronous invocation
- * List keyOffsets = bigtableClient.sampleRowKeysCallable().call("[TABLE]");
+ * List keyOffsets = bigtableDataClient.sampleRowKeysCallable().call("[TABLE]");
*
* // Asynchronous invocation
- * ApiFuture> keyOffsets = bigtableClient.sampleRowKeysCallable().futureCall("[TABLE]");
+ * ApiFuture> keyOffsets = bigtableDataClient.sampleRowKeysCallable().futureCall("[TABLE]");
* }
* }
*/
@@ -345,11 +345,11 @@ public UnaryCallable> sampleRowKeysCallable() {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* RowMutation mutation = RowMutation.create("[TABLE]", "[ROW KEY]")
* .setCell("[FAMILY NAME]", "[QUALIFIER]", "[VALUE]");
*
- * ApitFuture future = bigtableClient.mutateRowAsync(mutation);
+ * ApitFuture future = bigtableDataClient.mutateRowAsync(mutation);
* }
* }
*/
@@ -365,11 +365,11 @@ public ApiFuture mutateRowAsync(RowMutation rowMutation) {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* RowMutation mutation = RowMutation.create("[TABLE]", "[ROW KEY]")
* .setCell("[FAMILY NAME]", "[QUALIFIER]", "[VALUE]");
*
- * bigtableClient.mutateRowCallable().call(mutation);
+ * bigtableDataClient.mutateRowCallable().call(mutation);
* }
* }
*/
@@ -385,8 +385,8 @@ public UnaryCallable mutateRowCallable() {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
- * try (BulkMutationBatcher batcher = bigtableClient.newBulkMutationBatcher()) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
+ * try (BulkMutationBatcher batcher = bigtableDataClient.newBulkMutationBatcher()) {
* for (String someValue : someCollection) {
* RowMutation mutation = RowMutation.create("[TABLE]", "[ROW KEY]")
* .setCell("[FAMILY NAME]", "[QUALIFIER]", "[VALUE]");
@@ -414,12 +414,12 @@ public BulkMutationBatcher newBulkMutationBatcher() {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* BulkMutation batch = BulkMutation.create("[TABLE]");
* for (String someValue : someCollection) {
* batch.add("[ROW KEY]", Mutation.create().setCell("[FAMILY NAME]", "[QUALIFIER]", "[VALUE]");
* }
- * ApiFuture result = bigtableClient.bulkMutateRowsAsync(batch);
+ * ApiFuture result = bigtableDataClient.bulkMutateRowsAsync(batch);
* }
* }
*/
@@ -436,12 +436,12 @@ public ApiFuture bulkMutateRowsAsync(BulkMutation mutation) {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* BulkMutation batch = BulkMutation.create("[TABLE]");
* for (String someValue : someCollection) {
* batch.add("[ROW KEY]", Mutation.create().setCell("[FAMILY NAME]", "[QUALIFIER]", "[VALUE]");
* }
- * bigtableClient.bulkMutateRowsCallable().call(batch);
+ * bigtableDataClient.bulkMutationCallable().call(batch);
* }
* }
*/
@@ -456,7 +456,7 @@ public UnaryCallable bulkMutationCallable() {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* ConditionalRowMutation mutation = ConditionalRowMutation.create("[TABLE]", "[KEY]")
* .condition(FILTERS.value().regex("old-value"))
* .then(
@@ -464,7 +464,7 @@ public UnaryCallable bulkMutationCallable() {
* .setCell("[FAMILY]", "[QUALIFIER]", "[VALUE]")
* );
*
- * ApiFuture future = bigtableClient.checkAndMutateRowAsync(mutation);
+ * ApiFuture future = bigtableDataClient.checkAndMutateRowAsync(mutation);
* }
* }
*/
@@ -479,7 +479,7 @@ public ApiFuture checkAndMutateRowAsync(ConditionalRowMutation mutation
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* ConditionalRowMutation mutation = ConditionalRowMutation.create("[TABLE]", "[KEY]")
* .condition(FILTERS.value().regex("old-value"))
* .then(
@@ -487,7 +487,7 @@ public ApiFuture checkAndMutateRowAsync(ConditionalRowMutation mutation
* .setCell("[FAMILY]", "[QUALIFIER]", "[VALUE]")
* );
*
- * boolean success = bigtableClient.checkAndMutateRowCallable().call(mutation);
+ * boolean success = bigtableDataClient.checkAndMutateRowCallable().call(mutation);
* }
* }
*/
@@ -505,12 +505,12 @@ public UnaryCallable checkAndMutateRowCallable(
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* ReadModifyWriteRow mutation = ReadModifyWriteRow.create("[TABLE]", "[KEY]")
* .increment("[FAMILY]", "[QUALIFIER]", 1)
* .append("[FAMILY2]", "[QUALIFIER2]", "suffix");
*
- * ApiFuture success = bigtableClient.readModifyWriteRowAsync(mutation);
+ * ApiFuture success = bigtableDataClient.readModifyWriteRowAsync(mutation);
* }
* }
*/
@@ -528,12 +528,12 @@ public ApiFuture readModifyWriteRowAsync(ReadModifyWriteRow mutation) {
*
* {@code
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
- * try (BigtableClient bigtableClient = BigtableClient.create(instanceName)) {
+ * try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
* ReadModifyWriteRow mutation = ReadModifyWriteRow.create("[TABLE]", "[KEY]")
* .increment("[FAMILY]", "[QUALIFIER]", 1)
* .append("[FAMILY2]", "[QUALIFIER2]", "suffix");
*
- * Row row = bigtableClient.readModifyWriteRowCallable().call(mutation);
+ * Row row = bigtableDataClient.readModifyWriteRowCallable().call(mutation);
* }
* }
*/