From 0d5b378075f3723126c8809f4afcc8fc9f81d611 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 9 Aug 2021 11:05:22 -0700 Subject: [PATCH] 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 Source-Date: Tue Aug 3 11:12:29 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: bb0a090d9204110042ab5dee2ce9e06e8071ce54 Source-Link: https://github.com/googleapis/googleapis/commit/bb0a090d9204110042ab5dee2ce9e06e8071ce54 * feat!: release gapic-generator-java v2.0.0 Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Author: Google APIs Source-Date: Tue Aug 3 13:48:38 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: d9eaf41de44d953458b18712a3f240bb4c564e48 Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48 --- .../firestore/v1/FirestoreAdminClient.java | 19 +- .../firestore/v1/FirestoreAdminSettings.java | 3 +- .../v1/stub/FirestoreAdminStubSettings.java | 3 +- .../v1/stub/GrpcFirestoreAdminStub.java | 109 +++++------ .../cloud/firestore/v1/FirestoreClient.java | 22 +-- .../cloud/firestore/v1/FirestoreSettings.java | 3 +- .../v1/stub/FirestoreStubSettings.java | 3 +- .../firestore/v1/stub/GrpcFirestoreStub.java | 179 +++++++----------- synth.metadata | 6 +- 9 files changed, 124 insertions(+), 223 deletions(-) diff --git a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java index dbfa3a2a3..f6c967d4d 100644 --- a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java +++ b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java @@ -16,7 +16,6 @@ package com.google.cloud.firestore.v1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -1395,14 +1394,7 @@ public static ApiFuture createAsync( ApiFuture futurePage = ListIndexesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( - futurePage, - new ApiFunction() { - @Override - public ListIndexesPagedResponse apply(ListIndexesPage input) { - return new ListIndexesPagedResponse(input); - } - }, - MoreExecutors.directExecutor()); + futurePage, input -> new ListIndexesPagedResponse(input), MoreExecutors.directExecutor()); } private ListIndexesPagedResponse(ListIndexesPage page) { @@ -1475,14 +1467,7 @@ public static ApiFuture createAsync( ApiFuture futurePage = ListFieldsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( - futurePage, - new ApiFunction() { - @Override - public ListFieldsPagedResponse apply(ListFieldsPage input) { - return new ListFieldsPagedResponse(input); - } - }, - MoreExecutors.directExecutor()); + futurePage, input -> new ListFieldsPagedResponse(input), MoreExecutors.directExecutor()); } private ListFieldsPagedResponse(ListFieldsPage page) { diff --git a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java index 3a101473c..02e38e570 100644 --- a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java +++ b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java @@ -248,14 +248,13 @@ public FirestoreAdminStubSettings.Builder getStubSettingsBuilder() { return ((FirestoreAdminStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java index c2bbfcb97..306d80d5d 100644 --- a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java +++ b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java @@ -697,14 +697,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java index b8c6919c0..61490bce1 100644 --- a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java +++ b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java @@ -25,7 +25,6 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.common.collect.ImmutableMap; import com.google.firestore.admin.v1.CreateIndexRequest; @@ -52,7 +51,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -213,117 +211,90 @@ protected GrpcFirestoreAdminStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createIndexMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateIndexRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings listIndexesTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listIndexesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListIndexesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getIndexTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getIndexMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetIndexRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings deleteIndexTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteIndexMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteIndexRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings getFieldTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getFieldMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetFieldRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateFieldTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateFieldMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateFieldRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("field.name", String.valueOf(request.getField().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("field.name", String.valueOf(request.getField().getName())); + return params.build(); }) .build(); GrpcCallSettings listFieldsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listFieldsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFieldsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings exportDocumentsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(exportDocumentsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ExportDocumentsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings importDocumentsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(importDocumentsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ImportDocumentsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); @@ -474,7 +445,13 @@ public UnaryCallable importDocumentsCallable( @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java index c0abfa15d..84fb31a21 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java @@ -16,7 +16,6 @@ package com.google.cloud.firestore.v1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -1183,12 +1182,7 @@ public static ApiFuture createAsync( ListDocumentsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListDocumentsPagedResponse apply(ListDocumentsPage input) { - return new ListDocumentsPagedResponse(input); - } - }, + input -> new ListDocumentsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1264,12 +1258,7 @@ public static ApiFuture createAsync( PartitionQueryPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public PartitionQueryPagedResponse apply(PartitionQueryPage input) { - return new PartitionQueryPagedResponse(input); - } - }, + input -> new PartitionQueryPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1345,12 +1334,7 @@ public static ApiFuture createAsync( ListCollectionIdsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListCollectionIdsPagedResponse apply(ListCollectionIdsPage input) { - return new ListCollectionIdsPagedResponse(input); - } - }, + input -> new ListCollectionIdsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreSettings.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreSettings.java index fcbe1d60b..8a3aa2438 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreSettings.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreSettings.java @@ -265,14 +265,13 @@ public FirestoreStubSettings.Builder getStubSettingsBuilder() { return ((FirestoreStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java index d1fc98256..4b65e1da2 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java @@ -784,14 +784,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreStub.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreStub.java index a80ef708d..d145c4bfe 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreStub.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreStub.java @@ -26,7 +26,6 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.BidiStreamingCallable; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; import com.google.common.collect.ImmutableMap; @@ -61,7 +60,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -286,53 +284,41 @@ protected GrpcFirestoreStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(getDocumentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetDocumentRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings listDocumentsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listDocumentsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListDocumentsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("collection_id", String.valueOf(request.getCollectionId())); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("collection_id", String.valueOf(request.getCollectionId())); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings updateDocumentTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateDocumentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateDocumentRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("document.name", String.valueOf(request.getDocument().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("document.name", String.valueOf(request.getDocument().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteDocumentTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteDocumentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteDocumentRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -340,13 +326,10 @@ public Map extract(DeleteDocumentRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(batchGetDocumentsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchGetDocumentsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("database", String.valueOf(request.getDatabase())); + return params.build(); }) .build(); GrpcCallSettings @@ -354,52 +337,40 @@ public Map extract(BatchGetDocumentsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(beginTransactionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BeginTransactionRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("database", String.valueOf(request.getDatabase())); + return params.build(); }) .build(); GrpcCallSettings commitTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(commitMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CommitRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("database", String.valueOf(request.getDatabase())); + return params.build(); }) .build(); GrpcCallSettings rollbackTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(rollbackMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(RollbackRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("database", String.valueOf(request.getDatabase())); + return params.build(); }) .build(); GrpcCallSettings runQueryTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(runQueryMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(RunQueryRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -407,39 +378,30 @@ public Map extract(RunQueryRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(partitionQueryMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(PartitionQueryRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings writeTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(writeMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(WriteRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("database", String.valueOf(request.getDatabase())); + return params.build(); }) .build(); GrpcCallSettings listenTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listenMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListenRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("database", String.valueOf(request.getDatabase())); + return params.build(); }) .build(); GrpcCallSettings @@ -447,40 +409,31 @@ public Map extract(ListenRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listCollectionIdsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCollectionIdsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings batchWriteTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(batchWriteMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchWriteRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("database", String.valueOf(request.getDatabase())); + return params.build(); }) .build(); GrpcCallSettings createDocumentTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createDocumentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateDocumentRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("collection_id", String.valueOf(request.getCollectionId())); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("collection_id", String.valueOf(request.getCollectionId())); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); @@ -651,7 +604,13 @@ public UnaryCallable createDocumentCallable() { @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/synth.metadata b/synth.metadata index 78fbe692d..c0be14079 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-firestore.git", - "sha": "a35091eacf04b20be6b820cecab3d87319bf1760" + "sha": "a27dd9cb0e2681a15eae754c97255d0d8c86bcae" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, {