Skip to content

Commit 215bfbc

Browse files
andreamlinandreamlin
authored
---
yaml --- r: 8967 b: refs/heads/lesv-patch-1 c: bb3208d h: refs/heads/master i: 8965: dcd23f0 8963: 9458a44 8959: 830060d
1 parent 69b9c5c commit 215bfbc

160 files changed

Lines changed: 21588 additions & 11529 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ refs/tags/v0.22.0: 18b298fe4bfe8ec2f20b0e0bf7ffdcce5cc3c5fe
6666
refs/heads/vam-google-patch-1: d0c8fee3a4074d0bf7360ce8c4f7f7223d0ee7b9
6767
refs/heads/vam-google-patch-CODEOWNERS: 2ac1616e25229e51d08a984708ef1918f91a35ee
6868
refs/heads/danoscarmike-patch-1: 7342a9916bce4ed00002c7202e2a16c5d46afaea
69-
refs/heads/lesv-patch-1: 30497c08eb23396e68eff25b5273e64b57823da9
69+
refs/heads/lesv-patch-1: bb3208def13c84fdd1d4b87e1d8101190809f684
7070
refs/heads/ml-update-branch: 079dd6610017f5c51b9d1938c12d6d55b61513cf
7171
refs/heads/vkedia-patch-2: 7d8241388a9769a5c069334761b06c7012c878e7
7272
refs/heads/vkedia-patch-3: 4d128043acaa7db9160faf439d2ca6104e8a88cb

‎branches/lesv-patch-1/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClient.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.api.gax.core.BackgroundResource;
2525
import com.google.api.gax.rpc.UnaryCallable;
2626
import com.google.cloud.bigquery.datatransfer.v1.stub.DataTransferServiceStub;
27+
import com.google.cloud.bigquery.datatransfer.v1.stub.DataTransferServiceStubSettings;
2728
import com.google.protobuf.Empty;
2829
import com.google.protobuf.FieldMask;
2930
import com.google.protobuf.Timestamp;
@@ -136,7 +137,7 @@ public static final DataTransferServiceClient create(DataTransferServiceStub stu
136137
*/
137138
protected DataTransferServiceClient(DataTransferServiceSettings settings) throws IOException {
138139
this.settings = settings;
139-
this.stub = settings.createStub();
140+
this.stub = ((DataTransferServiceStubSettings) settings.getStubSettings()).createStub();
140141
}
141142

142143
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")

‎branches/lesv-patch-1/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java‎

Lines changed: 50 additions & 562 deletions
Large diffs are not rendered by default.

‎branches/lesv-patch-1/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java‎

Lines changed: 866 additions & 0 deletions
Large diffs are not rendered by default.

‎branches/lesv-patch-1/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceStub.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse;
3232
import com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest;
3333
import com.google.cloud.bigquery.datatransfer.v1.DataSource;
34-
import com.google.cloud.bigquery.datatransfer.v1.DataTransferServiceSettings;
3534
import com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest;
3635
import com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest;
3736
import com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest;
@@ -236,15 +235,15 @@ public class GrpcDataTransferServiceStub extends DataTransferServiceStub {
236235
private final UnaryCallable<CheckValidCredsRequest, CheckValidCredsResponse>
237236
checkValidCredsCallable;
238237

239-
public static final GrpcDataTransferServiceStub create(DataTransferServiceSettings settings)
238+
public static final GrpcDataTransferServiceStub create(DataTransferServiceStubSettings settings)
240239
throws IOException {
241240
return new GrpcDataTransferServiceStub(settings, ClientContext.create(settings));
242241
}
243242

244243
public static final GrpcDataTransferServiceStub create(ClientContext clientContext)
245244
throws IOException {
246245
return new GrpcDataTransferServiceStub(
247-
DataTransferServiceSettings.newBuilder().build(), clientContext);
246+
DataTransferServiceStubSettings.newBuilder().build(), clientContext);
248247
}
249248

250249
/**
@@ -253,7 +252,7 @@ public static final GrpcDataTransferServiceStub create(ClientContext clientConte
253252
* should be preferred.
254253
*/
255254
protected GrpcDataTransferServiceStub(
256-
DataTransferServiceSettings settings, ClientContext clientContext) throws IOException {
255+
DataTransferServiceStubSettings settings, ClientContext clientContext) throws IOException {
257256

258257
GrpcCallSettings<GetDataSourceRequest, DataSource> getDataSourceTransportSettings =
259258
GrpcCallSettings.<GetDataSourceRequest, DataSource>newBuilder()

‎branches/lesv-patch-1/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import com.google.bigtable.admin.v2.UpdateAppProfileRequest;
5151
import com.google.bigtable.admin.v2.UpdateClusterMetadata;
5252
import com.google.cloud.bigtable.admin.v2.stub.BigtableInstanceAdminStub;
53+
import com.google.cloud.bigtable.admin.v2.stub.BigtableInstanceAdminStubSettings;
5354
import com.google.iam.v1.GetIamPolicyRequest;
5455
import com.google.iam.v1.Policy;
5556
import com.google.iam.v1.SetIamPolicyRequest;
@@ -171,7 +172,7 @@ public static final BigtableInstanceAdminClient create(BigtableInstanceAdminStub
171172
*/
172173
protected BigtableInstanceAdminClient(BigtableInstanceAdminSettings settings) throws IOException {
173174
this.settings = settings;
174-
this.stub = settings.createStub();
175+
this.stub = ((BigtableInstanceAdminStubSettings) settings.getStubSettings()).createStub();
175176
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
176177
}
177178

‎branches/lesv-patch-1/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java‎

Lines changed: 72 additions & 579 deletions
Large diffs are not rendered by default.

‎branches/lesv-patch-1/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import com.google.bigtable.admin.v2.Table;
5050
import com.google.bigtable.admin.v2.TableName;
5151
import com.google.cloud.bigtable.admin.v2.stub.BigtableTableAdminStub;
52+
import com.google.cloud.bigtable.admin.v2.stub.BigtableTableAdminStubSettings;
5253
import com.google.longrunning.Operation;
5354
import com.google.longrunning.OperationsClient;
5455
import com.google.protobuf.Empty;
@@ -165,7 +166,7 @@ public static final BigtableTableAdminClient create(BigtableTableAdminStub stub)
165166
*/
166167
protected BigtableTableAdminClient(BigtableTableAdminSettings settings) throws IOException {
167168
this.settings = settings;
168-
this.stub = settings.createStub();
169+
this.stub = ((BigtableTableAdminStubSettings) settings.getStubSettings()).createStub();
169170
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
170171
}
171172

0 commit comments

Comments
 (0)