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

Commit b47c2b3

Browse files
yoshi-automationyoshi-automation
authored
feat!: Java 8 breaking generator changes (#960)
* chore: release gapic-generator-java v1.0.17 Committer: @miraleung PiperOrigin-RevId: 388499329 Source-Author: Google APIs <noreply@google.com> Source-Date: Tue Aug 3 11:12:29 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: bb0a090d9204110042ab5dee2ce9e06e8071ce54 Source-Link: googleapis/googleapis@bb0a090 * feat!: release gapic-generator-java v2.0.0 Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Author: Google APIs <noreply@google.com> Source-Date: Tue Aug 3 13:48:38 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: d9eaf41de44d953458b18712a3f240bb4c564e48 Source-Link: googleapis/googleapis@d9eaf41
1 parent 8317ab0 commit b47c2b3

5 files changed

Lines changed: 74 additions & 135 deletions

File tree

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

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.bigquery.datatransfer.v1;
1818

19-
import com.google.api.core.ApiFunction;
2019
import com.google.api.core.ApiFuture;
2120
import com.google.api.core.ApiFutures;
2221
import com.google.api.core.BetaApi;
@@ -1934,12 +1933,7 @@ public static ApiFuture<ListDataSourcesPagedResponse> createAsync(
19341933
ListDataSourcesPage.createEmptyPage().createPageAsync(context, futureResponse);
19351934
return ApiFutures.transform(
19361935
futurePage,
1937-
new ApiFunction<ListDataSourcesPage, ListDataSourcesPagedResponse>() {
1938-
@Override
1939-
public ListDataSourcesPagedResponse apply(ListDataSourcesPage input) {
1940-
return new ListDataSourcesPagedResponse(input);
1941-
}
1942-
},
1936+
input -> new ListDataSourcesPagedResponse(input),
19431937
MoreExecutors.directExecutor());
19441938
}
19451939

@@ -2017,12 +2011,7 @@ public static ApiFuture<ListTransferConfigsPagedResponse> createAsync(
20172011
ListTransferConfigsPage.createEmptyPage().createPageAsync(context, futureResponse);
20182012
return ApiFutures.transform(
20192013
futurePage,
2020-
new ApiFunction<ListTransferConfigsPage, ListTransferConfigsPagedResponse>() {
2021-
@Override
2022-
public ListTransferConfigsPagedResponse apply(ListTransferConfigsPage input) {
2023-
return new ListTransferConfigsPagedResponse(input);
2024-
}
2025-
},
2014+
input -> new ListTransferConfigsPagedResponse(input),
20262015
MoreExecutors.directExecutor());
20272016
}
20282017

@@ -2105,12 +2094,7 @@ public static ApiFuture<ListTransferRunsPagedResponse> createAsync(
21052094
ListTransferRunsPage.createEmptyPage().createPageAsync(context, futureResponse);
21062095
return ApiFutures.transform(
21072096
futurePage,
2108-
new ApiFunction<ListTransferRunsPage, ListTransferRunsPagedResponse>() {
2109-
@Override
2110-
public ListTransferRunsPagedResponse apply(ListTransferRunsPage input) {
2111-
return new ListTransferRunsPagedResponse(input);
2112-
}
2113-
},
2097+
input -> new ListTransferRunsPagedResponse(input),
21142098
MoreExecutors.directExecutor());
21152099
}
21162100

@@ -2187,12 +2171,7 @@ public static ApiFuture<ListTransferLogsPagedResponse> createAsync(
21872171
ListTransferLogsPage.createEmptyPage().createPageAsync(context, futureResponse);
21882172
return ApiFutures.transform(
21892173
futurePage,
2190-
new ApiFunction<ListTransferLogsPage, ListTransferLogsPagedResponse>() {
2191-
@Override
2192-
public ListTransferLogsPagedResponse apply(ListTransferLogsPage input) {
2193-
return new ListTransferLogsPagedResponse(input);
2194-
}
2195-
},
2174+
input -> new ListTransferLogsPagedResponse(input),
21962175
MoreExecutors.directExecutor());
21972176
}
21982177

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,13 @@ public DataTransferServiceStubSettings.Builder getStubSettingsBuilder() {
248248
return ((DataTransferServiceStubSettings.Builder) getStubSettings());
249249
}
250250

251-
// NEXT_MAJOR_VER: remove 'throws Exception'.
252251
/**
253252
* Applies the given settings updater function to all of the unary API methods in this service.
254253
*
255254
* <p>Note: This method does not support applying settings to streaming methods.
256255
*/
257256
public Builder applyToAllUnaryMethods(
258-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
257+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
259258
super.applyToAllUnaryMethods(
260259
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
261260
return this;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -810,14 +810,13 @@ private static Builder initDefaults(Builder builder) {
810810
return builder;
811811
}
812812

813-
// NEXT_MAJOR_VER: remove 'throws Exception'.
814813
/**
815814
* Applies the given settings updater function to all of the unary API methods in this service.
816815
*
817816
* <p>Note: This method does not support applying settings to streaming methods.
818817
*/
819818
public Builder applyToAllUnaryMethods(
820-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
819+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
821820
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
822821
return this;
823822
}

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

Lines changed: 65 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.api.gax.grpc.GrpcCallSettings;
2727
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2828
import com.google.api.gax.rpc.ClientContext;
29-
import com.google.api.gax.rpc.RequestParamsExtractor;
3029
import com.google.api.gax.rpc.UnaryCallable;
3130
import com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest;
3231
import com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse;
@@ -58,7 +57,6 @@
5857
import io.grpc.MethodDescriptor;
5958
import io.grpc.protobuf.ProtoUtils;
6059
import java.io.IOException;
61-
import java.util.Map;
6260
import java.util.concurrent.TimeUnit;
6361
import javax.annotation.Generated;
6462

@@ -313,111 +311,87 @@ protected GrpcDataTransferServiceStub(
313311
GrpcCallSettings.<GetDataSourceRequest, DataSource>newBuilder()
314312
.setMethodDescriptor(getDataSourceMethodDescriptor)
315313
.setParamsExtractor(
316-
new RequestParamsExtractor<GetDataSourceRequest>() {
317-
@Override
318-
public Map<String, String> extract(GetDataSourceRequest request) {
319-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
320-
params.put("name", String.valueOf(request.getName()));
321-
return params.build();
322-
}
314+
request -> {
315+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
316+
params.put("name", String.valueOf(request.getName()));
317+
return params.build();
323318
})
324319
.build();
325320
GrpcCallSettings<ListDataSourcesRequest, ListDataSourcesResponse>
326321
listDataSourcesTransportSettings =
327322
GrpcCallSettings.<ListDataSourcesRequest, ListDataSourcesResponse>newBuilder()
328323
.setMethodDescriptor(listDataSourcesMethodDescriptor)
329324
.setParamsExtractor(
330-
new RequestParamsExtractor<ListDataSourcesRequest>() {
331-
@Override
332-
public Map<String, String> extract(ListDataSourcesRequest request) {
333-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
334-
params.put("parent", String.valueOf(request.getParent()));
335-
return params.build();
336-
}
325+
request -> {
326+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
327+
params.put("parent", String.valueOf(request.getParent()));
328+
return params.build();
337329
})
338330
.build();
339331
GrpcCallSettings<CreateTransferConfigRequest, TransferConfig>
340332
createTransferConfigTransportSettings =
341333
GrpcCallSettings.<CreateTransferConfigRequest, TransferConfig>newBuilder()
342334
.setMethodDescriptor(createTransferConfigMethodDescriptor)
343335
.setParamsExtractor(
344-
new RequestParamsExtractor<CreateTransferConfigRequest>() {
345-
@Override
346-
public Map<String, String> extract(CreateTransferConfigRequest request) {
347-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
348-
params.put("parent", String.valueOf(request.getParent()));
349-
return params.build();
350-
}
336+
request -> {
337+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
338+
params.put("parent", String.valueOf(request.getParent()));
339+
return params.build();
351340
})
352341
.build();
353342
GrpcCallSettings<UpdateTransferConfigRequest, TransferConfig>
354343
updateTransferConfigTransportSettings =
355344
GrpcCallSettings.<UpdateTransferConfigRequest, TransferConfig>newBuilder()
356345
.setMethodDescriptor(updateTransferConfigMethodDescriptor)
357346
.setParamsExtractor(
358-
new RequestParamsExtractor<UpdateTransferConfigRequest>() {
359-
@Override
360-
public Map<String, String> extract(UpdateTransferConfigRequest request) {
361-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
362-
params.put(
363-
"transfer_config.name",
364-
String.valueOf(request.getTransferConfig().getName()));
365-
return params.build();
366-
}
347+
request -> {
348+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
349+
params.put(
350+
"transfer_config.name",
351+
String.valueOf(request.getTransferConfig().getName()));
352+
return params.build();
367353
})
368354
.build();
369355
GrpcCallSettings<DeleteTransferConfigRequest, Empty> deleteTransferConfigTransportSettings =
370356
GrpcCallSettings.<DeleteTransferConfigRequest, Empty>newBuilder()
371357
.setMethodDescriptor(deleteTransferConfigMethodDescriptor)
372358
.setParamsExtractor(
373-
new RequestParamsExtractor<DeleteTransferConfigRequest>() {
374-
@Override
375-
public Map<String, String> extract(DeleteTransferConfigRequest request) {
376-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
377-
params.put("name", String.valueOf(request.getName()));
378-
return params.build();
379-
}
359+
request -> {
360+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
361+
params.put("name", String.valueOf(request.getName()));
362+
return params.build();
380363
})
381364
.build();
382365
GrpcCallSettings<GetTransferConfigRequest, TransferConfig> getTransferConfigTransportSettings =
383366
GrpcCallSettings.<GetTransferConfigRequest, TransferConfig>newBuilder()
384367
.setMethodDescriptor(getTransferConfigMethodDescriptor)
385368
.setParamsExtractor(
386-
new RequestParamsExtractor<GetTransferConfigRequest>() {
387-
@Override
388-
public Map<String, String> extract(GetTransferConfigRequest request) {
389-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
390-
params.put("name", String.valueOf(request.getName()));
391-
return params.build();
392-
}
369+
request -> {
370+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
371+
params.put("name", String.valueOf(request.getName()));
372+
return params.build();
393373
})
394374
.build();
395375
GrpcCallSettings<ListTransferConfigsRequest, ListTransferConfigsResponse>
396376
listTransferConfigsTransportSettings =
397377
GrpcCallSettings.<ListTransferConfigsRequest, ListTransferConfigsResponse>newBuilder()
398378
.setMethodDescriptor(listTransferConfigsMethodDescriptor)
399379
.setParamsExtractor(
400-
new RequestParamsExtractor<ListTransferConfigsRequest>() {
401-
@Override
402-
public Map<String, String> extract(ListTransferConfigsRequest request) {
403-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
404-
params.put("parent", String.valueOf(request.getParent()));
405-
return params.build();
406-
}
380+
request -> {
381+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
382+
params.put("parent", String.valueOf(request.getParent()));
383+
return params.build();
407384
})
408385
.build();
409386
GrpcCallSettings<ScheduleTransferRunsRequest, ScheduleTransferRunsResponse>
410387
scheduleTransferRunsTransportSettings =
411388
GrpcCallSettings.<ScheduleTransferRunsRequest, ScheduleTransferRunsResponse>newBuilder()
412389
.setMethodDescriptor(scheduleTransferRunsMethodDescriptor)
413390
.setParamsExtractor(
414-
new RequestParamsExtractor<ScheduleTransferRunsRequest>() {
415-
@Override
416-
public Map<String, String> extract(ScheduleTransferRunsRequest request) {
417-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
418-
params.put("parent", String.valueOf(request.getParent()));
419-
return params.build();
420-
}
391+
request -> {
392+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
393+
params.put("parent", String.valueOf(request.getParent()));
394+
return params.build();
421395
})
422396
.build();
423397
GrpcCallSettings<StartManualTransferRunsRequest, StartManualTransferRunsResponse>
@@ -426,81 +400,63 @@ public Map<String, String> extract(ScheduleTransferRunsRequest request) {
426400
.<StartManualTransferRunsRequest, StartManualTransferRunsResponse>newBuilder()
427401
.setMethodDescriptor(startManualTransferRunsMethodDescriptor)
428402
.setParamsExtractor(
429-
new RequestParamsExtractor<StartManualTransferRunsRequest>() {
430-
@Override
431-
public Map<String, String> extract(StartManualTransferRunsRequest request) {
432-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
433-
params.put("parent", String.valueOf(request.getParent()));
434-
return params.build();
435-
}
403+
request -> {
404+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
405+
params.put("parent", String.valueOf(request.getParent()));
406+
return params.build();
436407
})
437408
.build();
438409
GrpcCallSettings<GetTransferRunRequest, TransferRun> getTransferRunTransportSettings =
439410
GrpcCallSettings.<GetTransferRunRequest, TransferRun>newBuilder()
440411
.setMethodDescriptor(getTransferRunMethodDescriptor)
441412
.setParamsExtractor(
442-
new RequestParamsExtractor<GetTransferRunRequest>() {
443-
@Override
444-
public Map<String, String> extract(GetTransferRunRequest request) {
445-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
446-
params.put("name", String.valueOf(request.getName()));
447-
return params.build();
448-
}
413+
request -> {
414+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
415+
params.put("name", String.valueOf(request.getName()));
416+
return params.build();
449417
})
450418
.build();
451419
GrpcCallSettings<DeleteTransferRunRequest, Empty> deleteTransferRunTransportSettings =
452420
GrpcCallSettings.<DeleteTransferRunRequest, Empty>newBuilder()
453421
.setMethodDescriptor(deleteTransferRunMethodDescriptor)
454422
.setParamsExtractor(
455-
new RequestParamsExtractor<DeleteTransferRunRequest>() {
456-
@Override
457-
public Map<String, String> extract(DeleteTransferRunRequest request) {
458-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
459-
params.put("name", String.valueOf(request.getName()));
460-
return params.build();
461-
}
423+
request -> {
424+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
425+
params.put("name", String.valueOf(request.getName()));
426+
return params.build();
462427
})
463428
.build();
464429
GrpcCallSettings<ListTransferRunsRequest, ListTransferRunsResponse>
465430
listTransferRunsTransportSettings =
466431
GrpcCallSettings.<ListTransferRunsRequest, ListTransferRunsResponse>newBuilder()
467432
.setMethodDescriptor(listTransferRunsMethodDescriptor)
468433
.setParamsExtractor(
469-
new RequestParamsExtractor<ListTransferRunsRequest>() {
470-
@Override
471-
public Map<String, String> extract(ListTransferRunsRequest request) {
472-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
473-
params.put("parent", String.valueOf(request.getParent()));
474-
return params.build();
475-
}
434+
request -> {
435+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
436+
params.put("parent", String.valueOf(request.getParent()));
437+
return params.build();
476438
})
477439
.build();
478440
GrpcCallSettings<ListTransferLogsRequest, ListTransferLogsResponse>
479441
listTransferLogsTransportSettings =
480442
GrpcCallSettings.<ListTransferLogsRequest, ListTransferLogsResponse>newBuilder()
481443
.setMethodDescriptor(listTransferLogsMethodDescriptor)
482444
.setParamsExtractor(
483-
new RequestParamsExtractor<ListTransferLogsRequest>() {
484-
@Override
485-
public Map<String, String> extract(ListTransferLogsRequest request) {
486-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
487-
params.put("parent", String.valueOf(request.getParent()));
488-
return params.build();
489-
}
445+
request -> {
446+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
447+
params.put("parent", String.valueOf(request.getParent()));
448+
return params.build();
490449
})
491450
.build();
492451
GrpcCallSettings<CheckValidCredsRequest, CheckValidCredsResponse>
493452
checkValidCredsTransportSettings =
494453
GrpcCallSettings.<CheckValidCredsRequest, CheckValidCredsResponse>newBuilder()
495454
.setMethodDescriptor(checkValidCredsMethodDescriptor)
496455
.setParamsExtractor(
497-
new RequestParamsExtractor<CheckValidCredsRequest>() {
498-
@Override
499-
public Map<String, String> extract(CheckValidCredsRequest request) {
500-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
501-
params.put("name", String.valueOf(request.getName()));
502-
return params.build();
503-
}
456+
request -> {
457+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
458+
params.put("name", String.valueOf(request.getName()));
459+
return params.build();
504460
})
505461
.build();
506462

@@ -686,7 +642,13 @@ public UnaryCallable<CheckValidCredsRequest, CheckValidCredsResponse> checkValid
686642

687643
@Override
688644
public final void close() {
689-
shutdown();
645+
try {
646+
backgroundResources.close();
647+
} catch (RuntimeException e) {
648+
throw e;
649+
} catch (Exception e) {
650+
throw new IllegalStateException("Failed to close resource", e);
651+
}
690652
}
691653

692654
@Override

0 commit comments

Comments
 (0)