diff --git a/README.md b/README.md index 34ecfb675..c6caa0b6b 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.18.0') +implementation platform('com.google.cloud:libraries-bom:26.19.0') implementation 'com.google.cloud:google-cloud-firestore' ``` 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 28ec996d8..ea202cc22 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 @@ -28,7 +28,6 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; -import com.google.common.collect.ImmutableMap; import com.google.firestore.v1.BatchGetDocumentsRequest; import com.google.firestore.v1.BatchGetDocumentsResponse; import com.google.firestore.v1.BatchWriteRequest; @@ -298,169 +297,71 @@ protected GrpcFirestoreStub( GrpcCallSettings getDocumentTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getDocumentMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - }) .build(); GrpcCallSettings listDocumentsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listDocumentsMethodDescriptor) - .setParamsExtractor( - 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( - 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( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - }) .build(); GrpcCallSettings batchGetDocumentsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(batchGetDocumentsMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - }) .build(); GrpcCallSettings beginTransactionTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(beginTransactionMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - }) .build(); GrpcCallSettings commitTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(commitMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - }) .build(); GrpcCallSettings rollbackTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(rollbackMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - }) .build(); GrpcCallSettings runQueryTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(runQueryMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - }) .build(); GrpcCallSettings runAggregationQueryTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(runAggregationQueryMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - }) .build(); GrpcCallSettings partitionQueryTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(partitionQueryMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - }) .build(); GrpcCallSettings writeTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(writeMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - }) .build(); GrpcCallSettings listenTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listenMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - }) .build(); GrpcCallSettings listCollectionIdsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listCollectionIdsMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - }) .build(); GrpcCallSettings batchWriteTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(batchWriteMethodDescriptor) - .setParamsExtractor( - request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("database", String.valueOf(request.getDatabase())); - return params.build(); - }) .build(); GrpcCallSettings createDocumentTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createDocumentMethodDescriptor) - .setParamsExtractor( - 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(); this.getDocumentCallable =