diff --git a/google-cloud-bigquerydatatransfer/clirr-ignored-differences.xml b/google-cloud-bigquerydatatransfer/clirr-ignored-differences.xml
new file mode 100644
index 00000000..57b7d8b2
--- /dev/null
+++ b/google-cloud-bigquerydatatransfer/clirr-ignored-differences.xml
@@ -0,0 +1,11 @@
+
+
+
** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + * DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); * DataSource response = dataTransferServiceClient.getDataSource(name); * } *
@@ -167,7 +167,7 @@ public DataTransferServiceStub getStub() { * *@@ -191,7 +191,7 @@ public final DataSource getDataSource(DataSourceName name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + * DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); * DataSource response = dataTransferServiceClient.getDataSource(name); * } *
@@ -214,7 +214,7 @@ public final DataSource getDataSource(String name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + * DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); * DataSource response = dataTransferServiceClient.getDataSource(name.toString()); * } *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + * DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); * GetDataSourceRequest request = GetDataSourceRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -237,7 +237,7 @@ public final DataSource getDataSource(GetDataSourceRequest request) { * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + * DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); * GetDataSourceRequest request = GetDataSourceRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -259,7 +259,7 @@ public final UnaryCallable
getDataSourceCallab * * * try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * for (DataSource element : dataTransferServiceClient.listDataSources(parent).iterateAll()) { * // doThingsWith(element); * } @@ -270,7 +270,7 @@ public final UnaryCallable
getDataSourceCallab * be in the form: `projects/{project_id}` or `projects/{project_id}/locations/{location_id} * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final ListDataSourcesPagedResponse listDataSources(ParentName parent) { + public final ListDataSourcesPagedResponse listDataSources(ProjectName parent) { ListDataSourcesRequest request = ListDataSourcesRequest.newBuilder() .setParent(parent == null ? null : parent.toString()) @@ -286,7 +286,34 @@ public final ListDataSourcesPagedResponse listDataSources(ParentName parent) { * * + * + * @param parent Required. The BigQuery project id for which data sources should be returned. Must + * be in the form: `projects/{project_id}` or `projects/{project_id}/locations/{location_id} + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final ListDataSourcesPagedResponse listDataSources(LocationName parent) { + ListDataSourcesRequest request = + ListDataSourcesRequest.newBuilder() + .setParent(parent == null ? null : parent.toString()) + .build(); + return listDataSources(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Lists supported data sources and returns their settings, which can be used for UI rendering. + * + ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]"); + * for (DataSource element : dataTransferServiceClient.listDataSources(parent).iterateAll()) { + * // doThingsWith(element); + * } + * } + *
Sample code: + * + *
+ * try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { + * ProjectName parent = ProjectName.of("[PROJECT]"); * for (DataSource element : dataTransferServiceClient.listDataSources(parent.toString()).iterateAll()) { * // doThingsWith(element); * } @@ -310,7 +337,7 @@ public final ListDataSourcesPagedResponse listDataSources(String parent) { * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * ListDataSourcesRequest request = ListDataSourcesRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -335,7 +362,7 @@ public final ListDataSourcesPagedResponse listDataSources(ListDataSourcesRequest * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * ListDataSourcesRequest request = ListDataSourcesRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -360,7 +387,7 @@ public final ListDataSourcesPagedResponse listDataSources(ListDataSourcesRequest * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * ListDataSourcesRequest request = ListDataSourcesRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -392,7 +419,7 @@ public final ListDataSourcesPagedResponse listDataSources(ListDataSourcesRequest * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * TransferConfig transferConfig = TransferConfig.newBuilder().build(); * TransferConfig response = dataTransferServiceClient.createTransferConfig(parent, transferConfig); * } @@ -406,7 +433,7 @@ public final ListDataSourcesPagedResponse listDataSources(ListDataSourcesRequest * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final TransferConfig createTransferConfig( - ParentName parent, TransferConfig transferConfig) { + ProjectName parent, TransferConfig transferConfig) { CreateTransferConfigRequest request = CreateTransferConfigRequest.newBuilder() .setParent(parent == null ? null : parent.toString()) @@ -423,7 +450,38 @@ public final TransferConfig createTransferConfig( * *
+ * + * @param parent Required. The BigQuery project id where the transfer configuration should be + * created. Must be in the format projects/{project_id}/locations/{location_id} or + * projects/{project_id}. If specified location and location of the destination bigquery + * dataset do not match - the request will fail. + * @param transferConfig Required. Data transfer configuration to create. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final TransferConfig createTransferConfig( + LocationName parent, TransferConfig transferConfig) { + CreateTransferConfigRequest request = + CreateTransferConfigRequest.newBuilder() + .setParent(parent == null ? null : parent.toString()) + .setTransferConfig(transferConfig) + .build(); + return createTransferConfig(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Creates a new data transfer configuration. + * + ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]"); + * TransferConfig transferConfig = TransferConfig.newBuilder().build(); + * TransferConfig response = dataTransferServiceClient.createTransferConfig(parent, transferConfig); + * } + *
Sample code: + * + *
+ * try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { + * ProjectName parent = ProjectName.of("[PROJECT]"); * TransferConfig transferConfig = TransferConfig.newBuilder().build(); * TransferConfig response = dataTransferServiceClient.createTransferConfig(parent.toString(), transferConfig); * } @@ -453,7 +511,7 @@ public final TransferConfig createTransferConfig(String parent, TransferConfig t * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * TransferConfig transferConfig = TransferConfig.newBuilder().build(); * CreateTransferConfigRequest request = CreateTransferConfigRequest.newBuilder() * .setParent(parent.toString()) @@ -478,7 +536,7 @@ public final TransferConfig createTransferConfig(CreateTransferConfigRequest req * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * TransferConfig transferConfig = TransferConfig.newBuilder().build(); * CreateTransferConfigRequest request = CreateTransferConfigRequest.newBuilder() * .setParent(parent.toString()) @@ -581,7 +639,7 @@ public final TransferConfig updateTransferConfig(UpdateTransferConfigRequest req * *
@@ -607,7 +665,7 @@ public final void deleteTransferConfig(TransferConfigName name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName name = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * dataTransferServiceClient.deleteTransferConfig(name); * } *
@@ -631,7 +689,7 @@ public final void deleteTransferConfig(String name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName name = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * dataTransferServiceClient.deleteTransferConfig(name.toString()); * } *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName name = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * DeleteTransferConfigRequest request = DeleteTransferConfigRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -654,7 +712,7 @@ public final void deleteTransferConfig(DeleteTransferConfigRequest request) { * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName name = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * DeleteTransferConfigRequest request = DeleteTransferConfigRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -676,7 +734,7 @@ public final UnaryCallable
deleteTransferCon * * @@ -702,7 +760,7 @@ public final TransferConfig getTransferConfig(TransferConfigName name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName name = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * TransferConfig response = dataTransferServiceClient.getTransferConfig(name); * } *
@@ -725,7 +783,7 @@ public final TransferConfig getTransferConfig(String name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName name = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * TransferConfig response = dataTransferServiceClient.getTransferConfig(name.toString()); * } *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName name = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * GetTransferConfigRequest request = GetTransferConfigRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -748,7 +806,7 @@ public final TransferConfig getTransferConfig(GetTransferConfigRequest request) * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName name = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * GetTransferConfigRequest request = GetTransferConfigRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -770,7 +828,34 @@ public final UnaryCallable
getTransfer * * + * + * @param parent Required. The BigQuery project id for which data sources should be returned: + * `projects/{project_id}` or `projects/{project_id}/locations/{location_id}` + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final ListTransferConfigsPagedResponse listTransferConfigs(ProjectName parent) { + ListTransferConfigsRequest request = + ListTransferConfigsRequest.newBuilder() + .setParent(parent == null ? null : parent.toString()) + .build(); + return listTransferConfigs(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Returns information about all data transfers in the project. + * + ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); + * for (TransferConfig element : dataTransferServiceClient.listTransferConfigs(parent).iterateAll()) { + * // doThingsWith(element); + * } + * } + *
Sample code: + * + *
+ * try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { + * LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]"); * for (TransferConfig element : dataTransferServiceClient.listTransferConfigs(parent).iterateAll()) { * // doThingsWith(element); * } @@ -781,7 +866,7 @@ public final UnaryCallable
getTransfer * `projects/{project_id}` or `projects/{project_id}/locations/{location_id}` * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final ListTransferConfigsPagedResponse listTransferConfigs(ParentName parent) { + public final ListTransferConfigsPagedResponse listTransferConfigs(LocationName parent) { ListTransferConfigsRequest request = ListTransferConfigsRequest.newBuilder() .setParent(parent == null ? null : parent.toString()) @@ -797,7 +882,7 @@ public final ListTransferConfigsPagedResponse listTransferConfigs(ParentName par * * * try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * for (TransferConfig element : dataTransferServiceClient.listTransferConfigs(parent.toString()).iterateAll()) { * // doThingsWith(element); * } @@ -822,7 +907,7 @@ public final ListTransferConfigsPagedResponse listTransferConfigs(String parent) * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * ListTransferConfigsRequest request = ListTransferConfigsRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -848,7 +933,7 @@ public final ListTransferConfigsPagedResponse listTransferConfigs( * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * ListTransferConfigsRequest request = ListTransferConfigsRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -873,7 +958,7 @@ public final ListTransferConfigsPagedResponse listTransferConfigs( * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * ParentName parent = ProjectName.of("[PROJECT]"); + * ProjectName parent = ProjectName.of("[PROJECT]"); * ListTransferConfigsRequest request = ListTransferConfigsRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -908,7 +993,7 @@ public final ListTransferConfigsPagedResponse listTransferConfigs( * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName parent = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * Timestamp startTime = Timestamp.newBuilder().build(); * Timestamp endTime = Timestamp.newBuilder().build(); * ScheduleTransferRunsResponse response = dataTransferServiceClient.scheduleTransferRuns(parent, startTime, endTime); @@ -946,7 +1031,7 @@ public final ScheduleTransferRunsResponse scheduleTransferRuns( * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName parent = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * Timestamp startTime = Timestamp.newBuilder().build(); * Timestamp endTime = Timestamp.newBuilder().build(); * ScheduleTransferRunsResponse response = dataTransferServiceClient.scheduleTransferRuns(parent.toString(), startTime, endTime); @@ -984,7 +1069,7 @@ public final ScheduleTransferRunsResponse scheduleTransferRuns( * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName parent = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * Timestamp startTime = Timestamp.newBuilder().build(); * Timestamp endTime = Timestamp.newBuilder().build(); * ScheduleTransferRunsRequest request = ScheduleTransferRunsRequest.newBuilder() @@ -1015,7 +1100,7 @@ public final ScheduleTransferRunsResponse scheduleTransferRuns( * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName parent = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * Timestamp startTime = Timestamp.newBuilder().build(); * Timestamp endTime = Timestamp.newBuilder().build(); * ScheduleTransferRunsRequest request = ScheduleTransferRunsRequest.newBuilder() @@ -1034,6 +1119,51 @@ public final ScheduleTransferRunsResponse scheduleTransferRuns( return stub.scheduleTransferRunsCallable(); } + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Start manual transfer runs to be executed now with schedule_time equal to current time. The + * transfer runs can be created for a time range where the run_time is between start_time + * (inclusive) and end_time (exclusive), or for a specific run_time. + * + *
Sample code: + * + *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final StartManualTransferRunsResponse startManualTransferRuns( + StartManualTransferRunsRequest request) { + return startManualTransferRunsCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Start manual transfer runs to be executed now with schedule_time equal to current time. The + * transfer runs can be created for a time range where the run_time is between start_time + * (inclusive) and end_time (exclusive), or for a specific run_time. + * + *+ * try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { + * StartManualTransferRunsRequest request = StartManualTransferRunsRequest.newBuilder().build(); + * StartManualTransferRunsResponse response = dataTransferServiceClient.startManualTransferRuns(request); + * } + *
Sample code: + * + *
+ */ + public final UnaryCallable+ * try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { + * StartManualTransferRunsRequest request = StartManualTransferRunsRequest.newBuilder().build(); + * ApiFuture<StartManualTransferRunsResponse> future = dataTransferServiceClient.startManualTransferRunsCallable().futureCall(request); + * // Do something + * StartManualTransferRunsResponse response = future.get(); + * } + *
+ startManualTransferRunsCallable() { + return stub.startManualTransferRunsCallable(); + } + // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Returns information about the particular transfer run. @@ -1042,7 +1172,7 @@ public final ScheduleTransferRunsResponse scheduleTransferRuns( * * @@ -1066,7 +1196,7 @@ public final TransferRun getTransferRun(RunName name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName name = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * TransferRun response = dataTransferServiceClient.getTransferRun(name); * } *
@@ -1089,7 +1219,7 @@ public final TransferRun getTransferRun(String name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName name = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * TransferRun response = dataTransferServiceClient.getTransferRun(name.toString()); * } *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName name = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * GetTransferRunRequest request = GetTransferRunRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -1112,7 +1242,7 @@ public final TransferRun getTransferRun(GetTransferRunRequest request) { * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName name = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * GetTransferRunRequest request = GetTransferRunRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -1134,7 +1264,7 @@ public final UnaryCallable
getTransferRunCal * * @@ -1160,7 +1290,7 @@ public final void deleteTransferRun(RunName name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName name = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * dataTransferServiceClient.deleteTransferRun(name); * } *
@@ -1183,7 +1313,7 @@ public final void deleteTransferRun(String name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName name = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * dataTransferServiceClient.deleteTransferRun(name.toString()); * } *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName name = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * DeleteTransferRunRequest request = DeleteTransferRunRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -1206,7 +1336,7 @@ public final void deleteTransferRun(DeleteTransferRunRequest request) { * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName name = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * DeleteTransferRunRequest request = DeleteTransferRunRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -1228,7 +1358,7 @@ public final UnaryCallable
deleteTransferRunCal * * * try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName parent = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * for (TransferRun element : dataTransferServiceClient.listTransferRuns(parent).iterateAll()) { * // doThingsWith(element); * } @@ -1257,7 +1387,7 @@ public final ListTransferRunsPagedResponse listTransferRuns(TransferConfigName p * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName parent = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * for (TransferRun element : dataTransferServiceClient.listTransferRuns(parent.toString()).iterateAll()) { * // doThingsWith(element); * } @@ -1284,7 +1414,7 @@ public final ListTransferRunsPagedResponse listTransferRuns(String parent) { * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName parent = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * ListTransferRunsRequest request = ListTransferRunsRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -1309,7 +1439,7 @@ public final ListTransferRunsPagedResponse listTransferRuns(ListTransferRunsRequ * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName parent = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * ListTransferRunsRequest request = ListTransferRunsRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -1334,7 +1464,7 @@ public final ListTransferRunsPagedResponse listTransferRuns(ListTransferRunsRequ * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + * TransferConfigName parent = TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); * ListTransferRunsRequest request = ListTransferRunsRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -1366,7 +1496,7 @@ public final ListTransferRunsPagedResponse listTransferRuns(ListTransferRunsRequ * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName parent = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName parent = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * for (TransferMessage element : dataTransferServiceClient.listTransferLogs(parent).iterateAll()) { * // doThingsWith(element); * } @@ -1394,7 +1524,7 @@ public final ListTransferLogsPagedResponse listTransferLogs(RunName parent) { * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName parent = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName parent = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * for (TransferMessage element : dataTransferServiceClient.listTransferLogs(parent.toString()).iterateAll()) { * // doThingsWith(element); * } @@ -1420,7 +1550,7 @@ public final ListTransferLogsPagedResponse listTransferLogs(String parent) { * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName parent = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName parent = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * ListTransferLogsRequest request = ListTransferLogsRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -1445,7 +1575,7 @@ public final ListTransferLogsPagedResponse listTransferLogs(ListTransferLogsRequ * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName parent = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName parent = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * ListTransferLogsRequest request = ListTransferLogsRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -1470,7 +1600,7 @@ public final ListTransferLogsPagedResponse listTransferLogs(ListTransferLogsRequ * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * RunName parent = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + * RunName parent = RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); * ListTransferLogsRequest request = ListTransferLogsRequest.newBuilder() * .setParent(parent.toString()) * .build(); @@ -1505,7 +1635,7 @@ public final ListTransferLogsPagedResponse listTransferLogs(ListTransferLogsRequ * *
@@ -1532,7 +1662,7 @@ public final CheckValidCredsResponse checkValidCreds(DataSourceName name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + * DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); * CheckValidCredsResponse response = dataTransferServiceClient.checkValidCreds(name); * } *
@@ -1558,7 +1688,7 @@ public final CheckValidCredsResponse checkValidCreds(String name) { * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + * DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); * CheckValidCredsResponse response = dataTransferServiceClient.checkValidCreds(name.toString()); * } *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + * DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); * CheckValidCredsRequest request = CheckValidCredsRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -1584,7 +1714,7 @@ public final CheckValidCredsResponse checkValidCreds(CheckValidCredsRequest requ * *
* try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + * DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); * CheckValidCredsRequest request = CheckValidCredsRequest.newBuilder() * .setName(name.toString()) * .build(); @@ -1599,51 +1729,6 @@ public final CheckValidCredsResponse checkValidCreds(CheckValidCredsRequest requ return stub.checkValidCredsCallable(); } - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Start manual transfer runs to be executed now with schedule_time equal to current time. The - * transfer runs can be created for a time range where the run_time is between start_time - * (inclusive) and end_time (exclusive), or for a specific run_time. - * - *
Sample code: - * - *
- * - * @param request The request object containing all of the parameters for the API call. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final StartManualTransferRunsResponse startManualTransferRuns( - StartManualTransferRunsRequest request) { - return startManualTransferRunsCallable().call(request); - } - - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Start manual transfer runs to be executed now with schedule_time equal to current time. The - * transfer runs can be created for a time range where the run_time is between start_time - * (inclusive) and end_time (exclusive), or for a specific run_time. - * - *- * try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * StartManualTransferRunsRequest request = StartManualTransferRunsRequest.newBuilder().build(); - * StartManualTransferRunsResponse response = dataTransferServiceClient.startManualTransferRuns(request); - * } - *
Sample code: - * - *
- */ - public final UnaryCallable- * try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * StartManualTransferRunsRequest request = StartManualTransferRunsRequest.newBuilder().build(); - * ApiFuture<StartManualTransferRunsResponse> future = dataTransferServiceClient.startManualTransferRunsCallable().futureCall(request); - * // Do something - * StartManualTransferRunsResponse response = future.get(); - * } - *
- startManualTransferRunsCallable() { - return stub.startManualTransferRunsCallable(); - } - @Override public final void close() { stub.close(); diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java b/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java index 14b935b8..4abb3d73 100644 --- a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java +++ b/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java @@ -119,6 +119,12 @@ public UnaryCallSettings getTransferCo return ((DataTransferServiceStubSettings) getStubSettings()).scheduleTransferRunsSettings(); } + /** Returns the object with the settings used for calls to startManualTransferRuns. */ + public UnaryCallSettings + startManualTransferRunsSettings() { + return ((DataTransferServiceStubSettings) getStubSettings()).startManualTransferRunsSettings(); + } + /** Returns the object with the settings used for calls to getTransferRun. */ public UnaryCallSettings getTransferRunSettings() { return ((DataTransferServiceStubSettings) getStubSettings()).getTransferRunSettings(); @@ -149,12 +155,6 @@ public UnaryCallSettings deleteTransferRunSetti return ((DataTransferServiceStubSettings) getStubSettings()).checkValidCredsSettings(); } - /** Returns the object with the settings used for calls to startManualTransferRuns. */ - public UnaryCallSettings - startManualTransferRunsSettings() { - return ((DataTransferServiceStubSettings) getStubSettings()).startManualTransferRunsSettings(); - } - public static final DataTransferServiceSettings create(DataTransferServiceStubSettings stub) throws IOException { return new DataTransferServiceSettings.Builder(stub.toBuilder()).build(); @@ -303,6 +303,13 @@ public UnaryCallSettings.Builder getDataSource return getStubSettingsBuilder().scheduleTransferRunsSettings(); } + /** Returns the builder for the settings used for calls to startManualTransferRuns. */ + public UnaryCallSettings.Builder< + StartManualTransferRunsRequest, StartManualTransferRunsResponse> + startManualTransferRunsSettings() { + return getStubSettingsBuilder().startManualTransferRunsSettings(); + } + /** Returns the builder for the settings used for calls to getTransferRun. */ public UnaryCallSettings.Builder getTransferRunSettings() { return getStubSettingsBuilder().getTransferRunSettings(); @@ -333,13 +340,6 @@ public UnaryCallSettings.Builder deleteTransfer return getStubSettingsBuilder().checkValidCredsSettings(); } - /** Returns the builder for the settings used for calls to startManualTransferRuns. */ - public UnaryCallSettings.Builder< - StartManualTransferRunsRequest, StartManualTransferRunsResponse> - startManualTransferRunsSettings() { - return getStubSettingsBuilder().startManualTransferRunsSettings(); - } - @Override public DataTransferServiceSettings build() throws IOException { return new DataTransferServiceSettings(this); diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/package-info.java b/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/package-info.java index c60206b4..5fe10fe5 100644 --- a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/package-info.java +++ b/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/package-info.java @@ -30,7 +30,7 @@ * ** try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { - * DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + * DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); * DataSource response = dataTransferServiceClient.getDataSource(name); * } *
diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStub.java b/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStub.java index edc9a4d4..a9331f03 100644 --- a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStub.java +++ b/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStub.java @@ -104,6 +104,11 @@ public UnaryCallablegetTransferConfig throw new UnsupportedOperationException("Not implemented: scheduleTransferRunsCallable()"); } + public UnaryCallable + startManualTransferRunsCallable() { + throw new UnsupportedOperationException("Not implemented: startManualTransferRunsCallable()"); + } + public UnaryCallable getTransferRunCallable() { throw new UnsupportedOperationException("Not implemented: getTransferRunCallable()"); } @@ -136,11 +141,6 @@ public UnaryCallable checkValid throw new UnsupportedOperationException("Not implemented: checkValidCredsCallable()"); } - public UnaryCallable - startManualTransferRunsCallable() { - throw new UnsupportedOperationException("Not implemented: startManualTransferRunsCallable()"); - } - @Override public abstract void close(); } diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java b/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java index 79c7c294..d841b7ee 100644 --- a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java +++ b/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java @@ -132,6 +132,8 @@ public class DataTransferServiceStubSettings extends StubSettings scheduleTransferRunsSettings; + private final UnaryCallSettings + startManualTransferRunsSettings; private final UnaryCallSettings getTransferRunSettings; private final UnaryCallSettings deleteTransferRunSettings; private final PagedCallSettings< @@ -142,8 +144,6 @@ public class DataTransferServiceStubSettings extends StubSettings checkValidCredsSettings; - private final UnaryCallSettings - startManualTransferRunsSettings; /** Returns the object with the settings used for calls to getDataSource. */ public UnaryCallSettings getDataSourceSettings() { @@ -192,6 +192,12 @@ public UnaryCallSettings getTransferCo return scheduleTransferRunsSettings; } + /** Returns the object with the settings used for calls to startManualTransferRuns. */ + public UnaryCallSettings + startManualTransferRunsSettings() { + return startManualTransferRunsSettings; + } + /** Returns the object with the settings used for calls to getTransferRun. */ public UnaryCallSettings getTransferRunSettings() { return getTransferRunSettings; @@ -222,12 +228,6 @@ public UnaryCallSettings deleteTransferRunSetti return checkValidCredsSettings; } - /** Returns the object with the settings used for calls to startManualTransferRuns. */ - public UnaryCallSettings - startManualTransferRunsSettings() { - return startManualTransferRunsSettings; - } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public DataTransferServiceStub createStub() throws IOException { if (getTransportChannelProvider() @@ -305,12 +305,12 @@ protected DataTransferServiceStubSettings(Builder settingsBuilder) throws IOExce getTransferConfigSettings = settingsBuilder.getTransferConfigSettings().build(); listTransferConfigsSettings = settingsBuilder.listTransferConfigsSettings().build(); scheduleTransferRunsSettings = settingsBuilder.scheduleTransferRunsSettings().build(); + startManualTransferRunsSettings = settingsBuilder.startManualTransferRunsSettings().build(); getTransferRunSettings = settingsBuilder.getTransferRunSettings().build(); deleteTransferRunSettings = settingsBuilder.deleteTransferRunSettings().build(); listTransferRunsSettings = settingsBuilder.listTransferRunsSettings().build(); listTransferLogsSettings = settingsBuilder.listTransferLogsSettings().build(); checkValidCredsSettings = settingsBuilder.checkValidCredsSettings().build(); - startManualTransferRunsSettings = settingsBuilder.startManualTransferRunsSettings().build(); } private static final PagedListDescriptor< @@ -573,6 +573,9 @@ public static class Builder private final UnaryCallSettings.Builder< ScheduleTransferRunsRequest, ScheduleTransferRunsResponse> scheduleTransferRunsSettings; + private final UnaryCallSettings.Builder< + StartManualTransferRunsRequest, StartManualTransferRunsResponse> + startManualTransferRunsSettings; private final UnaryCallSettings.Builder getTransferRunSettings; private final UnaryCallSettings.Builder @@ -585,9 +588,6 @@ public static class Builder listTransferLogsSettings; private final UnaryCallSettings.Builder checkValidCredsSettings; - private final UnaryCallSettings.Builder< - StartManualTransferRunsRequest, StartManualTransferRunsResponse> - startManualTransferRunsSettings; private static final ImmutableMap > RETRYABLE_CODE_DEFINITIONS; @@ -647,6 +647,8 @@ protected Builder(ClientContext clientContext) { scheduleTransferRunsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + startManualTransferRunsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + getTransferRunSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); deleteTransferRunSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); @@ -657,8 +659,6 @@ protected Builder(ClientContext clientContext) { checkValidCredsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); - startManualTransferRunsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); - unaryMethodSettingsBuilders = ImmutableList. >of( getDataSourceSettings, @@ -669,12 +669,12 @@ protected Builder(ClientContext clientContext) { getTransferConfigSettings, listTransferConfigsSettings, scheduleTransferRunsSettings, + startManualTransferRunsSettings, getTransferRunSettings, deleteTransferRunSettings, listTransferRunsSettings, listTransferLogsSettings, - checkValidCredsSettings, - startManualTransferRunsSettings); + checkValidCredsSettings); initDefaults(this); } @@ -712,7 +712,7 @@ private static Builder initDefaults(Builder builder) { builder .deleteTransferConfigSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent")) + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); builder @@ -730,6 +730,11 @@ private static Builder initDefaults(Builder builder) { .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + builder + .startManualTransferRunsSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + builder .getTransferRunSettings() .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent")) @@ -737,7 +742,7 @@ private static Builder initDefaults(Builder builder) { builder .deleteTransferRunSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent")) + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); builder @@ -752,11 +757,6 @@ private static Builder initDefaults(Builder builder) { builder .checkValidCredsSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); - - builder - .startManualTransferRunsSettings() .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); @@ -774,12 +774,12 @@ protected Builder(DataTransferServiceStubSettings settings) { getTransferConfigSettings = settings.getTransferConfigSettings.toBuilder(); listTransferConfigsSettings = settings.listTransferConfigsSettings.toBuilder(); scheduleTransferRunsSettings = settings.scheduleTransferRunsSettings.toBuilder(); + startManualTransferRunsSettings = settings.startManualTransferRunsSettings.toBuilder(); getTransferRunSettings = settings.getTransferRunSettings.toBuilder(); deleteTransferRunSettings = settings.deleteTransferRunSettings.toBuilder(); listTransferRunsSettings = settings.listTransferRunsSettings.toBuilder(); listTransferLogsSettings = settings.listTransferLogsSettings.toBuilder(); checkValidCredsSettings = settings.checkValidCredsSettings.toBuilder(); - startManualTransferRunsSettings = settings.startManualTransferRunsSettings.toBuilder(); unaryMethodSettingsBuilders = ImmutableList. >of( @@ -791,12 +791,12 @@ protected Builder(DataTransferServiceStubSettings settings) { getTransferConfigSettings, listTransferConfigsSettings, scheduleTransferRunsSettings, + startManualTransferRunsSettings, getTransferRunSettings, deleteTransferRunSettings, listTransferRunsSettings, listTransferLogsSettings, - checkValidCredsSettings, - startManualTransferRunsSettings); + checkValidCredsSettings); } // NEXT_MAJOR_VER: remove 'throws Exception' @@ -866,6 +866,13 @@ public UnaryCallSettings.Builder getDataSource return scheduleTransferRunsSettings; } + /** Returns the builder for the settings used for calls to startManualTransferRuns. */ + public UnaryCallSettings.Builder< + StartManualTransferRunsRequest, StartManualTransferRunsResponse> + startManualTransferRunsSettings() { + return startManualTransferRunsSettings; + } + /** Returns the builder for the settings used for calls to getTransferRun. */ public UnaryCallSettings.Builder getTransferRunSettings() { return getTransferRunSettings; @@ -896,13 +903,6 @@ public UnaryCallSettings.Builder deleteTransfer return checkValidCredsSettings; } - /** Returns the builder for the settings used for calls to startManualTransferRuns. */ - public UnaryCallSettings.Builder< - StartManualTransferRunsRequest, StartManualTransferRunsResponse> - startManualTransferRunsSettings() { - return startManualTransferRunsSettings; - } - @Override public DataTransferServiceStubSettings build() throws IOException { return new DataTransferServiceStubSettings(this); diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceStub.java b/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceStub.java index 9f4f07bd..e140e7a4 100644 --- a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceStub.java +++ b/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceStub.java @@ -154,6 +154,19 @@ public class GrpcDataTransferServiceStub extends DataTransferServiceStub { .setResponseMarshaller( ProtoUtils.marshaller(ScheduleTransferRunsResponse.getDefaultInstance())) .build(); + private static final MethodDescriptor< + StartManualTransferRunsRequest, StartManualTransferRunsResponse> + startManualTransferRunsMethodDescriptor = + MethodDescriptor + . newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName( + "google.cloud.bigquery.datatransfer.v1.DataTransferService/StartManualTransferRuns") + .setRequestMarshaller( + ProtoUtils.marshaller(StartManualTransferRunsRequest.getDefaultInstance())) + .setResponseMarshaller( + ProtoUtils.marshaller(StartManualTransferRunsResponse.getDefaultInstance())) + .build(); private static final MethodDescriptor getTransferRunMethodDescriptor = MethodDescriptor. newBuilder() @@ -207,19 +220,6 @@ public class GrpcDataTransferServiceStub extends DataTransferServiceStub { .setResponseMarshaller( ProtoUtils.marshaller(CheckValidCredsResponse.getDefaultInstance())) .build(); - private static final MethodDescriptor< - StartManualTransferRunsRequest, StartManualTransferRunsResponse> - startManualTransferRunsMethodDescriptor = - MethodDescriptor - . newBuilder() - .setType(MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - "google.cloud.bigquery.datatransfer.v1.DataTransferService/StartManualTransferRuns") - .setRequestMarshaller( - ProtoUtils.marshaller(StartManualTransferRunsRequest.getDefaultInstance())) - .setResponseMarshaller( - ProtoUtils.marshaller(StartManualTransferRunsResponse.getDefaultInstance())) - .build(); private final BackgroundResource backgroundResources; @@ -240,6 +240,8 @@ public class GrpcDataTransferServiceStub extends DataTransferServiceStub { listTransferConfigsPagedCallable; private final UnaryCallable scheduleTransferRunsCallable; + private final UnaryCallable + startManualTransferRunsCallable; private final UnaryCallable getTransferRunCallable; private final UnaryCallable deleteTransferRunCallable; private final UnaryCallable @@ -252,8 +254,6 @@ public class GrpcDataTransferServiceStub extends DataTransferServiceStub { listTransferLogsPagedCallable; private final UnaryCallable checkValidCredsCallable; - private final UnaryCallable - startManualTransferRunsCallable; private final GrpcStubCallableFactory callableFactory; @@ -407,6 +407,21 @@ public Map extract(ScheduleTransferRunsRequest request) { } }) .build(); + GrpcCallSettings + startManualTransferRunsTransportSettings = + GrpcCallSettings + . newBuilder() + .setMethodDescriptor(startManualTransferRunsMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor () { + @Override + public Map extract(StartManualTransferRunsRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) + .build(); GrpcCallSettings getTransferRunTransportSettings = GrpcCallSettings. newBuilder() .setMethodDescriptor(getTransferRunMethodDescriptor) @@ -475,21 +490,6 @@ public Map extract(CheckValidCredsRequest request) { } }) .build(); - GrpcCallSettings - startManualTransferRunsTransportSettings = - GrpcCallSettings - . newBuilder() - .setMethodDescriptor(startManualTransferRunsMethodDescriptor) - .setParamsExtractor( - new RequestParamsExtractor () { - @Override - public Map extract(StartManualTransferRunsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } - }) - .build(); this.getDataSourceCallable = callableFactory.createUnaryCallable( @@ -535,6 +535,11 @@ public Map extract(StartManualTransferRunsRequest request) { scheduleTransferRunsTransportSettings, settings.scheduleTransferRunsSettings(), clientContext); + this.startManualTransferRunsCallable = + callableFactory.createUnaryCallable( + startManualTransferRunsTransportSettings, + settings.startManualTransferRunsSettings(), + clientContext); this.getTransferRunCallable = callableFactory.createUnaryCallable( getTransferRunTransportSettings, settings.getTransferRunSettings(), clientContext); @@ -558,11 +563,6 @@ public Map extract(StartManualTransferRunsRequest request) { this.checkValidCredsCallable = callableFactory.createUnaryCallable( checkValidCredsTransportSettings, settings.checkValidCredsSettings(), clientContext); - this.startManualTransferRunsCallable = - callableFactory.createUnaryCallable( - startManualTransferRunsTransportSettings, - settings.startManualTransferRunsSettings(), - clientContext); backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources()); } @@ -611,6 +611,11 @@ public UnaryCallable getTransferConfig return scheduleTransferRunsCallable; } + public UnaryCallable + startManualTransferRunsCallable() { + return startManualTransferRunsCallable; + } + public UnaryCallable getTransferRunCallable() { return getTransferRunCallable; } @@ -643,11 +648,6 @@ public UnaryCallable checkValid return checkValidCredsCallable; } - public UnaryCallable - startManualTransferRunsCallable() { - return startManualTransferRunsCallable; - } - @Override public final void close() { shutdown(); diff --git a/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java b/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java index 7acedaeb..860e36ac 100644 --- a/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java +++ b/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java @@ -86,7 +86,7 @@ public void tearDown() throws Exception { @Test @SuppressWarnings("all") public void getDataSourceTest() { - DataSourceName name2 = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + DataSourceName name2 = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); String dataSourceId = "dataSourceId-1015796374"; String displayName = "displayName1615086568"; String description = "description-1724546052"; @@ -115,7 +115,7 @@ public void getDataSourceTest() { .build(); mockDataTransferService.addResponse(expectedResponse); - DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); DataSource actualResponse = client.getDataSource(name); Assert.assertEquals(expectedResponse, actualResponse); @@ -124,7 +124,7 @@ public void getDataSourceTest() { Assert.assertEquals(1, actualRequests.size()); GetDataSourceRequest actualRequest = (GetDataSourceRequest) actualRequests.get(0); - Assert.assertEquals(name, DataSourceNames.parse(actualRequest.getName())); + Assert.assertEquals(name, DataSourceName.parse(actualRequest.getName())); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -138,7 +138,7 @@ public void getDataSourceExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); client.getDataSource(name); Assert.fail("No exception raised"); @@ -160,7 +160,7 @@ public void listDataSourcesTest() { .build(); mockDataTransferService.addResponse(expectedResponse); - ParentName parent = ProjectName.of("[PROJECT]"); + ProjectName parent = ProjectName.of("[PROJECT]"); ListDataSourcesPagedResponse pagedListResponse = client.listDataSources(parent); @@ -172,7 +172,7 @@ public void listDataSourcesTest() { Assert.assertEquals(1, actualRequests.size()); ListDataSourcesRequest actualRequest = (ListDataSourcesRequest) actualRequests.get(0); - Assert.assertEquals(parent, ParentNames.parse(actualRequest.getParent())); + Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent())); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -186,7 +186,7 @@ public void listDataSourcesExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - ParentName parent = ProjectName.of("[PROJECT]"); + ProjectName parent = ProjectName.of("[PROJECT]"); client.listDataSources(parent); Assert.fail("No exception raised"); @@ -198,7 +198,8 @@ public void listDataSourcesExceptionTest() throws Exception { @Test @SuppressWarnings("all") public void createTransferConfigTest() { - TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName name = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); String destinationDatasetId = "destinationDatasetId1541564179"; String displayName = "displayName1615086568"; String dataSourceId = "dataSourceId-1015796374"; @@ -223,7 +224,7 @@ public void createTransferConfigTest() { .build(); mockDataTransferService.addResponse(expectedResponse); - ParentName parent = ProjectName.of("[PROJECT]"); + ProjectName parent = ProjectName.of("[PROJECT]"); TransferConfig transferConfig = TransferConfig.newBuilder().build(); TransferConfig actualResponse = client.createTransferConfig(parent, transferConfig); @@ -233,7 +234,7 @@ public void createTransferConfigTest() { Assert.assertEquals(1, actualRequests.size()); CreateTransferConfigRequest actualRequest = (CreateTransferConfigRequest) actualRequests.get(0); - Assert.assertEquals(parent, ParentNames.parse(actualRequest.getParent())); + Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent())); Assert.assertEquals(transferConfig, actualRequest.getTransferConfig()); Assert.assertTrue( channelProvider.isHeaderSent( @@ -248,7 +249,7 @@ public void createTransferConfigExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - ParentName parent = ProjectName.of("[PROJECT]"); + ProjectName parent = ProjectName.of("[PROJECT]"); TransferConfig transferConfig = TransferConfig.newBuilder().build(); client.createTransferConfig(parent, transferConfig); @@ -261,7 +262,8 @@ public void createTransferConfigExceptionTest() throws Exception { @Test @SuppressWarnings("all") public void updateTransferConfigTest() { - TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName name = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); String destinationDatasetId = "destinationDatasetId1541564179"; String displayName = "displayName1615086568"; String dataSourceId = "dataSourceId-1015796374"; @@ -327,7 +329,8 @@ public void deleteTransferConfigTest() { Empty expectedResponse = Empty.newBuilder().build(); mockDataTransferService.addResponse(expectedResponse); - TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName name = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); client.deleteTransferConfig(name); @@ -335,7 +338,7 @@ public void deleteTransferConfigTest() { Assert.assertEquals(1, actualRequests.size()); DeleteTransferConfigRequest actualRequest = (DeleteTransferConfigRequest) actualRequests.get(0); - Assert.assertEquals(name, TransferConfigNames.parse(actualRequest.getName())); + Assert.assertEquals(name, TransferConfigName.parse(actualRequest.getName())); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -349,7 +352,8 @@ public void deleteTransferConfigExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName name = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); client.deleteTransferConfig(name); Assert.fail("No exception raised"); @@ -361,7 +365,8 @@ public void deleteTransferConfigExceptionTest() throws Exception { @Test @SuppressWarnings("all") public void getTransferConfigTest() { - TransferConfigName name2 = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName name2 = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); String destinationDatasetId = "destinationDatasetId1541564179"; String displayName = "displayName1615086568"; String dataSourceId = "dataSourceId-1015796374"; @@ -386,7 +391,8 @@ public void getTransferConfigTest() { .build(); mockDataTransferService.addResponse(expectedResponse); - TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName name = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); TransferConfig actualResponse = client.getTransferConfig(name); Assert.assertEquals(expectedResponse, actualResponse); @@ -395,7 +401,7 @@ public void getTransferConfigTest() { Assert.assertEquals(1, actualRequests.size()); GetTransferConfigRequest actualRequest = (GetTransferConfigRequest) actualRequests.get(0); - Assert.assertEquals(name, TransferConfigNames.parse(actualRequest.getName())); + Assert.assertEquals(name, TransferConfigName.parse(actualRequest.getName())); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -409,7 +415,8 @@ public void getTransferConfigExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - TransferConfigName name = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName name = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); client.getTransferConfig(name); Assert.fail("No exception raised"); @@ -431,7 +438,7 @@ public void listTransferConfigsTest() { .build(); mockDataTransferService.addResponse(expectedResponse); - ParentName parent = ProjectName.of("[PROJECT]"); + ProjectName parent = ProjectName.of("[PROJECT]"); ListTransferConfigsPagedResponse pagedListResponse = client.listTransferConfigs(parent); @@ -443,7 +450,7 @@ public void listTransferConfigsTest() { Assert.assertEquals(1, actualRequests.size()); ListTransferConfigsRequest actualRequest = (ListTransferConfigsRequest) actualRequests.get(0); - Assert.assertEquals(parent, ParentNames.parse(actualRequest.getParent())); + Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent())); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -457,7 +464,7 @@ public void listTransferConfigsExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - ParentName parent = ProjectName.of("[PROJECT]"); + ProjectName parent = ProjectName.of("[PROJECT]"); client.listTransferConfigs(parent); Assert.fail("No exception raised"); @@ -473,7 +480,8 @@ public void scheduleTransferRunsTest() { ScheduleTransferRunsResponse.newBuilder().build(); mockDataTransferService.addResponse(expectedResponse); - TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName parent = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); Timestamp startTime = Timestamp.newBuilder().build(); Timestamp endTime = Timestamp.newBuilder().build(); @@ -485,7 +493,7 @@ public void scheduleTransferRunsTest() { Assert.assertEquals(1, actualRequests.size()); ScheduleTransferRunsRequest actualRequest = (ScheduleTransferRunsRequest) actualRequests.get(0); - Assert.assertEquals(parent, TransferConfigNames.parse(actualRequest.getParent())); + Assert.assertEquals(parent, TransferConfigName.parse(actualRequest.getParent())); Assert.assertEquals(startTime, actualRequest.getStartTime()); Assert.assertEquals(endTime, actualRequest.getEndTime()); Assert.assertTrue( @@ -501,7 +509,8 @@ public void scheduleTransferRunsExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName parent = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); Timestamp startTime = Timestamp.newBuilder().build(); Timestamp endTime = Timestamp.newBuilder().build(); @@ -512,10 +521,50 @@ public void scheduleTransferRunsExceptionTest() throws Exception { } } + @Test + @SuppressWarnings("all") + public void startManualTransferRunsTest() { + StartManualTransferRunsResponse expectedResponse = + StartManualTransferRunsResponse.newBuilder().build(); + mockDataTransferService.addResponse(expectedResponse); + + StartManualTransferRunsRequest request = StartManualTransferRunsRequest.newBuilder().build(); + + StartManualTransferRunsResponse actualResponse = client.startManualTransferRuns(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockDataTransferService.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + StartManualTransferRunsRequest actualRequest = + (StartManualTransferRunsRequest) actualRequests.get(0); + + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void startManualTransferRunsExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockDataTransferService.addException(exception); + + try { + StartManualTransferRunsRequest request = StartManualTransferRunsRequest.newBuilder().build(); + + client.startManualTransferRuns(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + @Test @SuppressWarnings("all") public void getTransferRunTest() { - RunName name2 = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + RunName name2 = + RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); String destinationDatasetId = "destinationDatasetId1541564179"; String dataSourceId = "dataSourceId-1015796374"; long userId = 147132913L; @@ -532,7 +581,8 @@ public void getTransferRunTest() { .build(); mockDataTransferService.addResponse(expectedResponse); - RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + RunName name = + RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); TransferRun actualResponse = client.getTransferRun(name); Assert.assertEquals(expectedResponse, actualResponse); @@ -541,7 +591,7 @@ public void getTransferRunTest() { Assert.assertEquals(1, actualRequests.size()); GetTransferRunRequest actualRequest = (GetTransferRunRequest) actualRequests.get(0); - Assert.assertEquals(name, RunNames.parse(actualRequest.getName())); + Assert.assertEquals(name, RunName.parse(actualRequest.getName())); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -555,7 +605,8 @@ public void getTransferRunExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + RunName name = + RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); client.getTransferRun(name); Assert.fail("No exception raised"); @@ -570,7 +621,8 @@ public void deleteTransferRunTest() { Empty expectedResponse = Empty.newBuilder().build(); mockDataTransferService.addResponse(expectedResponse); - RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + RunName name = + RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); client.deleteTransferRun(name); @@ -578,7 +630,7 @@ public void deleteTransferRunTest() { Assert.assertEquals(1, actualRequests.size()); DeleteTransferRunRequest actualRequest = (DeleteTransferRunRequest) actualRequests.get(0); - Assert.assertEquals(name, RunNames.parse(actualRequest.getName())); + Assert.assertEquals(name, RunName.parse(actualRequest.getName())); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -592,7 +644,8 @@ public void deleteTransferRunExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - RunName name = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + RunName name = + RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); client.deleteTransferRun(name); Assert.fail("No exception raised"); @@ -614,7 +667,8 @@ public void listTransferRunsTest() { .build(); mockDataTransferService.addResponse(expectedResponse); - TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName parent = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); ListTransferRunsPagedResponse pagedListResponse = client.listTransferRuns(parent); @@ -626,7 +680,7 @@ public void listTransferRunsTest() { Assert.assertEquals(1, actualRequests.size()); ListTransferRunsRequest actualRequest = (ListTransferRunsRequest) actualRequests.get(0); - Assert.assertEquals(parent, TransferConfigNames.parse(actualRequest.getParent())); + Assert.assertEquals(parent, TransferConfigName.parse(actualRequest.getParent())); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -640,7 +694,8 @@ public void listTransferRunsExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - TransferConfigName parent = ProjectTransferConfigName.of("[PROJECT]", "[TRANSFER_CONFIG]"); + TransferConfigName parent = + TransferConfigName.ofProjectTransferConfigName("[PROJECT]", "[TRANSFER_CONFIG]"); client.listTransferRuns(parent); Assert.fail("No exception raised"); @@ -662,7 +717,8 @@ public void listTransferLogsTest() { .build(); mockDataTransferService.addResponse(expectedResponse); - RunName parent = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + RunName parent = + RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); ListTransferLogsPagedResponse pagedListResponse = client.listTransferLogs(parent); @@ -674,7 +730,7 @@ public void listTransferLogsTest() { Assert.assertEquals(1, actualRequests.size()); ListTransferLogsRequest actualRequest = (ListTransferLogsRequest) actualRequests.get(0); - Assert.assertEquals(parent, RunNames.parse(actualRequest.getParent())); + Assert.assertEquals(parent, RunName.parse(actualRequest.getParent())); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -688,7 +744,8 @@ public void listTransferLogsExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - RunName parent = ProjectRunName.of("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); + RunName parent = + RunName.ofProjectTransferConfigRunName("[PROJECT]", "[TRANSFER_CONFIG]", "[RUN]"); client.listTransferLogs(parent); Assert.fail("No exception raised"); @@ -705,7 +762,7 @@ public void checkValidCredsTest() { CheckValidCredsResponse.newBuilder().setHasValidCreds(hasValidCreds).build(); mockDataTransferService.addResponse(expectedResponse); - DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); CheckValidCredsResponse actualResponse = client.checkValidCreds(name); Assert.assertEquals(expectedResponse, actualResponse); @@ -714,7 +771,7 @@ public void checkValidCredsTest() { Assert.assertEquals(1, actualRequests.size()); CheckValidCredsRequest actualRequest = (CheckValidCredsRequest) actualRequests.get(0); - Assert.assertEquals(name, DataSourceNames.parse(actualRequest.getName())); + Assert.assertEquals(name, DataSourceName.parse(actualRequest.getName())); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -728,7 +785,7 @@ public void checkValidCredsExceptionTest() throws Exception { mockDataTransferService.addException(exception); try { - DataSourceName name = ProjectDataSourceName.of("[PROJECT]", "[DATA_SOURCE]"); + DataSourceName name = DataSourceName.ofProjectDataSourceName("[PROJECT]", "[DATA_SOURCE]"); client.checkValidCreds(name); Assert.fail("No exception raised"); @@ -736,43 +793,4 @@ public void checkValidCredsExceptionTest() throws Exception { // Expected exception } } - - @Test - @SuppressWarnings("all") - public void startManualTransferRunsTest() { - StartManualTransferRunsResponse expectedResponse = - StartManualTransferRunsResponse.newBuilder().build(); - mockDataTransferService.addResponse(expectedResponse); - - StartManualTransferRunsRequest request = StartManualTransferRunsRequest.newBuilder().build(); - - StartManualTransferRunsResponse actualResponse = client.startManualTransferRuns(request); - Assert.assertEquals(expectedResponse, actualResponse); - - List actualRequests = mockDataTransferService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); - StartManualTransferRunsRequest actualRequest = - (StartManualTransferRunsRequest) actualRequests.get(0); - - Assert.assertTrue( - channelProvider.isHeaderSent( - ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), - GaxGrpcProperties.getDefaultApiClientHeaderPattern())); - } - - @Test - @SuppressWarnings("all") - public void startManualTransferRunsExceptionTest() throws Exception { - StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); - mockDataTransferService.addException(exception); - - try { - StartManualTransferRunsRequest request = StartManualTransferRunsRequest.newBuilder().build(); - - client.startManualTransferRuns(request); - Assert.fail("No exception raised"); - } catch (InvalidArgumentException e) { - // Expected exception - } - } } diff --git a/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSmokeTest.java b/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSmokeTest.java index 117cae61..3b62083a 100644 --- a/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSmokeTest.java +++ b/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSmokeTest.java @@ -46,7 +46,7 @@ public static void main(String args[]) { public static void executeNoCatch(String projectId) throws Exception { try (DataTransferServiceClient client = DataTransferServiceClient.create()) { - ParentName parent = LocationName.of(projectId, "us-central1"); + ProjectName parent = ProjectName.of(projectId); ListDataSourcesPagedResponse pagedResponse = client.listDataSources(parent); } diff --git a/proto-google-cloud-bigquerydatatransfer-v1/clirr-ignored-differences.xml b/proto-google-cloud-bigquerydatatransfer-v1/clirr-ignored-differences.xml index e944adaa..c3b17fa6 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-bigquerydatatransfer-v1/clirr-ignored-differences.xml @@ -8,8 +8,25 @@ * get*(*) - +7012 -com/google/cloud/bigquery/datatransfer/v1/*OrBuilder -boolean has*(*) +8001 +com/google/cloud/bigquery/datatransfer/v1/ParentNames ++ +8001 +com/google/cloud/bigquery/datatransfer/v1/UntypedParentName ++ +8001 +com/google/cloud/bigquery/datatransfer/v1/ParentName ++ +5001 +com/google/cloud/bigquery/datatransfer/v1/ProjectName +com/google/cloud/bigquery/datatransfer/v1/ParentName ++ - \ No newline at end of file + diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceName.java index 10ba46ce..2beacb14 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceName.java @@ -16,10 +16,301 @@ package com.google.cloud.bigquery.datatransfer.v1; +import com.google.api.core.BetaApi; +import com.google.api.pathtemplate.PathTemplate; +import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; /** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -public abstract class DataSourceName implements ResourceName { +public class DataSourceName implements ResourceName { + + @Deprecated protected DataSourceName() {} + + private static final PathTemplate PROJECT_DATA_SOURCE_PATH_TEMPLATE = + PathTemplate.createWithoutUrlEncoding("projects/{project}/dataSources/{data_source}"); + private static final PathTemplate PROJECT_LOCATION_DATA_SOURCE_PATH_TEMPLATE = + PathTemplate.createWithoutUrlEncoding( + "projects/{project}/locations/{location}/dataSources/{data_source}"); + + private volatile Map5001 +com/google/cloud/bigquery/datatransfer/v1/LocationName +com/google/cloud/bigquery/datatransfer/v1/ParentName fieldValuesMap; + private PathTemplate pathTemplate; + private String fixedValue; + + private String project; + private String dataSource; + private String location; + + public String getProject() { + return project; + } + + public String getDataSource() { + return dataSource; + } + + public String getLocation() { + return location; + } + + private DataSourceName(Builder builder) { + project = Preconditions.checkNotNull(builder.getProject()); + dataSource = Preconditions.checkNotNull(builder.getDataSource()); + pathTemplate = PROJECT_DATA_SOURCE_PATH_TEMPLATE; + } + + private DataSourceName(ProjectLocationDataSourceBuilder builder) { + project = Preconditions.checkNotNull(builder.getProject()); + location = Preconditions.checkNotNull(builder.getLocation()); + dataSource = Preconditions.checkNotNull(builder.getDataSource()); + pathTemplate = PROJECT_LOCATION_DATA_SOURCE_PATH_TEMPLATE; + } + + public static Builder newBuilder() { + return new Builder(); + } + + @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") + public static Builder newProjectDataSourceBuilder() { + return new Builder(); + } + + @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") + public static ProjectLocationDataSourceBuilder newProjectLocationDataSourceBuilder() { + return new ProjectLocationDataSourceBuilder(); + } + + public Builder toBuilder() { + return new Builder(this); + } + + public static DataSourceName of(String project, String dataSource) { + return newProjectDataSourceBuilder().setProject(project).setDataSource(dataSource).build(); + } + + @BetaApi("The static create methods are not stable yet and may be changed in the future.") + public static DataSourceName ofProjectDataSourceName(String project, String dataSource) { + return newProjectDataSourceBuilder().setProject(project).setDataSource(dataSource).build(); + } + + @BetaApi("The static create methods are not stable yet and may be changed in the future.") + public static DataSourceName ofProjectLocationDataSourceName( + String project, String location, String dataSource) { + return newProjectLocationDataSourceBuilder() + .setProject(project) + .setLocation(location) + .setDataSource(dataSource) + .build(); + } + + public static String format(String project, String dataSource) { + return newBuilder().setProject(project).setDataSource(dataSource).build().toString(); + } + + @BetaApi("The static format methods are not stable yet and may be changed in the future.") + public static String formatProjectDataSourceName(String project, String dataSource) { + return newBuilder().setProject(project).setDataSource(dataSource).build().toString(); + } + + @BetaApi("The static format methods are not stable yet and may be changed in the future.") + public static String formatProjectLocationDataSourceName( + String project, String location, String dataSource) { + return newProjectLocationDataSourceBuilder() + .setProject(project) + .setLocation(location) + .setDataSource(dataSource) + .build() + .toString(); + } + + public static DataSourceName parse(String formattedString) { + if (formattedString.isEmpty()) { + return null; + } + if (PROJECT_DATA_SOURCE_PATH_TEMPLATE.matches(formattedString)) { + Map matchMap = PROJECT_DATA_SOURCE_PATH_TEMPLATE.match(formattedString); + return ofProjectDataSourceName(matchMap.get("project"), matchMap.get("data_source")); + } else if (PROJECT_LOCATION_DATA_SOURCE_PATH_TEMPLATE.matches(formattedString)) { + Map matchMap = + PROJECT_LOCATION_DATA_SOURCE_PATH_TEMPLATE.match(formattedString); + return ofProjectLocationDataSourceName( + matchMap.get("project"), matchMap.get("location"), matchMap.get("data_source")); + } + throw new ValidationException("JobName.parse: formattedString not in valid format"); + } + + @BetaApi("The method will be renamed to parseList after subclasses of this class are removed.") + public static List parse(List formattedStrings) { + List list = new ArrayList<>(formattedStrings.size()); + for (String formattedString : formattedStrings) { + list.add(parse(formattedString)); + } + return list; + } + + @BetaApi("The method will be renamed to toStringList after subclasses of this class are removed.") + public static List toStrings(List values) { + List list = new ArrayList<>(values.size()); + for (DataSourceName value : values) { + if (value == null) { + list.add(""); + } else { + list.add(value.toString()); + } + } + return list; + } + + public static boolean isParsableFrom(String formattedString) { + return PROJECT_DATA_SOURCE_PATH_TEMPLATE.matches(formattedString) + || PROJECT_LOCATION_DATA_SOURCE_PATH_TEMPLATE.matches(formattedString); + } + + @Override + public Map getFieldValuesMap() { + if (fieldValuesMap == null) { + synchronized (this) { + if (fieldValuesMap == null) { + ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); + if (project != null) { + fieldMapBuilder.put("project", project); + } + if (dataSource != null) { + fieldMapBuilder.put("data_source", dataSource); + } + if (location != null) { + fieldMapBuilder.put("location", location); + } + fieldValuesMap = fieldMapBuilder.build(); + } + } + } + return fieldValuesMap; + } + + public String getFieldValue(String fieldName) { + return getFieldValuesMap().get(fieldName); + } + + @Override + public String toString() { + return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap()); + } + + /** Builder for projects/{project}/dataSources/{data_source}. */ + public static class Builder { + + private String project; + private String dataSource; + + protected Builder() {} + + public String getProject() { + return project; + } + + public String getDataSource() { + return dataSource; + } + + public Builder setProject(String project) { + this.project = project; + return this; + } + + public Builder setDataSource(String dataSource) { + this.dataSource = dataSource; + return this; + } + + private Builder(DataSourceName dataSourceName) { + Preconditions.checkArgument( + dataSourceName.pathTemplate == PROJECT_DATA_SOURCE_PATH_TEMPLATE, + "toBuilder is only supported when DataSourceName has the pattern of " + + "projects/{project}/dataSources/{data_source}."); + project = dataSourceName.project; + dataSource = dataSourceName.dataSource; + } + + public DataSourceName build() { + return new DataSourceName(this); + } + } + + /** Builder for projects/{project}/locations/{location}/dataSources/{data_source}. */ + @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") + public static class ProjectLocationDataSourceBuilder { + + private String project; + private String location; + private String dataSource; + + private ProjectLocationDataSourceBuilder() {} + + public String getProject() { + return project; + } + + public String getLocation() { + return location; + } + + public String getDataSource() { + return dataSource; + } + + public ProjectLocationDataSourceBuilder setProject(String project) { + this.project = project; + return this; + } + + public ProjectLocationDataSourceBuilder setLocation(String location) { + this.location = location; + return this; + } + + public ProjectLocationDataSourceBuilder setDataSource(String dataSource) { + this.dataSource = dataSource; + return this; + } + + public DataSourceName build() { + return new DataSourceName(this); + } + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o != null || getClass() == o.getClass()) { + DataSourceName that = (DataSourceName) o; + return (Objects.equals(this.project, that.project)) + && (Objects.equals(this.dataSource, that.dataSource)) + && (Objects.equals(this.location, that.location)); + } + return false; + } + + @Override + public int hashCode() { + int h = 1; + h *= 1000003; + h ^= Objects.hashCode(fixedValue); + h *= 1000003; + h ^= Objects.hashCode(project); + h *= 1000003; + h ^= Objects.hashCode(dataSource); + h *= 1000003; + h ^= Objects.hashCode(location); + return h; + } } diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationDataSourceName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationDataSourceName.java index 2b9fe18a..b49ac613 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationDataSourceName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationDataSourceName.java @@ -141,7 +141,7 @@ public String toString() { } /** Builder for LocationDataSourceName. */ - public static class Builder { + public static class Builder extends DataSourceName.Builder { private String project; private String location; diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationName.java index c23604e4..1d848e30 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationName.java @@ -17,20 +17,16 @@ package com.google.cloud.bigquery.datatransfer.v1; import com.google.api.pathtemplate.PathTemplate; +import com.google.api.resourcenames.ResourceName; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated -public class LocationName extends ParentName { +public class LocationName implements ResourceName { private static final PathTemplate PATH_TEMPLATE = PathTemplate.createWithoutUrlEncoding("projects/{project}/locations/{location}"); diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationRunName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationRunName.java index 49647acb..18caf25e 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationRunName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationRunName.java @@ -159,7 +159,7 @@ public String toString() { } /** Builder for LocationRunName. */ - public static class Builder { + public static class Builder extends RunName.Builder { private String project; private String location; diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationTransferConfigName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationTransferConfigName.java index 84b81a71..efce0a13 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationTransferConfigName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationTransferConfigName.java @@ -147,7 +147,7 @@ public String toString() { } /** Builder for LocationTransferConfigName. */ - public static class Builder { + public static class Builder extends TransferConfigName.Builder { private String project; private String location; diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ParentName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ParentName.java deleted file mode 100644 index b48a1756..00000000 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ParentName.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2019 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.bigquery.datatransfer.v1; - -import com.google.api.resourcenames.ResourceName; - -/** AUTO-GENERATED DOCUMENTATION AND CLASS */ -@javax.annotation.Generated("by GAPIC protoc plugin") -public abstract class ParentName implements ResourceName { - protected ParentName() {} -} diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ParentNames.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ParentNames.java deleted file mode 100644 index 86cb55db..00000000 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ParentNames.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2019 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.bigquery.datatransfer.v1; - -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ -@javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated -public class ParentNames { - private ParentNames() {} - - public static ParentName parse(String resourceNameString) { - if (ProjectName.isParsableFrom(resourceNameString)) { - return ProjectName.parse(resourceNameString); - } - if (LocationName.isParsableFrom(resourceNameString)) { - return LocationName.parse(resourceNameString); - } - return UntypedParentName.parse(resourceNameString); - } -} diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectDataSourceName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectDataSourceName.java index e6482a4b..716b5f7b 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectDataSourceName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectDataSourceName.java @@ -127,7 +127,7 @@ public String toString() { } /** Builder for ProjectDataSourceName. */ - public static class Builder { + public static class Builder extends DataSourceName.Builder { private String project; private String dataSource; diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectName.java index fb430c0c..66eaeaf8 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectName.java @@ -17,20 +17,16 @@ package com.google.cloud.bigquery.datatransfer.v1; import com.google.api.pathtemplate.PathTemplate; +import com.google.api.resourcenames.ResourceName; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated -public class ProjectName extends ParentName { +public class ProjectName implements ResourceName { private static final PathTemplate PATH_TEMPLATE = PathTemplate.createWithoutUrlEncoding("projects/{project}"); diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectRunName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectRunName.java index 14fa2d93..0a168676 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectRunName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectRunName.java @@ -141,7 +141,7 @@ public String toString() { } /** Builder for ProjectRunName. */ - public static class Builder { + public static class Builder extends RunName.Builder { private String project; private String transferConfig; diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectTransferConfigName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectTransferConfigName.java index e65a4202..c4f5487c 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectTransferConfigName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectTransferConfigName.java @@ -128,7 +128,7 @@ public String toString() { } /** Builder for ProjectTransferConfigName. */ - public static class Builder { + public static class Builder extends TransferConfigName.Builder { private String project; private String transferConfig; diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/RunName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/RunName.java index 4b41f6b8..e0e57c30 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/RunName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/RunName.java @@ -16,10 +16,367 @@ package com.google.cloud.bigquery.datatransfer.v1; +import com.google.api.core.BetaApi; +import com.google.api.pathtemplate.PathTemplate; +import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; /** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -public abstract class RunName implements ResourceName { +public class RunName implements ResourceName { + + @Deprecated protected RunName() {} + + private static final PathTemplate PROJECT_TRANSFER_CONFIG_RUN_PATH_TEMPLATE = + PathTemplate.createWithoutUrlEncoding( + "projects/{project}/transferConfigs/{transfer_config}/runs/{run}"); + private static final PathTemplate PROJECT_LOCATION_TRANSFER_CONFIG_RUN_PATH_TEMPLATE = + PathTemplate.createWithoutUrlEncoding( + "projects/{project}/locations/{location}/transferConfigs/{transfer_config}/runs/{run}"); + + private volatile Map fieldValuesMap; + private PathTemplate pathTemplate; + private String fixedValue; + + private String project; + private String transferConfig; + private String run; + private String location; + + public String getProject() { + return project; + } + + public String getTransferConfig() { + return transferConfig; + } + + public String getRun() { + return run; + } + + public String getLocation() { + return location; + } + + private RunName(Builder builder) { + project = Preconditions.checkNotNull(builder.getProject()); + transferConfig = Preconditions.checkNotNull(builder.getTransferConfig()); + run = Preconditions.checkNotNull(builder.getRun()); + pathTemplate = PROJECT_TRANSFER_CONFIG_RUN_PATH_TEMPLATE; + } + + private RunName(ProjectLocationTransferConfigRunBuilder builder) { + project = Preconditions.checkNotNull(builder.getProject()); + location = Preconditions.checkNotNull(builder.getLocation()); + transferConfig = Preconditions.checkNotNull(builder.getTransferConfig()); + run = Preconditions.checkNotNull(builder.getRun()); + pathTemplate = PROJECT_LOCATION_TRANSFER_CONFIG_RUN_PATH_TEMPLATE; + } + + public static Builder newBuilder() { + return new Builder(); + } + + @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") + public static Builder newProjectTransferConfigRunBuilder() { + return new Builder(); + } + + @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") + public static ProjectLocationTransferConfigRunBuilder + newProjectLocationTransferConfigRunBuilder() { + return new ProjectLocationTransferConfigRunBuilder(); + } + + public Builder toBuilder() { + return new Builder(this); + } + + public static RunName of(String project, String transferConfig, String run) { + return newProjectTransferConfigRunBuilder() + .setProject(project) + .setTransferConfig(transferConfig) + .setRun(run) + .build(); + } + + @BetaApi("The static create methods are not stable yet and may be changed in the future.") + public static RunName ofProjectTransferConfigRunName( + String project, String transferConfig, String run) { + return newProjectTransferConfigRunBuilder() + .setProject(project) + .setTransferConfig(transferConfig) + .setRun(run) + .build(); + } + + @BetaApi("The static create methods are not stable yet and may be changed in the future.") + public static RunName ofProjectLocationTransferConfigRunName( + String project, String location, String transferConfig, String run) { + return newProjectLocationTransferConfigRunBuilder() + .setProject(project) + .setLocation(location) + .setTransferConfig(transferConfig) + .setRun(run) + .build(); + } + + public static String format(String project, String transferConfig, String run) { + return newBuilder() + .setProject(project) + .setTransferConfig(transferConfig) + .setRun(run) + .build() + .toString(); + } + + @BetaApi("The static format methods are not stable yet and may be changed in the future.") + public static String formatProjectTransferConfigRunName( + String project, String transferConfig, String run) { + return newBuilder() + .setProject(project) + .setTransferConfig(transferConfig) + .setRun(run) + .build() + .toString(); + } + + @BetaApi("The static format methods are not stable yet and may be changed in the future.") + public static String formatProjectLocationTransferConfigRunName( + String project, String location, String transferConfig, String run) { + return newProjectLocationTransferConfigRunBuilder() + .setProject(project) + .setLocation(location) + .setTransferConfig(transferConfig) + .setRun(run) + .build() + .toString(); + } + + public static RunName parse(String formattedString) { + if (formattedString.isEmpty()) { + return null; + } + if (PROJECT_TRANSFER_CONFIG_RUN_PATH_TEMPLATE.matches(formattedString)) { + Map matchMap = + PROJECT_TRANSFER_CONFIG_RUN_PATH_TEMPLATE.match(formattedString); + return ofProjectTransferConfigRunName( + matchMap.get("project"), matchMap.get("transfer_config"), matchMap.get("run")); + } else if (PROJECT_LOCATION_TRANSFER_CONFIG_RUN_PATH_TEMPLATE.matches(formattedString)) { + Map matchMap = + PROJECT_LOCATION_TRANSFER_CONFIG_RUN_PATH_TEMPLATE.match(formattedString); + return ofProjectLocationTransferConfigRunName( + matchMap.get("project"), + matchMap.get("location"), + matchMap.get("transfer_config"), + matchMap.get("run")); + } + throw new ValidationException("JobName.parse: formattedString not in valid format"); + } + + @BetaApi("The method will be renamed to parseList after subclasses of this class are removed.") + public static List parse(List formattedStrings) { + List list = new ArrayList<>(formattedStrings.size()); + for (String formattedString : formattedStrings) { + list.add(parse(formattedString)); + } + return list; + } + + @BetaApi("The method will be renamed to toStringList after subclasses of this class are removed.") + public static List toStrings(List values) { + List list = new ArrayList<>(values.size()); + for (RunName value : values) { + if (value == null) { + list.add(""); + } else { + list.add(value.toString()); + } + } + return list; + } + + public static boolean isParsableFrom(String formattedString) { + return PROJECT_TRANSFER_CONFIG_RUN_PATH_TEMPLATE.matches(formattedString) + || PROJECT_LOCATION_TRANSFER_CONFIG_RUN_PATH_TEMPLATE.matches(formattedString); + } + + @Override + public Map getFieldValuesMap() { + if (fieldValuesMap == null) { + synchronized (this) { + if (fieldValuesMap == null) { + ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); + if (project != null) { + fieldMapBuilder.put("project", project); + } + if (transferConfig != null) { + fieldMapBuilder.put("transfer_config", transferConfig); + } + if (run != null) { + fieldMapBuilder.put("run", run); + } + if (location != null) { + fieldMapBuilder.put("location", location); + } + fieldValuesMap = fieldMapBuilder.build(); + } + } + } + return fieldValuesMap; + } + + public String getFieldValue(String fieldName) { + return getFieldValuesMap().get(fieldName); + } + + @Override + public String toString() { + return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap()); + } + + /** Builder for projects/{project}/transferConfigs/{transfer_config}/runs/{run}. */ + public static class Builder { + + private String project; + private String transferConfig; + private String run; + + protected Builder() {} + + public String getProject() { + return project; + } + + public String getTransferConfig() { + return transferConfig; + } + + public String getRun() { + return run; + } + + public Builder setProject(String project) { + this.project = project; + return this; + } + + public Builder setTransferConfig(String transferConfig) { + this.transferConfig = transferConfig; + return this; + } + + public Builder setRun(String run) { + this.run = run; + return this; + } + + private Builder(RunName runName) { + Preconditions.checkArgument( + runName.pathTemplate == PROJECT_TRANSFER_CONFIG_RUN_PATH_TEMPLATE, + "toBuilder is only supported when RunName has the pattern of " + + "projects/{project}/transferConfigs/{transfer_config}/runs/{run}."); + project = runName.project; + transferConfig = runName.transferConfig; + run = runName.run; + } + + public RunName build() { + return new RunName(this); + } + } + + /** + * Builder for + * projects/{project}/locations/{location}/transferConfigs/{transfer_config}/runs/{run}. + */ + @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") + public static class ProjectLocationTransferConfigRunBuilder { + + private String project; + private String location; + private String transferConfig; + private String run; + + private ProjectLocationTransferConfigRunBuilder() {} + + public String getProject() { + return project; + } + + public String getLocation() { + return location; + } + + public String getTransferConfig() { + return transferConfig; + } + + public String getRun() { + return run; + } + + public ProjectLocationTransferConfigRunBuilder setProject(String project) { + this.project = project; + return this; + } + + public ProjectLocationTransferConfigRunBuilder setLocation(String location) { + this.location = location; + return this; + } + + public ProjectLocationTransferConfigRunBuilder setTransferConfig(String transferConfig) { + this.transferConfig = transferConfig; + return this; + } + + public ProjectLocationTransferConfigRunBuilder setRun(String run) { + this.run = run; + return this; + } + + public RunName build() { + return new RunName(this); + } + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o != null || getClass() == o.getClass()) { + RunName that = (RunName) o; + return (Objects.equals(this.project, that.project)) + && (Objects.equals(this.transferConfig, that.transferConfig)) + && (Objects.equals(this.run, that.run)) + && (Objects.equals(this.location, that.location)); + } + return false; + } + + @Override + public int hashCode() { + int h = 1; + h *= 1000003; + h ^= Objects.hashCode(fixedValue); + h *= 1000003; + h ^= Objects.hashCode(project); + h *= 1000003; + h ^= Objects.hashCode(transferConfig); + h *= 1000003; + h ^= Objects.hashCode(run); + h *= 1000003; + h ^= Objects.hashCode(location); + return h; + } } diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfigName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfigName.java index fa5ae142..4b2c4e55 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfigName.java +++ b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfigName.java @@ -16,10 +16,308 @@ package com.google.cloud.bigquery.datatransfer.v1; +import com.google.api.core.BetaApi; +import com.google.api.pathtemplate.PathTemplate; +import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; /** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -public abstract class TransferConfigName implements ResourceName { +public class TransferConfigName implements ResourceName { + + @Deprecated protected TransferConfigName() {} + + private static final PathTemplate PROJECT_TRANSFER_CONFIG_PATH_TEMPLATE = + PathTemplate.createWithoutUrlEncoding("projects/{project}/transferConfigs/{transfer_config}"); + private static final PathTemplate PROJECT_LOCATION_TRANSFER_CONFIG_PATH_TEMPLATE = + PathTemplate.createWithoutUrlEncoding( + "projects/{project}/locations/{location}/transferConfigs/{transfer_config}"); + + private volatile Map fieldValuesMap; + private PathTemplate pathTemplate; + private String fixedValue; + + private String project; + private String transferConfig; + private String location; + + public String getProject() { + return project; + } + + public String getTransferConfig() { + return transferConfig; + } + + public String getLocation() { + return location; + } + + private TransferConfigName(Builder builder) { + project = Preconditions.checkNotNull(builder.getProject()); + transferConfig = Preconditions.checkNotNull(builder.getTransferConfig()); + pathTemplate = PROJECT_TRANSFER_CONFIG_PATH_TEMPLATE; + } + + private TransferConfigName(ProjectLocationTransferConfigBuilder builder) { + project = Preconditions.checkNotNull(builder.getProject()); + location = Preconditions.checkNotNull(builder.getLocation()); + transferConfig = Preconditions.checkNotNull(builder.getTransferConfig()); + pathTemplate = PROJECT_LOCATION_TRANSFER_CONFIG_PATH_TEMPLATE; + } + + public static Builder newBuilder() { + return new Builder(); + } + + @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") + public static Builder newProjectTransferConfigBuilder() { + return new Builder(); + } + + @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") + public static ProjectLocationTransferConfigBuilder newProjectLocationTransferConfigBuilder() { + return new ProjectLocationTransferConfigBuilder(); + } + + public Builder toBuilder() { + return new Builder(this); + } + + public static TransferConfigName of(String project, String transferConfig) { + return newProjectTransferConfigBuilder() + .setProject(project) + .setTransferConfig(transferConfig) + .build(); + } + + @BetaApi("The static create methods are not stable yet and may be changed in the future.") + public static TransferConfigName ofProjectTransferConfigName( + String project, String transferConfig) { + return newProjectTransferConfigBuilder() + .setProject(project) + .setTransferConfig(transferConfig) + .build(); + } + + @BetaApi("The static create methods are not stable yet and may be changed in the future.") + public static TransferConfigName ofProjectLocationTransferConfigName( + String project, String location, String transferConfig) { + return newProjectLocationTransferConfigBuilder() + .setProject(project) + .setLocation(location) + .setTransferConfig(transferConfig) + .build(); + } + + public static String format(String project, String transferConfig) { + return newBuilder().setProject(project).setTransferConfig(transferConfig).build().toString(); + } + + @BetaApi("The static format methods are not stable yet and may be changed in the future.") + public static String formatProjectTransferConfigName(String project, String transferConfig) { + return newBuilder().setProject(project).setTransferConfig(transferConfig).build().toString(); + } + + @BetaApi("The static format methods are not stable yet and may be changed in the future.") + public static String formatProjectLocationTransferConfigName( + String project, String location, String transferConfig) { + return newProjectLocationTransferConfigBuilder() + .setProject(project) + .setLocation(location) + .setTransferConfig(transferConfig) + .build() + .toString(); + } + + public static TransferConfigName parse(String formattedString) { + if (formattedString.isEmpty()) { + return null; + } + if (PROJECT_TRANSFER_CONFIG_PATH_TEMPLATE.matches(formattedString)) { + Map matchMap = PROJECT_TRANSFER_CONFIG_PATH_TEMPLATE.match(formattedString); + return ofProjectTransferConfigName(matchMap.get("project"), matchMap.get("transfer_config")); + } else if (PROJECT_LOCATION_TRANSFER_CONFIG_PATH_TEMPLATE.matches(formattedString)) { + Map matchMap = + PROJECT_LOCATION_TRANSFER_CONFIG_PATH_TEMPLATE.match(formattedString); + return ofProjectLocationTransferConfigName( + matchMap.get("project"), matchMap.get("location"), matchMap.get("transfer_config")); + } + throw new ValidationException("JobName.parse: formattedString not in valid format"); + } + + @BetaApi("The method will be renamed to parseList after subclasses of this class are removed.") + public static List parse(List formattedStrings) { + List list = new ArrayList<>(formattedStrings.size()); + for (String formattedString : formattedStrings) { + list.add(parse(formattedString)); + } + return list; + } + + @BetaApi("The method will be renamed to toStringList after subclasses of this class are removed.") + public static List toStrings(List values) { + List list = new ArrayList<>(values.size()); + for (TransferConfigName value : values) { + if (value == null) { + list.add(""); + } else { + list.add(value.toString()); + } + } + return list; + } + + public static boolean isParsableFrom(String formattedString) { + return PROJECT_TRANSFER_CONFIG_PATH_TEMPLATE.matches(formattedString) + || PROJECT_LOCATION_TRANSFER_CONFIG_PATH_TEMPLATE.matches(formattedString); + } + + @Override + public Map getFieldValuesMap() { + if (fieldValuesMap == null) { + synchronized (this) { + if (fieldValuesMap == null) { + ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); + if (project != null) { + fieldMapBuilder.put("project", project); + } + if (transferConfig != null) { + fieldMapBuilder.put("transfer_config", transferConfig); + } + if (location != null) { + fieldMapBuilder.put("location", location); + } + fieldValuesMap = fieldMapBuilder.build(); + } + } + } + return fieldValuesMap; + } + + public String getFieldValue(String fieldName) { + return getFieldValuesMap().get(fieldName); + } + + @Override + public String toString() { + return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap()); + } + + /** Builder for projects/{project}/transferConfigs/{transfer_config}. */ + public static class Builder { + + private String project; + private String transferConfig; + + protected Builder() {} + + public String getProject() { + return project; + } + + public String getTransferConfig() { + return transferConfig; + } + + public Builder setProject(String project) { + this.project = project; + return this; + } + + public Builder setTransferConfig(String transferConfig) { + this.transferConfig = transferConfig; + return this; + } + + private Builder(TransferConfigName transferConfigName) { + Preconditions.checkArgument( + transferConfigName.pathTemplate == PROJECT_TRANSFER_CONFIG_PATH_TEMPLATE, + "toBuilder is only supported when TransferConfigName has the pattern of " + + "projects/{project}/transferConfigs/{transfer_config}."); + project = transferConfigName.project; + transferConfig = transferConfigName.transferConfig; + } + + public TransferConfigName build() { + return new TransferConfigName(this); + } + } + + /** Builder for projects/{project}/locations/{location}/transferConfigs/{transfer_config}. */ + @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") + public static class ProjectLocationTransferConfigBuilder { + + private String project; + private String location; + private String transferConfig; + + private ProjectLocationTransferConfigBuilder() {} + + public String getProject() { + return project; + } + + public String getLocation() { + return location; + } + + public String getTransferConfig() { + return transferConfig; + } + + public ProjectLocationTransferConfigBuilder setProject(String project) { + this.project = project; + return this; + } + + public ProjectLocationTransferConfigBuilder setLocation(String location) { + this.location = location; + return this; + } + + public ProjectLocationTransferConfigBuilder setTransferConfig(String transferConfig) { + this.transferConfig = transferConfig; + return this; + } + + public TransferConfigName build() { + return new TransferConfigName(this); + } + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o != null || getClass() == o.getClass()) { + TransferConfigName that = (TransferConfigName) o; + return (Objects.equals(this.project, that.project)) + && (Objects.equals(this.transferConfig, that.transferConfig)) + && (Objects.equals(this.location, that.location)); + } + return false; + } + + @Override + public int hashCode() { + int h = 1; + h *= 1000003; + h ^= Objects.hashCode(fixedValue); + h *= 1000003; + h ^= Objects.hashCode(project); + h *= 1000003; + h ^= Objects.hashCode(transferConfig); + h *= 1000003; + h ^= Objects.hashCode(location); + return h; + } } diff --git a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedParentName.java b/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedParentName.java deleted file mode 100644 index 4400f318..00000000 --- a/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedParentName.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright 2019 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.bigquery.datatransfer.v1; - -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ -@javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated -public class UntypedParentName extends ParentName { - - private final String rawValue; - private Map valueMap; - - private UntypedParentName(String rawValue) { - this.rawValue = Preconditions.checkNotNull(rawValue); - this.valueMap = ImmutableMap.of("", rawValue); - } - - public static UntypedParentName from(ResourceName resourceName) { - return new UntypedParentName(resourceName.toString()); - } - - public static UntypedParentName parse(String formattedString) { - return new UntypedParentName(formattedString); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList (values.size()); - for (UntypedParentName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return true; - } - - /** Return a map with a single value rawValue keyed on an empty String "". */ - public Map getFieldValuesMap() { - return valueMap; - } - - /** Return the initial rawValue if @param fieldName is an empty String, else return null. */ - public String getFieldValue(String fieldName) { - return valueMap.get(fieldName); - } - - @Override - public String toString() { - return rawValue; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o instanceof UntypedParentName) { - UntypedParentName that = (UntypedParentName) o; - return this.rawValue.equals(that.rawValue); - } - return false; - } - - @Override - public int hashCode() { - return rawValue.hashCode(); - } -} diff --git a/synth.metadata b/synth.metadata index 16f168a1..e92b4613 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,6 +1,20 @@ { - "updateTime": "2020-02-08T09:40:04.487923Z", + "updateTime": "2020-02-12T22:39:54.531945Z", "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-bigquerydatatransfer.git", + "sha": "9fff5b9e64d716540bf9239c996b2787c3643df7" + } + }, + { + "git": { + "name": "synthtool", + "remote": "rpc://devrel/cloud/libraries/tools/autosynth", + "sha": "dd7cd93888cbeb1d4c56a1ca814491c7813160e8" + } + }, { "generator": { "name": "artman", @@ -12,9 +26,9 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "e7d8a694f4559201e6913f6610069cb08b39274e", - "internalRef": "293903652", - "log": "e7d8a694f4559201e6913f6610069cb08b39274e\nDepend on the latest gapic-generator and resource names plugin.\n\nThis fixes the very old an very annoying bug: https://github.com/googleapis/gapic-generator/pull/3087\n\nPiperOrigin-RevId: 293903652\n\n806b2854a966d55374ee26bb0cef4e30eda17b58\nfix: correct capitalization of Ruby namespaces in SecurityCenter V1p1beta1\n\nPiperOrigin-RevId: 293903613\n\n1b83c92462b14d67a7644e2980f723112472e03a\nPublish annotations and grpc service config for Logging API.\n\nPiperOrigin-RevId: 293893514\n\ne46f761cd6ec15a9e3d5ed4ff321a4bcba8e8585\nGenerate the Bazel build file for recommendengine public api\n\nPiperOrigin-RevId: 293710856\n\n68477017c4173c98addac0373950c6aa9d7b375f\nMake `language_code` optional for UpdateIntentRequest and BatchUpdateIntentsRequest.\n\nThe comments and proto annotations describe this parameter as optional.\n\nPiperOrigin-RevId: 293703548\n\n16f823f578bca4e845a19b88bb9bc5870ea71ab2\nAdd BUILD.bazel files for managedidentities API\n\nPiperOrigin-RevId: 293698246\n\n2f53fd8178c9a9de4ad10fae8dd17a7ba36133f2\nAdd v1p1beta1 config file\n\nPiperOrigin-RevId: 293696729\n\n052b274138fce2be80f97b6dcb83ab343c7c8812\nAdd source field for user event and add field behavior annotations\n\nPiperOrigin-RevId: 293693115\n\n1e89732b2d69151b1b3418fff3d4cc0434f0dded\ndatacatalog: v1beta1 add three new RPCs to gapic v1beta1 config\n\nPiperOrigin-RevId: 293692823\n\n9c8bd09bbdc7c4160a44f1fbab279b73cd7a2337\nchange the name of AccessApproval service to AccessApprovalAdmin\n\nPiperOrigin-RevId: 293690934\n\n2e23b8fbc45f5d9e200572ca662fe1271bcd6760\nAdd ListEntryGroups method, add http bindings to support entry group tagging, and update some comments.\n\nPiperOrigin-RevId: 293666452\n\n0275e38a4ca03a13d3f47a9613aac8c8b0d3f1f2\nAdd proto_package field to managedidentities API. It is needed for APIs that still depend on artman generation.\n\nPiperOrigin-RevId: 293643323\n\n4cdfe8278cb6f308106580d70648001c9146e759\nRegenerating public protos for Data Catalog to add new Custom Type Entry feature.\n\nPiperOrigin-RevId: 293614782\n\n45d2a569ab526a1fad3720f95eefb1c7330eaada\nEnable client generation for v1 ManagedIdentities API.\n\nPiperOrigin-RevId: 293515675\n\n2c17086b77e6f3bcf04a1f65758dfb0c3da1568f\nAdd the Actions on Google common types (//google/actions/type/*).\n\nPiperOrigin-RevId: 293478245\n\n781aadb932e64a12fb6ead7cd842698d99588433\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293443396\n\ne2602608c9138c2fca24162720e67f9307c30b95\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293442964\n\nc8aef82028d06b7992278fa9294c18570dc86c3d\nAdd cc_proto_library and cc_grpc_library targets for Bigtable protos.\n\nAlso fix indentation of cc_grpc_library targets in Spanner and IAM protos.\n\nPiperOrigin-RevId: 293440538\n\ne2faab04f4cb7f9755072330866689b1943a16e9\ncloudtasks: v2 replace non-standard retry params in gapic config v2\n\nPiperOrigin-RevId: 293424055\n\ndfb4097ea628a8470292c6590a4313aee0c675bd\nerrorreporting: v1beta1 add legacy artman config for php\n\nPiperOrigin-RevId: 293423790\n\nb18aed55b45bfe5b62476292c72759e6c3e573c6\nasset: v1p1beta1 updated comment for `page_size` limit.\n\nPiperOrigin-RevId: 293421386\n\nc9ef36b7956d9859a2fc86ad35fcaa16958ab44f\nbazel: Refactor CI build scripts\n\nPiperOrigin-RevId: 293387911\n\na8ed9d921fdddc61d8467bfd7c1668f0ad90435c\nfix: set Ruby module name for OrgPolicy\n\nPiperOrigin-RevId: 293257997\n\n6c7d28509bd8315de8af0889688ee20099594269\nredis: v1beta1 add UpgradeInstance and connect_mode field to Instance\n\nPiperOrigin-RevId: 293242878\n\nae0abed4fcb4c21f5cb67a82349a049524c4ef68\nredis: v1 add connect_mode field to Instance\n\nPiperOrigin-RevId: 293241914\n\n3f7a0d29b28ee9365771da2b66edf7fa2b4e9c56\nAdds service config definition for bigqueryreservation v1beta1\n\nPiperOrigin-RevId: 293234418\n\n0c88168d5ed6fe353a8cf8cbdc6bf084f6bb66a5\naddition of BUILD & configuration for accessapproval v1\n\nPiperOrigin-RevId: 293219198\n\n39bedc2e30f4778ce81193f6ba1fec56107bcfc4\naccessapproval: v1 publish protos\n\nPiperOrigin-RevId: 293167048\n\n69d9945330a5721cd679f17331a78850e2618226\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080182\n\nf6a1a6b417f39694275ca286110bc3c1ca4db0dc\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080178\n\n29d40b78e3dc1579b0b209463fbcb76e5767f72a\nExpose managedidentities/v1beta1/ API for client library usage.\n\nPiperOrigin-RevId: 292979741\n\na22129a1fb6e18056d576dfb7717aef74b63734a\nExpose managedidentities/v1/ API for client library usage.\n\nPiperOrigin-RevId: 292968186\n\n" + "sha": "2c17ac33b226194041155bb5340c3f34733f1b3a", + "internalRef": "294734008", + "log": "2c17ac33b226194041155bb5340c3f34733f1b3a\nAdd parameter to sample generated for UpdateInstance. Related to https://github.com/googleapis/python-redis/issues/4\n\nPiperOrigin-RevId: 294734008\n\nd5e8a8953f2acdfe96fb15e85eb2f33739623957\nMove bigquery datatransfer to gapic v2.\n\nPiperOrigin-RevId: 294703703\n\nefd36705972cfcd7d00ab4c6dfa1135bafacd4ae\nfix: Add two annotations that we missed.\n\nPiperOrigin-RevId: 294664231\n\n8a36b928873ff9c05b43859b9d4ea14cd205df57\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1beta2).\n\nPiperOrigin-RevId: 294459768\n\nc7a3caa2c40c49f034a3c11079dd90eb24987047\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1).\n\nPiperOrigin-RevId: 294456889\n\n5006247aa157e59118833658084345ee59af7c09\nFix: Make deprecated fields optional\nFix: Deprecate SetLoggingServiceRequest.zone in line with the comments\nFeature: Add resource name method signatures where appropriate\n\nPiperOrigin-RevId: 294383128\n\neabba40dac05c5cbe0fca3a35761b17e372036c4\nFix: C# and PHP package/namespace capitalization for BigQuery Storage v1.\n\nPiperOrigin-RevId: 294382444\n\nf8d9a858a7a55eba8009a23aa3f5cc5fe5e88dde\nfix: artman configuration file for bigtable-admin\n\nPiperOrigin-RevId: 294322616\n\n0f29555d1cfcf96add5c0b16b089235afbe9b1a9\nAPI definition for (not-yet-launched) GCS gRPC.\n\nPiperOrigin-RevId: 294321472\n\nfcc86bee0e84dc11e9abbff8d7c3529c0626f390\nfix: Bigtable Admin v2\n\nChange LRO metadata from PartialUpdateInstanceMetadata\nto UpdateInstanceMetadata. (Otherwise, it will not build.)\n\nPiperOrigin-RevId: 294264582\n\n6d9361eae2ebb3f42d8c7ce5baf4bab966fee7c0\nrefactor: Add annotations to Bigtable Admin v2.\n\nPiperOrigin-RevId: 294243406\n\nad7616f3fc8e123451c8b3a7987bc91cea9e6913\nFix: Resource type in CreateLogMetricRequest should use logging.googleapis.com.\nFix: ListLogEntries should have a method signature for convenience of calling it.\n\nPiperOrigin-RevId: 294222165\n\n63796fcbb08712676069e20a3e455c9f7aa21026\nFix: Remove extraneous resource definition for cloudkms.googleapis.com/CryptoKey.\n\nPiperOrigin-RevId: 294176658\n\n" } }, {