Skip to content

Commit 27d0953

Browse files
committed
rename some Bigtable files to BaseBigtable files
1 parent cf869e2 commit 27d0953

15 files changed

+317
-6507
lines changed

google-cloud-clients/google-cloud-bigtable-admin/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ at the top of your file:
7676
```java
7777
import com.google.bigtable.admin.v2.ColumnFamily;
7878
import com.google.bigtable.admin.v2.InstanceName;
79-
import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
79+
import com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient;
8080
```
8181

8282
Then, to create a table, use the following code:

google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java

Lines changed: 165 additions & 167 deletions
Large diffs are not rendered by default.

google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminSettings.java

Lines changed: 0 additions & 479 deletions
This file was deleted.

google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java

Lines changed: 135 additions & 137 deletions
Large diffs are not rendered by default.

google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java

Lines changed: 0 additions & 2181 deletions
This file was deleted.

google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.google.cloud.bigtable.admin.v2;
1717

18-
import static com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient.ListAppProfilesPagedResponse;
18+
import static com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPagedResponse;
1919

2020
import com.google.api.core.ApiFunction;
2121
import com.google.api.core.BetaApi;
@@ -68,7 +68,7 @@
6868

6969
// AUTO-GENERATED DOCUMENTATION AND CLASS
7070
/**
71-
* Settings class to configure an instance of {@link BigtableInstanceAdminClient}.
71+
* Settings class to configure an instance of {@link BaseBigtableInstanceAdminClient}.
7272
*
7373
* <p>The default instance has everything set to sensible defaults:
7474
*

google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java

Lines changed: 0 additions & 1980 deletions
This file was deleted.

google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package com.google.cloud.bigtable.admin.v2;
1717

18-
import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListSnapshotsPagedResponse;
19-
import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListTablesPagedResponse;
18+
import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListSnapshotsPagedResponse;
19+
import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPagedResponse;
2020

2121
import com.google.api.core.ApiFunction;
2222
import com.google.api.core.BetaApi;
@@ -60,7 +60,7 @@
6060

6161
// AUTO-GENERATED DOCUMENTATION AND CLASS
6262
/**
63-
* Settings class to configure an instance of {@link BigtableTableAdminClient}.
63+
* Settings class to configure an instance of {@link BaseBigtableTableAdminClient}.
6464
*
6565
* <p>The default instance has everything set to sensible defaults:
6666
*

google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/models/TableAdminResponses.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
package com.google.cloud.bigtable.admin.v2.models;
1717

1818
import static com.google.cloud.bigtable.admin.v2.models.GCRules.GCRULES;
19+
20+
import com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient;
1921
import java.util.Collection;
2022
import java.util.HashMap;
2123
import java.util.Map;
@@ -29,7 +31,6 @@
2931
import com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse;
3032
import com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState;
3133
import com.google.bigtable.admin.v2.TableName;
32-
import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
3334
import com.google.cloud.bigtable.admin.v2.models.GCRules.GCRule;
3435
import com.google.cloud.bigtable.admin.v2.models.GCRules.IntersectionRule;
3536
import com.google.cloud.bigtable.admin.v2.models.GCRules.UnionRule;
@@ -269,7 +270,7 @@ private GCRule convertGcRule(GcRule source) {
269270
* Wrapper for {@link GenerateConsistencyTokenResponse#getConsistencyToken()}
270271
*
271272
* <p>Cannot be created. They are obtained by invoking {@link
272-
* BigtableTableAdminClient#generateConsistencyToken(String)}
273+
* BaseBigtableTableAdminClient#generateConsistencyToken(String)}
273274
*/
274275
public static final class ConsistencyToken {
275276
private final String token;

google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ public static void stopServer() {
106106
public void setUp() throws IOException {
107107
serviceHelper.reset();
108108
channelProvider = serviceHelper.createChannelProvider();
109-
BaseBigtableInstanceAdminSettings settings =
110-
BaseBigtableInstanceAdminSettings.newBuilder()
109+
BigtableInstanceAdminSettings settings =
110+
BigtableInstanceAdminSettings.newBuilder()
111111
.setTransportChannelProvider(channelProvider)
112112
.setCredentialsProvider(NoCredentialsProvider.create())
113113
.build();

google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import com.google.bigtable.admin.v2.ListTablesRequest;
4444
import com.google.bigtable.admin.v2.ListTablesResponse;
4545
import com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest;
46-
import com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification;
4746
import com.google.bigtable.admin.v2.Snapshot;
4847
import com.google.bigtable.admin.v2.SnapshotName;
4948
import com.google.bigtable.admin.v2.SnapshotTableRequest;
@@ -96,8 +95,8 @@ public static void stopServer() {
9695
public void setUp() throws IOException {
9796
serviceHelper.reset();
9897
channelProvider = serviceHelper.createChannelProvider();
99-
BaseBigtableTableAdminSettings settings =
100-
BaseBigtableTableAdminSettings.newBuilder()
98+
BigtableTableAdminSettings settings =
99+
BigtableTableAdminSettings.newBuilder()
101100
.setTransportChannelProvider(channelProvider)
102101
.setCredentialsProvider(NoCredentialsProvider.create())
103102
.build();

0 commit comments

Comments
 (0)