Skip to content
This repository was archived by the owner on Sep 27, 2023. It is now read-only.

Commit d1cc550

Browse files
stephaniewang526yoshi-automation
stephaniewang526
and
yoshi-automation
authored
feat: re-implement resource name helper classes (#59)
* [CHANGE ME] Re-generated to pick up changes in the API or client library generator. * remove ParentName, ParentNames and UntypedParentName * blank line at eof * blank line at eof * fix missing diff * regenerate Co-authored-by: Yoshi Automation Bot <[email protected]>
1 parent 7328d35 commit d1cc550

25 files changed

+1388
-474
lines changed

‎google-cloud-bigquerydatatransfer/clirr-ignored-differences.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<!--TODO: To be removed-->
5+
<difference>
6+
<differenceType>7005</differenceType>
7+
<className>com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClient</className>
8+
<method>* *(com.google.cloud.bigquery.datatransfer.v1.ParentName*)</method>
9+
<to>* *(com.google.cloud.bigquery.datatransfer.v1.ProjectName*)</to>
10+
</difference>
11+
</differences>

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

+186-101
Large diffs are not rendered by default.

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ public UnaryCallSettings<GetTransferConfigRequest, TransferConfig> getTransferCo
119119
return ((DataTransferServiceStubSettings) getStubSettings()).scheduleTransferRunsSettings();
120120
}
121121

122+
/** Returns the object with the settings used for calls to startManualTransferRuns. */
123+
public UnaryCallSettings<StartManualTransferRunsRequest, StartManualTransferRunsResponse>
124+
startManualTransferRunsSettings() {
125+
return ((DataTransferServiceStubSettings) getStubSettings()).startManualTransferRunsSettings();
126+
}
127+
122128
/** Returns the object with the settings used for calls to getTransferRun. */
123129
public UnaryCallSettings<GetTransferRunRequest, TransferRun> getTransferRunSettings() {
124130
return ((DataTransferServiceStubSettings) getStubSettings()).getTransferRunSettings();
@@ -149,12 +155,6 @@ public UnaryCallSettings<DeleteTransferRunRequest, Empty> deleteTransferRunSetti
149155
return ((DataTransferServiceStubSettings) getStubSettings()).checkValidCredsSettings();
150156
}
151157

152-
/** Returns the object with the settings used for calls to startManualTransferRuns. */
153-
public UnaryCallSettings<StartManualTransferRunsRequest, StartManualTransferRunsResponse>
154-
startManualTransferRunsSettings() {
155-
return ((DataTransferServiceStubSettings) getStubSettings()).startManualTransferRunsSettings();
156-
}
157-
158158
public static final DataTransferServiceSettings create(DataTransferServiceStubSettings stub)
159159
throws IOException {
160160
return new DataTransferServiceSettings.Builder(stub.toBuilder()).build();
@@ -303,6 +303,13 @@ public UnaryCallSettings.Builder<GetDataSourceRequest, DataSource> getDataSource
303303
return getStubSettingsBuilder().scheduleTransferRunsSettings();
304304
}
305305

306+
/** Returns the builder for the settings used for calls to startManualTransferRuns. */
307+
public UnaryCallSettings.Builder<
308+
StartManualTransferRunsRequest, StartManualTransferRunsResponse>
309+
startManualTransferRunsSettings() {
310+
return getStubSettingsBuilder().startManualTransferRunsSettings();
311+
}
312+
306313
/** Returns the builder for the settings used for calls to getTransferRun. */
307314
public UnaryCallSettings.Builder<GetTransferRunRequest, TransferRun> getTransferRunSettings() {
308315
return getStubSettingsBuilder().getTransferRunSettings();
@@ -333,13 +340,6 @@ public UnaryCallSettings.Builder<DeleteTransferRunRequest, Empty> deleteTransfer
333340
return getStubSettingsBuilder().checkValidCredsSettings();
334341
}
335342

