Skip to content

Commit 029e009

Browse files
igorbernstein2pongad
authored andcommitted
Bigtable: prefix gapic generated clients with Base, prefix overlay clients with Bigtable (googleapis#3538)
1 parent 149987e commit 029e009

22 files changed

+3912
-3911
lines changed

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

Lines changed: 175 additions & 179 deletions
Large diffs are not rendered by default.

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

Lines changed: 17 additions & 16 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
*
@@ -84,17 +84,18 @@
8484
*
8585
* <pre>
8686
* <code>
87-
* BigtableInstanceAdminSettings.Builder bigtableInstanceAdminSettingsBuilder =
88-
* BigtableInstanceAdminSettings.newBuilder();
89-
* bigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
87+
* BaseBigtableInstanceAdminSettings.Builder baseBigtableInstanceAdminSettingsBuilder =
88+
* BaseBigtableInstanceAdminSettings.newBuilder();
89+
* baseBigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
9090
* .setTotalTimeout(Duration.ofSeconds(30));
91-
* BigtableInstanceAdminSettings bigtableInstanceAdminSettings = bigtableInstanceAdminSettingsBuilder.build();
91+
* BaseBigtableInstanceAdminSettings baseBigtableInstanceAdminSettings = baseBigtableInstanceAdminSettingsBuilder.build();
9292
* </code>
9393
* </pre>
9494
*/
9595
@Generated("by gapic-generator")
9696
@BetaApi
97-
public class BigtableInstanceAdminSettings extends ClientSettings<BigtableInstanceAdminSettings> {
97+
public class BaseBigtableInstanceAdminSettings
98+
extends ClientSettings<BaseBigtableInstanceAdminSettings> {
9899
/** Returns the object with the settings used for calls to createInstance. */
99100
public UnaryCallSettings<CreateInstanceRequest, Operation> createInstanceSettings() {
100101
return ((BigtableInstanceAdminStubSettings) getStubSettings()).createInstanceSettings();
@@ -232,9 +233,9 @@ public UnaryCallSettings<SetIamPolicyRequest, Policy> setIamPolicySettings() {
232233
return ((BigtableInstanceAdminStubSettings) getStubSettings()).testIamPermissionsSettings();
233234
}
234235

235-
public static final BigtableInstanceAdminSettings create(BigtableInstanceAdminStubSettings stub)
236-
throws IOException {
237-
return new BigtableInstanceAdminSettings.Builder(stub.toBuilder()).build();
236+
public static final BaseBigtableInstanceAdminSettings create(
237+
BigtableInstanceAdminStubSettings stub) throws IOException {
238+
return new BaseBigtableInstanceAdminSettings.Builder(stub.toBuilder()).build();
238239
}
239240

240241
/** Returns a builder for the default ExecutorProvider for this service. */
@@ -286,13 +287,13 @@ public Builder toBuilder() {
286287
return new Builder(this);
287288
}
288289

289-
protected BigtableInstanceAdminSettings(Builder settingsBuilder) throws IOException {
290+
protected BaseBigtableInstanceAdminSettings(Builder settingsBuilder) throws IOException {
290291
super(settingsBuilder);
291292
}
292293

293-
/** Builder for BigtableInstanceAdminSettings. */
294+
/** Builder for BaseBigtableInstanceAdminSettings. */
294295
public static class Builder
295-
extends ClientSettings.Builder<BigtableInstanceAdminSettings, Builder> {
296+
extends ClientSettings.Builder<BaseBigtableInstanceAdminSettings, Builder> {
296297
protected Builder() throws IOException {
297298
this((ClientContext) null);
298299
}
@@ -305,7 +306,7 @@ private static Builder createDefault() {
305306
return new Builder(BigtableInstanceAdminStubSettings.newBuilder());
306307
}
307308

308-
protected Builder(BigtableInstanceAdminSettings settings) {
309+
protected Builder(BaseBigtableInstanceAdminSettings settings) {
309310
super(settings.getStubSettings().toBuilder());
310311
}
311312

@@ -471,8 +472,8 @@ public UnaryCallSettings.Builder<SetIamPolicyRequest, Policy> setIamPolicySettin
471472
}
472473

473474
@Override
474-
public BigtableInstanceAdminSettings build() throws IOException {
475-
return new BigtableInstanceAdminSettings(this);
475+
public BaseBigtableInstanceAdminSettings build() throws IOException {
476+
return new BaseBigtableInstanceAdminSettings(this);
476477
}
477478
}
478479
}

0 commit comments

Comments
 (0)