Skip to content

Commit 3fd597b

Browse files
garrettjonesgooglegarrettjonesgoogle
authored
Regen for oneof -> inheritance conversion (googleapis#2930)
This is a breaking change for Pub/Sub and BigQueryDataTransfer.
1 parent 55b65cc commit 3fd597b

57 files changed

Lines changed: 1118 additions & 867 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.

‎google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClient.java‎

Lines changed: 79 additions & 65 deletions
Large diffs are not rendered by default.

‎google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* <pre>
3131
* <code>
3232
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) {
33-
* DataSourceNameOneof name = DataSourceNameOneof.from(LocationDataSourceName.of("[PROJECT]", "[LOCATION]", "[DATA_SOURCE]"));
33+
* DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]");
3434
* DataSource response = dataTransferServiceClient.getDataSource(name);
3535
* }
3636
* </code>

‎google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java‎

Lines changed: 41 additions & 87 deletions
Large diffs are not rendered by default.

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

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public final OperationFuture<Instance, CreateInstanceMetadata> createInstanceAsy
239239

240240
CreateInstanceRequest request =
241241
CreateInstanceRequest.newBuilder()
242-
.setParent(parent.toString())
242+
.setParent(parent == null ? null : parent.toString())
243243
.setInstanceId(instanceId)
244244
.setInstance(instance)
245245
.putAllClusters(clusters)
@@ -353,7 +353,8 @@ public final UnaryCallable<CreateInstanceRequest, Operation> createInstanceCalla
353353
*/
354354
public final Instance getInstance(InstanceName name) {
355355

356-
GetInstanceRequest request = GetInstanceRequest.newBuilder().setName(name.toString()).build();
356+
GetInstanceRequest request =
357+
GetInstanceRequest.newBuilder().setName(name == null ? null : name.toString()).build();
357358
return getInstance(request);
358359
}
359360

