Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Remove 'x-goog-request-params' header from GRPC requests due to incorrect format. #1358

Merged
merged 4 commits into from Jul 19, 2023
Merged

fix: Remove 'x-goog-request-params' header from GRPC requests due to incorrect format. #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54f0716
Work around
tom-andersen Jul 18, 2023
9261f36
Remove `x-goog-request-params`
tom-andersen Jul 19, 2023
15e6eff
Lint
tom-andersen Jul 19, 2023
f53c911
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Expand Up @@ -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'
```
Expand Down
99 changes: 0 additions & 99 deletions ...e-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreStub.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -298,169 +297,71 @@ protected GrpcFirestoreStub(
GrpcCallSettings<GetDocumentRequest, Document> getDocumentTransportSettings =
GrpcCallSettings.<GetDocumentRequest, Document>newBuilder()
.setMethodDescriptor(getDocumentMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("name", String.valueOf(request.getName()));
return params.build();
})
.build();
GrpcCallSettings<ListDocumentsRequest, ListDocumentsResponse> listDocumentsTransportSettings =
GrpcCallSettings.<ListDocumentsRequest, ListDocumentsResponse>newBuilder()
.setMethodDescriptor(listDocumentsMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("collection_id", String.valueOf(request.getCollectionId()));
params.put("parent", String.valueOf(request.getParent()));
return params.build();
})
.build();
GrpcCallSettings<UpdateDocumentRequest, Document> updateDocumentTransportSettings =
GrpcCallSettings.<UpdateDocumentRequest, Document>newBuilder()
.setMethodDescriptor(updateDocumentMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("document.name", String.valueOf(request.getDocument().getName()));
return params.build();
})
.build();
GrpcCallSettings<DeleteDocumentRequest, Empty> deleteDocumentTransportSettings =
GrpcCallSettings.<DeleteDocumentRequest, Empty>newBuilder()
.setMethodDescriptor(deleteDocumentMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("name", String.valueOf(request.getName()));
return params.build();
})
.build();
GrpcCallSettings<BatchGetDocumentsRequest, BatchGetDocumentsResponse>
batchGetDocumentsTransportSettings =
GrpcCallSettings.<BatchGetDocumentsRequest, BatchGetDocumentsResponse>newBuilder()
.setMethodDescriptor(batchGetDocumentsMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("database", String.valueOf(request.getDatabase()));
return params.build();
})
.build();
GrpcCallSettings<BeginTransactionRequest, BeginTransactionResponse>
beginTransactionTransportSettings =
GrpcCallSettings.<BeginTransactionRequest, BeginTransactionResponse>newBuilder()
.setMethodDescriptor(beginTransactionMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("database", String.valueOf(request.getDatabase()));
return params.build();
})
.build();
GrpcCallSettings<CommitRequest, CommitResponse> commitTransportSettings =
GrpcCallSettings.<CommitRequest, CommitResponse>newBuilder()
.setMethodDescriptor(commitMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("database", String.valueOf(request.getDatabase()));
return params.build();
})
.build();
GrpcCallSettings<RollbackRequest, Empty> rollbackTransportSettings =
GrpcCallSettings.<RollbackRequest, Empty>newBuilder()
.setMethodDescriptor(rollbackMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("database", String.valueOf(request.getDatabase()));
return params.build();
})
.build();
GrpcCallSettings<RunQueryRequest, RunQueryResponse> runQueryTransportSettings =
GrpcCallSettings.<RunQueryRequest, RunQueryResponse>newBuilder()
.setMethodDescriptor(runQueryMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("parent", String.valueOf(request.getParent()));
return params.build();
})
.build();
GrpcCallSettings<RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQueryTransportSettings =
GrpcCallSettings.<RunAggregationQueryRequest, RunAggregationQueryResponse>newBuilder()
.setMethodDescriptor(runAggregationQueryMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("parent", String.valueOf(request.getParent()));
return params.build();
})
.build();
GrpcCallSettings<PartitionQueryRequest, PartitionQueryResponse>
partitionQueryTransportSettings =
GrpcCallSettings.<PartitionQueryRequest, PartitionQueryResponse>newBuilder()
.setMethodDescriptor(partitionQueryMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("parent", String.valueOf(request.getParent()));
return params.build();
})
.build();
GrpcCallSettings<WriteRequest, WriteResponse> writeTransportSettings =
GrpcCallSettings.<WriteRequest, WriteResponse>newBuilder()
.setMethodDescriptor(writeMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("database", String.valueOf(request.getDatabase()));
return params.build();
})
.build();
GrpcCallSettings<ListenRequest, ListenResponse> listenTransportSettings =
GrpcCallSettings.<ListenRequest, ListenResponse>newBuilder()
.setMethodDescriptor(listenMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("database", String.valueOf(request.getDatabase()));
return params.build();
})
.build();
GrpcCallSettings<ListCollectionIdsRequest, ListCollectionIdsResponse>
listCollectionIdsTransportSettings =
GrpcCallSettings.<ListCollectionIdsRequest, ListCollectionIdsResponse>newBuilder()
.setMethodDescriptor(listCollectionIdsMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("parent", String.valueOf(request.getParent()));
return params.build();
})
.build();
GrpcCallSettings<BatchWriteRequest, BatchWriteResponse> batchWriteTransportSettings =
GrpcCallSettings.<BatchWriteRequest, BatchWriteResponse>newBuilder()
.setMethodDescriptor(batchWriteMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("database", String.valueOf(request.getDatabase()));
return params.build();
})
.build();
GrpcCallSettings<CreateDocumentRequest, Document> createDocumentTransportSettings =
GrpcCallSettings.<CreateDocumentRequest, Document>newBuilder()
.setMethodDescriptor(createDocumentMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("collection_id", String.valueOf(request.getCollectionId()));
params.put("parent", String.valueOf(request.getParent()));
return params.build();
})
.build();

this.getDocumentCallable =
Expand Down