Skip to content

Commit 0d5b378

Browse files
yoshi-automationyoshi-automation
authored
feat!: update gapic generator to 2.0.0, java 8 features (#719)
* 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 e4f985e commit 0d5b378

File tree

9 files changed

+124
-223
lines changed

9 files changed

+124
-223
lines changed

‎google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java‎

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

1717
package com.google.cloud.firestore.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;
@@ -1395,14 +1394,7 @@ public static ApiFuture<ListIndexesPagedResponse> createAsync(
13951394
ApiFuture<ListIndexesPage> futurePage =
13961395
ListIndexesPage.createEmptyPage().createPageAsync(context, futureResponse);
13971396
return ApiFutures.transform(
1398-
futurePage,
1399-
new ApiFunction<ListIndexesPage, ListIndexesPagedResponse>() {
1400-
@Override
1401-
public ListIndexesPagedResponse apply(ListIndexesPage input) {
1402-
return new ListIndexesPagedResponse(input);
1403-
}
1404-
},
1405-
MoreExecutors.directExecutor());
1397+
futurePage, input -> new ListIndexesPagedResponse(input), MoreExecutors.directExecutor());
14061398
}
14071399

14081400
private ListIndexesPagedResponse(ListIndexesPage page) {
@@ -1475,14 +1467,7 @@ public static ApiFuture<ListFieldsPagedResponse> createAsync(
14751467
ApiFuture<ListFieldsPage> futurePage =
14761468
ListFieldsPage.createEmptyPage().createPageAsync(context, futureResponse);
14771469
return ApiFutures.transform(
1478-
futurePage,
1479-
new ApiFunction<ListFieldsPage, ListFieldsPagedResponse>() {
1480-
@Override
1481-
public ListFieldsPagedResponse apply(ListFieldsPage input) {
1482-
return new ListFieldsPagedResponse(input);
1483-
}
1484-
},
1485-
MoreExecutors.directExecutor());
1470+
futurePage, input -> new ListFieldsPagedResponse(input), MoreExecutors.directExecutor());
14861471
}
14871472

