Skip to content

Commit 4d3950c

Browse files
---
yaml --- r: 8931 b: refs/heads/lesv-patch-1 c: 5c6104a h: refs/heads/master i: 8929: 4523eb1 8927: 91e5c04
1 parent 17a128d commit 4d3950c

49 files changed

Lines changed: 705 additions & 740 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: 8cac8b8190f3a38a8986d707c38a5fb55f9d237d
69+
refs/heads/lesv-patch-1: 5c6104a4e0c95212f585c5269b1c8a7db7b53430
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: 40 additions & 40 deletions
Large diffs are not rendered by default.

branches/lesv-patch-1/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void getDataSourceTest() {
101101
boolean manualRunsDisabled = true;
102102
DataSource expectedResponse =
103103
DataSource.newBuilder()
104-
.setNameWithDataSourceNameOneof(name2)
104+
.setName(name2.toString())
105105
.setDataSourceId(dataSourceId)
106106
.setDisplayName(displayName)
107107
.setDescription(description)
@@ -127,7 +127,7 @@ public void getDataSourceTest() {
127127
Assert.assertEquals(1, actualRequests.size());
128128
GetDataSourceRequest actualRequest = (GetDataSourceRequest) actualRequests.get(0);
129129

130-
Assert.assertEquals(name, actualRequest.getNameAsDataSourceNameOneof());
130+
Assert.assertEquals(name, DataSourceNameOneof.parse(actualRequest.getName()));
131131
Assert.assertTrue(
132132
channelProvider.isHeaderSent(
133133
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -177,7 +177,7 @@ public void listDataSourcesTest() {
177177
Assert.assertEquals(1, actualRequests.size());
178178
ListDataSourcesRequest actualRequest = (ListDataSourcesRequest) actualRequests.get(0);
179179

180-
Assert.assertEquals(parent, actualRequest.getParentAsParentNameOneof());
180+
Assert.assertEquals(parent, ParentNameOneof.parse(actualRequest.getParent()));
181181
Assert.assertTrue(
182182
channelProvider.isHeaderSent(
183183
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -216,7 +216,7 @@ public void createTransferConfigTest() {
216216
String datasetRegion = "datasetRegion959248539";
217217
TransferConfig expectedResponse =
218218
TransferConfig.newBuilder()
219-
.setNameWithTransferConfigNameOneof(name)
219+
.setName(name.toString())
220220
.setDestinationDatasetId(destinationDatasetId)
221221
.setDisplayName(displayName)
222222
.setDataSourceId(dataSourceId)
@@ -238,7 +238,7 @@ public void createTransferConfigTest() {
238238
Assert.assertEquals(1, actualRequests.size());
239239
CreateTransferConfigRequest actualRequest = (CreateTransferConfigRequest) actualRequests.get(0);
240240

241-
Assert.assertEquals(parent, actualRequest.getParentAsParentNameOneof());
241+
Assert.assertEquals(parent, ParentNameOneof.parse(actualRequest.getParent()));
242242
Assert.assertEquals(transferConfig, actualRequest.getTransferConfig());
243243
Assert.assertTrue(
244244
channelProvider.isHeaderSent(
@@ -279,7 +279,7 @@ public void updateTransferConfigTest() {
279279
String datasetRegion = "datasetRegion959248539";
280280
TransferConfig expectedResponse =
281281
TransferConfig.newBuilder()
282-
.setNameWithTransferConfigNameOneof(name)
282+
.setName(name.toString())
283283
.setDestinationDatasetId(destinationDatasetId)
284284
.setDisplayName(displayName)
285285
.setDataSourceId(dataSourceId)
@@ -342,7 +342,7 @@ public void deleteTransferConfigTest() {
342342
Assert.assertEquals(1, actualRequests.size());
343343
DeleteTransferConfigRequest actualRequest = (DeleteTransferConfigRequest) actualRequests.get(0);
344344

345-
Assert.assertEquals(name, actualRequest.getNameAsTransferConfigNameOneof());
345+
Assert.assertEquals(name, TransferConfigNameOneof.parse(actualRequest.getName()));
346346
Assert.assertTrue(
347347
channelProvider.isHeaderSent(
348348
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -383,7 +383,7 @@ public void getTransferConfigTest() {
383383
String datasetRegion = "datasetRegion959248539";
384384
TransferConfig expectedResponse =
385385
TransferConfig.newBuilder()
386-
.setNameWithTransferConfigNameOneof(name2)
386+
.setName(name2.toString())
387387
.setDestinationDatasetId(destinationDatasetId)
388388
.setDisplayName(displayName)
389389
.setDataSourceId(dataSourceId)
@@ -406,7 +406,7 @@ public void getTransferConfigTest() {
406406
Assert.assertEquals(1, actualRequests.size());
407407
GetTransferConfigRequest actualRequest = (GetTransferConfigRequest) actualRequests.get(0);
408408

409-
Assert.assertEquals(name, actualRequest.getNameAsTransferConfigNameOneof());
409+
Assert.assertEquals(name, TransferConfigNameOneof.parse(actualRequest.getName()));
410410
Assert.assertTrue(
411411
channelProvider.isHeaderSent(
412412
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -456,7 +456,7 @@ public void listTransferConfigsTest() {
456456
Assert.assertEquals(1, actualRequests.size());
457457
ListTransferConfigsRequest actualRequest = (ListTransferConfigsRequest) actualRequests.get(0);
458458

459-
Assert.assertEquals(parent, actualRequest.getParentAsParentNameOneof());
459+
Assert.assertEquals(parent, ParentNameOneof.parse(actualRequest.getParent()));
460460
Assert.assertTrue(
461461
channelProvider.isHeaderSent(
462462
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -500,7 +500,7 @@ public void scheduleTransferRunsTest() {
500500
Assert.assertEquals(1, actualRequests.size());
501501
ScheduleTransferRunsRequest actualRequest = (ScheduleTransferRunsRequest) actualRequests.get(0);
502502

503-
Assert.assertEquals(parent, actualRequest.getParentAsTransferConfigNameOneof());
503+
Assert.assertEquals(parent, TransferConfigNameOneof.parse(actualRequest.getParent()));
504504
Assert.assertEquals(startTime, actualRequest.getStartTime());
505505
Assert.assertEquals(endTime, actualRequest.getEndTime());
506506
Assert.assertTrue(
@@ -541,7 +541,7 @@ public void getTransferRunTest() {
541541
String schedule = "schedule-697920873";
542542
TransferRun expectedResponse =
543543
TransferRun.newBuilder()
544-
.setNameWithRunNameOneof(name2)
544+
.setName(name2.toString())
545545
.setDestinationDatasetId(destinationDatasetId)
546546
.setDataSourceId(dataSourceId)
547547
.setUserId(userId)
@@ -560,7 +560,7 @@ public void getTransferRunTest() {
560560
Assert.assertEquals(1, actualRequests.size());
561561
GetTransferRunRequest actualRequest = (GetTransferRunRequest) actualRequests.get(0);
562562

563-
Assert.assertEquals(name, actualRequest.getNameAsRunNameOneof());
563+
Assert.assertEquals(name, RunNameOneof.parse(actualRequest.getName()));
564564
Assert.assertTrue(
565565
channelProvider.isHeaderSent(
566566
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -601,7 +601,7 @@ public void deleteTransferRunTest() {
601601
Assert.assertEquals(1, actualRequests.size());
602602
DeleteTransferRunRequest actualRequest = (DeleteTransferRunRequest) actualRequests.get(0);
603603

604-
Assert.assertEquals(name, actualRequest.getNameAsRunNameOneof());
604+
Assert.assertEquals(name, RunNameOneof.parse(actualRequest.getName()));
605605
Assert.assertTrue(
606606
channelProvider.isHeaderSent(
607607
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -653,7 +653,7 @@ public void listTransferRunsTest() {
653653
Assert.assertEquals(1, actualRequests.size());
654654
ListTransferRunsRequest actualRequest = (ListTransferRunsRequest) actualRequests.get(0);
655655

656-
Assert.assertEquals(parent, actualRequest.getParentAsTransferConfigNameOneof());
656+
Assert.assertEquals(parent, TransferConfigNameOneof.parse(actualRequest.getParent()));
657657
Assert.assertTrue(
658658
channelProvider.isHeaderSent(
659659
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -705,7 +705,7 @@ public void listTransferLogsTest() {
705705
Assert.assertEquals(1, actualRequests.size());
706706
ListTransferLogsRequest actualRequest = (ListTransferLogsRequest) actualRequests.get(0);
707707

708-
Assert.assertEquals(parent, actualRequest.getParentAsRunNameOneof());
708+
Assert.assertEquals(parent, RunNameOneof.parse(actualRequest.getParent()));
709709
Assert.assertTrue(
710710
channelProvider.isHeaderSent(
711711
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -749,7 +749,7 @@ public void checkValidCredsTest() {
749749
Assert.assertEquals(1, actualRequests.size());
750750
CheckValidCredsRequest actualRequest = (CheckValidCredsRequest) actualRequests.get(0);
751751

752-
Assert.assertEquals(name, actualRequest.getNameAsDataSourceNameOneof());
752+
Assert.assertEquals(name, DataSourceNameOneof.parse(actualRequest.getName()));
753753
Assert.assertTrue(
754754
channelProvider.isHeaderSent(
755755
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),

0 commit comments

Comments
 (0)