Skip to content

Commit

Permalink
fix: Remove 'x-goog-request-params' header from GRPC requests due to …
Browse files Browse the repository at this point in the history 
…incorrect format. (#1358)

* Work around

* Remove `x-goog-request-params`

* Lint

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
@tom-andersen @gcf-owl-bot
tom-andersen and gcf-owl-bot[bot] committed Jul 19, 2023
1 parent 23d9b2c commit 1a1bf5f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 100 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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

0 comments on commit 1a1bf5f

Please sign in to comment.