14881473
private ListFieldsPagedResponse(ListFieldsPage page) {

‎google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,13 @@ public FirestoreAdminStubSettings.Builder getStubSettingsBuilder() {
248248
return ((FirestoreAdminStubSettings.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-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,14 +697,13 @@ private static Builder initDefaults(Builder builder) {
697697
return builder;
698698
}
699699

700-
// NEXT_MAJOR_VER: remove 'throws Exception'.
701700
/**
702701
* Applies the given settings updater function to all of the unary API methods in this service.
703702
*
704703
* <p>Note: This method does not support applying settings to streaming methods.
705704
*/
706705
public Builder applyToAllUnaryMethods(
707-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
706+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
708707
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
709708
return this;
710709
}

‎google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java‎

Lines changed: 43 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2626
import com.google.api.gax.rpc.ClientContext;
2727
import com.google.api.gax.rpc.OperationCallable;
28-
import com.google.api.gax.rpc.RequestParamsExtractor;
2928
import com.google.api.gax.rpc.UnaryCallable;
3029
import com.google.common.collect.ImmutableMap;
3130
import com.google.firestore.admin.v1.CreateIndexRequest;
@@ -52,7 +51,6 @@
5251
import io.grpc.MethodDescriptor;
5352
import io.grpc.protobuf.ProtoUtils;
5453
import java.io.IOException;
55-
import java.util.Map;
5654
import java.util.concurrent.TimeUnit;
5755
import javax.annotation.Generated;
5856

@@ -213,117 +211,90 @@ protected GrpcFirestoreAdminStub(
213211
GrpcCallSettings.<CreateIndexRequest, Operation>newBuilder()
214212
.setMethodDescriptor(createIndexMethodDescriptor)
215213
.setParamsExtractor(
216-
new RequestParamsExtractor<CreateIndexRequest>() {
217-
@Override
218-
public Map<String, String> extract(CreateIndexRequest request) {
219-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
220-
params.put("parent", String.valueOf(request.getParent()));
221-
return params.build();
222-
}
214+
request -> {
215+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
216+
params.put("parent", String.valueOf(request.getParent()));
217+
return params.build();
223218
})
224219
.build();
225220
GrpcCallSettings<ListIndexesRequest, ListIndexesResponse> listIndexesTransportSettings =
226221
GrpcCallSettings.<ListIndexesRequest, ListIndexesResponse>newBuilder()
227222
.setMethodDescriptor(listIndexesMethodDescriptor)
228223
.setParamsExtractor(
229-
new RequestParamsExtractor<ListIndexesRequest>() {
230-
@Override
231-
public Map<String, String> extract(ListIndexesRequest request) {
232-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
233-
params.put("parent", String.valueOf(request.getParent()));
234-
return params.build();
235-
}
224+
request -> {
225+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
226+
params.put("parent", String.valueOf(request.getParent()));
227+
return params.build();
236228
})
237229
.build();
238230
GrpcCallSettings<GetIndexRequest, Index> getIndexTransportSettings =
239231
GrpcCallSettings.<GetIndexRequest, Index>newBuilder()
240232
.setMethodDescriptor(getIndexMethodDescriptor)
241233
.setParamsExtractor(
242-
new RequestParamsExtractor<GetIndexRequest>() {
243-
@Override
244-
public Map<String, String> extract(GetIndexRequest request) {
245-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
246-
params.put("name", String.valueOf(request.getName()));
247-
return params.build();
248-
}
234+
request -> {
235+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
236+
params.put("name", String.valueOf(request.getName()));
237+
return params.build();
249238
})
250239
.build();
251240
GrpcCallSettings<DeleteIndexRequest, Empty> deleteIndexTransportSettings =
252241
GrpcCallSettings.<DeleteIndexRequest, Empty>newBuilder()
253242
.setMethodDescriptor(deleteIndexMethodDescriptor)
254243
.setParamsExtractor(
255-
new RequestParamsExtractor<DeleteIndexRequest>() {
256-
@Override
257-
public Map<String, String> extract(DeleteIndexRequest request) {
258-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
259-
params.put("name", String.valueOf(request.getName()));
260-
return params.build();
261-
}
244+
request -> {
245+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
246+
params.put("name", String.valueOf(request.getName()));
247+
return params.build();
262248
})
263249
.build();
264250
GrpcCallSettings<GetFieldRequest, Field> getFieldTransportSettings =
265251
GrpcCallSettings.<GetFieldRequest, Field>newBuilder()
266252
.setMethodDescriptor(getFieldMethodDescriptor)
267253
.setParamsExtractor(
268-
new RequestParamsExtractor<GetFieldRequest>() {
269-
@Override
270-
public Map<String, String> extract(GetFieldRequest request) {
271-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
272-
params.put("name", String.valueOf(request.getName()));
273-
return params.build();
274-
}
254+
request -> {
255+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
256+
params.put("name", String.valueOf(request.getName()));
257+
return params.build();
275258
})
276259
.build();
277260
GrpcCallSettings<UpdateFieldRequest, Operation> updateFieldTransportSettings =
278261
GrpcCallSettings.<UpdateFieldRequest, Operation>newBuilder()
279262
.setMethodDescriptor(updateFieldMethodDescriptor)
280263
.setParamsExtractor(
281-
new RequestParamsExtractor<UpdateFieldRequest>() {
282-
@Override
283-
public Map<String, String> extract(UpdateFieldRequest request) {
284-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
285-
params.put("field.name", String.valueOf(request.getField().getName()));
286-
return params.build();
287-
}
264+
request -> {
265+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
266+
params.put("field.name", String.valueOf(request.getField().getName()));
267+
return params.build();
288268
})
289269
.build();
290270
GrpcCallSettings<ListFieldsRequest, ListFieldsResponse> listFieldsTransportSettings =
291271
GrpcCallSettings.<ListFieldsRequest, ListFieldsResponse>newBuilder()
292272
.setMethodDescriptor(listFieldsMethodDescriptor)
293273
.setParamsExtractor(
294-
new RequestParamsExtractor<ListFieldsRequest>() {
295-
@Override
296-
public Map<String, String> extract(ListFieldsRequest request) {
297-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
298-
params.put("parent", String.valueOf(request.getParent()));
299-
return params.build();
300-
}
274+
request -> {
275+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
276+
params.put("parent", String.valueOf(request.getParent()));
277+
return params.build();
301278
})
302279
.build();
303280
GrpcCallSettings<ExportDocumentsRequest, Operation> exportDocumentsTransportSettings =
304281
GrpcCallSettings.<ExportDocumentsRequest, Operation>newBuilder()
305282
.setMethodDescriptor(exportDocumentsMethodDescriptor)
306283
.setParamsExtractor(
307-
new RequestParamsExtractor<ExportDocumentsRequest>() {
308-
@Override
309-
public Map<String, String> extract(ExportDocumentsRequest request) {
310-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
311-
params.put("name", String.valueOf(request.getName()));
312-
return params.build();
313-
}
284+
request -> {
285+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
286+
params.put("name", String.valueOf(request.getName()));
287+
return params.build();
314288
})
315289
.build();
316290
GrpcCallSettings<ImportDocumentsRequest, Operation> importDocumentsTransportSettings =
317291
GrpcCallSettings.<ImportDocumentsRequest, Operation>newBuilder()
318292
.setMethodDescriptor(importDocumentsMethodDescriptor)
319293
.setParamsExtractor(
320-
new RequestParamsExtractor<ImportDocumentsRequest>() {
321-
@Override
322-
public Map<String, String> extract(ImportDocumentsRequest request) {
323-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
324-
params.put("name", String.valueOf(request.getName()));
325-
return params.build();
326-
}
294+
request -> {
295+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
296+
params.put("name", String.valueOf(request.getName()));
297+
return params.build();
327298
})
328299
.build();
329300

@@ -474,7 +445,13 @@ public UnaryCallable<ImportDocumentsRequest, Operation> importDocumentsCallable(
474445

475446
@Override
476447
public final void close() {
477-
shutdown();
448+
try {
449+
backgroundResources.close();
450+
} catch (RuntimeException e) {
451+
throw e;
452+
} catch (Exception e) {
453+
throw new IllegalStateException("Failed to close resource", e);
454+
}
478455
}
479456

480457
@Override

‎google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java‎

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

1717
package com.google.cloud.firestore.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;
@@ -1183,12 +1182,7 @@ public static ApiFuture<ListDocumentsPagedResponse> createAsync(
11831182
ListDocumentsPage.createEmptyPage().createPageAsync(context, futureResponse);
11841183
return ApiFutures.transform(
11851184
futurePage,
1186-
new ApiFunction<ListDocumentsPage, ListDocumentsPagedResponse>() {
1187-
@Override
1188-
public ListDocumentsPagedResponse apply(ListDocumentsPage input) {
1189-
return new ListDocumentsPagedResponse(input);
1190-
}
1191-
},
1185+
input -> new ListDocumentsPagedResponse(input),
11921186
MoreExecutors.directExecutor());
11931187
}
11941188

@@ -1264,12 +1258,7 @@ public static ApiFuture<PartitionQueryPagedResponse> createAsync(
12641258
PartitionQueryPage.createEmptyPage().createPageAsync(context, futureResponse);
12651259
return ApiFutures.transform(
12661260
futurePage,
1267-
new ApiFunction<PartitionQueryPage, PartitionQueryPagedResponse>() {
1268-
@Override
1269-
public PartitionQueryPagedResponse apply(PartitionQueryPage input) {
1270-
return new PartitionQueryPagedResponse(input);
1271-
}
1272-
},
1261+
input -> new PartitionQueryPagedResponse(input),
12731262
MoreExecutors.directExecutor());
12741263
}
12751264

@@ -1345,12 +1334,7 @@ public static ApiFuture<ListCollectionIdsPagedResponse> createAsync(
13451334
ListCollectionIdsPage.createEmptyPage().createPageAsync(context, futureResponse);
13461335
return ApiFutures.transform(
13471336
futurePage,
1348-
new ApiFunction<ListCollectionIdsPage, ListCollectionIdsPagedResponse>() {
1349-
@Override
1350-
public ListCollectionIdsPagedResponse apply(ListCollectionIdsPage input) {
1351-
return new ListCollectionIdsPagedResponse(input);
1352-
}
1353-
},
1337+
input -> new ListCollectionIdsPagedResponse(input),
13541338
MoreExecutors.directExecutor());
13551339
}
13561340

‎google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,13 @@ public FirestoreStubSettings.Builder getStubSettingsBuilder() {
265265
return ((FirestoreStubSettings.Builder) getStubSettings());
266266
}
267267

268-
// NEXT_MAJOR_VER: remove 'throws Exception'.
269268
/**
270269
* Applies the given settings updater function to all of the unary API methods in this service.
271270
*
272271
* <p>Note: This method does not support applying settings to streaming methods.
273272
*/
274273
public Builder applyToAllUnaryMethods(
275-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
274+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
276275
super.applyToAllUnaryMethods(
277276
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
278277
return this;

‎google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,14 +784,13 @@ private static Builder initDefaults(Builder builder) {
784784
return builder;
785785
}
786786

787-
// NEXT_MAJOR_VER: remove 'throws Exception'.
788787
/**
789788
* Applies the given settings updater function to all of the unary API methods in this service.
790789
*
791790
* <p>Note: This method does not support applying settings to streaming methods.
792791
*/
793792
public Builder applyToAllUnaryMethods(
794-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
793+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
795794
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
796795
return this;
797796
}

0 commit comments

Comments
 (0)