Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bigtable: prefix gapic generated clients with Base, prefix overlay clients with Bigtable #3538

Merged
merged 2 commits into from
Aug 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.google.cloud.bigtable.admin.v2;

import static com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient.ListAppProfilesPagedResponse;
import static com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPagedResponse;

import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
Expand Down Expand Up @@ -68,7 +68,7 @@

// AUTO-GENERATED DOCUMENTATION AND CLASS
/**
* Settings class to configure an instance of {@link BigtableInstanceAdminClient}.
* Settings class to configure an instance of {@link BaseBigtableInstanceAdminClient}.
*
* <p>The default instance has everything set to sensible defaults:
*
Expand All @@ -84,17 +84,18 @@
*
* <pre>
* <code>
* BigtableInstanceAdminSettings.Builder bigtableInstanceAdminSettingsBuilder =
* BigtableInstanceAdminSettings.newBuilder();
* bigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
* BaseBigtableInstanceAdminSettings.Builder baseBigtableInstanceAdminSettingsBuilder =
* BaseBigtableInstanceAdminSettings.newBuilder();
* baseBigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* BigtableInstanceAdminSettings bigtableInstanceAdminSettings = bigtableInstanceAdminSettingsBuilder.build();
* BaseBigtableInstanceAdminSettings baseBigtableInstanceAdminSettings = baseBigtableInstanceAdminSettingsBuilder.build();
* </code>
* </pre>
*/
@Generated("by gapic-generator")
@BetaApi
public class BigtableInstanceAdminSettings extends ClientSettings<BigtableInstanceAdminSettings> {
public class BaseBigtableInstanceAdminSettings
extends ClientSettings<BaseBigtableInstanceAdminSettings> {
/** Returns the object with the settings used for calls to createInstance. */
public UnaryCallSettings<CreateInstanceRequest, Operation> createInstanceSettings() {
return ((BigtableInstanceAdminStubSettings) getStubSettings()).createInstanceSettings();
Expand Down Expand Up @@ -232,9 +233,9 @@ public UnaryCallSettings<SetIamPolicyRequest, Policy> setIamPolicySettings() {
return ((BigtableInstanceAdminStubSettings) getStubSettings()).testIamPermissionsSettings();
}

public static final BigtableInstanceAdminSettings create(BigtableInstanceAdminStubSettings stub)
throws IOException {
return new BigtableInstanceAdminSettings.Builder(stub.toBuilder()).build();
public static final BaseBigtableInstanceAdminSettings create(
BigtableInstanceAdminStubSettings stub) throws IOException {
return new BaseBigtableInstanceAdminSettings.Builder(stub.toBuilder()).build();
}

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

protected BigtableInstanceAdminSettings(Builder settingsBuilder) throws IOException {
protected BaseBigtableInstanceAdminSettings(Builder settingsBuilder) throws IOException {
super(settingsBuilder);
}

/** Builder for BigtableInstanceAdminSettings. */
/** Builder for BaseBigtableInstanceAdminSettings. */
public static class Builder
extends ClientSettings.Builder<BigtableInstanceAdminSettings, Builder> {
extends ClientSettings.Builder<BaseBigtableInstanceAdminSettings, Builder> {
protected Builder() throws IOException {
this((ClientContext) null);
}
Expand All @@ -305,7 +306,7 @@ private static Builder createDefault() {
return new Builder(BigtableInstanceAdminStubSettings.newBuilder());
}

protected Builder(BigtableInstanceAdminSettings settings) {
protected Builder(BaseBigtableInstanceAdminSettings settings) {
super(settings.getStubSettings().toBuilder());
}

Expand Down Expand Up @@ -471,8 +472,8 @@ public UnaryCallSettings.Builder<SetIamPolicyRequest, Policy> setIamPolicySettin
}

@Override
public BigtableInstanceAdminSettings build() throws IOException {
return new BigtableInstanceAdminSettings(this);
public BaseBigtableInstanceAdminSettings build() throws IOException {
return new BaseBigtableInstanceAdminSettings(this);
}
}
}
Loading