Skip to content

Commit

Permalink
Merge branch 'main' into mila/multiple-inequality
Browse files Browse the repository at this point in the history
  • Loading branch information
@milaGGL
milaGGL authored Sep 13, 2023
2 parents 906c139 + 0eadae0 commit 035bca5
Show file tree
Hide file tree
Showing 21 changed files with 267 additions and 46 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## [3.14.3](https://github.com/googleapis/java-firestore/compare/v3.14.2...v3.14.3) (2023-09-12)


### Bug Fixes

* Add reflections configs for generated firestore classes ([#1419](https://github.com/googleapis/java-firestore/issues/1419)) ([1c5e09f](https://github.com/googleapis/java-firestore/commit/1c5e09f08f3e8d57152fa7f0fae52ef2cea8331b))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.15.0 ([#1417](https://github.com/googleapis/java-firestore/issues/1417)) ([3626776](https://github.com/googleapis/java-firestore/commit/3626776483d005ba5d07046eebe25b9c6b39242e))

## [3.14.2](https://github.com/googleapis/java-firestore/compare/v3.14.1...v3.14.2) (2023-09-07)


Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore</artifactId>
<version>3.14.1</version>
<version>3.14.2</version>
</dependency>

```
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-firestore-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-firestore-admin</artifactId>
<version>3.14.2</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
<packaging>jar</packaging>
<name>Google Cloud Firestore Admin Client</name>
<url>https://github.com/googleapis/java-firestore</url>
Expand All @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>3.14.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
16 changes: 8 additions & 8 deletions google-cloud-firestore-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-bom</artifactId>
<version>3.14.2</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
<packaging>pom</packaging>
<parent>
<groupId>com.google.cloud</groupId>
Expand Down Expand Up @@ -52,37 +52,37 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore</artifactId>
<version>3.14.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-admin</artifactId>
<version>3.14.2</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
<version>3.14.2</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-v1</artifactId>
<version>3.14.2</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
<version>3.14.2</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-v1</artifactId>
<version>3.14.2</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
<version>3.14.2</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-firestore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-firestore</artifactId>
<version>3.14.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<packaging>jar</packaging>
<name>Google Cloud Firestore</name>
<url>https://github.com/googleapis/java-firestore</url>
Expand All @@ -12,7 +12,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>3.14.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.14.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-firestore</site.installationModule>
Expand Down
99 changes: 99 additions & 0 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 @@ -26,6 +26,7 @@
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.RequestParamsBuilder;
import com.google.api.gax.rpc.ServerStreamingCallable;
import com.google.api.gax.rpc.UnaryCallable;
import com.google.firestore.v1.BatchGetDocumentsRequest;
Expand Down Expand Up @@ -297,71 +298,169 @@ protected GrpcFirestoreStub(
GrpcCallSettings<GetDocumentRequest, Document> getDocumentTransportSettings =
GrpcCallSettings.<GetDocumentRequest, Document>newBuilder()
.setMethodDescriptor(getDocumentMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("name", String.valueOf(request.getName()));
return builder.build();
})
.build();
GrpcCallSettings<ListDocumentsRequest, ListDocumentsResponse> listDocumentsTransportSettings =
GrpcCallSettings.<ListDocumentsRequest, ListDocumentsResponse>newBuilder()
.setMethodDescriptor(listDocumentsMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("collection_id", String.valueOf(request.getCollectionId()));
builder.add("parent", String.valueOf(request.getParent()));
return builder.build();
})
.build();
GrpcCallSettings<UpdateDocumentRequest, Document> updateDocumentTransportSettings =
GrpcCallSettings.<UpdateDocumentRequest, Document>newBuilder()
.setMethodDescriptor(updateDocumentMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("document.name", String.valueOf(request.getDocument().getName()));
return builder.build();
})
.build();
GrpcCallSettings<DeleteDocumentRequest, Empty> deleteDocumentTransportSettings =
GrpcCallSettings.<DeleteDocumentRequest, Empty>newBuilder()
.setMethodDescriptor(deleteDocumentMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("name", String.valueOf(request.getName()));
return builder.build();
})
.build();
GrpcCallSettings<BatchGetDocumentsRequest, BatchGetDocumentsResponse>
batchGetDocumentsTransportSettings =
GrpcCallSettings.<BatchGetDocumentsRequest, BatchGetDocumentsResponse>newBuilder()
.setMethodDescriptor(batchGetDocumentsMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("database", String.valueOf(request.getDatabase()));
return builder.build();
})
.build();
GrpcCallSettings<BeginTransactionRequest, BeginTransactionResponse>
beginTransactionTransportSettings =
GrpcCallSettings.<BeginTransactionRequest, BeginTransactionResponse>newBuilder()
.setMethodDescriptor(beginTransactionMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("database", String.valueOf(request.getDatabase()));
return builder.build();
})
.build();
GrpcCallSettings<CommitRequest, CommitResponse> commitTransportSettings =
GrpcCallSettings.<CommitRequest, CommitResponse>newBuilder()
.setMethodDescriptor(commitMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("database", String.valueOf(request.getDatabase()));
return builder.build();
})
.build();
GrpcCallSettings<RollbackRequest, Empty> rollbackTransportSettings =
GrpcCallSettings.<RollbackRequest, Empty>newBuilder()
.setMethodDescriptor(rollbackMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("database", String.valueOf(request.getDatabase()));
return builder.build();
})
.build();
GrpcCallSettings<RunQueryRequest, RunQueryResponse> runQueryTransportSettings =
GrpcCallSettings.<RunQueryRequest, RunQueryResponse>newBuilder()
.setMethodDescriptor(runQueryMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("parent", String.valueOf(request.getParent()));
return builder.build();
})
.build();
GrpcCallSettings<RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQueryTransportSettings =
GrpcCallSettings.<RunAggregationQueryRequest, RunAggregationQueryResponse>newBuilder()
.setMethodDescriptor(runAggregationQueryMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("parent", String.valueOf(request.getParent()));
return builder.build();
})
.build();
GrpcCallSettings<PartitionQueryRequest, PartitionQueryResponse>
partitionQueryTransportSettings =
GrpcCallSettings.<PartitionQueryRequest, PartitionQueryResponse>newBuilder()
.setMethodDescriptor(partitionQueryMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("parent", String.valueOf(request.getParent()));
return builder.build();
})
.build();
GrpcCallSettings<WriteRequest, WriteResponse> writeTransportSettings =
GrpcCallSettings.<WriteRequest, WriteResponse>newBuilder()
.setMethodDescriptor(writeMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("database", String.valueOf(request.getDatabase()));
return builder.build();
})
.build();
GrpcCallSettings<ListenRequest, ListenResponse> listenTransportSettings =
GrpcCallSettings.<ListenRequest, ListenResponse>newBuilder()
.setMethodDescriptor(listenMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("database", String.valueOf(request.getDatabase()));
return builder.build();
})
.build();
GrpcCallSettings<ListCollectionIdsRequest, ListCollectionIdsResponse>
listCollectionIdsTransportSettings =
GrpcCallSettings.<ListCollectionIdsRequest, ListCollectionIdsResponse>newBuilder()
.setMethodDescriptor(listCollectionIdsMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("parent", String.valueOf(request.getParent()));
return builder.build();
})
.build();
GrpcCallSettings<BatchWriteRequest, BatchWriteResponse> batchWriteTransportSettings =
GrpcCallSettings.<BatchWriteRequest, BatchWriteResponse>newBuilder()
.setMethodDescriptor(batchWriteMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("database", String.valueOf(request.getDatabase()));
return builder.build();
})
.build();
GrpcCallSettings<CreateDocumentRequest, Document> createDocumentTransportSettings =
GrpcCallSettings.<CreateDocumentRequest, Document>newBuilder()
.setMethodDescriptor(createDocumentMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add("collection_id", String.valueOf(request.getCollectionId()));
builder.add("parent", String.valueOf(request.getParent()));
return builder.build();
})
.build();

this.getDocumentCallable =
Expand Down
Loading

0 comments on commit 035bca5

Please sign in to comment.