Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/hermetic_library_generation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
with:
fetch-depth: 0
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
- uses: googleapis/sdk-platform-java/.github/scripts@v2.64.1
- uses: googleapis/sdk-platform-java/.github/scripts@v2.64.2
if: env.SHOULD_RUN == 'true'
with:
base_ref: ${{ github.base_ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unmanaged-dependency-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
shell: bash
run: .kokoro/build.sh
- name: Unmanaged dependency check
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.1
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.2
with:
bom-path: google-cloud-firestore-bom/pom.xml
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-a.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-b.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-c.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current}
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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.71.0')
implementation platform('com.google.cloud:libraries-bom:26.72.0')

implementation 'com.google.cloud:google-cloud-firestore'
```
Expand Down
6 changes: 3 additions & 3 deletions generation_config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
gapic_generator_version: 2.64.1
googleapis_commitish: 5342712986262b93211b136eb4bd6fb79b3764af
libraries_bom_version: 26.71.0
gapic_generator_version: 2.64.2
googleapis_commitish: b32495a713a68dd0dff90cf0b24021debfca048a
libraries_bom_version: 26.72.0
libraries:
- api_shortname: firestore
name_pretty: Cloud Firestore
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-firestore-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.54.1</version>
<version>3.54.2</version>
</parent>

<name>Google Cloud Firestore BOM</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
import com.google.firestore.v1.DeleteDocumentRequest;
import com.google.firestore.v1.Document;
import com.google.firestore.v1.DocumentMask;
import com.google.firestore.v1.ExecutePipelineRequest;
import com.google.firestore.v1.ExecutePipelineResponse;
import com.google.firestore.v1.GetDocumentRequest;
import com.google.firestore.v1.ListCollectionIdsRequest;
import com.google.firestore.v1.ListCollectionIdsResponse;
Expand Down Expand Up @@ -247,6 +249,16 @@
* </td>
* </tr>
* <tr>
* <td><p> ExecutePipeline</td>
* <td><p> Executes a pipeline query.</td>
* <td>
* <p>Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.</p>
* <ul>
* <li><p> executePipelineCallable()
* </ul>
* </td>
* </tr>
* <tr>
* <td><p> RunAggregationQuery</td>
* <td><p> Runs an aggregation query.
* <p> Rather than producing [Document][google.firestore.v1.Document] results like [Firestore.RunQuery][google.firestore.v1.Firestore.RunQuery], this API allows running an aggregation to produce a series of [AggregationResult][google.firestore.v1.AggregationResult] server-side.
Expand Down Expand Up @@ -1123,6 +1135,34 @@ public final ServerStreamingCallable<RunQueryRequest, RunQueryResponse> runQuery
return stub.runQueryCallable();
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Executes a pipeline query.
*
* <p>Sample code:
*
* <pre>{@code
* // This snippet has been automatically generated and should be regarded as a code template only.
* // It will require modifications to work:
* // - It may require correct/in-range values for request initialization.
* // - It may require specifying regional endpoints when creating the service client as shown in
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
* try (FirestoreClient firestoreClient = FirestoreClient.create()) {
* ExecutePipelineRequest request =
* ExecutePipelineRequest.newBuilder().setDatabase("database1789464955").build();
* ServerStream<ExecutePipelineResponse> stream =
* firestoreClient.executePipelineCallable().call(request);
* for (ExecutePipelineResponse response : stream) {
* // Do something when a response is received.
* }
* }
* }</pre>
*/
public final ServerStreamingCallable<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineCallable() {
return stub.executePipelineCallable();
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Runs an aggregation query.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
import com.google.firestore.v1.CreateDocumentRequest;
import com.google.firestore.v1.DeleteDocumentRequest;
import com.google.firestore.v1.Document;
import com.google.firestore.v1.ExecutePipelineRequest;
import com.google.firestore.v1.ExecutePipelineResponse;
import com.google.firestore.v1.GetDocumentRequest;
import com.google.firestore.v1.ListCollectionIdsRequest;
import com.google.firestore.v1.ListCollectionIdsResponse;
Expand Down Expand Up @@ -168,6 +170,12 @@ public ServerStreamingCallSettings<RunQueryRequest, RunQueryResponse> runQuerySe
return ((FirestoreStubSettings) getStubSettings()).runQuerySettings();
}

/** Returns the object with the settings used for calls to executePipeline. */
public ServerStreamingCallSettings<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineSettings() {
return ((FirestoreStubSettings) getStubSettings()).executePipelineSettings();
}

/** Returns the object with the settings used for calls to runAggregationQuery. */
public ServerStreamingCallSettings<RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQuerySettings() {
Expand Down Expand Up @@ -369,6 +377,12 @@ public UnaryCallSettings.Builder<RollbackRequest, Empty> rollbackSettings() {
return getStubSettingsBuilder().runQuerySettings();
}

/** Returns the builder for the settings used for calls to executePipeline. */
public ServerStreamingCallSettings.Builder<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineSettings() {
return getStubSettingsBuilder().executePipelineSettings();
}

/** Returns the builder for the settings used for calls to runAggregationQuery. */
public ServerStreamingCallSettings.Builder<
RunAggregationQueryRequest, RunAggregationQueryResponse>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
"DeleteDocument": {
"methods": ["deleteDocument", "deleteDocument", "deleteDocumentCallable"]
},
"ExecutePipeline": {
"methods": ["executePipelineCallable"]
},
"GetDocument": {
"methods": ["getDocument", "getDocumentCallable"]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import com.google.firestore.v1.CreateDocumentRequest;
import com.google.firestore.v1.DeleteDocumentRequest;
import com.google.firestore.v1.Document;
import com.google.firestore.v1.ExecutePipelineRequest;
import com.google.firestore.v1.ExecutePipelineResponse;
import com.google.firestore.v1.GetDocumentRequest;
import com.google.firestore.v1.ListCollectionIdsRequest;
import com.google.firestore.v1.ListCollectionIdsResponse;
Expand Down Expand Up @@ -107,6 +109,11 @@ public ServerStreamingCallable<RunQueryRequest, RunQueryResponse> runQueryCallab
throw new UnsupportedOperationException("Not implemented: runQueryCallable()");
}

public ServerStreamingCallable<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineCallable() {
throw new UnsupportedOperationException("Not implemented: executePipelineCallable()");
}

public ServerStreamingCallable<RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQueryCallable() {
throw new UnsupportedOperationException("Not implemented: runAggregationQueryCallable()");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
import com.google.firestore.v1.Cursor;
import com.google.firestore.v1.DeleteDocumentRequest;
import com.google.firestore.v1.Document;
import com.google.firestore.v1.ExecutePipelineRequest;
import com.google.firestore.v1.ExecutePipelineResponse;
import com.google.firestore.v1.GetDocumentRequest;
import com.google.firestore.v1.ListCollectionIdsRequest;
import com.google.firestore.v1.ListCollectionIdsResponse;
Expand Down Expand Up @@ -158,6 +160,8 @@ public class FirestoreStubSettings extends StubSettings<FirestoreStubSettings> {
private final UnaryCallSettings<CommitRequest, CommitResponse> commitSettings;
private final UnaryCallSettings<RollbackRequest, Empty> rollbackSettings;
private final ServerStreamingCallSettings<RunQueryRequest, RunQueryResponse> runQuerySettings;
private final ServerStreamingCallSettings<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineSettings;
private final ServerStreamingCallSettings<RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQuerySettings;
private final PagedCallSettings<
Expand Down Expand Up @@ -378,6 +382,12 @@ public ServerStreamingCallSettings<RunQueryRequest, RunQueryResponse> runQuerySe
return runQuerySettings;
}

/** Returns the object with the settings used for calls to executePipeline. */
public ServerStreamingCallSettings<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineSettings() {
return executePipelineSettings;
}

/** Returns the object with the settings used for calls to runAggregationQuery. */
public ServerStreamingCallSettings<RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQuerySettings() {
Expand Down Expand Up @@ -536,6 +546,7 @@ protected FirestoreStubSettings(Builder settingsBuilder) throws IOException {
commitSettings = settingsBuilder.commitSettings().build();
rollbackSettings = settingsBuilder.rollbackSettings().build();
runQuerySettings = settingsBuilder.runQuerySettings().build();
executePipelineSettings = settingsBuilder.executePipelineSettings().build();
runAggregationQuerySettings = settingsBuilder.runAggregationQuerySettings().build();
partitionQuerySettings = settingsBuilder.partitionQuerySettings().build();
writeSettings = settingsBuilder.writeSettings().build();
Expand Down Expand Up @@ -563,6 +574,9 @@ public static class Builder extends StubSettings.Builder<FirestoreStubSettings,
private final UnaryCallSettings.Builder<RollbackRequest, Empty> rollbackSettings;
private final ServerStreamingCallSettings.Builder<RunQueryRequest, RunQueryResponse>
runQuerySettings;
private final ServerStreamingCallSettings.Builder<
ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineSettings;
private final ServerStreamingCallSettings.Builder<
RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQuerySettings;
Expand Down Expand Up @@ -711,6 +725,7 @@ protected Builder(ClientContext clientContext) {
commitSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
rollbackSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
runQuerySettings = ServerStreamingCallSettings.newBuilder();
executePipelineSettings = ServerStreamingCallSettings.newBuilder();
runAggregationQuerySettings = ServerStreamingCallSettings.newBuilder();
partitionQuerySettings = PagedCallSettings.newBuilder(PARTITION_QUERY_PAGE_STR_FACT);
writeSettings = StreamingCallSettings.newBuilder();
Expand Down Expand Up @@ -747,6 +762,7 @@ protected Builder(FirestoreStubSettings settings) {
commitSettings = settings.commitSettings.toBuilder();
rollbackSettings = settings.rollbackSettings.toBuilder();
runQuerySettings = settings.runQuerySettings.toBuilder();
executePipelineSettings = settings.executePipelineSettings.toBuilder();
runAggregationQuerySettings = settings.runAggregationQuerySettings.toBuilder();
partitionQuerySettings = settings.partitionQuerySettings.toBuilder();
writeSettings = settings.writeSettings.toBuilder();
Expand Down Expand Up @@ -840,6 +856,11 @@ private static Builder initDefaults(Builder builder) {
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));

builder
.executePipelineSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));

builder
.runAggregationQuerySettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
Expand Down Expand Up @@ -933,6 +954,12 @@ public UnaryCallSettings.Builder<RollbackRequest, Empty> rollbackSettings() {
return runQuerySettings;
}

/** Returns the builder for the settings used for calls to executePipeline. */
public ServerStreamingCallSettings.Builder<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineSettings() {
return executePipelineSettings;
}

/** Returns the builder for the settings used for calls to runAggregationQuery. */
public ServerStreamingCallSettings.Builder<
RunAggregationQueryRequest, RunAggregationQueryResponse>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.google.api.gax.rpc.RequestParamsBuilder;
import com.google.api.gax.rpc.ServerStreamingCallable;
import com.google.api.gax.rpc.UnaryCallable;
import com.google.api.pathtemplate.PathTemplate;
import com.google.firestore.v1.BatchGetDocumentsRequest;
import com.google.firestore.v1.BatchGetDocumentsResponse;
import com.google.firestore.v1.BatchWriteRequest;
Expand All @@ -40,6 +41,8 @@
import com.google.firestore.v1.CreateDocumentRequest;
import com.google.firestore.v1.DeleteDocumentRequest;
import com.google.firestore.v1.Document;
import com.google.firestore.v1.ExecutePipelineRequest;
import com.google.firestore.v1.ExecutePipelineResponse;
import com.google.firestore.v1.GetDocumentRequest;
import com.google.firestore.v1.ListCollectionIdsRequest;
import com.google.firestore.v1.ListCollectionIdsResponse;
Expand Down Expand Up @@ -168,6 +171,18 @@ public class GrpcFirestoreStub extends FirestoreStub {
.setSampledToLocalTracing(true)
.build();

private static final MethodDescriptor<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineMethodDescriptor =
MethodDescriptor.<ExecutePipelineRequest, ExecutePipelineResponse>newBuilder()
.setType(MethodDescriptor.MethodType.SERVER_STREAMING)
.setFullMethodName("google.firestore.v1.Firestore/ExecutePipeline")
.setRequestMarshaller(
ProtoUtils.marshaller(ExecutePipelineRequest.getDefaultInstance()))
.setResponseMarshaller(
ProtoUtils.marshaller(ExecutePipelineResponse.getDefaultInstance()))
.setSampledToLocalTracing(true)
.build();

private static final MethodDescriptor<RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQueryMethodDescriptor =
MethodDescriptor.<RunAggregationQueryRequest, RunAggregationQueryResponse>newBuilder()
Expand Down Expand Up @@ -256,6 +271,8 @@ public class GrpcFirestoreStub extends FirestoreStub {
private final UnaryCallable<CommitRequest, CommitResponse> commitCallable;
private final UnaryCallable<RollbackRequest, Empty> rollbackCallable;
private final ServerStreamingCallable<RunQueryRequest, RunQueryResponse> runQueryCallable;
private final ServerStreamingCallable<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineCallable;
private final ServerStreamingCallable<RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQueryCallable;
private final UnaryCallable<PartitionQueryRequest, PartitionQueryResponse> partitionQueryCallable;
Expand All @@ -274,6 +291,11 @@ public class GrpcFirestoreStub extends FirestoreStub {
private final GrpcOperationsStub operationsStub;
private final GrpcStubCallableFactory callableFactory;

private static final PathTemplate EXECUTE_PIPELINE_0_PATH_TEMPLATE =
PathTemplate.create("projects/{project_id=*}/**");
private static final PathTemplate EXECUTE_PIPELINE_1_PATH_TEMPLATE =
PathTemplate.create("projects/*/databases/{database_id=*}/**");

public static final GrpcFirestoreStub create(FirestoreStubSettings settings) throws IOException {
return new GrpcFirestoreStub(settings, ClientContext.create(settings));
}
Expand Down Expand Up @@ -404,6 +426,20 @@ protected GrpcFirestoreStub(
return builder.build();
})
.build();
GrpcCallSettings<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineTransportSettings =
GrpcCallSettings.<ExecutePipelineRequest, ExecutePipelineResponse>newBuilder()
.setMethodDescriptor(executePipelineMethodDescriptor)
.setParamsExtractor(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add(
request.getDatabase(), "project_id", EXECUTE_PIPELINE_0_PATH_TEMPLATE);
builder.add(
request.getDatabase(), "database_id", EXECUTE_PIPELINE_1_PATH_TEMPLATE);
return builder.build();
})
.build();
GrpcCallSettings<RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQueryTransportSettings =
GrpcCallSettings.<RunAggregationQueryRequest, RunAggregationQueryResponse>newBuilder()
Expand Down Expand Up @@ -511,6 +547,9 @@ protected GrpcFirestoreStub(
this.runQueryCallable =
callableFactory.createServerStreamingCallable(
runQueryTransportSettings, settings.runQuerySettings(), clientContext);
this.executePipelineCallable =
callableFactory.createServerStreamingCallable(
executePipelineTransportSettings, settings.executePipelineSettings(), clientContext);
this.runAggregationQueryCallable =
callableFactory.createServerStreamingCallable(
runAggregationQueryTransportSettings,
Expand Down Expand Up @@ -606,6 +645,12 @@ public ServerStreamingCallable<RunQueryRequest, RunQueryResponse> runQueryCallab
return runQueryCallable;
}

@Override
public ServerStreamingCallable<ExecutePipelineRequest, ExecutePipelineResponse>
executePipelineCallable() {
return executePipelineCallable;
}

@Override
public ServerStreamingCallable<RunAggregationQueryRequest, RunAggregationQueryResponse>
runAggregationQueryCallable() {
Expand Down
Loading
Loading