336-
/** Returns the builder for the settings used for calls to startManualTransferRuns. */
337-
public UnaryCallSettings.Builder<
338-
StartManualTransferRunsRequest, StartManualTransferRunsResponse>
339-
startManualTransferRunsSettings() {
340-
return getStubSettingsBuilder().startManualTransferRunsSettings();
341-
}
342-
343343
@Override
344344
public DataTransferServiceSettings build() throws IOException {
345345
return new DataTransferServiceSettings(this);

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

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

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ public UnaryCallable<GetTransferConfigRequest, TransferConfig> getTransferConfig
104104
throw new UnsupportedOperationException("Not implemented: scheduleTransferRunsCallable()");
105105
}
106106

107+
public UnaryCallable<StartManualTransferRunsRequest, StartManualTransferRunsResponse>
108+
startManualTransferRunsCallable() {
109+
throw new UnsupportedOperationException("Not implemented: startManualTransferRunsCallable()");
110+
}
111+
107112
public UnaryCallable<GetTransferRunRequest, TransferRun> getTransferRunCallable() {
108113
throw new UnsupportedOperationException("Not implemented: getTransferRunCallable()");
109114
}
@@ -136,11 +141,6 @@ public UnaryCallable<CheckValidCredsRequest, CheckValidCredsResponse> checkValid
136141
throw new UnsupportedOperationException("Not implemented: checkValidCredsCallable()");
137142
}
138143

139-
public UnaryCallable<StartManualTransferRunsRequest, StartManualTransferRunsResponse>
140-
startManualTransferRunsCallable() {
141-
throw new UnsupportedOperationException("Not implemented: startManualTransferRunsCallable()");
142-
}
143-
144144
@Override
145145
public abstract void close();
146146
}

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

+33-33
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ public class DataTransferServiceStubSettings extends StubSettings<DataTransferSe
132132
listTransferConfigsSettings;
133133
private final UnaryCallSettings<ScheduleTransferRunsRequest, ScheduleTransferRunsResponse>
134134
scheduleTransferRunsSettings;
135+
private final UnaryCallSettings<StartManualTransferRunsRequest, StartManualTransferRunsResponse>
136+
startManualTransferRunsSettings;
135137
private final UnaryCallSettings<GetTransferRunRequest, TransferRun> getTransferRunSettings;
136138
private final UnaryCallSettings<DeleteTransferRunRequest, Empty> deleteTransferRunSettings;
137139
private final PagedCallSettings<
@@ -142,8 +144,6 @@ public class DataTransferServiceStubSettings extends StubSettings<DataTransferSe
142144
listTransferLogsSettings;
143145
private final UnaryCallSettings<CheckValidCredsRequest, CheckValidCredsResponse>
144146
checkValidCredsSettings;
145-
private final UnaryCallSettings<StartManualTransferRunsRequest, StartManualTransferRunsResponse>
146-
startManualTransferRunsSettings;
147147

148148
/** Returns the object with the settings used for calls to getDataSource. */
149149
public UnaryCallSettings<GetDataSourceRequest, DataSource> getDataSourceSettings() {
@@ -192,6 +192,12 @@ public UnaryCallSettings<GetTransferConfigRequest, TransferConfig> getTransferCo
192192
return scheduleTransferRunsSettings;
193193
}
194194

195+
/** Returns the object with the settings used for calls to startManualTransferRuns. */
196+
public UnaryCallSettings<StartManualTransferRunsRequest, StartManualTransferRunsResponse>
197+
startManualTransferRunsSettings() {
198+
return startManualTransferRunsSettings;
199+
}
200+
195201
/** Returns the object with the settings used for calls to getTransferRun. */
196202
public UnaryCallSettings<GetTransferRunRequest, TransferRun> getTransferRunSettings() {
197203
return getTransferRunSettings;
@@ -222,12 +228,6 @@ public UnaryCallSettings<DeleteTransferRunRequest, Empty> deleteTransferRunSetti
222228
return checkValidCredsSettings;
223229
}
224230