@@ -422,7 +423,9 @@ public final UnaryCallable<GetInstanceRequest, Instance> getInstanceCallable() {
422423
public final ListInstancesResponse listInstances(ProjectName parent) {
423424

424425
ListInstancesRequest request =
425-
ListInstancesRequest.newBuilder().setParent(parent.toString()).build();
426+
ListInstancesRequest.newBuilder()
427+
.setParent(parent == null ? null : parent.toString())
428+
.build();
426429
return listInstances(request);
427430
}
428431

@@ -597,7 +600,7 @@ public final OperationFuture<Instance, UpdateInstanceMetadata> partialUpdateInst
597600
public final void deleteInstance(InstanceName name) {
598601

599602
DeleteInstanceRequest request =
600-
DeleteInstanceRequest.newBuilder().setName(name.toString()).build();
603+
DeleteInstanceRequest.newBuilder().setName(name == null ? null : name.toString()).build();
601604
deleteInstance(request);
602605
}
603606

@@ -673,7 +676,7 @@ public final OperationFuture<Cluster, CreateClusterMetadata> createClusterAsync(
673676

674677
CreateClusterRequest request =
675678
CreateClusterRequest.newBuilder()
676-
.setParent(parent.toString())
679+
.setParent(parent == null ? null : parent.toString())
677680
.setClusterId(clusterId)
678681
.setCluster(cluster)
679682
.build();
@@ -780,7 +783,8 @@ public final UnaryCallable<CreateClusterRequest, Operation> createClusterCallabl
780783
*/
781784
public final Cluster getCluster(ClusterName name) {
782785

783-
GetClusterRequest request = GetClusterRequest.newBuilder().setName(name.toString()).build();
786+
GetClusterRequest request =
787+
GetClusterRequest.newBuilder().setName(name == null ? null : name.toString()).build();
784788
return getCluster(request);
785789
}
786790

@@ -851,7 +855,9 @@ public final UnaryCallable<GetClusterRequest, Cluster> getClusterCallable() {
851855
public final ListClustersResponse listClusters(InstanceName parent) {
852856

853857
ListClustersRequest request =
854-
ListClustersRequest.newBuilder().setParent(parent.toString()).build();
858+
ListClustersRequest.newBuilder()
859+
.setParent(parent == null ? null : parent.toString())
860+
.build();
855861
return listClusters(request);
856862
}
857863

@@ -1000,7 +1006,7 @@ public final UnaryCallable<Cluster, Operation> updateClusterCallable() {
10001006
public final void deleteCluster(ClusterName name) {
10011007

10021008
DeleteClusterRequest request =
1003-
DeleteClusterRequest.newBuilder().setName(name.toString()).build();
1009+
DeleteClusterRequest.newBuilder().setName(name == null ? null : name.toString()).build();
10041010
deleteCluster(request);
10051011
}
10061012

@@ -1082,7 +1088,7 @@ public final AppProfile createAppProfile(
10821088

10831089
CreateAppProfileRequest request =
10841090
CreateAppProfileRequest.newBuilder()
1085-
.setParent(parent.toString())
1091+
.setParent(parent == null ? null : parent.toString())
10861092
.setAppProfileId(appProfileId)
10871093
.setAppProfile(appProfile)
10881094
.build();
@@ -1177,7 +1183,7 @@ public final UnaryCallable<CreateAppProfileRequest, AppProfile> createAppProfile
11771183
public final AppProfile getAppProfile(AppProfileName name) {
11781184

11791185
GetAppProfileRequest request =
1180-
GetAppProfileRequest.newBuilder().setName(name.toString()).build();
1186+
GetAppProfileRequest.newBuilder().setName(name == null ? null : name.toString()).build();
11811187
return getAppProfile(request);
11821188
}
11831189

@@ -1262,7 +1268,9 @@ public final UnaryCallable<GetAppProfileRequest, AppProfile> getAppProfileCallab
12621268
*/
12631269
public final ListAppProfilesPagedResponse listAppProfiles(InstanceName parent) {
12641270
ListAppProfilesRequest request =
1265-
ListAppProfilesRequest.newBuilder().setParent(parent.toString()).build();
1271+
ListAppProfilesRequest.newBuilder()
1272+
.setParent(parent == null ? null : parent.toString())
1273+
.build();
12661274
return listAppProfiles(request);
12671275
}
12681276

@@ -1513,7 +1521,7 @@ public final UnaryCallable<UpdateAppProfileRequest, Operation> updateAppProfileC
15131521
public final void deleteAppProfile(AppProfileName name) {
15141522

15151523
DeleteAppProfileRequest request =
1516-
DeleteAppProfileRequest.newBuilder().setName(name.toString()).build();
1524+
DeleteAppProfileRequest.newBuilder().setName(name == null ? null : name.toString()).build();
15171525
deleteAppProfile(request);
15181526
}
15191527

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public final Table createTable(InstanceName parent, String tableId, Table table)
226226

227227
CreateTableRequest request =
228228
CreateTableRequest.newBuilder()
229-
.setParent(parent.toString())
229+
.setParent(parent == null ? null : parent.toString())
230230
.setTableId(tableId)
231231
.setTable(table)
232232
.build();
@@ -323,7 +323,7 @@ public final OperationFuture<Table, CreateTableFromSnapshotMetadata> createTable
323323

324324
CreateTableFromSnapshotRequest request =
325325
CreateTableFromSnapshotRequest.newBuilder()
326-
.setParent(parent.toString())
326+
.setParent(parent == null ? null : parent.toString())
327327
.setTableId(tableId)
328328
.setSourceSnapshot(sourceSnapshot)
329329
.build();
@@ -451,7 +451,8 @@ public final OperationFuture<Table, CreateTableFromSnapshotMetadata> createTable
451451
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
452452
*/
453453
public final ListTablesPagedResponse listTables(InstanceName parent) {
454-
ListTablesRequest request = ListTablesRequest.newBuilder().setParent(parent.toString()).build();
454+
ListTablesRequest request =
455+
ListTablesRequest.newBuilder().setParent(parent == null ? null : parent.toString()).build();
455456
return listTables(request);
456457
}
457458

@@ -554,7 +555,8 @@ public final UnaryCallable<ListTablesRequest, ListTablesResponse> listTablesCall
554555
*/
555556
public final Table getTable(TableName name) {
556557

557-
GetTableRequest request = GetTableRequest.newBuilder().setName(name.toString()).build();
558+
GetTableRequest request =
559+
GetTableRequest.newBuilder().setName(name == null ? null : name.toString()).build();
558560
return getTable(request);
559561
}
560562

@@ -622,7 +624,8 @@ public final UnaryCallable<GetTableRequest, Table> getTableCallable() {
622624
*/
623625
public final void deleteTable(TableName name) {
624626

625-
DeleteTableRequest request = DeleteTableRequest.newBuilder().setName(name.toString()).build();
627+
DeleteTableRequest request =
628+
DeleteTableRequest.newBuilder().setName(name == null ? null : name.toString()).build();
626629
deleteTable(request);
627630
}
628631

@@ -699,7 +702,7 @@ public final Table modifyColumnFamilies(
699702

700703
ModifyColumnFamiliesRequest request =
701704
ModifyColumnFamiliesRequest.newBuilder()
702-
.setName(name.toString())
705+
.setName(name == null ? null : name.toString())
703706
.addAllModifications(modifications)
704707
.build();
705708
return modifyColumnFamilies(request);
@@ -832,7 +835,9 @@ public final UnaryCallable<DropRowRangeRequest, Empty> dropRowRangeCallable() {
832835
public final GenerateConsistencyTokenResponse generateConsistencyToken(TableName name) {
833836

834837
GenerateConsistencyTokenRequest request =
835-
GenerateConsistencyTokenRequest.newBuilder().setName(name.toString()).build();
838+
GenerateConsistencyTokenRequest.newBuilder()
839+
.setName(name == null ? null : name.toString())
840+
.build();
836841
return generateConsistencyToken(request);
837842
}
838843

@@ -926,7 +931,7 @@ public final CheckConsistencyResponse checkConsistency(TableName name, String co
926931

927932
CheckConsistencyRequest request =
928933
CheckConsistencyRequest.newBuilder()
929-
.setName(name.toString())
934+
.setName(name == null ? null : name.toString())
930935
.setConsistencyToken(consistencyToken)
931936
.build();
932937
return checkConsistency(request);
@@ -1123,7 +1128,8 @@ public final UnaryCallable<SnapshotTableRequest, Operation> snapshotTableCallabl
11231128
*/
11241129
public final Snapshot getSnapshot(SnapshotName name) {
11251130

1126-
GetSnapshotRequest request = GetSnapshotRequest.newBuilder().setName(name.toString()).build();
1131+
GetSnapshotRequest request =
1132+
GetSnapshotRequest.newBuilder().setName(name == null ? null : name.toString()).build();
11271133
return getSnapshot(request);
11281134
}
11291135

@@ -1210,7 +1216,9 @@ public final UnaryCallable<GetSnapshotRequest, Snapshot> getSnapshotCallable() {
12101216
*/
12111217
public final ListSnapshotsPagedResponse listSnapshots(ClusterName parent) {
12121218
ListSnapshotsRequest request =
1213-
ListSnapshotsRequest.newBuilder().setParent(parent.toString()).build();
1219+
ListSnapshotsRequest.newBuilder()
1220+
.setParent(parent == null ? null : parent.toString())
1221+
.build();
12141222
return listSnapshots(request);
12151223
}
12161224

@@ -1335,7 +1343,7 @@ public final UnaryCallable<ListSnapshotsRequest, ListSnapshotsResponse> listSnap
13351343
public final void deleteSnapshot(SnapshotName name) {
13361344

13371345
DeleteSnapshotRequest request =
1338-
DeleteSnapshotRequest.newBuilder().setName(name.toString()).build();
1346+
DeleteSnapshotRequest.newBuilder().setName(name == null ? null : name.toString()).build();
13391347
deleteSnapshot(request);
13401348
}
13411349

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public final MutateRowResponse mutateRow(
279279

280280
MutateRowRequest request =
281281
MutateRowRequest.newBuilder()
282-
.setTableName(tableName.toString())
282+
.setTableName(tableName == null ? null : tableName.toString())
283283
.setRowKey(rowKey)
284284
.addAllMutations(mutations)
285285
.build();
@@ -426,7 +426,7 @@ public final CheckAndMutateRowResponse checkAndMutateRow(
426426

427427
CheckAndMutateRowRequest request =
428428
CheckAndMutateRowRequest.newBuilder()
429-
.setTableName(tableName.toString())
429+
.setTableName(tableName == null ? null : tableName.toString())
430430
.setRowKey(rowKey)
431431
.setPredicateFilter(predicateFilter)
432432
.addAllTrueMutations(trueMutations)
@@ -517,7 +517,7 @@ public final ReadModifyWriteRowResponse readModifyWriteRow(
517517

518518
ReadModifyWriteRowRequest request =
519519
ReadModifyWriteRowRequest.newBuilder()
520-
.setTableName(tableName.toString())
520+
.setTableName(tableName == null ? null : tableName.toString())
521521
.setRowKey(rowKey)
522522
.addAllRules(rules)
523523
.build();

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private static Builder initDefaults(Builder builder) {
300300

301301
builder
302302
.mutateRowSettings()
303-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
303+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
304304
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
305305

306306
builder

‎google-cloud-bom/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@
126126
<properties>
127127
<api-client.version>1.23.0</api-client.version>
128128

129-
<api-common.version>1.2.0</api-common.version>
129+
<api-common.version>1.3.0</api-common.version>
130130
<gax.version>1.19.0</gax.version>
131131
<gax-grpc.version>1.19.0</gax-grpc.version>
132132
<gax-httpjson.version>0.36.0</gax-httpjson.version>
133-
<generated-proto-beta.version>0.1.30</generated-proto-beta.version>
134-
<generated-proto-ga.version>1.0.6</generated-proto-ga.version>
133+
<generated-proto-beta.version>0.2.0</generated-proto-beta.version>
134+
<generated-proto-ga.version>1.1.0</generated-proto-ga.version>
135135
<google.auth.version>0.9.0</google.auth.version>
136136
<grpc.version>1.9.0</grpc.version>
137137
<nettyssl.version>2.0.7.Final</nettyssl.version>

‎google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,29 @@
4040

4141
// AUTO-GENERATED DOCUMENTATION AND SERVICE
4242
/**
43-
* Service Description: Manages conversational agents.
43+
* Service Description: Agents are best described as Natural Language Understanding (NLU) modules
44+
* that transform user requests into actionable data. You can include agents in your app, product,
45+
* or service to determine user intent and respond to the user in a natural way.
4446
*
45-
* <p>Refer to the [Dialogflow documentation](https://dialogflow.com/docs/agents) for more details
46-
* about agents. #
47+
* <p>After you create an agent, you can add [Intents][google.cloud.dialogflow.v2beta1.Intents],
48+
* [Contexts][google.cloud.dialogflow.v2beta1.Contexts], [Entity
49+
* Types][google.cloud.dialogflow.v2beta1.EntityTypes],
50+
* [Webhooks][google.cloud.dialogflow.v2beta1.WebhookRequest], and so on to manage the flow of a
51+
* conversation and match user input to predefined intents and actions.
52+
*
53+
* <p>You can create an agent using both Dialogflow Standard Edition and Dialogflow Enterprise
54+
* Edition. For details, see [Dialogflow Editions](/dialogflow-enterprise/docs/editions).
55+
*
56+
* <p>You can save your agent for backup or versioning by exporting the agent by using the
57+
* [ExportAgent][google.cloud.dialogflow.v2beta1.Agents.ExportAgent] method. You can import a saved
58+
* agent by using the [ImportAgent][google.cloud.dialogflow.v2beta1.Agents.ImportAgent] method.
59+
*
60+
* <p>Dialogflow provides several [prebuilt agents](https://dialogflow.com/docs/prebuilt-agents) for
61+
* common conversation scenarios such as determining a date and time, converting currency, and so
62+
* on.
63+
*
64+
* <p>For more information about agents, see the [Dialogflow
65+
* documentation](https://dialogflow.com/docs/agents).
4766
*
4867
* <p>This class provides the ability to make remote calls to the backing service through method
4968
* calls that map to API methods. Sample code to get started:
@@ -189,7 +208,8 @@ public final OperationsClient getOperationsClient() {
189208
*/
190209
public final Agent getAgent(ProjectName parent) {
191210

192-
GetAgentRequest request = GetAgentRequest.newBuilder().setParent(parent.toString()).build();
211+
GetAgentRequest request =
212+
GetAgentRequest.newBuilder().setParent(parent == null ? null : parent.toString()).build();
193213
return getAgent(request);
194214
}
195215

@@ -264,7 +284,9 @@ public final UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
264284
*/
265285
public final SearchAgentsPagedResponse searchAgents(ProjectName parent) {
266286
SearchAgentsRequest request =
267-
SearchAgentsRequest.newBuilder().setParent(parent.toString()).build();
287+
SearchAgentsRequest.newBuilder()
288+
.setParent(parent == null ? null : parent.toString())
289+
.build();
268290
return searchAgents(request);
269291
}
270292

@@ -386,7 +408,8 @@ public final UnaryCallable<SearchAgentsRequest, SearchAgentsResponse> searchAgen
386408
*/
387409
public final OperationFuture<Empty, Struct> trainAgentAsync(ProjectName parent) {
388410

389-
TrainAgentRequest request = TrainAgentRequest.newBuilder().setParent(parent.toString()).build();
411+
TrainAgentRequest request =
412+
TrainAgentRequest.newBuilder().setParent(parent == null ? null : parent.toString()).build();
390413
return trainAgentAsync(request);
391414
}
392415

@@ -490,7 +513,9 @@ public final UnaryCallable<TrainAgentRequest, Operation> trainAgentCallable() {
490513
public final OperationFuture<ExportAgentResponse, Struct> exportAgentAsync(ProjectName parent) {
491514

492515
ExportAgentRequest request =
493-
ExportAgentRequest.newBuilder().setParent(parent.toString()).build();
516+
ExportAgentRequest.newBuilder()
517+
.setParent(parent == null ? null : parent.toString())
518+
.build();
494519
return exportAgentAsync(request);
495520
}
496521

0 commit comments

Comments
 (0)