225-
/** Returns the object with the settings used for calls to startManualTransferRuns. */
226-
public UnaryCallSettings<StartManualTransferRunsRequest, StartManualTransferRunsResponse>
227-
startManualTransferRunsSettings() {
228-
return startManualTransferRunsSettings;
229-
}
230-
231231
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
232232
public DataTransferServiceStub createStub() throws IOException {
233233
if (getTransportChannelProvider()
@@ -305,12 +305,12 @@ protected DataTransferServiceStubSettings(Builder settingsBuilder) throws IOExce
305305
getTransferConfigSettings = settingsBuilder.getTransferConfigSettings().build();
306306
listTransferConfigsSettings = settingsBuilder.listTransferConfigsSettings().build();
307307
scheduleTransferRunsSettings = settingsBuilder.scheduleTransferRunsSettings().build();
308+
startManualTransferRunsSettings = settingsBuilder.startManualTransferRunsSettings().build();
308309
getTransferRunSettings = settingsBuilder.getTransferRunSettings().build();
309310
deleteTransferRunSettings = settingsBuilder.deleteTransferRunSettings().build();
310311
listTransferRunsSettings = settingsBuilder.listTransferRunsSettings().build();
311312
listTransferLogsSettings = settingsBuilder.listTransferLogsSettings().build();
312313
checkValidCredsSettings = settingsBuilder.checkValidCredsSettings().build();
313-
startManualTransferRunsSettings = settingsBuilder.startManualTransferRunsSettings().build();
314314
}
315315

316316
private static final PagedListDescriptor<
@@ -573,6 +573,9 @@ public static class Builder
573573
private final UnaryCallSettings.Builder<
574574
ScheduleTransferRunsRequest, ScheduleTransferRunsResponse>
575575
scheduleTransferRunsSettings;
576+
private final UnaryCallSettings.Builder<
577+
StartManualTransferRunsRequest, StartManualTransferRunsResponse>
578+
startManualTransferRunsSettings;
576579
private final UnaryCallSettings.Builder<GetTransferRunRequest, TransferRun>
577580
getTransferRunSettings;
578581
private final UnaryCallSettings.Builder<DeleteTransferRunRequest, Empty>
@@ -585,9 +588,6 @@ public static class Builder
585588
listTransferLogsSettings;
586589
private final UnaryCallSettings.Builder<CheckValidCredsRequest, CheckValidCredsResponse>
587590
checkValidCredsSettings;
588-
private final UnaryCallSettings.Builder<
589-
StartManualTransferRunsRequest, StartManualTransferRunsResponse>
590-
startManualTransferRunsSettings;
591591

592592
private static final ImmutableMap<String, ImmutableSet<StatusCode.Code>>
593593
RETRYABLE_CODE_DEFINITIONS;
@@ -647,6 +647,8 @@ protected Builder(ClientContext clientContext) {
647647

648648
scheduleTransferRunsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
649649

650+
startManualTransferRunsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
651+
650652
getTransferRunSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
651653

652654
deleteTransferRunSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -657,8 +659,6 @@ protected Builder(ClientContext clientContext) {
657659

658660
checkValidCredsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
659661

660-
startManualTransferRunsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
661-
662662
unaryMethodSettingsBuilders =
663663
ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
664664
getDataSourceSettings,
@@ -669,12 +669,12 @@ protected Builder(ClientContext clientContext) {
669669
getTransferConfigSettings,
670670
listTransferConfigsSettings,
671671
scheduleTransferRunsSettings,
672+
startManualTransferRunsSettings,
672673
getTransferRunSettings,
673674
deleteTransferRunSettings,
674675
listTransferRunsSettings,
675676
listTransferLogsSettings,
676-
checkValidCredsSettings,
677-
startManualTransferRunsSettings);
677+
checkValidCredsSettings);
678678

679679
initDefaults(this);
680680
}
@@ -712,7 +712,7 @@ private static Builder initDefaults(Builder builder) {
712712

713713
builder
714714
.deleteTransferConfigSettings()
715-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
715+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
716716
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
717717

718718
builder
@@ -730,14 +730,19 @@ private static Builder initDefaults(Builder builder) {
730730
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
731731
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
732732

733+
builder
734+
.startManualTransferRunsSettings()
735+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
736+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
737+
733738
builder
734739
.getTransferRunSettings()
735740
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
736741
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
737742

738743
builder
739744
.deleteTransferRunSettings()
740-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
745+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
741746
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
742747

743748
builder
@@ -752,11 +757,6 @@ private static Builder initDefaults(Builder builder) {
752757

753758
builder
754759
.checkValidCredsSettings()
755-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
756-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
757-
758-
builder
759-
.startManualTransferRunsSettings()
760760
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
761761
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
762762

@@ -774,12 +774,12 @@ protected Builder(DataTransferServiceStubSettings settings) {
774774
getTransferConfigSettings = settings.getTransferConfigSettings.toBuilder();
775775
listTransferConfigsSettings = settings.listTransferConfigsSettings.toBuilder();
776776
scheduleTransferRunsSettings = settings.scheduleTransferRunsSettings.toBuilder();
777+
startManualTransferRunsSettings = settings.startManualTransferRunsSettings.toBuilder();
777778
getTransferRunSettings = settings.getTransferRunSettings.toBuilder();
778779
deleteTransferRunSettings = settings.deleteTransferRunSettings.toBuilder();
779780
listTransferRunsSettings = settings.listTransferRunsSettings.toBuilder();
780781
listTransferLogsSettings = settings.listTransferLogsSettings.toBuilder();
781782
checkValidCredsSettings = settings.checkValidCredsSettings.toBuilder();
782-
startManualTransferRunsSettings = settings.startManualTransferRunsSettings.toBuilder();
783783

784784
unaryMethodSettingsBuilders =
785785
ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
@@ -791,12 +791,12 @@ protected Builder(DataTransferServiceStubSettings settings) {
791791
getTransferConfigSettings,
792792
listTransferConfigsSettings,
793793
scheduleTransferRunsSettings,
794+
startManualTransferRunsSettings,
794795
getTransferRunSettings,
795796
deleteTransferRunSettings,
796797
listTransferRunsSettings,
797798
listTransferLogsSettings,
798-
checkValidCredsSettings,
799-
startManualTransferRunsSettings);
799+
checkValidCredsSettings);
800800
}
801801

802802
// NEXT_MAJOR_VER: remove 'throws Exception'
@@ -866,6 +866,13 @@ public UnaryCallSettings.Builder<GetDataSourceRequest, DataSource> getDataSource
866866
return scheduleTransferRunsSettings;
867867
}
868868

869+
/** Returns the builder for the settings used for calls to startManualTransferRuns. */
870+
public UnaryCallSettings.Builder<
871+
StartManualTransferRunsRequest, StartManualTransferRunsResponse>
872+
startManualTransferRunsSettings() {
873+
return startManualTransferRunsSettings;
874+
}
875+
869876
/** Returns the builder for the settings used for calls to getTransferRun. */
870877
public UnaryCallSettings.Builder<GetTransferRunRequest, TransferRun> getTransferRunSettings() {
871878
return getTransferRunSettings;
@@ -896,13 +903,6 @@ public UnaryCallSettings.Builder<DeleteTransferRunRequest, Empty> deleteTransfer
896903
return checkValidCredsSettings;
897904
}
898905

899-
/** Returns the builder for the settings used for calls to startManualTransferRuns. */
900-
public UnaryCallSettings.Builder<
901-
StartManualTransferRunsRequest, StartManualTransferRunsResponse>
902-
startManualTransferRunsSettings() {
903-
return startManualTransferRunsSettings;
904-
}
905-
906906
@Override
907907
public DataTransferServiceStubSettings build() throws IOException {
908908
return new DataTransferServiceStubSettings(this);

0 commit comments

Comments
 (0)