From 39839ca9cfea914f0dfaf589e7257f2675784640 Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Wed, 1 May 2024 11:20:18 -0400 Subject: [PATCH 001/292] chore: update sync-repo-settings.yaml (#1417) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ If you write sample code, please follow the [samples format]( https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). --- .github/sync-repo-settings.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 0159d7ae3..4bdaef4e9 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -162,6 +162,23 @@ branchProtectionRules: - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc + - pattern: grpc-experimental + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - OwlBot Post Processor + - 'Kokoro - Test: Java GraalVM Native Image' + - 'Kokoro - Test: Java 17 GraalVM Native Image' + - javadoc permissionRules: - team: yoshi-admins permission: admin From 48d7dafc0c7a49e95bf41d29865ac872b0de0faf Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 2 May 2024 17:15:13 +0200 Subject: [PATCH 002/292] deps: update dependency com.google.errorprone:error_prone_core to v2.27.1 (#1421) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eeb20ad87..bdb5d4f68 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ github google-cloud-datastore-parent https://googleapis.dev/java/google-api-grpc/latest - 2.27.0 + 2.27.1 From 5a5dfdfb0855cf485b875ab071b79979d24f98dd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 2 May 2024 17:20:49 +0200 Subject: [PATCH 003/292] deps: update dependency com.google.guava:guava-testlib to v33.2.0-jre (#1422) --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 8d6b79e8d..351e0dfae 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -122,7 +122,7 @@ com.google.guava guava-testlib - 33.1.0-jre + 33.2.0-jre test From ac3a1c10f64c8338346f8fb39f4857f47e8fc639 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 3 May 2024 16:56:09 +0200 Subject: [PATCH 004/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 (#1426) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 851d94b20..59c863ec0 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.29.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.30.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index d7a73c2c6..c72b54690 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.29.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.30.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index b5c7f594b..ac1b9d4e9 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.29.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.30.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 2651713e3..f149e76dc 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.29.0 + 3.30.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index bdb5d4f68..a67d68b4e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.29.0 + 3.30.0 From b265fb3c3b8ebc972edbe5a7beae816379846dac Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 16:32:17 +0000 Subject: [PATCH 005/292] fix(deps): Update the Java code generator (gapic-generator-java) to 2.39.0 (#1406) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 626430774 Source-Link: https://togithub.com/googleapis/googleapis/commit/835b84ebfc4974ab5dcd9b31ad66c01ef3455475 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/43f369d90f19d09ac18720151ab106042beb811b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDNmMzY5ZDkwZjE5ZDA5YWMxODcyMDE1MWFiMTA2MDQyYmViODExYiJ9 --- .../v1/stub/DatastoreAdminStubSettings.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java index 64ad035d8..fc346d38c 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java @@ -258,15 +258,6 @@ public DatastoreAdminStub createStub() throws IOException { "Transport not supported: %s", getTransportChannelProvider().getTransportName())); } - /** Returns the endpoint set by the user or the the service's default endpoint. */ - @Override - public String getEndpoint() { - if (super.getEndpoint() != null) { - return super.getEndpoint(); - } - return getDefaultEndpoint(); - } - /** Returns the default service name. */ @Override public String getServiceName() { @@ -716,15 +707,6 @@ public UnaryCallSettings.Builder getIndexSettings() { return listIndexesSettings; } - /** Returns the endpoint set by the user or the the service's default endpoint. */ - @Override - public String getEndpoint() { - if (super.getEndpoint() != null) { - return super.getEndpoint(); - } - return getDefaultEndpoint(); - } - @Override public DatastoreAdminStubSettings build() throws IOException { return new DatastoreAdminStubSettings(this); From da51c88b81faee5141e9eb6c5ccbc2cc25e581b2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:20:16 +0000 Subject: [PATCH 006/292] chore(main): release 2.19.2 (#1414) :robot: I have created a release *beep* *boop* --- ## [2.19.2](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03) ### Bug Fixes * **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) * Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) * Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) * Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 15 +++++++++++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 43 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba6bc10ff..b026d8096 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [2.19.2](https://github.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://github.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://github.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://github.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://github.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) +* Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://github.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://github.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) +* Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://github.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://github.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) +* Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://github.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://github.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd)) + ## [2.19.1](https://github.com/googleapis/java-datastore/compare/v2.19.0...v2.19.1) (2024-04-19) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index e136a9d8c..4c926f630 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.19.2-SNAPSHOT + 2.19.2 com.google.cloud google-cloud-datastore-parent - 2.19.2-SNAPSHOT + 2.19.2 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f149e76dc..4e9e971c0 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.19.2-SNAPSHOT + 2.19.2 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.19.2-SNAPSHOT + 2.19.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.2-SNAPSHOT + 2.19.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.2-SNAPSHOT + 0.110.2 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.2-SNAPSHOT + 2.19.2 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 351e0dfae..4337bb677 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.19.2-SNAPSHOT + 2.19.2 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.19.2-SNAPSHOT + 2.19.2 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 150832cde..938047de0 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.2-SNAPSHOT + 2.19.2 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.19.2-SNAPSHOT + 2.19.2 diff --git a/pom.xml b/pom.xml index a67d68b4e..7e8f89d1b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.19.2-SNAPSHOT + 2.19.2 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.2-SNAPSHOT + 2.19.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.2-SNAPSHOT + 2.19.2 com.google.cloud google-cloud-datastore - 2.19.2-SNAPSHOT + 2.19.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.2-SNAPSHOT + 0.110.2 com.google.cloud.datastore datastore-v1-proto-client - 2.19.2-SNAPSHOT + 2.19.2 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 58e80a474..f76114f5f 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.2-SNAPSHOT + 2.19.2 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.19.2-SNAPSHOT + 2.19.2 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index f7533666e..17524e533 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.2-SNAPSHOT + 0.110.2 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.19.2-SNAPSHOT + 2.19.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 45331e46b..94b4517b4 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.19.2-SNAPSHOT + 2.19.2 diff --git a/versions.txt b/versions.txt index 3d01cfb1c..572000fda 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.19.1:2.19.2-SNAPSHOT -google-cloud-datastore-bom:2.19.1:2.19.2-SNAPSHOT -proto-google-cloud-datastore-v1:0.110.1:0.110.2-SNAPSHOT -datastore-v1-proto-client:2.19.1:2.19.2-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.19.1:2.19.2-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.19.1:2.19.2-SNAPSHOT +google-cloud-datastore:2.19.2:2.19.2 +google-cloud-datastore-bom:2.19.2:2.19.2 +proto-google-cloud-datastore-v1:0.110.2:0.110.2 +datastore-v1-proto-client:2.19.2:2.19.2 +proto-google-cloud-datastore-admin-v1:2.19.2:2.19.2 +grpc-google-cloud-datastore-admin-v1:2.19.2:2.19.2 From beb8d0d7163ca071039beca66228b926416de7c9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 15:00:31 +0000 Subject: [PATCH 007/292] chore(main): release 2.19.3-SNAPSHOT (#1432) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 4c926f630..afebe45cb 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.19.2 + 2.19.3-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.19.2 + 2.19.3-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 4e9e971c0..526341880 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.19.2 + 2.19.3-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.19.2 + 2.19.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.2 + 2.19.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.2 + 0.110.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.2 + 2.19.3-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 4337bb677..ae5c82ff7 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.19.2 + 2.19.3-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.19.2 + 2.19.3-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 938047de0..aea98fffb 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.2 + 2.19.3-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.19.2 + 2.19.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7e8f89d1b..e40fd6e1c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.19.2 + 2.19.3-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.2 + 2.19.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.2 + 2.19.3-SNAPSHOT com.google.cloud google-cloud-datastore - 2.19.2 + 2.19.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.2 + 0.110.3-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.19.2 + 2.19.3-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index f76114f5f..3e16b006e 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.2 + 2.19.3-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.19.2 + 2.19.3-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 17524e533..29cc3ef79 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.2 + 0.110.3-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.19.2 + 2.19.3-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 94b4517b4..4aacf6542 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.19.2 + 2.19.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index 572000fda..6d440544d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.19.2:2.19.2 -google-cloud-datastore-bom:2.19.2:2.19.2 -proto-google-cloud-datastore-v1:0.110.2:0.110.2 -datastore-v1-proto-client:2.19.2:2.19.2 -proto-google-cloud-datastore-admin-v1:2.19.2:2.19.2 -grpc-google-cloud-datastore-admin-v1:2.19.2:2.19.2 +google-cloud-datastore:2.19.2:2.19.3-SNAPSHOT +google-cloud-datastore-bom:2.19.2:2.19.3-SNAPSHOT +proto-google-cloud-datastore-v1:0.110.2:0.110.3-SNAPSHOT +datastore-v1-proto-client:2.19.2:2.19.3-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.19.2:2.19.3-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.19.2:2.19.3-SNAPSHOT From f93c60f192ddbffdb02d8e377b148942c351a1ef Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 6 May 2024 19:11:37 +0200 Subject: [PATCH 008/292] build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#1412) --- samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/pom.xml b/samples/pom.xml index a24801164..745443d35 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -39,7 +39,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.2 true From 063a81e2d49788f3cca3f4c8f359c1c9b1cf4a34 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 6 May 2024 19:30:18 +0200 Subject: [PATCH 009/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.2 (#1433) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.1` -> `2.19.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.19.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2192-2024-05-03) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) ##### Bug Fixes - **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#​1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#​1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) - Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#​1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) - Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#​1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) - Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#​1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore). --- README.md | 8 ++++---- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3f6f9916c..528dec305 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.19.1 + 2.19.2 ``` @@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.19.1' +implementation 'com.google.cloud:google-cloud-datastore:2.19.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.2" ``` @@ -384,7 +384,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.2 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index d36722381..91a974823 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.19.1 + 2.19.2 From b6f1c89f6892baaba0d545ad87db435aca2055a6 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 10:53:31 -0400 Subject: [PATCH 010/292] chore: autogen updates (#1434) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: An existing method `UpdateVehicleLocation` is removed from service `VehicleService` fix: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService` fix: An existing message `UpdateVehicleLocationRequest` is removed PiperOrigin-RevId: 631557549 Source-Link: https://github.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9 * 🦉 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 --- .../main/proto/google/datastore/admin/v1/datastore_admin.proto | 2 +- .../src/main/proto/google/datastore/admin/v1/index.proto | 2 +- .../src/main/proto/google/datastore/admin/v1/migration.proto | 2 +- .../src/main/proto/google/datastore/v1/aggregation_result.proto | 2 +- .../src/main/proto/google/datastore/v1/datastore.proto | 2 +- .../src/main/proto/google/datastore/v1/entity.proto | 2 +- .../src/main/proto/google/datastore/v1/query.proto | 2 +- .../src/main/proto/google/datastore/v1/query_profile.proto | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto index 79ca3df68..a8b3f9986 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto +++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto index 60bb5af5f..6a1d12227 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto +++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto index e5f7477da..813de87dd 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto +++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto index 91c521716..262b61fa4 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto index 1a3fbdd11..fbbabb0a3 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto index d80dd9093..ef4429343 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto index d1f0f8d07..81386d47b 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto index 01c9fc254..f38681c66 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From d6c295e1aea5f2a3bc3ce5606500d6e712293aa8 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 16:54:27 +0000 Subject: [PATCH 011/292] chore: update dependency versions in java templates (#1964) (#1435) * chore: update dependency versions in java templates * update other templates Source-Link: https://togithub.com/googleapis/synthtool/commit/0b86c72fe652dd7e52ba05a63f61bc1399ad5d65 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e --- .github/.OwlBot.lock.yaml | 4 +-- .github/workflows/approve-readme.yaml | 2 +- .github/workflows/ci.yaml | 30 ++++++++++---------- .github/workflows/renovate_config_check.yaml | 2 +- .github/workflows/samples.yaml | 4 +-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 6167135e9..5db36a5f7 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:81c3ec554428c8ff6c92f0d58668b7ef52265d053a82284c97a326745e786949 -# created: 2024-03-27T17:59:25.436353226Z + digest: sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e +# created: 2024-05-09T16:31:37.168667071Z diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index f5fc7d516..59f00b8eb 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ae66b1973..b91fa381f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: matrix: java: [11, 17, 21] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{matrix.java}} @@ -41,8 +41,8 @@ jobs: name: "units (8)" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: java-version: 8 distribution: temurin @@ -51,7 +51,7 @@ jobs: # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV shell: bash - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin @@ -63,8 +63,8 @@ jobs: steps: - name: Support longpaths run: git config --system core.longpaths true - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 @@ -78,8 +78,8 @@ jobs: matrix: java: [17] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{matrix.java}} @@ -88,8 +88,8 @@ jobs: javadoc: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -100,8 +100,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -112,8 +112,8 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml index 87d8eb2be..7c5ec7865 100644 --- a/.github/workflows/renovate_config_check.yaml +++ b/.github/workflows/renovate_config_check.yaml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '20' diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index 10d252d77..03b293956 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -20,8 +20,8 @@ jobs: checkstyle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 From 24f878035070d3137e6bd01d65ba60c66f87abd8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 13 May 2024 17:28:56 +0200 Subject: [PATCH 012/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 (#1436) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 * 🦉 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 --- README.md | 4 ++-- samples/native-image-sample/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 528dec305..931c9c4dd 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.38.0 + 26.39.0 pom import @@ -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.38.0') +implementation platform('com.google.cloud:libraries-bom:26.39.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index d1d30028d..d1035724c 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -28,7 +28,7 @@ com.google.cloud libraries-bom - 26.38.0 + 26.39.0 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 82f0945a7..6ac0109ed 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.38.0 + 26.39.0 pom import From b9cece7eb2e7fe06cd7424fa27056606bfec97d2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 13 May 2024 17:59:38 +0200 Subject: [PATCH 013/292] build: update actions/setup-java action to v4 (#1391) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 59c863ec0..2ddcab030 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 From 80dbca1246facf21b08d33e5c6a09b9708b6ce63 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 14 May 2024 15:46:07 +0200 Subject: [PATCH 014/292] deps: update actions/checkout action to v4 (#1390) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 2ddcab030..7890ce870 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -5,7 +5,7 @@ jobs: unmanaged_dependency_check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: distribution: temurin From 79f6c46bdbabc66082f23e9562ee9541e0fdeac9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 16 May 2024 19:12:12 +0200 Subject: [PATCH 015/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 (#1443) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 7890ce870..5ff23d7aa 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.30.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.30.1 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index c72b54690..3b76021ce 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.30.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.30.1" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index ac1b9d4e9..8c9d2b103 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.30.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.30.1" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 526341880..2f271a3bf 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.30.0 + 3.30.1 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index e40fd6e1c..a398872b1 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.30.0 + 3.30.1 From b3836a44c5cb68ee5c13daa63aa10e918ae17bee Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 17:26:17 +0000 Subject: [PATCH 016/292] chore(main): release 2.19.3 (#1438) :robot: I have created a release *beep* *boop* --- ## [2.19.3](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16) ### Dependencies * Update actions/checkout action to v4 ([#1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 8 ++++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 36 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b026d8096..185e9d891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.19.3](https://github.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16) + + +### Dependencies + +* Update actions/checkout action to v4 ([#1390](https://github.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://github.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) +* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://github.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://github.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9)) + ## [2.19.2](https://github.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index afebe45cb..73888aaa8 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.19.3-SNAPSHOT + 2.19.3 com.google.cloud google-cloud-datastore-parent - 2.19.3-SNAPSHOT + 2.19.3 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 2f271a3bf..808ef3745 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.19.3-SNAPSHOT + 2.19.3 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.19.3-SNAPSHOT + 2.19.3 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.3-SNAPSHOT + 2.19.3 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.3-SNAPSHOT + 0.110.3 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.3-SNAPSHOT + 2.19.3 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index ae5c82ff7..2d6872b40 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.19.3-SNAPSHOT + 2.19.3 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.19.3-SNAPSHOT + 2.19.3 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index aea98fffb..cd0a1cc64 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.3-SNAPSHOT + 2.19.3 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.19.3-SNAPSHOT + 2.19.3 diff --git a/pom.xml b/pom.xml index a398872b1..48ecc581a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.19.3-SNAPSHOT + 2.19.3 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.3-SNAPSHOT + 2.19.3 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.3-SNAPSHOT + 2.19.3 com.google.cloud google-cloud-datastore - 2.19.3-SNAPSHOT + 2.19.3 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.3-SNAPSHOT + 0.110.3 com.google.cloud.datastore datastore-v1-proto-client - 2.19.3-SNAPSHOT + 2.19.3 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 3e16b006e..20d09333f 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.3-SNAPSHOT + 2.19.3 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.19.3-SNAPSHOT + 2.19.3 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 29cc3ef79..cc61e5080 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.3-SNAPSHOT + 0.110.3 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.19.3-SNAPSHOT + 2.19.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 4aacf6542..48e7c491b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.19.3-SNAPSHOT + 2.19.3 diff --git a/versions.txt b/versions.txt index 6d440544d..c31381ffc 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.19.2:2.19.3-SNAPSHOT -google-cloud-datastore-bom:2.19.2:2.19.3-SNAPSHOT -proto-google-cloud-datastore-v1:0.110.2:0.110.3-SNAPSHOT -datastore-v1-proto-client:2.19.2:2.19.3-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.19.2:2.19.3-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.19.2:2.19.3-SNAPSHOT +google-cloud-datastore:2.19.3:2.19.3 +google-cloud-datastore-bom:2.19.3:2.19.3 +proto-google-cloud-datastore-v1:0.110.3:0.110.3 +datastore-v1-proto-client:2.19.3:2.19.3 +proto-google-cloud-datastore-admin-v1:2.19.3:2.19.3 +grpc-google-cloud-datastore-admin-v1:2.19.3:2.19.3 From 13d9af1c3eba37fcad70ce55f69ab4fea9a62627 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 18:12:16 +0000 Subject: [PATCH 017/292] chore(main): release 2.19.4-SNAPSHOT (#1444) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 73888aaa8..4c6c8306b 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.19.3 + 2.19.4-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.19.3 + 2.19.4-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 808ef3745..f4509a986 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.19.3 + 2.19.4-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.19.3 + 2.19.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.3 + 2.19.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.3 + 0.110.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.3 + 2.19.4-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 2d6872b40..50a0dc771 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.19.3 + 2.19.4-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.19.3 + 2.19.4-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index cd0a1cc64..d846af69e 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.3 + 2.19.4-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.19.3 + 2.19.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 48ecc581a..859d22ae8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.19.3 + 2.19.4-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.3 + 2.19.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.3 + 2.19.4-SNAPSHOT com.google.cloud google-cloud-datastore - 2.19.3 + 2.19.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.3 + 0.110.4-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.19.3 + 2.19.4-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 20d09333f..b7d230c93 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.3 + 2.19.4-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.19.3 + 2.19.4-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index cc61e5080..406872937 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.3 + 0.110.4-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.19.3 + 2.19.4-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 48e7c491b..c74f052fb 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.19.3 + 2.19.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index c31381ffc..5a99dd778 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.19.3:2.19.3 -google-cloud-datastore-bom:2.19.3:2.19.3 -proto-google-cloud-datastore-v1:0.110.3:0.110.3 -datastore-v1-proto-client:2.19.3:2.19.3 -proto-google-cloud-datastore-admin-v1:2.19.3:2.19.3 -grpc-google-cloud-datastore-admin-v1:2.19.3:2.19.3 +google-cloud-datastore:2.19.3:2.19.4-SNAPSHOT +google-cloud-datastore-bom:2.19.3:2.19.4-SNAPSHOT +proto-google-cloud-datastore-v1:0.110.3:0.110.4-SNAPSHOT +datastore-v1-proto-client:2.19.3:2.19.4-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.19.3:2.19.4-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.19.3:2.19.4-SNAPSHOT From 41919388adf2f86e264a504de27619f86c67b7d5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 17 May 2024 21:36:17 +0200 Subject: [PATCH 018/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.3 (#1446) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.2` -> `2.19.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.19.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2193-2024-05-16) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) ##### Dependencies - Update actions/checkout action to v4 ([#​1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) - Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#​1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore). --- README.md | 8 ++++---- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 931c9c4dd..0a6931db2 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.19.2 + 2.19.3 ``` @@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.19.2' +implementation 'com.google.cloud:google-cloud-datastore:2.19.3' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.3" ``` @@ -384,7 +384,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.3 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 91a974823..5943271fb 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.19.2 + 2.19.3 From 29aea34c916825bbf34f7630c1ac313be14caf92 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 20 May 2024 16:32:08 +0200 Subject: [PATCH 019/292] test(deps): update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 (#1448) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 * 🦉 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 --- samples/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index d1035724c..3b15124d5 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -107,7 +107,7 @@ org.graalvm.buildtools native-maven-plugin - 0.10.1 + 0.10.2 true com.example.datastore.NativeImageDatastoreSample From 6caf603f95926f0d14c007f6dd35d447181d32da Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 20 May 2024 16:33:43 +0200 Subject: [PATCH 020/292] build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#1453) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 5943271fb..45eb26354 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -53,7 +53,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.5.0 + 3.6.0 add-snippets-source diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c74f052fb..0f1b38b1b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -52,7 +52,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.5.0 + 3.6.0 add-snippets-source From 15365eb03b8f26f0b90d11bb41ccbb65093e7a45 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 14:46:16 +0000 Subject: [PATCH 021/292] chore: [java] allow passing libraries_bom_version from env (#1967) (#1451) * feat: [java] allow passing libraries_bom_version from env * reformat Source-Link: https://togithub.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea --- .github/.OwlBot.lock.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 5db36a5f7..f817c5f44 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e -# created: 2024-05-09T16:31:37.168667071Z + digest: sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea +# created: 2024-05-17T15:15:57.6714113Z From 15148f140b62c2f952537b86993a7ab9ea5645b3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 20 May 2024 17:23:19 +0200 Subject: [PATCH 022/292] test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 (#1449) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 * 🦉 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 --- samples/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 3b15124d5..00999bee3 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -86,7 +86,7 @@ org.graalvm.buildtools junit-platform-native - 0.10.1 + 0.10.2 test From c3c131735863d71971110e2ac7ac0244ce16ee92 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 20 May 2024 16:49:25 +0000 Subject: [PATCH 023/292] fix: Migrate off TextPrinter's deprecated methods (#1452) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: chore: Migrate off TextPrinter's deprecated methods * 🦉 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 --- .../src/main/java/com/google/cloud/datastore/Key.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java index 9e851d0cb..14fe264bb 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java @@ -145,7 +145,7 @@ public Object getNameOrId() { /** Returns the key in an encoded form that can be used as part of a URL. */ public String toUrlSafe() { try { - return URLEncoder.encode(TextFormat.printToString(toPb()), UTF_8.name()); + return URLEncoder.encode(TextFormat.printer().printToString(toPb()), UTF_8.name()); } catch (UnsupportedEncodingException e) { throw new IllegalStateException("Unexpected encoding exception", e); } From ff5e39775446216b4806f55f14dacb7fc8e8854b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 15:05:45 -0400 Subject: [PATCH 024/292] feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: New PropertyMask field which allows partial commits, lookups, and query results PiperOrigin-RevId: 635449160 Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9 * 🦉 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 --- .../google/datastore/v1/DatastoreProto.java | 310 ++++--- .../google/datastore/v1/LookupRequest.java | 329 +++++++ .../datastore/v1/LookupRequestOrBuilder.java | 50 ++ .../com/google/datastore/v1/Mutation.java | 366 +++++++- .../datastore/v1/MutationOrBuilder.java | 56 ++ .../com/google/datastore/v1/PropertyMask.java | 848 ++++++++++++++++++ .../datastore/v1/PropertyMaskOrBuilder.java | 117 +++ .../google/datastore/v1/RunQueryRequest.java | 337 ++++++- .../v1/RunQueryRequestOrBuilder.java | 47 + .../proto/google/datastore/v1/datastore.proto | 42 + 10 files changed, 2346 insertions(+), 156 deletions(-) create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java index 1b8753e35..e637dd010 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java @@ -100,6 +100,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r internal_static_google_datastore_v1_MutationResult_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_google_datastore_v1_MutationResult_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_PropertyMask_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_PropertyMask_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_google_datastore_v1_ReadOptions_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable @@ -134,151 +138,157 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "entity.proto\032\037google/datastore/v1/query." + "proto\032\'google/datastore/v1/query_profile" + ".proto\032\037google/protobuf/timestamp.proto\"" - + "\242\001\n\rLookupRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340" + + "\334\001\n\rLookupRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340" + "A\002\022\023\n\013database_id\030\t \001(\t\0226\n\014read_options\030" + "\001 \001(\0132 .google.datastore.v1.ReadOptions\022" + "+\n\004keys\030\003 \003(\0132\030.google.datastore.v1.KeyB" - + "\003\340A\002\"\346\001\n\016LookupResponse\0220\n\005found\030\001 \003(\0132!" - + ".google.datastore.v1.EntityResult\0222\n\007mis" - + "sing\030\002 \003(\0132!.google.datastore.v1.EntityR" - + "esult\022*\n\010deferred\030\003 \003(\0132\030.google.datasto" - + "re.v1.Key\022\023\n\013transaction\030\005 \001(\014\022-\n\tread_t" - + "ime\030\007 \001(\0132\032.google.protobuf.Timestamp\"\341\002" - + "\n\017RunQueryRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340" - + "A\002\022\023\n\013database_id\030\t \001(\t\0226\n\014partition_id\030" - + "\002 \001(\0132 .google.datastore.v1.PartitionId\022" - + "6\n\014read_options\030\001 \001(\0132 .google.datastore" - + ".v1.ReadOptions\022+\n\005query\030\003 \001(\0132\032.google." - + "datastore.v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132" - + "\035.google.datastore.v1.GqlQueryH\000\022A\n\017expl" - + "ain_options\030\014 \001(\0132#.google.datastore.v1." - + "ExplainOptionsB\003\340A\001B\014\n\nquery_type\"\306\001\n\020Ru" - + "nQueryResponse\0224\n\005batch\030\001 \001(\0132%.google.d" - + "atastore.v1.QueryResultBatch\022)\n\005query\030\002 " - + "\001(\0132\032.google.datastore.v1.Query\022\023\n\013trans" - + "action\030\005 \001(\014\022<\n\017explain_metrics\030\t \001(\0132#." - + "google.datastore.v1.ExplainMetrics\"\203\003\n\032R" - + "unAggregationQueryRequest\022\027\n\nproject_id\030" - + "\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\0226\n\014parti" - + "tion_id\030\002 \001(\0132 .google.datastore.v1.Part" - + "itionId\0226\n\014read_options\030\001 \001(\0132 .google.d" - + "atastore.v1.ReadOptions\022B\n\021aggregation_q" - + "uery\030\003 \001(\0132%.google.datastore.v1.Aggrega" - + "tionQueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google." - + "datastore.v1.GqlQueryH\000\022A\n\017explain_optio" - + "ns\030\013 \001(\0132#.google.datastore.v1.ExplainOp" - + "tionsB\003\340A\001B\014\n\nquery_type\"\342\001\n\033RunAggregat" - + "ionQueryResponse\022:\n\005batch\030\001 \001(\0132+.google" - + ".datastore.v1.AggregationResultBatch\0224\n\005" - + "query\030\002 \001(\0132%.google.datastore.v1.Aggreg" - + "ationQuery\022\023\n\013transaction\030\005 \001(\014\022<\n\017expla" - + "in_metrics\030\t \001(\0132#.google.datastore.v1.E" - + "xplainMetrics\"\215\001\n\027BeginTransactionReques" - + "t\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_i" - + "d\030\t \001(\t\022D\n\023transaction_options\030\n \001(\0132\'.g" - + "oogle.datastore.v1.TransactionOptions\"/\n" - + "\030BeginTransactionResponse\022\023\n\013transaction" - + "\030\001 \001(\014\"Y\n\017RollbackRequest\022\027\n\nproject_id\030" - + "\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022\030\n\013trans" - + "action\030\001 \001(\014B\003\340A\002\"\022\n\020RollbackResponse\"\350\002" - + "\n\rCommitRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002" - + "\022\023\n\013database_id\030\t \001(\t\0225\n\004mode\030\005 \001(\0162\'.go" - + "ogle.datastore.v1.CommitRequest.Mode\022\025\n\013" - + "transaction\030\001 \001(\014H\000\022I\n\026single_use_transa" - + "ction\030\n \001(\0132\'.google.datastore.v1.Transa" - + "ctionOptionsH\000\0220\n\tmutations\030\006 \003(\0132\035.goog" - + "le.datastore.v1.Mutation\"F\n\004Mode\022\024\n\020MODE" - + "_UNSPECIFIED\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021NON" - + "_TRANSACTIONAL\020\002B\026\n\024transaction_selector" - + "\"\227\001\n\016CommitResponse\022=\n\020mutation_results\030" - + "\003 \003(\0132#.google.datastore.v1.MutationResu" - + "lt\022\025\n\rindex_updates\030\004 \001(\005\022/\n\013commit_time" - + "\030\010 \001(\0132\032.google.protobuf.Timestamp\"o\n\022Al" - + "locateIdsRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A" - + "\002\022\023\n\013database_id\030\t \001(\t\022+\n\004keys\030\001 \003(\0132\030.g" - + "oogle.datastore.v1.KeyB\003\340A\002\"=\n\023AllocateI" - + "dsResponse\022&\n\004keys\030\001 \003(\0132\030.google.datast" - + "ore.v1.Key\"n\n\021ReserveIdsRequest\022\027\n\nproje" - + "ct_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022+\n" - + "\004keys\030\001 \003(\0132\030.google.datastore.v1.KeyB\003\340" - + "A\002\"\024\n\022ReserveIdsResponse\"\272\002\n\010Mutation\022-\n" - + "\006insert\030\004 \001(\0132\033.google.datastore.v1.Enti" - + "tyH\000\022-\n\006update\030\005 \001(\0132\033.google.datastore." - + "v1.EntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google.dat" - + "astore.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030.goo" - + "gle.datastore.v1.KeyH\000\022\026\n\014base_version\030\010" - + " \001(\003H\001\0221\n\013update_time\030\013 \001(\0132\032.google.pro" - + "tobuf.TimestampH\001B\013\n\toperationB\035\n\033confli" - + "ct_detection_strategy\"\305\001\n\016MutationResult" - + "\022%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022" - + "\017\n\007version\030\004 \001(\003\022/\n\013create_time\030\007 \001(\0132\032." - + "google.protobuf.Timestamp\022/\n\013update_time" - + "\030\006 \001(\0132\032.google.protobuf.Timestamp\022\031\n\021co" - + "nflict_detected\030\005 \001(\010\"\312\002\n\013ReadOptions\022L\n" - + "\020read_consistency\030\001 \001(\01620.google.datasto" - + "re.v1.ReadOptions.ReadConsistencyH\000\022\025\n\013t" - + "ransaction\030\002 \001(\014H\000\022B\n\017new_transaction\030\003 " - + "\001(\0132\'.google.datastore.v1.TransactionOpt" - + "ionsH\000\022/\n\tread_time\030\004 \001(\0132\032.google.proto" - + "buf.TimestampH\000\"M\n\017ReadConsistency\022 \n\034RE" - + "AD_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STRONG\020\001" - + "\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\"\222\002\n\022T" - + "ransactionOptions\022G\n\nread_write\030\001 \001(\01321." - + "google.datastore.v1.TransactionOptions.R" - + "eadWriteH\000\022E\n\tread_only\030\002 \001(\01320.google.d" - + "atastore.v1.TransactionOptions.ReadOnlyH" - + "\000\032)\n\tReadWrite\022\034\n\024previous_transaction\030\001" - + " \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\0132\032.go" - + "ogle.protobuf.TimestampB\006\n\004mode2\341\r\n\tData" - + "store\022\300\001\n\006Lookup\022\".google.datastore.v1.L" - + "ookupRequest\032#.google.datastore.v1.Looku" - + "pResponse\"m\332A\034project_id,read_options,ke" - + "ys\202\323\344\223\002%\" /v1/projects/{project_id}:look" - + "up:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id" - + "\022\251\001\n\010RunQuery\022$.google.datastore.v1.RunQ" - + "ueryRequest\032%.google.datastore.v1.RunQue" - + "ryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{projec" - + "t_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n" - + "\013database_id\022\325\001\n\023RunAggregationQuery\022/.g" - + "oogle.datastore.v1.RunAggregationQueryRe" - + "quest\0320.google.datastore.v1.RunAggregati" - + "onQueryResponse\"[\202\323\344\223\0022\"-/v1/projects/{p" - + "roject_id}:runAggregationQuery:\001*\212\323\344\223\002\035\022" - + "\014\n\nproject_id\022\r\n\013database_id\022\326\001\n\020BeginTr" - + "ansaction\022,.google.datastore.v1.BeginTra" - + "nsactionRequest\032-.google.datastore.v1.Be" - + "ginTransactionResponse\"e\332A\nproject_id\202\323\344" - + "\223\002/\"*/v1/projects/{project_id}:beginTran" - + "saction:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013databa" - + "se_id\022\346\001\n\006Commit\022\".google.datastore.v1.C" - + "ommitRequest\032#.google.datastore.v1.Commi" - + "tResponse\"\222\001\332A%project_id,mode,transacti" - + "on,mutations\332A\031project_id,mode,mutations" - + "\202\323\344\223\002%\" /v1/projects/{project_id}:commit" - + ":\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\302" - + "\001\n\010Rollback\022$.google.datastore.v1.Rollba" - + "ckRequest\032%.google.datastore.v1.Rollback" - + "Response\"i\332A\026project_id,transaction\202\323\344\223\002" - + "\'\"\"/v1/projects/{project_id}:rollback:\001*" - + "\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\307\001\n\013" - + "AllocateIds\022\'.google.datastore.v1.Alloca" - + "teIdsRequest\032(.google.datastore.v1.Alloc" - + "ateIdsResponse\"e\332A\017project_id,keys\202\323\344\223\002*" - + "\"%/v1/projects/{project_id}:allocateIds:" - + "\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\303\001" - + "\n\nReserveIds\022&.google.datastore.v1.Reser" - + "veIdsRequest\032\'.google.datastore.v1.Reser" - + "veIdsResponse\"d\332A\017project_id,keys\202\323\344\223\002)\"" - + "$/v1/projects/{project_id}:reserveIds:\001*" - + "\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\032v\312A\030" - + "datastore.googleapis.com\322AXhttps://www.g" - + "oogleapis.com/auth/cloud-platform,https:" - + "//www.googleapis.com/auth/datastoreB\300\001\n\027" - + "com.google.datastore.v1B\016DatastoreProtoP" - + "\001Z + * The properties to return. Defaults to returning all properties. + * + * If this field is set and an entity has a property not referenced in the + * mask, it will be absent from [LookupResponse.found.entity.properties][]. + * + * The entity's key is always returned. + * + * + * .google.datastore.v1.PropertyMask property_mask = 5; + * + * @return Whether the propertyMask field is set. + */ + @java.lang.Override + public boolean hasPropertyMask() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * + * + * 
+   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + * + * @return The propertyMask. + */ + @java.lang.Override + public com.google.datastore.v1.PropertyMask getPropertyMask() { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } + /** + * + * + * 
+   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + */ + @java.lang.Override + public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -319,6 +384,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < keys_.size(); i++) { output.writeMessage(3, keys_.get(i)); } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeMessage(5, getPropertyMask()); + } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); } @@ -340,6 +408,9 @@ public int getSerializedSize() { for (int i = 0; i < keys_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, keys_.get(i)); } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getPropertyMask()); + } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); } @@ -368,6 +439,10 @@ public boolean equals(final java.lang.Object obj) { if (!getReadOptions().equals(other.getReadOptions())) return false; } if (!getKeysList().equals(other.getKeysList())) return false; + if (hasPropertyMask() != other.hasPropertyMask()) return false; + if (hasPropertyMask()) { + if (!getPropertyMask().equals(other.getPropertyMask())) return false; + } if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -391,6 +466,10 @@ public int hashCode() { hash = (37 * hash) + KEYS_FIELD_NUMBER; hash = (53 * hash) + getKeysList().hashCode(); } + if (hasPropertyMask()) { + hash = (37 * hash) + PROPERTY_MASK_FIELD_NUMBER; + hash = (53 * hash) + getPropertyMask().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -532,6 +611,7 @@ private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { getReadOptionsFieldBuilder(); getKeysFieldBuilder(); + getPropertyMaskFieldBuilder(); } } @@ -553,6 +633,11 @@ public Builder clear() { keysBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000008); + propertyMask_ = null; + if (propertyMaskBuilder_ != null) { + propertyMaskBuilder_.dispose(); + propertyMaskBuilder_ = null; + } return this; } @@ -614,6 +699,11 @@ private void buildPartial0(com.google.datastore.v1.LookupRequest result) { readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build(); to_bitField0_ |= 0x00000001; } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.propertyMask_ = + propertyMaskBuilder_ == null ? propertyMask_ : propertyMaskBuilder_.build(); + to_bitField0_ |= 0x00000002; + } result.bitField0_ |= to_bitField0_; } @@ -702,6 +792,9 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) { } } } + if (other.hasPropertyMask()) { + mergePropertyMask(other.getPropertyMask()); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -746,6 +839,12 @@ public Builder mergeFrom( } break; } // case 26 + case 42: + { + input.readMessage(getPropertyMaskFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000010; + break; + } // case 42 case 66: { projectId_ = input.readStringRequireUtf8(); @@ -1549,6 +1648,236 @@ public java.util.List getKeysBuilderList() return keysBuilder_; } + private com.google.datastore.v1.PropertyMask propertyMask_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyMask, + com.google.datastore.v1.PropertyMask.Builder, + com.google.datastore.v1.PropertyMaskOrBuilder> + propertyMaskBuilder_; + /** + * + * + * 
+     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + * + * @return Whether the propertyMask field is set. + */ + public boolean hasPropertyMask() { + return ((bitField0_ & 0x00000010) != 0); + } + /** + * + * + * 
+     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + * + * @return The propertyMask. + */ + public com.google.datastore.v1.PropertyMask getPropertyMask() { + if (propertyMaskBuilder_ == null) { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } else { + return propertyMaskBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + */ + public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) { + if (propertyMaskBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + propertyMask_ = value; + } else { + propertyMaskBuilder_.setMessage(value); + } + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * + * + * 
+     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + */ + public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder builderForValue) { + if (propertyMaskBuilder_ == null) { + propertyMask_ = builderForValue.build(); + } else { + propertyMaskBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * + * + * 
+     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + */ + public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) { + if (propertyMaskBuilder_ == null) { + if (((bitField0_ & 0x00000010) != 0) + && propertyMask_ != null + && propertyMask_ != com.google.datastore.v1.PropertyMask.getDefaultInstance()) { + getPropertyMaskBuilder().mergeFrom(value); + } else { + propertyMask_ = value; + } + } else { + propertyMaskBuilder_.mergeFrom(value); + } + if (propertyMask_ != null) { + bitField0_ |= 0x00000010; + onChanged(); + } + return this; + } + /** + * + * + * 
+     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + */ + public Builder clearPropertyMask() { + bitField0_ = (bitField0_ & ~0x00000010); + propertyMask_ = null; + if (propertyMaskBuilder_ != null) { + propertyMaskBuilder_.dispose(); + propertyMaskBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + */ + public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() { + bitField0_ |= 0x00000010; + onChanged(); + return getPropertyMaskFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + */ + public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() { + if (propertyMaskBuilder_ != null) { + return propertyMaskBuilder_.getMessageOrBuilder(); + } else { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } + } + /** + * + * + * 
+     * The properties to return. Defaults to returning all properties.
+     *
+     * If this field is set and an entity has a property not referenced in the
+     * mask, it will be absent from [LookupResponse.found.entity.properties][].
+     *
+     * The entity's key is always returned.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyMask, + com.google.datastore.v1.PropertyMask.Builder, + com.google.datastore.v1.PropertyMaskOrBuilder> + getPropertyMaskFieldBuilder() { + if (propertyMaskBuilder_ == null) { + propertyMaskBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyMask, + com.google.datastore.v1.PropertyMask.Builder, + com.google.datastore.v1.PropertyMaskOrBuilder>( + getPropertyMask(), getParentForChildren(), isClean()); + propertyMask_ = null; + } + return propertyMaskBuilder_; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java index 82fe24661..d343eeca4 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java @@ -170,4 +170,54 @@ public interface LookupRequestOrBuilder * */ com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index); + + /** + * + * + * 
+   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + * + * @return Whether the propertyMask field is set. + */ + boolean hasPropertyMask(); + /** + * + * + * 
+   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + * + * @return The propertyMask. + */ + com.google.datastore.v1.PropertyMask getPropertyMask(); + /** + * + * + * 
+   * The properties to return. Defaults to returning all properties.
+   *
+   * If this field is set and an entity has a property not referenced in the
+   * mask, it will be absent from [LookupResponse.found.entity.properties][].
+   *
+   * The entity's key is always returned.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 5; + */ + com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder(); } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java index 91895d180..6857d48a6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java @@ -60,6 +60,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.datastore.v1.Mutation.class, com.google.datastore.v1.Mutation.Builder.class); } + private int bitField0_; private int operationCase_ = 0; @SuppressWarnings("serial") @@ -476,6 +477,77 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { return com.google.protobuf.Timestamp.getDefaultInstance(); } + public static final int PROPERTY_MASK_FIELD_NUMBER = 9; + private com.google.datastore.v1.PropertyMask propertyMask_; + /** + * + * + * 
+   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + * + * @return Whether the propertyMask field is set. + */ + @java.lang.Override + public boolean hasPropertyMask() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * + * + * 
+   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + * + * @return The propertyMask. + */ + @java.lang.Override + public com.google.datastore.v1.PropertyMask getPropertyMask() { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } + /** + * + * + * 
+   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + */ + @java.lang.Override + public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -505,6 +577,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (conflictDetectionStrategyCase_ == 8) { output.writeInt64(8, (long) ((java.lang.Long) conflictDetectionStrategy_)); } + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(9, getPropertyMask()); + } if (conflictDetectionStrategyCase_ == 11) { output.writeMessage(11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_); } @@ -542,6 +617,9 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeInt64Size( 8, (long) ((java.lang.Long) conflictDetectionStrategy_)); } + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getPropertyMask()); + } if (conflictDetectionStrategyCase_ == 11) { size += com.google.protobuf.CodedOutputStream.computeMessageSize( @@ -562,6 +640,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.Mutation other = (com.google.datastore.v1.Mutation) obj; + if (hasPropertyMask() != other.hasPropertyMask()) return false; + if (hasPropertyMask()) { + if (!getPropertyMask().equals(other.getPropertyMask())) return false; + } if (!getOperationCase().equals(other.getOperationCase())) return false; switch (operationCase_) { case 4: @@ -602,6 +684,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPropertyMask()) { + hash = (37 * hash) + PROPERTY_MASK_FIELD_NUMBER; + hash = (53 * hash) + getPropertyMask().hashCode(); + } switch (operationCase_) { case 4: hash = (37 * hash) + INSERT_FIELD_NUMBER; @@ -762,10 +848,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.Mutation.newBuilder() - private Builder() {} + private Builder() { + maybeForceBuilderInitialization(); + } private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); + maybeForceBuilderInitialization(); + } + + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { + getPropertyMaskFieldBuilder(); + } } @java.lang.Override @@ -787,6 +882,11 @@ public Builder clear() { if (updateTimeBuilder_ != null) { updateTimeBuilder_.clear(); } + propertyMask_ = null; + if (propertyMaskBuilder_ != null) { + propertyMaskBuilder_.dispose(); + propertyMaskBuilder_ = null; + } operationCase_ = 0; operation_ = null; conflictDetectionStrategyCase_ = 0; @@ -827,6 +927,13 @@ public com.google.datastore.v1.Mutation buildPartial() { private void buildPartial0(com.google.datastore.v1.Mutation result) { int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000040) != 0)) { + result.propertyMask_ = + propertyMaskBuilder_ == null ? propertyMask_ : propertyMaskBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + result.bitField0_ |= to_bitField0_; } private void buildPartialOneofs(com.google.datastore.v1.Mutation result) { @@ -896,6 +1003,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.datastore.v1.Mutation other) { if (other == com.google.datastore.v1.Mutation.getDefaultInstance()) return this; + if (other.hasPropertyMask()) { + mergePropertyMask(other.getPropertyMask()); + } switch (other.getOperationCase()) { case INSERT: { @@ -994,6 +1104,12 @@ public Builder mergeFrom( conflictDetectionStrategyCase_ = 8; break; } // case 64 + case 74: + { + input.readMessage(getPropertyMaskFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000040; + break; + } // case 74 case 90: { input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); @@ -2206,6 +2322,254 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { return updateTimeBuilder_; } + private com.google.datastore.v1.PropertyMask propertyMask_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyMask, + com.google.datastore.v1.PropertyMask.Builder, + com.google.datastore.v1.PropertyMaskOrBuilder> + propertyMaskBuilder_; + /** + * + * + * 
+     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + * + * @return Whether the propertyMask field is set. + */ + public boolean hasPropertyMask() { + return ((bitField0_ & 0x00000040) != 0); + } + /** + * + * + * 
+     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + * + * @return The propertyMask. + */ + public com.google.datastore.v1.PropertyMask getPropertyMask() { + if (propertyMaskBuilder_ == null) { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } else { + return propertyMaskBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + */ + public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) { + if (propertyMaskBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + propertyMask_ = value; + } else { + propertyMaskBuilder_.setMessage(value); + } + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + /** + * + * + * 
+     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + */ + public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder builderForValue) { + if (propertyMaskBuilder_ == null) { + propertyMask_ = builderForValue.build(); + } else { + propertyMaskBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + /** + * + * + * 
+     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + */ + public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) { + if (propertyMaskBuilder_ == null) { + if (((bitField0_ & 0x00000040) != 0) + && propertyMask_ != null + && propertyMask_ != com.google.datastore.v1.PropertyMask.getDefaultInstance()) { + getPropertyMaskBuilder().mergeFrom(value); + } else { + propertyMask_ = value; + } + } else { + propertyMaskBuilder_.mergeFrom(value); + } + if (propertyMask_ != null) { + bitField0_ |= 0x00000040; + onChanged(); + } + return this; + } + /** + * + * + * 
+     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + */ + public Builder clearPropertyMask() { + bitField0_ = (bitField0_ & ~0x00000040); + propertyMask_ = null; + if (propertyMaskBuilder_ != null) { + propertyMaskBuilder_.dispose(); + propertyMaskBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + */ + public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() { + bitField0_ |= 0x00000040; + onChanged(); + return getPropertyMaskFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + */ + public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() { + if (propertyMaskBuilder_ != null) { + return propertyMaskBuilder_.getMessageOrBuilder(); + } else { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } + } + /** + * + * + * 
+     * The properties to write in this mutation.
+     * None of the properties in the mask may have a reserved name, except for
+     * `__key__`.
+     * This field is ignored for `delete`.
+     *
+     * If the entity already exists, only properties referenced in the mask are
+     * updated, others are left untouched.
+     * Properties referenced in the mask but not in the entity are deleted.
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyMask, + com.google.datastore.v1.PropertyMask.Builder, + com.google.datastore.v1.PropertyMaskOrBuilder> + getPropertyMaskFieldBuilder() { + if (propertyMaskBuilder_ == null) { + propertyMaskBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyMask, + com.google.datastore.v1.PropertyMask.Builder, + com.google.datastore.v1.PropertyMaskOrBuilder>( + getPropertyMask(), getParentForChildren(), isClean()); + propertyMask_ = null; + } + return propertyMaskBuilder_; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java index e833ed942..e051e6003 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java @@ -246,6 +246,62 @@ public interface MutationOrBuilder */ com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder(); + /** + * + * + * 
+   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + * + * @return Whether the propertyMask field is set. + */ + boolean hasPropertyMask(); + /** + * + * + * 
+   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + * + * @return The propertyMask. + */ + com.google.datastore.v1.PropertyMask getPropertyMask(); + /** + * + * + * 
+   * The properties to write in this mutation.
+   * None of the properties in the mask may have a reserved name, except for
+   * `__key__`.
+   * This field is ignored for `delete`.
+   *
+   * If the entity already exists, only properties referenced in the mask are
+   * updated, others are left untouched.
+   * Properties referenced in the mask but not in the entity are deleted.
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 9; + */ + com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder(); + com.google.datastore.v1.Mutation.OperationCase getOperationCase(); com.google.datastore.v1.Mutation.ConflictDetectionStrategyCase getConflictDetectionStrategyCase(); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java new file mode 100644 index 000000000..2d9c2caf6 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java @@ -0,0 +1,848 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +// Protobuf Java Version: 3.25.3 +package com.google.datastore.v1; + +/** + * + * + * 
+ * The set of arbitrarily nested property paths used to restrict an operation to
+ * only a subset of properties in an entity.
+ *
+ * + * Protobuf type {@code google.datastore.v1.PropertyMask} + */ +public final class PropertyMask extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyMask) + PropertyMaskOrBuilder { + private static final long serialVersionUID = 0L; + // Use PropertyMask.newBuilder() to construct. + private PropertyMask(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + + private PropertyMask() { + paths_ = com.google.protobuf.LazyStringArrayList.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new PropertyMask(); + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_PropertyMask_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_PropertyMask_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PropertyMask.class, + com.google.datastore.v1.PropertyMask.Builder.class); + } + + public static final int PATHS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") + private com.google.protobuf.LazyStringArrayList paths_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + /** + * + * + * 
+   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   *
+ * + * repeated string paths = 1; + * + * @return A list containing the paths. + */ + public com.google.protobuf.ProtocolStringList getPathsList() { + return paths_; + } + /** + * + * + * 
+   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   *
+ * + * repeated string paths = 1; + * + * @return The count of paths. + */ + public int getPathsCount() { + return paths_.size(); + } + /** + * + * + * 
+   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   *
+ * + * repeated string paths = 1; + * + * @param index The index of the element to return. + * @return The paths at the given index. + */ + public java.lang.String getPaths(int index) { + return paths_.get(index); + } + /** + * + * + * 
+   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   *
+ * + * repeated string paths = 1; + * + * @param index The index of the value to return. + * @return The bytes of the paths at the given index. + */ + public com.google.protobuf.ByteString getPathsBytes(int index) { + return paths_.getByteString(index); + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + for (int i = 0; i < paths_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, paths_.getRaw(i)); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + { + int dataSize = 0; + for (int i = 0; i < paths_.size(); i++) { + dataSize += computeStringSizeNoTag(paths_.getRaw(i)); + } + size += dataSize; + size += 1 * getPathsList().size(); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.PropertyMask)) { + return super.equals(obj); + } + com.google.datastore.v1.PropertyMask other = (com.google.datastore.v1.PropertyMask) obj; + + if (!getPathsList().equals(other.getPathsList())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getPathsCount() > 0) { + hash = (37 * hash) + PATHS_FIELD_NUMBER; + hash = (53 * hash) + getPathsList().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.PropertyMask parseFrom(java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.PropertyMask parseFrom( + java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.PropertyMask parseFrom(com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.PropertyMask parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.PropertyMask parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.PropertyMask parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.PropertyMask parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.PropertyMask parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.PropertyMask parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.PropertyMask parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.PropertyMask parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.PropertyMask parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(com.google.datastore.v1.PropertyMask prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * + * + * 
+   * The set of arbitrarily nested property paths used to restrict an operation to
+   * only a subset of properties in an entity.
+   *
+ * + * Protobuf type {@code google.datastore.v1.PropertyMask} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder + implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyMask) + com.google.datastore.v1.PropertyMaskOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_PropertyMask_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_PropertyMask_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PropertyMask.class, + com.google.datastore.v1.PropertyMask.Builder.class); + } + + // Construct using com.google.datastore.v1.PropertyMask.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + paths_ = com.google.protobuf.LazyStringArrayList.emptyList(); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_PropertyMask_descriptor; + } + + @java.lang.Override + public com.google.datastore.v1.PropertyMask getDefaultInstanceForType() { + return com.google.datastore.v1.PropertyMask.getDefaultInstance(); + } + + @java.lang.Override + public com.google.datastore.v1.PropertyMask build() { + com.google.datastore.v1.PropertyMask result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.datastore.v1.PropertyMask buildPartial() { + com.google.datastore.v1.PropertyMask result = new com.google.datastore.v1.PropertyMask(this); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartial0(com.google.datastore.v1.PropertyMask result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + paths_.makeImmutable(); + result.paths_ = paths_; + } + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + return super.setField(field, value); + } + + @java.lang.Override + public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + + @java.lang.Override + public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + return super.addRepeatedField(field, value); + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.PropertyMask) { + return mergeFrom((com.google.datastore.v1.PropertyMask) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.PropertyMask other) { + if (other == com.google.datastore.v1.PropertyMask.getDefaultInstance()) return this; + if (!other.paths_.isEmpty()) { + if (paths_.isEmpty()) { + paths_ = other.paths_; + bitField0_ |= 0x00000001; + } else { + ensurePathsIsMutable(); + paths_.addAll(other.paths_); + } + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + java.lang.String s = input.readStringRequireUtf8(); + ensurePathsIsMutable(); + paths_.add(s); + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private int bitField0_; + + private com.google.protobuf.LazyStringArrayList paths_ = + com.google.protobuf.LazyStringArrayList.emptyList(); + + private void ensurePathsIsMutable() { + if (!paths_.isModifiable()) { + paths_ = new com.google.protobuf.LazyStringArrayList(paths_); + } + bitField0_ |= 0x00000001; + } + /** + * + * + * 
+     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     *
+ * + * repeated string paths = 1; + * + * @return A list containing the paths. + */ + public com.google.protobuf.ProtocolStringList getPathsList() { + paths_.makeImmutable(); + return paths_; + } + /** + * + * + * 
+     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     *
+ * + * repeated string paths = 1; + * + * @return The count of paths. + */ + public int getPathsCount() { + return paths_.size(); + } + /** + * + * + * 
+     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     *
+ * + * repeated string paths = 1; + * + * @param index The index of the element to return. + * @return The paths at the given index. + */ + public java.lang.String getPaths(int index) { + return paths_.get(index); + } + /** + * + * + * 
+     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     *
+ * + * repeated string paths = 1; + * + * @param index The index of the value to return. + * @return The bytes of the paths at the given index. + */ + public com.google.protobuf.ByteString getPathsBytes(int index) { + return paths_.getByteString(index); + } + /** + * + * + * 
+     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     *
+ * + * repeated string paths = 1; + * + * @param index The index to set the value at. + * @param value The paths to set. + * @return This builder for chaining. + */ + public Builder setPaths(int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensurePathsIsMutable(); + paths_.set(index, value); + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * + * + * 
+     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     *
+ * + * repeated string paths = 1; + * + * @param value The paths to add. + * @return This builder for chaining. + */ + public Builder addPaths(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensurePathsIsMutable(); + paths_.add(value); + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * + * + * 
+     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     *
+ * + * repeated string paths = 1; + * + * @param values The paths to add. + * @return This builder for chaining. + */ + public Builder addAllPaths(java.lang.Iterable values) { + ensurePathsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll(values, paths_); + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * + * + * 
+     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     *
+ * + * repeated string paths = 1; + * + * @return This builder for chaining. + */ + public Builder clearPaths() { + paths_ = com.google.protobuf.LazyStringArrayList.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + ; + onChanged(); + return this; + } + /** + * + * + * 
+     * The paths to the properties covered by this mask.
+     *
+     * A path is a list of property names separated by dots (`.`), for example
+     * `foo.bar` means the property `bar` inside the entity property `foo` inside
+     * the entity associated with this path.
+     *
+     * If a property name contains a dot `.` or a backslash `\`, then that
+     * name must be escaped.
+     *
+     * A path must not be empty, and may not reference a value inside an
+     * [array value][google.datastore.v1.Value.array_value].
+     *
+ * + * repeated string paths = 1; + * + * @param value The bytes of the paths to add. + * @return This builder for chaining. + */ + public Builder addPathsBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + ensurePathsIsMutable(); + paths_.add(value); + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + @java.lang.Override + public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyMask) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyMask) + private static final com.google.datastore.v1.PropertyMask DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyMask(); + } + + public static com.google.datastore.v1.PropertyMask getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PropertyMask parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.datastore.v1.PropertyMask getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java new file mode 100644 index 000000000..8711d5d8a --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java @@ -0,0 +1,117 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +// Protobuf Java Version: 3.25.3 +package com.google.datastore.v1; + +public interface PropertyMaskOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyMask) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   *
+ * + * repeated string paths = 1; + * + * @return A list containing the paths. + */ + java.util.List getPathsList(); + /** + * + * + * 
+   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   *
+ * + * repeated string paths = 1; + * + * @return The count of paths. + */ + int getPathsCount(); + /** + * + * + * 
+   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   *
+ * + * repeated string paths = 1; + * + * @param index The index of the element to return. + * @return The paths at the given index. + */ + java.lang.String getPaths(int index); + /** + * + * + * 
+   * The paths to the properties covered by this mask.
+   *
+   * A path is a list of property names separated by dots (`.`), for example
+   * `foo.bar` means the property `bar` inside the entity property `foo` inside
+   * the entity associated with this path.
+   *
+   * If a property name contains a dot `.` or a backslash `\`, then that
+   * name must be escaped.
+   *
+   * A path must not be empty, and may not reference a value inside an
+   * [array value][google.datastore.v1.Value.array_value].
+   *
+ * + * repeated string paths = 1; + * + * @param index The index of the value to return. + * @return The bytes of the paths at the given index. + */ + com.google.protobuf.ByteString getPathsBytes(int index); +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java index 4420d5779..55691ceae 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java @@ -433,6 +433,68 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { return com.google.datastore.v1.GqlQuery.getDefaultInstance(); } + public static final int PROPERTY_MASK_FIELD_NUMBER = 10; + private com.google.datastore.v1.PropertyMask propertyMask_; + /** + * + * + * 
+   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + * + * @return Whether the propertyMask field is set. + */ + @java.lang.Override + public boolean hasPropertyMask() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * + * + * 
+   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + * + * @return The propertyMask. + */ + @java.lang.Override + public com.google.datastore.v1.PropertyMask getPropertyMask() { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } + /** + * + * + * 
+   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + */ + @java.lang.Override + public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } + public static final int EXPLAIN_OPTIONS_FIELD_NUMBER = 12; private com.google.datastore.v1.ExplainOptions explainOptions_; /** @@ -451,7 +513,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { */ @java.lang.Override public boolean hasExplainOptions() { - return ((bitField0_ & 0x00000004) != 0); + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -525,6 +587,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_); } if (((bitField0_ & 0x00000004) != 0)) { + output.writeMessage(10, getPropertyMask()); + } + if (((bitField0_ & 0x00000008) != 0)) { output.writeMessage(12, getExplainOptions()); } getUnknownFields().writeTo(output); @@ -559,6 +624,9 @@ public int getSerializedSize() { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_); } if (((bitField0_ & 0x00000004) != 0)) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getPropertyMask()); + } + if (((bitField0_ & 0x00000008) != 0)) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getExplainOptions()); } size += getUnknownFields().getSerializedSize(); @@ -586,6 +654,10 @@ public boolean equals(final java.lang.Object obj) { if (hasReadOptions()) { if (!getReadOptions().equals(other.getReadOptions())) return false; } + if (hasPropertyMask() != other.hasPropertyMask()) return false; + if (hasPropertyMask()) { + if (!getPropertyMask().equals(other.getPropertyMask())) return false; + } if (hasExplainOptions() != other.hasExplainOptions()) return false; if (hasExplainOptions()) { if (!getExplainOptions().equals(other.getExplainOptions())) return false; @@ -624,6 +696,10 @@ public int hashCode() { hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER; hash = (53 * hash) + getReadOptions().hashCode(); } + if (hasPropertyMask()) { + hash = (37 * hash) + PROPERTY_MASK_FIELD_NUMBER; + hash = (53 * hash) + getPropertyMask().hashCode(); + } if (hasExplainOptions()) { hash = (37 * hash) + EXPLAIN_OPTIONS_FIELD_NUMBER; hash = (53 * hash) + getExplainOptions().hashCode(); @@ -782,6 +858,7 @@ private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { getPartitionIdFieldBuilder(); getReadOptionsFieldBuilder(); + getPropertyMaskFieldBuilder(); getExplainOptionsFieldBuilder(); } } @@ -808,6 +885,11 @@ public Builder clear() { if (gqlQueryBuilder_ != null) { gqlQueryBuilder_.clear(); } + propertyMask_ = null; + if (propertyMaskBuilder_ != null) { + propertyMaskBuilder_.dispose(); + propertyMaskBuilder_ = null; + } explainOptions_ = null; if (explainOptionsBuilder_ != null) { explainOptionsBuilder_.dispose(); @@ -870,9 +952,14 @@ private void buildPartial0(com.google.datastore.v1.RunQueryRequest result) { to_bitField0_ |= 0x00000002; } if (((from_bitField0_ & 0x00000040) != 0)) { + result.propertyMask_ = + propertyMaskBuilder_ == null ? propertyMask_ : propertyMaskBuilder_.build(); + to_bitField0_ |= 0x00000004; + } + if (((from_bitField0_ & 0x00000080) != 0)) { result.explainOptions_ = explainOptionsBuilder_ == null ? explainOptions_ : explainOptionsBuilder_.build(); - to_bitField0_ |= 0x00000004; + to_bitField0_ |= 0x00000008; } result.bitField0_ |= to_bitField0_; } @@ -949,6 +1036,9 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) { if (other.hasReadOptions()) { mergeReadOptions(other.getReadOptions()); } + if (other.hasPropertyMask()) { + mergePropertyMask(other.getPropertyMask()); + } if (other.hasExplainOptions()) { mergeExplainOptions(other.getExplainOptions()); } @@ -1030,10 +1120,16 @@ public Builder mergeFrom( bitField0_ |= 0x00000002; break; } // case 74 + case 82: + { + input.readMessage(getPropertyMaskFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000040; + break; + } // case 82 case 98: { input.readMessage(getExplainOptionsFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; break; } // case 98 default: @@ -2104,6 +2200,227 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { return gqlQueryBuilder_; } + private com.google.datastore.v1.PropertyMask propertyMask_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyMask, + com.google.datastore.v1.PropertyMask.Builder, + com.google.datastore.v1.PropertyMaskOrBuilder> + propertyMaskBuilder_; + /** + * + * + * 
+     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + * + * @return Whether the propertyMask field is set. + */ + public boolean hasPropertyMask() { + return ((bitField0_ & 0x00000040) != 0); + } + /** + * + * + * 
+     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + * + * @return The propertyMask. + */ + public com.google.datastore.v1.PropertyMask getPropertyMask() { + if (propertyMaskBuilder_ == null) { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } else { + return propertyMaskBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + */ + public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) { + if (propertyMaskBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + propertyMask_ = value; + } else { + propertyMaskBuilder_.setMessage(value); + } + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + /** + * + * + * 
+     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + */ + public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder builderForValue) { + if (propertyMaskBuilder_ == null) { + propertyMask_ = builderForValue.build(); + } else { + propertyMaskBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + /** + * + * + * 
+     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + */ + public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) { + if (propertyMaskBuilder_ == null) { + if (((bitField0_ & 0x00000040) != 0) + && propertyMask_ != null + && propertyMask_ != com.google.datastore.v1.PropertyMask.getDefaultInstance()) { + getPropertyMaskBuilder().mergeFrom(value); + } else { + propertyMask_ = value; + } + } else { + propertyMaskBuilder_.mergeFrom(value); + } + if (propertyMask_ != null) { + bitField0_ |= 0x00000040; + onChanged(); + } + return this; + } + /** + * + * + * 
+     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + */ + public Builder clearPropertyMask() { + bitField0_ = (bitField0_ & ~0x00000040); + propertyMask_ = null; + if (propertyMaskBuilder_ != null) { + propertyMaskBuilder_.dispose(); + propertyMaskBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + */ + public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() { + bitField0_ |= 0x00000040; + onChanged(); + return getPropertyMaskFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + */ + public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() { + if (propertyMaskBuilder_ != null) { + return propertyMaskBuilder_.getMessageOrBuilder(); + } else { + return propertyMask_ == null + ? com.google.datastore.v1.PropertyMask.getDefaultInstance() + : propertyMask_; + } + } + /** + * + * + * 
+     * The properties to return.
+     * This field must not be set for a projection query.
+     *
+     * See
+     * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+     *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyMask, + com.google.datastore.v1.PropertyMask.Builder, + com.google.datastore.v1.PropertyMaskOrBuilder> + getPropertyMaskFieldBuilder() { + if (propertyMaskBuilder_ == null) { + propertyMaskBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyMask, + com.google.datastore.v1.PropertyMask.Builder, + com.google.datastore.v1.PropertyMaskOrBuilder>( + getPropertyMask(), getParentForChildren(), isClean()); + propertyMask_ = null; + } + return propertyMaskBuilder_; + } + private com.google.datastore.v1.ExplainOptions explainOptions_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.ExplainOptions, @@ -2125,7 +2442,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { * @return Whether the explainOptions field is set. */ public boolean hasExplainOptions() { - return ((bitField0_ & 0x00000040) != 0); + return ((bitField0_ & 0x00000080) != 0); } /** * @@ -2171,7 +2488,7 @@ public Builder setExplainOptions(com.google.datastore.v1.ExplainOptions value) { } else { explainOptionsBuilder_.setMessage(value); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -2194,7 +2511,7 @@ public Builder setExplainOptions( } else { explainOptionsBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -2212,7 +2529,7 @@ public Builder setExplainOptions( */ public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value) { if (explainOptionsBuilder_ == null) { - if (((bitField0_ & 0x00000040) != 0) + if (((bitField0_ & 0x00000080) != 0) && explainOptions_ != null && explainOptions_ != com.google.datastore.v1.ExplainOptions.getDefaultInstance()) { getExplainOptionsBuilder().mergeFrom(value); @@ -2223,7 +2540,7 @@ public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value) explainOptionsBuilder_.mergeFrom(value); } if (explainOptions_ != null) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); } return this; @@ -2241,7 +2558,7 @@ public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value) * */ public Builder clearExplainOptions() { - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000080); explainOptions_ = null; if (explainOptionsBuilder_ != null) { explainOptionsBuilder_.dispose(); @@ -2263,7 +2580,7 @@ public Builder clearExplainOptions() { * */ public com.google.datastore.v1.ExplainOptions.Builder getExplainOptionsBuilder() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return getExplainOptionsFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java index 9e7a6f0b9..55218e0e9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java @@ -229,6 +229,53 @@ public interface RunQueryRequestOrBuilder */ com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder(); + /** + * + * + * 
+   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + * + * @return Whether the propertyMask field is set. + */ + boolean hasPropertyMask(); + /** + * + * + * 
+   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + * + * @return The propertyMask. + */ + com.google.datastore.v1.PropertyMask getPropertyMask(); + /** + * + * + * 
+   * The properties to return.
+   * This field must not be set for a projection query.
+   *
+   * See
+   * [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask].
+   *
+ * + * .google.datastore.v1.PropertyMask property_mask = 10; + */ + com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto index fbbabb0a3..92b5038ea 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto @@ -173,6 +173,14 @@ message LookupRequest { // Required. Keys of entities to look up. repeated Key keys = 3 [(google.api.field_behavior) = REQUIRED]; + + // The properties to return. Defaults to returning all properties. + // + // If this field is set and an entity has a property not referenced in the + // mask, it will be absent from [LookupResponse.found.entity.properties][]. + // + // The entity's key is always returned. + PropertyMask property_mask = 5; } // The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup]. @@ -234,6 +242,13 @@ message RunQueryRequest { GqlQuery gql_query = 7; } + // The properties to return. + // This field must not be set for a projection query. + // + // See + // [LookupRequest.property_mask][google.datastore.v1.LookupRequest.property_mask]. + PropertyMask property_mask = 10; + // Optional. Explain options for the query. If set, additional query // statistics will be returned. If not, only query results will be returned. ExplainOptions explain_options = 12 [(google.api.field_behavior) = OPTIONAL]; @@ -526,6 +541,16 @@ message Mutation { // mutation conflicts. google.protobuf.Timestamp update_time = 11; } + + // The properties to write in this mutation. + // None of the properties in the mask may have a reserved name, except for + // `__key__`. + // This field is ignored for `delete`. + // + // If the entity already exists, only properties referenced in the mask are + // updated, others are left untouched. + // Properties referenced in the mask but not in the entity are deleted. + PropertyMask property_mask = 9; } // The result of applying a mutation. @@ -555,6 +580,23 @@ message MutationResult { bool conflict_detected = 5; } +// The set of arbitrarily nested property paths used to restrict an operation to +// only a subset of properties in an entity. +message PropertyMask { + // The paths to the properties covered by this mask. + // + // A path is a list of property names separated by dots (`.`), for example + // `foo.bar` means the property `bar` inside the entity property `foo` inside + // the entity associated with this path. + // + // If a property name contains a dot `.` or a backslash `\`, then that + // name must be escaped. + // + // A path must not be empty, and may not reference a value inside an + // [array value][google.datastore.v1.Value.array_value]. + repeated string paths = 1; +} + // The options shared by read requests. message ReadOptions { // The possible values for read consistencies. From 992815d9989d04f7b371dfa320ed17894626a07f Mon Sep 17 00:00:00 2001 From: Henry Johnson Date: Tue, 28 May 2024 11:10:31 +1200 Subject: [PATCH 025/292] fix: set the correct database id on the key parent when calling Key#getParent (#1457) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: set database ID on parent key * 🦉 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 --- .../com/google/cloud/datastore/IncompleteKey.java | 6 ++++-- .../google/cloud/datastore/IncompleteKeyTest.java | 12 ++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java index db9973cb5..71e31b94d 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java @@ -91,9 +91,11 @@ public Key getParent() { PathElement parent = ancestors.get(ancestors.size() - 1); Key.Builder keyBuilder; if (parent.hasName()) { - keyBuilder = Key.newBuilder(getProjectId(), parent.getKind(), parent.getName()); + keyBuilder = + Key.newBuilder(getProjectId(), parent.getKind(), parent.getName(), getDatabaseId()); } else { - keyBuilder = Key.newBuilder(getProjectId(), parent.getKind(), parent.getId()); + keyBuilder = + Key.newBuilder(getProjectId(), parent.getKind(), parent.getId(), getDatabaseId()); } String namespace = getNamespace(); if (namespace != null) { diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java index a1f8956b5..75549e5ea 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java @@ -25,15 +25,17 @@ public class IncompleteKeyTest { - private static IncompleteKey pk1, pk2, pk4; - private static Key parent1; + private static IncompleteKey pk1, pk2, pk4, pk5; + private static Key parent1, parent2; @Before public void setUp() { pk1 = IncompleteKey.newBuilder("ds", "kind1").build(); parent1 = Key.newBuilder("ds", "kind2", 10).setNamespace("ns").build(); + parent2 = Key.newBuilder("ds", "kind2", 10, "test-db").setNamespace("ns").build(); pk2 = IncompleteKey.newBuilder(parent1, "kind3").build(); pk4 = IncompleteKey.newBuilderWithDatabaseId("ds", "kind3", "test-db").build(); + pk5 = IncompleteKey.newBuilder(parent2, "kind4").build(); } @Test @@ -59,12 +61,18 @@ public void testBuilders() { assertEquals("test-db", pk4.getDatabaseId()); assertEquals("kind3", pk4.getKind()); assertTrue(pk4.getAncestors().isEmpty()); + + assertEquals("ds", pk5.getProjectId()); + assertEquals("test-db", pk5.getDatabaseId()); + assertEquals("kind4", pk5.getKind()); + assertEquals(parent2.getPath(), pk5.getAncestors()); } @Test public void testParent() { assertNull(pk1.getParent()); assertEquals(parent1, pk2.getParent()); + assertEquals(parent2, pk5.getParent()); Key parent2 = Key.newBuilder("ds", "kind3", "name").setNamespace("ns").build(); IncompleteKey pk3 = IncompleteKey.newBuilder(parent2, "kind3").build(); assertEquals(parent2, pk3.getParent()); From 2d380e51e7ddde71e8625b23b94857e4a48c12f9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 13:30:17 +0000 Subject: [PATCH 026/292] chore(main): release 2.20.0 (#1454) :robot: I have created a release *beep* *boop* --- ## [2.20.0](https://togithub.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27) ### Features * New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://togithub.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://togithub.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b)) ### Bug Fixes * Migrate off TextPrinter's deprecated methods ([#1452](https://togithub.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://togithub.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92)) * Set the correct database id on the key parent when calling Key#getParent ([#1457](https://togithub.com/googleapis/java-datastore/issues/1457)) ([992815d](https://togithub.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 13 +++++++++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 41 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 185e9d891..37dd53f58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [2.20.0](https://github.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27) + + +### Features + +* New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://github.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://github.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b)) + + +### Bug Fixes + +* Migrate off TextPrinter's deprecated methods ([#1452](https://github.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://github.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92)) +* Set the correct database id on the key parent when calling Key#getParent ([#1457](https://github.com/googleapis/java-datastore/issues/1457)) ([992815d](https://github.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f)) + ## [2.19.3](https://github.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 4c6c8306b..6a96c7688 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.19.4-SNAPSHOT + 2.20.0 com.google.cloud google-cloud-datastore-parent - 2.19.4-SNAPSHOT + 2.20.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f4509a986..837193172 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.19.4-SNAPSHOT + 2.20.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.19.4-SNAPSHOT + 2.20.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.4-SNAPSHOT + 2.20.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.4-SNAPSHOT + 0.111.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.4-SNAPSHOT + 2.20.0 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 50a0dc771..21ea96e1f 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.19.4-SNAPSHOT + 2.20.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.19.4-SNAPSHOT + 2.20.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index d846af69e..0411bb3e1 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.4-SNAPSHOT + 2.20.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.19.4-SNAPSHOT + 2.20.0 diff --git a/pom.xml b/pom.xml index 859d22ae8..2aa5869ae 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.19.4-SNAPSHOT + 2.20.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.4-SNAPSHOT + 2.20.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.19.4-SNAPSHOT + 2.20.0 com.google.cloud google-cloud-datastore - 2.19.4-SNAPSHOT + 2.20.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.4-SNAPSHOT + 0.111.0 com.google.cloud.datastore datastore-v1-proto-client - 2.19.4-SNAPSHOT + 2.20.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index b7d230c93..5ce728f7a 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.19.4-SNAPSHOT + 2.20.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.19.4-SNAPSHOT + 2.20.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 406872937..bb5427dfb 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.110.4-SNAPSHOT + 0.111.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.19.4-SNAPSHOT + 2.20.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 0f1b38b1b..6d378e516 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.19.4-SNAPSHOT + 2.20.0 diff --git a/versions.txt b/versions.txt index 5a99dd778..e8bac13b0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.19.3:2.19.4-SNAPSHOT -google-cloud-datastore-bom:2.19.3:2.19.4-SNAPSHOT -proto-google-cloud-datastore-v1:0.110.3:0.110.4-SNAPSHOT -datastore-v1-proto-client:2.19.3:2.19.4-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.19.3:2.19.4-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.19.3:2.19.4-SNAPSHOT +google-cloud-datastore:2.20.0:2.20.0 +google-cloud-datastore-bom:2.20.0:2.20.0 +proto-google-cloud-datastore-v1:0.111.0:0.111.0 +datastore-v1-proto-client:2.20.0:2.20.0 +proto-google-cloud-datastore-admin-v1:2.20.0:2.20.0 +grpc-google-cloud-datastore-admin-v1:2.20.0:2.20.0 From 55c5a6397c688623cacba045aab31c5f6b845b93 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 15:32:17 +0000 Subject: [PATCH 027/292] chore(main): release 2.20.1-SNAPSHOT (#1461) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 6a96c7688..c9805ccc0 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.20.0 + 2.20.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.20.0 + 2.20.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 837193172..fd4ff704a 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.20.0 + 2.20.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.20.0 + 2.20.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.0 + 2.20.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.0 + 0.111.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.0 + 2.20.1-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 21ea96e1f..9467dd692 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.20.0 + 2.20.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.20.0 + 2.20.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 0411bb3e1..34ed50955 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.0 + 2.20.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.0 + 2.20.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2aa5869ae..a72b38f98 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.20.0 + 2.20.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.0 + 2.20.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.0 + 2.20.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.20.0 + 2.20.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.0 + 0.111.1-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.20.0 + 2.20.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 5ce728f7a..95dd5fcaa 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.0 + 2.20.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.0 + 2.20.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index bb5427dfb..de242755b 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.0 + 0.111.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.20.0 + 2.20.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6d378e516..421612d06 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.20.0 + 2.20.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index e8bac13b0..6f2c5611b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.20.0:2.20.0 -google-cloud-datastore-bom:2.20.0:2.20.0 -proto-google-cloud-datastore-v1:0.111.0:0.111.0 -datastore-v1-proto-client:2.20.0:2.20.0 -proto-google-cloud-datastore-admin-v1:2.20.0:2.20.0 -grpc-google-cloud-datastore-admin-v1:2.20.0:2.20.0 +google-cloud-datastore:2.20.0:2.20.1-SNAPSHOT +google-cloud-datastore-bom:2.20.0:2.20.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.111.0:0.111.1-SNAPSHOT +datastore-v1-proto-client:2.20.0:2.20.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.20.0:2.20.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.20.0:2.20.1-SNAPSHOT From 5058efbfa235f6ffa9c41071fb1421c842336116 Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Tue, 28 May 2024 11:49:35 -0400 Subject: [PATCH 028/292] test: add integration test for incomplete key (#1460) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: add integration test for incomplete key * 🦉 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 --- .../cloud/datastore/it/ITDatastoreTest.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java index 09dcd2116..c012d28c9 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java @@ -144,6 +144,7 @@ public class ITDatastoreTest { private static Key KEY3; private static Key KEY4; private static Key KEY5; + private static Key KEY6; private static final String MARKS_KIND = "Marks"; private static FullEntity PARTIAL_ENTITY1; private static FullEntity PARTIAL_ENTITY2; @@ -193,6 +194,10 @@ public ITDatastoreTest( KEY3 = Key.newBuilder(KEY2).setName("bla").setNamespace(NAMESPACE).build(); KEY4 = Key.newBuilder(KEY2).setName("newName1").setNamespace(NAMESPACE).build(); KEY5 = Key.newBuilder(KEY2).setName("newName2").setNamespace(NAMESPACE).build(); + KEY6 = + Key.newBuilder(options.getProjectId(), KIND2, 100, options.getDatabaseId()) + .setNamespace(NAMESPACE) + .build(); LIST_VALUE2 = ListValue.of(Collections.singletonList(KeyValue.of(KEY1))); @@ -1787,6 +1792,21 @@ public void testGet() { assertFalse(entity.contains("bla")); } + @Test + public void testIncompleteKey() { + Key parentKey = null; + try { + IncompleteKey incompleteKey = IncompleteKey.newBuilder(KEY6, KIND1).build(); + parentKey = incompleteKey.getParent(); + Entity entity = Entity.newBuilder(parentKey).set("name", "val").build(); + datastore.put(entity); + Entity retrievedEntity = datastore.get(parentKey); + assertThat(retrievedEntity).isEqualTo(entity); + } finally { + datastore.delete(parentKey); + } + } + @Test public void testGetWithReadTime() throws InterruptedException { Key key = From 85b90a266421a842db0093c83d16346fd04513ed Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 28 May 2024 17:58:02 +0200 Subject: [PATCH 029/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 (#1463) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 * 🦉 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 --- README.md | 8 ++++---- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0a6931db2..9bdf33b26 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.19.3 + 2.20.0 ``` @@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.19.3' +implementation 'com.google.cloud:google-cloud-datastore:2.20.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.19.3" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.0" ``` @@ -384,7 +384,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.19.3 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 45eb26354..4b268da0e 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.19.3 + 2.20.0 From bb1b4033f80995d4bd52f85092179a7d2f997e4c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 29 May 2024 23:06:10 +0200 Subject: [PATCH 030/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 (#1466) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 * 🦉 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 --- README.md | 4 ++-- samples/native-image-sample/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9bdf33b26..4520f2779 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.39.0 + 26.40.0 pom import @@ -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.39.0') +implementation platform('com.google.cloud:libraries-bom:26.40.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 00999bee3..282d2e56d 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -28,7 +28,7 @@ com.google.cloud libraries-bom - 26.39.0 + 26.40.0 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 6ac0109ed..65ec852e3 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.39.0 + 26.40.0 pom import From 42c643d78562c5cbd6c17c29a0a124be8d05198a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 4 Jun 2024 05:47:36 +0200 Subject: [PATCH 031/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 (#1471) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 5ff23d7aa..10b46672b 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.30.1 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.31.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 3b76021ce..ca8cab04c 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.30.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.31.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 8c9d2b103..b1afa67b1 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.30.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.31.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index fd4ff704a..f4c9564b3 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.30.1 + 3.31.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index a72b38f98..fbae08ca6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.30.1 + 3.31.0 From 614e930f2bdccc517d4733e5fb7f3cefad696a20 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 4 Jun 2024 05:58:35 +0200 Subject: [PATCH 032/292] deps: update dependency com.google.guava:guava-testlib to v33.2.1-jre (#1470) --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 9467dd692..0605a1359 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -122,7 +122,7 @@ com.google.guava guava-testlib - 33.2.0-jre + 33.2.1-jre test From e3fac2bf9992fcb2e91319df0520094865de2d49 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 4 Jun 2024 05:59:13 +0200 Subject: [PATCH 033/292] deps: update dependency com.google.errorprone:error_prone_core to v2.28.0 (#1469) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fbae08ca6..d5ea36b79 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ github google-cloud-datastore-parent https://googleapis.dev/java/google-api-grpc/latest - 2.27.1 + 2.28.0 From e8e1576f840215143ff4be861cc58f0850dbeb01 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 4 Jun 2024 08:00:01 +0200 Subject: [PATCH 034/292] build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.7.0 (#1459) --- samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/pom.xml b/samples/pom.xml index 745443d35..e81bec450 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -47,7 +47,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true From e7636fdf3bd582f15ba7511ec12dfba7a289a132 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 00:04:39 +0800 Subject: [PATCH 035/292] chore(main): release 2.20.1 (#1476) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 9 +++++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 37 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37dd53f58..074f849e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [2.20.1](https://github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) (2024-06-04) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#1471](https://github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a)) +* Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#1469](https://github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49)) +* Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#1470](https://github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20)) + ## [2.20.0](https://github.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index c9805ccc0..53589fe58 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.20.1-SNAPSHOT + 2.20.1 com.google.cloud google-cloud-datastore-parent - 2.20.1-SNAPSHOT + 2.20.1 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f4c9564b3..042d87294 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.20.1-SNAPSHOT + 2.20.1 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.20.1-SNAPSHOT + 2.20.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.1-SNAPSHOT + 2.20.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.1-SNAPSHOT + 0.111.1 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.1-SNAPSHOT + 2.20.1 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 0605a1359..6d9c3ab0a 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.20.1-SNAPSHOT + 2.20.1 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.20.1-SNAPSHOT + 2.20.1 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 34ed50955..f2059b821 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.1-SNAPSHOT + 2.20.1 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.1-SNAPSHOT + 2.20.1 diff --git a/pom.xml b/pom.xml index d5ea36b79..0d81b4a1e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.20.1-SNAPSHOT + 2.20.1 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.1-SNAPSHOT + 2.20.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.1-SNAPSHOT + 2.20.1 com.google.cloud google-cloud-datastore - 2.20.1-SNAPSHOT + 2.20.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.1-SNAPSHOT + 0.111.1 com.google.cloud.datastore datastore-v1-proto-client - 2.20.1-SNAPSHOT + 2.20.1 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 95dd5fcaa..94759e4ad 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.1-SNAPSHOT + 2.20.1 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.1-SNAPSHOT + 2.20.1 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index de242755b..3d41fdbe2 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.1-SNAPSHOT + 0.111.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.20.1-SNAPSHOT + 2.20.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 421612d06..d882d8916 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.20.1-SNAPSHOT + 2.20.1 diff --git a/versions.txt b/versions.txt index 6f2c5611b..bd987449e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.20.0:2.20.1-SNAPSHOT -google-cloud-datastore-bom:2.20.0:2.20.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.111.0:0.111.1-SNAPSHOT -datastore-v1-proto-client:2.20.0:2.20.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.20.0:2.20.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.20.0:2.20.1-SNAPSHOT +google-cloud-datastore:2.20.1:2.20.1 +google-cloud-datastore-bom:2.20.1:2.20.1 +proto-google-cloud-datastore-v1:0.111.1:0.111.1 +datastore-v1-proto-client:2.20.1:2.20.1 +proto-google-cloud-datastore-admin-v1:2.20.1:2.20.1 +grpc-google-cloud-datastore-admin-v1:2.20.1:2.20.1 From 9d61e9b5348cfa0df27a5c5b05e57b93a8c82396 Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Wed, 26 Jun 2024 04:50:20 +0800 Subject: [PATCH 036/292] Doc: Add gRPC datastore gapic upgrade user guide (#1489) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Add read me user guide * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Updating formatting * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fixing formatting * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * adjusting formatting * 🦉 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 --- .readme-partials.yaml | 98 ++++++++++++++++++++++++++++++++++++++- README.md | 104 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 197 insertions(+), 5 deletions(-) diff --git a/.readme-partials.yaml b/.readme-partials.yaml index 9823b5c70..ced21e49f 100644 --- a/.readme-partials.yaml +++ b/.readme-partials.yaml @@ -105,7 +105,103 @@ custom_content: | running on Compute Engine or from your own desktop. To run the example on App Engine, simply move the code from the main method to your application's servlet class and change the print statements to display on your webpage. - + + gRPC Java Datastore Client User Guide + ------- + In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance. + + #### Download Instructions + Instructions: + 1. Clone the grpc-experimental branch from GitHub: + ```python + git clone -b grpc-experimental https://github.com/googleapis/java-datastore.git + ``` + 2. Run the following commands to build the library: + ```python + # Go to the directory the code was downloaded to + cd java-datastore/ + + # Build the library + mvn clean install -DskipTests=true + ``` + 3. Add the following dependency to your project: + ```xml + + com.google.cloud + google-cloud-datastore + 2.20.0-grpc-experimental-1-SNAPSHOT + + ``` + + #### How to Use + To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation. + + Example: + ```java + DatastoreOptions datastoreOptions = + DatastoreOptions.newBuilder() + .setProjectId("my-project") + .setDatabaseId("my-database") + .setTransportOptions(GrpcTransportOptions.newBuilder().build()) + .build(); + ``` + Setting the transport options explicitly to `GrpcTransportOptions` will signal the client to use gRPC instead of HTTP when making calls to the server. + + To revert back to the existing stable behavior and transport, simply remove the transport options line or replace it with `HttpTransportOptions`. Please note this will require an application rebuild and restart. + Example: + ```java + // will default to existing HTTP transport behavior + DatastoreOptions datastoreOptions = DatastoreOptions.newBuilder() + .setProjectId("my-project") + .setDatabaseId("my-database") + .build(); + + // will also default to existing HTTP transport behavior + DatastoreOptions datastoreOptions = + DatastoreOptions.newBuilder() + .setProjectId("my-project") + .setDatabaseId("my-database") + .setTransportOptions(HttpTransportOptions.newBuilder() + .setConnectTimeout(1000) + .build()).build(); + ``` + + Note: client instantiations that already use `setTransportOptions` with `HttpTransportOptions` will continue to have the same behavior. Only transports that are explicitly set to gRPC will change. + + #### Verify Datastore Transport Options Type + To verify which type of TransportOptions you have successfully configured, you can use the below lines of code to compare transport options type: + ```java + // checks if using gRPC transport options + boolean isGRPC = datastore.getOptions().getTransportOptions() instanceof GrpcTransportOptions; + + // checks if using HTTP transport options + boolean isHTTP = datastore.getOptions().getTransportOptions() instanceof HTTPTransportOptions; + ``` + + #### New Features + There are new gRPC specific features available to use in this update. + + ##### Channel Pooling + To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. + See [ChannelPoolSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.grpc.ChannelPoolSettings) and [Performance Best Practices](https://grpc.io/docs/guides/performance/) for more information on channel pools and best practices for performance. + + Example: + ```java + InstantiatingGrpcChannelProvider channelProvider = + DatastoreSettings.defaultGrpcTransportProviderBuilder() + .setChannelPoolSettings( + ChannelPoolSettings.builder() + .setInitialChannelCount(MIN_VAL) + .setMaxChannelCount(MAX_VAL) + .build()) + .build(); + + DatastoreOptions options = DatastoreOptions.newBuilder() + .setProjectId("my-project") + .setChannelProvider(channelProvider) + .setTransportOptions(GrpcTransportOptions.newBuilder().build()) + .build(); + ``` Testing ------- diff --git a/README.md b/README.md index 4520f2779..7ddb359d5 100644 --- a/README.md +++ b/README.md @@ -50,20 +50,20 @@ 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.40.0') +implementation platform('com.google.cloud:libraries-bom:26.42.0') implementation 'com.google.cloud:google-cloud-datastore' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.20.0' +implementation 'com.google.cloud:google-cloud-datastore:2.20.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.1" ``` @@ -210,6 +210,102 @@ running on Compute Engine or from your own desktop. To run the example on App En the code from the main method to your application's servlet class and change the print statements to display on your webpage. +gRPC Java Datastore Client User Guide +------- +In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance. + +#### Download Instructions +Instructions: +1. Clone the grpc-experimental branch from GitHub: +```python +git clone -b grpc-experimental https://github.com/googleapis/java-datastore.git +``` +2. Run the following commands to build the library: +```python +# Go to the directory the code was downloaded to +cd java-datastore/ + +# Build the library +mvn clean install -DskipTests=true +``` +3. Add the following dependency to your project: +```xml + + com.google.cloud + google-cloud-datastore + 2.20.0-grpc-experimental-1-SNAPSHOT + +``` + +#### How to Use +To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation. + +Example: +```java +DatastoreOptions datastoreOptions = + DatastoreOptions.newBuilder() + .setProjectId("my-project") + .setDatabaseId("my-database") + .setTransportOptions(GrpcTransportOptions.newBuilder().build()) + .build(); +``` +Setting the transport options explicitly to `GrpcTransportOptions` will signal the client to use gRPC instead of HTTP when making calls to the server. + +To revert back to the existing stable behavior and transport, simply remove the transport options line or replace it with `HttpTransportOptions`. Please note this will require an application rebuild and restart. +Example: +```java +// will default to existing HTTP transport behavior +DatastoreOptions datastoreOptions = DatastoreOptions.newBuilder() + .setProjectId("my-project") + .setDatabaseId("my-database") + .build(); + +// will also default to existing HTTP transport behavior +DatastoreOptions datastoreOptions = + DatastoreOptions.newBuilder() + .setProjectId("my-project") + .setDatabaseId("my-database") + .setTransportOptions(HttpTransportOptions.newBuilder() + .setConnectTimeout(1000) + .build()).build(); +``` + +Note: client instantiations that already use `setTransportOptions` with `HttpTransportOptions` will continue to have the same behavior. Only transports that are explicitly set to gRPC will change. + +#### Verify Datastore Transport Options Type +To verify which type of TransportOptions you have successfully configured, you can use the below lines of code to compare transport options type: +```java +// checks if using gRPC transport options +boolean isGRPC = datastore.getOptions().getTransportOptions() instanceof GrpcTransportOptions; + +// checks if using HTTP transport options +boolean isHTTP = datastore.getOptions().getTransportOptions() instanceof HTTPTransportOptions; +``` + +#### New Features +There are new gRPC specific features available to use in this update. + +##### Channel Pooling +To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. +See [ChannelPoolSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.grpc.ChannelPoolSettings) and [Performance Best Practices](https://grpc.io/docs/guides/performance/) for more information on channel pools and best practices for performance. + +Example: +```java +InstantiatingGrpcChannelProvider channelProvider = + DatastoreSettings.defaultGrpcTransportProviderBuilder() + .setChannelPoolSettings( + ChannelPoolSettings.builder() + .setInitialChannelCount(MIN_VAL) + .setMaxChannelCount(MAX_VAL) + .build()) + .build(); + +DatastoreOptions options = DatastoreOptions.newBuilder() + .setProjectId("my-project") + .setChannelProvider(channelProvider) + .setTransportOptions(GrpcTransportOptions.newBuilder().build()) + .build(); +``` Testing ------- @@ -384,7 +480,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.1 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles From 44080bcd9ef256873076a35b95a50d5a1123644c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 05:18:22 +0000 Subject: [PATCH 037/292] chore(main): release 2.20.2-SNAPSHOT (#1479) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 53589fe58..398f55761 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.20.1 + 2.20.2-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.20.1 + 2.20.2-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 042d87294..9b4d65cd5 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.20.1 + 2.20.2-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.20.1 + 2.20.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.1 + 2.20.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.1 + 0.111.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.1 + 2.20.2-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6d9c3ab0a..52ecab94f 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.20.1 + 2.20.2-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.20.1 + 2.20.2-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index f2059b821..14f7fc606 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.1 + 2.20.2-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.1 + 2.20.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0d81b4a1e..19ddfdf15 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.20.1 + 2.20.2-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.1 + 2.20.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.1 + 2.20.2-SNAPSHOT com.google.cloud google-cloud-datastore - 2.20.1 + 2.20.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.1 + 0.111.2-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.20.1 + 2.20.2-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 94759e4ad..64647bf0b 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.1 + 2.20.2-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.1 + 2.20.2-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 3d41fdbe2..86d6e1cec 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.1 + 0.111.2-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.20.1 + 2.20.2-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index d882d8916..b4462afa8 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.20.1 + 2.20.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index bd987449e..a3e4e9988 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.20.1:2.20.1 -google-cloud-datastore-bom:2.20.1:2.20.1 -proto-google-cloud-datastore-v1:0.111.1:0.111.1 -datastore-v1-proto-client:2.20.1:2.20.1 -proto-google-cloud-datastore-admin-v1:2.20.1:2.20.1 -grpc-google-cloud-datastore-admin-v1:2.20.1:2.20.1 +google-cloud-datastore:2.20.1:2.20.2-SNAPSHOT +google-cloud-datastore-bom:2.20.1:2.20.2-SNAPSHOT +proto-google-cloud-datastore-v1:0.111.1:0.111.2-SNAPSHOT +datastore-v1-proto-client:2.20.1:2.20.2-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.20.1:2.20.2-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.20.1:2.20.2-SNAPSHOT From d940c937959942d753f9215e7ce940ab6742be46 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 28 Jun 2024 21:48:34 +0200 Subject: [PATCH 038/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 (#1492) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 * 🦉 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 --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 10b46672b..ec72b08ac 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.31.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index ca8cab04c..0c813eaf7 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.31.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.32.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index b1afa67b1..ef1c9176c 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.31.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.32.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 9b4d65cd5..38ed9bb53 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.31.0 + 3.32.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 19ddfdf15..4236919ad 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.31.0 + 3.32.0 From 9293051b1d966f0d55be2d8df1b873b99d6d160d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 22:26:19 +0000 Subject: [PATCH 039/292] chore(main): release 2.20.2 (#1503) :robot: I have created a release *beep* *boop* --- ## [2.20.2](https://togithub.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1492](https://togithub.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://togithub.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 35 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 074f849e8..f9ca1c263 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.20.2](https://github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1492](https://github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) + ## [2.20.1](https://github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) (2024-06-04) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 398f55761..dd7683c64 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.20.2-SNAPSHOT + 2.20.2 com.google.cloud google-cloud-datastore-parent - 2.20.2-SNAPSHOT + 2.20.2 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 38ed9bb53..5b01bd928 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.20.2-SNAPSHOT + 2.20.2 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.20.2-SNAPSHOT + 2.20.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.2-SNAPSHOT + 2.20.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.2-SNAPSHOT + 0.111.2 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.2-SNAPSHOT + 2.20.2 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 52ecab94f..7a70bdf73 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.20.2-SNAPSHOT + 2.20.2 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.20.2-SNAPSHOT + 2.20.2 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 14f7fc606..5c3f255f5 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.2-SNAPSHOT + 2.20.2 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.2-SNAPSHOT + 2.20.2 diff --git a/pom.xml b/pom.xml index 4236919ad..b72ce5ec3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.20.2-SNAPSHOT + 2.20.2 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.2-SNAPSHOT + 2.20.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.2-SNAPSHOT + 2.20.2 com.google.cloud google-cloud-datastore - 2.20.2-SNAPSHOT + 2.20.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.2-SNAPSHOT + 0.111.2 com.google.cloud.datastore datastore-v1-proto-client - 2.20.2-SNAPSHOT + 2.20.2 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 64647bf0b..b63ebd708 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.2-SNAPSHOT + 2.20.2 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.2-SNAPSHOT + 2.20.2 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 86d6e1cec..8128587a6 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.2-SNAPSHOT + 0.111.2 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.20.2-SNAPSHOT + 2.20.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b4462afa8..1f2e22ec4 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.20.2-SNAPSHOT + 2.20.2 diff --git a/versions.txt b/versions.txt index a3e4e9988..f42550e75 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.20.1:2.20.2-SNAPSHOT -google-cloud-datastore-bom:2.20.1:2.20.2-SNAPSHOT -proto-google-cloud-datastore-v1:0.111.1:0.111.2-SNAPSHOT -datastore-v1-proto-client:2.20.1:2.20.2-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.20.1:2.20.2-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.20.1:2.20.2-SNAPSHOT +google-cloud-datastore:2.20.2:2.20.2 +google-cloud-datastore-bom:2.20.2:2.20.2 +proto-google-cloud-datastore-v1:0.111.2:0.111.2 +datastore-v1-proto-client:2.20.2:2.20.2 +proto-google-cloud-datastore-admin-v1:2.20.2:2.20.2 +grpc-google-cloud-datastore-admin-v1:2.20.2:2.20.2 From d142d9c95d91c8cadaf696efc12d6136814938ff Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Sat, 29 Jun 2024 21:46:56 -0400 Subject: [PATCH 040/292] feat: enable hermetic library generation (#1462) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * restore to older version * update googleapis_committish * fix googleapis_committish * infer image tag from config yaml * correct workflow name * update config scripts and yamls * remove old update_googleapis_committish workflow * restore proto folder * Revert "restore proto folder" This reverts commit 59046f83269c16fb775d1069b54ee5de0749b8e5. * feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455) * feat: New PropertyMask field which allows partial commits, lookups, and query results PiperOrigin-RevId: 635449160 Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9 * 🦉 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 * sync config structure with that of google-cloud-java * remove quotes from config yamls * fix typo in update_generation_config.yaml * correct * quote codeowners_team in generation config * update generator version * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Owl Bot --- .../{.OwlBot.yaml => .OwlBot-hermetic.yaml} | 0 .../scripts/hermetic_library_generation.sh | 117 +++++++++++++++++ .github/scripts/update_generation_config.sh | 121 ++++++++++++++++++ .../hermetic_library_generation.yaml | 38 ++++++ .../workflows/update_generation_config.yaml | 42 ++++++ generation_config.yaml | 25 ++++ 6 files changed, 343 insertions(+) rename .github/{.OwlBot.yaml => .OwlBot-hermetic.yaml} (100%) create mode 100644 .github/scripts/hermetic_library_generation.sh create mode 100644 .github/scripts/update_generation_config.sh create mode 100644 .github/workflows/hermetic_library_generation.yaml create mode 100644 .github/workflows/update_generation_config.yaml create mode 100644 generation_config.yaml diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot-hermetic.yaml similarity index 100% rename from .github/.OwlBot.yaml rename to .github/.OwlBot-hermetic.yaml diff --git a/.github/scripts/hermetic_library_generation.sh b/.github/scripts/hermetic_library_generation.sh new file mode 100644 index 000000000..6c3f22d8f --- /dev/null +++ b/.github/scripts/hermetic_library_generation.sh @@ -0,0 +1,117 @@ +#!/bin/bash +set -e +# This script should be run at the root of the repository. +# This script is used to, when a pull request changes the generation +# configuration (generation_config.yaml by default): +# 1. Find whether the last commit in this pull request contains changes to +# the generation configuration and exit early if it doesn't have such a change +# since the generation result would be the same. +# 2. Compare generation configurations in the current branch (with which the +# pull request associated) and target branch (into which the pull request is +# merged); +# 3. Generate changed libraries using library_generation image; +# 4. Commit the changes to the pull request, if any. +# 5. Edit the PR body with generated pull request description, if applicable. + +# The following commands need to be installed before running the script: +# 1. git +# 2. gh +# 3. docker + +# The parameters of this script is: +# 1. target_branch, the branch into which the pull request is merged. +# 2. current_branch, the branch with which the pull request is associated. +# 3. [optional] generation_config, the path to the generation configuration, +# the default value is generation_config.yaml in the repository root. +while [[ $# -gt 0 ]]; do +key="$1" +case "${key}" in + --target_branch) + target_branch="$2" + shift + ;; + --current_branch) + current_branch="$2" + shift + ;; + --generation_config) + generation_config="$2" + shift + ;; + *) + echo "Invalid option: [$1]" + exit 1 + ;; +esac +shift +done + +if [ -z "${target_branch}" ]; then + echo "missing required argument --target_branch" + exit 1 +fi + +if [ -z "${current_branch}" ]; then + echo "missing required argument --current_branch" + exit 1 +fi + +if [ -z "${generation_config}" ]; then + generation_config=generation_config.yaml + echo "Using default generation config: ${generation_config}" +fi + +workspace_name="/workspace" +baseline_generation_config="baseline_generation_config.yaml" +message="chore: generate libraries at $(date)" + +git checkout "${target_branch}" +git checkout "${current_branch}" +# if the last commit doesn't contain changes to generation configuration, +# do not generate again as the result will be the same. +change_of_last_commit="$(git diff-tree --no-commit-id --name-only HEAD~1..HEAD -r)" +if [[ ! ("${change_of_last_commit}" == *"${generation_config}"*) ]]; then + echo "The last commit doesn't contain any changes to the generation_config.yaml, skipping the whole generation process." || true + exit 0 +fi +# copy generation configuration from target branch to current branch. +git show "${target_branch}":"${generation_config}" > "${baseline_generation_config}" +config_diff=$(diff "${generation_config}" "${baseline_generation_config}" || true) + +# parse image tag from the generation configuration. +image_tag=$(grep "gapic_generator_version" "${generation_config}" | cut -d ':' -f 2 | xargs) + +# run hermetic code generation docker image. +docker run \ + --rm \ + -u "$(id -u):$(id -g)" \ + -v "$(pwd):${workspace_name}" \ + gcr.io/cloud-devrel-public-resources/java-library-generation:"${image_tag}" \ + --baseline-generation-config-path="${workspace_name}/${baseline_generation_config}" \ + --current-generation-config-path="${workspace_name}/${generation_config}" + + +# commit the change to the pull request. +if [[ $(basename $(pwd)) == "google-cloud-java" ]]; then + git add java-* pom.xml gapic-libraries-bom/pom.xml versions.txt +else + # The image leaves intermediate folders and files it works with. Here we remove them + rm -rdf output googleapis "${baseline_generation_config}" + git add --all -- ':!pr_description.txt' +fi +changed_files=$(git diff --cached --name-only) +if [[ "${changed_files}" == "" ]]; then + echo "There is no generated code change with the generation config change ${config_diff}." + echo "Skip committing to the pull request." + exit 0 +fi + +echo "Configuration diff:" +echo "${config_diff}" +git commit -m "${message}" +git push +# set pr body if pr_description.txt is generated. +if [[ -f "pr_description.txt" ]]; then + pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number") + gh pr edit "${pr_num}" --body "$(cat pr_description.txt)" +fi diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh new file mode 100644 index 000000000..561a31304 --- /dev/null +++ b/.github/scripts/update_generation_config.sh @@ -0,0 +1,121 @@ +#!/bin/bash +set -e +# This script should be run at the root of the repository. +# This script is used to update googleapis_commitish, gapic_generator_version, +# and libraries_bom_version in generation configuration at the time of running +# and create a pull request. + +# The following commands need to be installed before running the script: +# 1. git +# 2. gh +# 3. jq + +# Utility functions +# Get the latest released version of a Maven artifact. +function get_latest_released_version() { + local group_id=$1 + local artifact_id=$2 + latest=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json" | jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' | sort -V | tail -n 1) + echo "${latest}" +} + +# Update a key to a new value in the generation config. +function update_config() { + local key_word=$1 + local new_value=$2 + local file=$3 + echo "Update ${key_word} to ${new_value} in ${file}" + sed -i -e "s/^${key_word}.*$/${key_word}: ${new_value}/" "${file}" +} + +# The parameters of this script is: +# 1. base_branch, the base branch of the result pull request. +# 2. repo, organization/repo-name, e.g., googleapis/google-cloud-java +# 3. [optional] generation_config, the path to the generation configuration, +# the default value is generation_config.yaml in the repository root. +while [[ $# -gt 0 ]]; do +key="$1" +case "${key}" in + --base_branch) + base_branch="$2" + shift + ;; + --repo) + repo="$2" + shift + ;; + --generation_config) + generation_config="$2" + shift + ;; + *) + echo "Invalid option: [$1]" + exit 1 + ;; +esac +shift +done + +if [ -z "${base_branch}" ]; then + echo "missing required argument --base_branch" + exit 1 +fi + +if [ -z "${repo}" ]; then + echo "missing required argument --repo" + exit 1 +fi + +if [ -z "${generation_config}" ]; then + generation_config="generation_config.yaml" + echo "Use default generation config: ${generation_config}" +fi + +current_branch="generate-libraries-${base_branch}" +title="chore: Update generation configuration at $(date)" + +# try to find a open pull request associated with the branch +pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number") +# create a branch if there's no open pull request associated with the +# branch; otherwise checkout the pull request. +if [ -z "${pr_num}" ]; then + git checkout -b "${current_branch}" +else + gh pr checkout "${pr_num}" +fi + +mkdir tmp-googleapis +# use partial clone because only commit history is needed. +git clone --filter=blob:none https://github.com/googleapis/googleapis.git tmp-googleapis +pushd tmp-googleapis +git pull +latest_commit=$(git rev-parse HEAD) +popd +rm -rf tmp-googleapis +update_config "googleapis_commitish" "${latest_commit}" "${generation_config}" + +# update gapic-generator-java version to the latest +latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java") +update_config "gapic_generator_version" "${latest_version}" "${generation_config}" + +# update libraries-bom version to the latest +latest_version=$(get_latest_released_version "com.google.cloud" "libraries-bom") +update_config "libraries_bom_version" "${latest_version}" "${generation_config}" + +git add "${generation_config}" +changed_files=$(git diff --cached --name-only) +if [[ "${changed_files}" == "" ]]; then + echo "The latest generation config is not changed." + echo "Skip committing to the pull request." + exit 0 +fi +git commit -m "${title}" +if [ -z "${pr_num}" ]; then + git remote add remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${repo}.git" + git fetch -q --unshallow remote_repo + git push -f remote_repo "${current_branch}" + gh pr create --title "${title}" --head "${current_branch}" --body "${title}" --base "${base_branch}" +else + git push + gh pr edit "${pr_num}" --title "${title}" --body "${title}" +fi diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml new file mode 100644 index 000000000..0c7a82a3c --- /dev/null +++ b/.github/workflows/hermetic_library_generation.yaml @@ -0,0 +1,38 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# GitHub action job to test core java library features on +# downstream client libraries before they are released. +name: Hermetic library generation upon generation config change through pull requests +on: + pull_request: + +jobs: + library_generation: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} + - name: Generate changed libraries + shell: bash + run: | + set -x + [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com" + [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot" + bash .github/scriptes/hermetic_library_generation.sh \ + --target_branch ${{ github.base_ref }} \ + --current_branch ${{ github.head_ref }} + env: + GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml new file mode 100644 index 000000000..3cf773992 --- /dev/null +++ b/.github/workflows/update_generation_config.yaml @@ -0,0 +1,42 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# GitHub action job to test core java library features on +# downstream client libraries before they are released. +name: Update generation configuration +on: + schedule: + - cron: '0 2 * * *' + workflow_dispatch: + +jobs: + update-generation-config: + runs-on: ubuntu-22.04 + env: + # the branch into which the pull request is merged + base_branch: main + steps: + - uses: actions/checkout@v4 + with: + token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} + - name: Update params in generation config to latest + shell: bash + run: | + set -x + [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com" + [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot" + bash .github/scripts/update_generation_config.sh \ + --base_branch "${base_branch}"\ + --repo ${{ github.repository }} + env: + GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} diff --git a/generation_config.yaml b/generation_config.yaml new file mode 100644 index 000000000..ae6c9c9be --- /dev/null +++ b/generation_config.yaml @@ -0,0 +1,25 @@ +gapic_generator_version: 2.42.0 +googleapis_commitish: bcaed39fd1a805a6411a3992ea32dc1ba0ba7ec3 +libraries_bom_version: 26.38.0 +libraries: + - api_shortname: datastore + name_pretty: Cloud Datastore + product_documentation: https://cloud.google.com/datastore + client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history + issue_tracker: https://issuetracker.google.com/savedsearches/559768 + release_level: stable + language: java + repo: googleapis/java-datastore + repo_short: java-datastore + distribution_name: com.google.cloud:google-cloud-datastore + codeowner_team: '@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners' + api_id: datastore.googleapis.com + library_type: GAPIC_COMBO + api_description: is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries. + excluded_dependencies: grpc-google-cloud-datastore-v1 + extra_versioned_modules: datastore-v1-proto-client + excluded_poms: grpc-google-cloud-datastore-v1 + recommended_package: com.google.cloud.datastore + GAPICs: + - proto_path: google/datastore/v1 + - proto_path: google/datastore/admin/v1 From b55ec328ea1d8ca415d711bdffc2ce7246cc26d6 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 02:38:42 +0800 Subject: [PATCH 041/292] ci: [java] automatic kokoro label in and /gcbrun comment (#1965) (#1481) Source-Link: https://github.com/googleapis/synthtool/commit/bd2bae89f70bad380da47fab9ec25985dfb87d67 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 4 ++-- .github/trusted-contribution.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index f817c5f44..359fe71c1 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea -# created: 2024-05-17T15:15:57.6714113Z + digest: sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3 +# created: 2024-06-05T18:32:21.724930324Z diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index a0ba1f7d9..88d3ac9bf 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,3 +1,9 @@ trustedContributors: - renovate-bot - gcf-owl-bot[bot] + +annotations: +- type: comment + text: "/gcbrun" +- type: label + text: "kokoro:force-run" From 43b00f3fa85b470f615c3d1cc2e0b85821dd4fbb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 1 Jul 2024 21:26:50 +0200 Subject: [PATCH 042/292] test(deps): update dependency com.google.truth:truth to v1.4.3 (#1501) --- datastore-v1-proto-client/pom.xml | 2 +- google-cloud-datastore/pom.xml | 2 +- samples/install-without-bom/pom.xml | 2 +- samples/native-image-sample/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index dd7683c64..019ad21c3 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -98,7 +98,7 @@ com.google.truth truth - 1.4.2 + 1.4.3 test diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 7a70bdf73..e87d85d29 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -157,7 +157,7 @@ com.google.truth truth - 1.4.2 + 1.4.3 test diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 4b268da0e..715d7154c 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -42,7 +42,7 @@ com.google.truth truth - 1.4.2 + 1.4.3 test diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 282d2e56d..25f7e959a 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -50,7 +50,7 @@ com.google.truth truth - 1.4.2 + 1.4.3 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1f2e22ec4..b1777167f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -41,7 +41,7 @@ com.google.truth truth - 1.4.2 + 1.4.3 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 65ec852e3..5d57d6d14 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -53,7 +53,7 @@ com.google.truth truth - 1.4.2 + 1.4.3 test From 515331e2ec6338f1bf8f3a59679957ce97b4fc11 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 2 Jul 2024 12:07:46 -0400 Subject: [PATCH 043/292] chore: correct hermetic library generation script path (#1506) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: correct hermetic library generation script path * 🦉 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 --- .github/workflows/hermetic_library_generation.yaml | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 0c7a82a3c..3ea9ae43e 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -31,7 +31,7 @@ jobs: set -x [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com" [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot" - bash .github/scriptes/hermetic_library_generation.sh \ + bash .github/scripts/hermetic_library_generation.sh \ --target_branch ${{ github.base_ref }} \ --current_branch ${{ github.head_ref }} env: diff --git a/README.md b/README.md index 7ddb359d5..175ca2b8f 100644 --- a/README.md +++ b/README.md @@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.20.1' +implementation 'com.google.cloud:google-cloud-datastore:2.20.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.2" ``` @@ -480,7 +480,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.2 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles From c146cab1d0f328f83dce739b3dd33f75b9d4f36a Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 2 Jul 2024 18:54:24 -0400 Subject: [PATCH 044/292] chore: skip hermetic generation on fork PRs (#1510) --- .github/workflows/hermetic_library_generation.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 3ea9ae43e..7146cc3dc 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -19,6 +19,8 @@ on: jobs: library_generation: + # skip pull requests coming from a forked repository + if: github.event.pull_request.head.repo.full_name == github.repository runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 250f86b28ac5abcb6ce885a2128ad4e19e962b4f Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 3 Jul 2024 15:26:15 -0400 Subject: [PATCH 045/292] chore: make the owlbot postprocessor check non-required (#1512) * chore: make the owlbot postprocessor check non-required * remove required check in other branches --- .github/sync-repo-settings.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 4bdaef4e9..046f23200 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -15,7 +15,6 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - OwlBot Post Processor - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc @@ -62,7 +61,6 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - OwlBot Post Processor - pattern: 2.2.x isAdminEnforced: true requiredApprovingReviewCount: 1 @@ -77,7 +75,6 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - OwlBot Post Processor - pattern: 2.12.x isAdminEnforced: true requiredApprovingReviewCount: 1 @@ -92,7 +89,6 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - OwlBot Post Processor - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - pattern: multi-db @@ -109,7 +105,6 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - OwlBot Post Processor - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - pattern: V3-experimental @@ -125,7 +120,6 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - OwlBot Post Processor - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc @@ -142,7 +136,6 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - OwlBot Post Processor - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - pattern: 2.17.x @@ -158,7 +151,6 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - OwlBot Post Processor - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc @@ -175,7 +167,6 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - OwlBot Post Processor - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc From d9dff923ef0d5123d7aa1395e8fb3334bbe1aa41 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 3 Jul 2024 15:26:37 -0400 Subject: [PATCH 046/292] chore: disable the Owl Bot post-processor (#1511) via deleting .OwlBot.lock.yaml (context) --- .github/.OwlBot.lock.yaml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .github/.OwlBot.lock.yaml diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml deleted file mode 100644 index 359fe71c1..000000000 --- a/.github/.OwlBot.lock.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -docker: - image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3 -# created: 2024-06-05T18:32:21.724930324Z From b244b8f5e5b550f48c6bd3c94571fe2f494b3a8a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 9 Jul 2024 18:26:44 +0200 Subject: [PATCH 047/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 (#1485) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 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 Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- README.md | 2 +- samples/native-image-sample/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 175ca2b8f..9089655ec 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.40.0 + 26.41.0 pom import diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 25f7e959a..0f3c1919c 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -28,7 +28,7 @@ com.google.cloud libraries-bom - 26.40.0 + 26.41.0 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 5d57d6d14..f04cdc885 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.40.0 + 26.41.0 pom import From 6a6e925f2c24f88d30a662cb476210757af0cf69 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 14:58:22 +0000 Subject: [PATCH 048/292] chore(main): release 2.20.3-SNAPSHOT (#1504) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 019ad21c3..70b9590b0 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.20.2 + 2.20.3-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.20.2 + 2.20.3-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 5b01bd928..281c581c9 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.20.2 + 2.20.3-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.20.2 + 2.20.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.2 + 2.20.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.2 + 0.111.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.2 + 2.20.3-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e87d85d29..b06df4c0f 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.20.2 + 2.20.3-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.20.2 + 2.20.3-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 5c3f255f5..69da06680 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.2 + 2.20.3-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.2 + 2.20.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index b72ce5ec3..407041f2b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.20.2 + 2.20.3-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.2 + 2.20.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.2 + 2.20.3-SNAPSHOT com.google.cloud google-cloud-datastore - 2.20.2 + 2.20.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.2 + 0.111.3-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.20.2 + 2.20.3-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index b63ebd708..f53996a6d 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.2 + 2.20.3-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.2 + 2.20.3-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 8128587a6..85f530c75 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.2 + 0.111.3-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.20.2 + 2.20.3-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b1777167f..93710c03b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.20.2 + 2.20.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index f42550e75..5d2ffbced 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.20.2:2.20.2 -google-cloud-datastore-bom:2.20.2:2.20.2 -proto-google-cloud-datastore-v1:0.111.2:0.111.2 -datastore-v1-proto-client:2.20.2:2.20.2 -proto-google-cloud-datastore-admin-v1:2.20.2:2.20.2 -grpc-google-cloud-datastore-admin-v1:2.20.2:2.20.2 +google-cloud-datastore:2.20.2:2.20.3-SNAPSHOT +google-cloud-datastore-bom:2.20.2:2.20.3-SNAPSHOT +proto-google-cloud-datastore-v1:0.111.2:0.111.3-SNAPSHOT +datastore-v1-proto-client:2.20.2:2.20.3-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT From d4780095a6690dc01e7b50768a386bc26c9876b6 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 31 Jul 2024 16:55:44 -0400 Subject: [PATCH 049/292] chore: setup 2.19.x lts branch (#1535) --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index 53b119627..cbb5be49c 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -30,3 +30,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 2.17.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.19.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 046f23200..fce568dc2 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -170,6 +170,22 @@ branchProtectionRules: - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc + - pattern: 2.19.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image' + - 'Kokoro - Test: Java 17 GraalVM Native Image' + - javadoc permissionRules: - team: yoshi-admins permission: admin From 21d8cad8b198fafad904aaa0b5d07296bbf9350b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 21:24:20 +0000 Subject: [PATCH 050/292] chore(main): release 2.21.0 (#1517) :robot: I have created a release *beep* *boop* --- ## [2.21.0](https://togithub.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31) ### Features * Enable hermetic library generation ([#1462](https://togithub.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://togithub.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 35 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9ca1c263..52e107131 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.21.0](https://github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31) + + +### Features + +* Enable hermetic library generation ([#1462](https://github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) + ## [2.20.2](https://github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 70b9590b0..59a18afe9 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.20.3-SNAPSHOT + 2.21.0 com.google.cloud google-cloud-datastore-parent - 2.20.3-SNAPSHOT + 2.21.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 281c581c9..87cc26a83 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.20.3-SNAPSHOT + 2.21.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.20.3-SNAPSHOT + 2.21.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.3-SNAPSHOT + 2.21.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.3-SNAPSHOT + 0.112.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.3-SNAPSHOT + 2.21.0 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index b06df4c0f..17c7d4ec7 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.20.3-SNAPSHOT + 2.21.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.20.3-SNAPSHOT + 2.21.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 69da06680..c92a2e085 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.3-SNAPSHOT + 2.21.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.3-SNAPSHOT + 2.21.0 diff --git a/pom.xml b/pom.xml index 407041f2b..92e9e6b9c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.20.3-SNAPSHOT + 2.21.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.3-SNAPSHOT + 2.21.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.20.3-SNAPSHOT + 2.21.0 com.google.cloud google-cloud-datastore - 2.20.3-SNAPSHOT + 2.21.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.3-SNAPSHOT + 0.112.0 com.google.cloud.datastore datastore-v1-proto-client - 2.20.3-SNAPSHOT + 2.21.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index f53996a6d..712d421f2 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.20.3-SNAPSHOT + 2.21.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.20.3-SNAPSHOT + 2.21.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 85f530c75..6a4c4c026 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.111.3-SNAPSHOT + 0.112.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.20.3-SNAPSHOT + 2.21.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 93710c03b..18c99a152 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.20.3-SNAPSHOT + 2.21.0 diff --git a/versions.txt b/versions.txt index 5d2ffbced..5dca750af 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.20.2:2.20.3-SNAPSHOT -google-cloud-datastore-bom:2.20.2:2.20.3-SNAPSHOT -proto-google-cloud-datastore-v1:0.111.2:0.111.3-SNAPSHOT -datastore-v1-proto-client:2.20.2:2.20.3-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT +google-cloud-datastore:2.21.0:2.21.0 +google-cloud-datastore-bom:2.21.0:2.21.0 +proto-google-cloud-datastore-v1:0.112.0:0.112.0 +datastore-v1-proto-client:2.21.0:2.21.0 +proto-google-cloud-datastore-admin-v1:2.21.0:2.21.0 +grpc-google-cloud-datastore-admin-v1:2.21.0:2.21.0 From 9e52395f7ee71315331790284d35e7aad2f387ed Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 6 Aug 2024 16:35:45 +0200 Subject: [PATCH 051/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 (#1531) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index ec72b08ac..ffc858543 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.32.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 0c813eaf7..a452e7c8c 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.32.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index ef1c9176c..ad15d4f7f 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.32.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 87cc26a83..f1be69a62 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.32.0 + 3.33.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 92e9e6b9c..5f7573e98 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.32.0 + 3.33.0 From 2e3926510913d4c429666d96b4333952db0fd350 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 11:02:31 -0700 Subject: [PATCH 052/292] chore(main): release 2.21.1-SNAPSHOT (#1538) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 59a18afe9..58425b4b1 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.21.0 + 2.21.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.21.0 + 2.21.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f1be69a62..fa6abfeda 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.21.0 + 2.21.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.21.0 + 2.21.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.0 + 2.21.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.0 + 0.112.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.0 + 2.21.1-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 17c7d4ec7..6e8fc6b8f 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.21.0 + 2.21.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.21.0 + 2.21.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index c92a2e085..c74367bf9 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.0 + 2.21.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.0 + 2.21.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 5f7573e98..85eeafc8e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.21.0 + 2.21.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.0 + 2.21.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.0 + 2.21.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.21.0 + 2.21.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.0 + 0.112.1-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.21.0 + 2.21.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 712d421f2..533ad8ad3 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.0 + 2.21.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.0 + 2.21.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 6a4c4c026..b8bb530fa 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.0 + 0.112.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.21.0 + 2.21.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 18c99a152..b182ec319 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.21.0 + 2.21.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 5dca750af..5141114d4 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.21.0:2.21.0 -google-cloud-datastore-bom:2.21.0:2.21.0 -proto-google-cloud-datastore-v1:0.112.0:0.112.0 -datastore-v1-proto-client:2.21.0:2.21.0 -proto-google-cloud-datastore-admin-v1:2.21.0:2.21.0 -grpc-google-cloud-datastore-admin-v1:2.21.0:2.21.0 +google-cloud-datastore:2.21.0:2.21.1-SNAPSHOT +google-cloud-datastore-bom:2.21.0:2.21.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.112.0:0.112.1-SNAPSHOT +datastore-v1-proto-client:2.21.0:2.21.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.21.0:2.21.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.21.0:2.21.1-SNAPSHOT From 7bc796e78a4aff21d9a02fe5a315a3383a0c1a71 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 6 Aug 2024 20:15:59 +0200 Subject: [PATCH 053/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.43.0 (#1515) --- samples/native-image-sample/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 0f3c1919c..5a0ee2386 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -28,7 +28,7 @@ com.google.cloud libraries-bom - 26.41.0 + 26.43.0 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index f04cdc885..7e4de0be6 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.41.0 + 26.43.0 pom import From a9e90f321da9d4061d3c87a2f5b7f30662b401ca Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 13:45:05 -0700 Subject: [PATCH 054/292] chore(main): release 2.21.1 (#1540) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 35 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52e107131..f6234e13b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.21.1](https://github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) (2024-08-06) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#1531](https://github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed)) + ## [2.21.0](https://github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 58425b4b1..eb7a28713 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.21.1-SNAPSHOT + 2.21.1 com.google.cloud google-cloud-datastore-parent - 2.21.1-SNAPSHOT + 2.21.1 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index fa6abfeda..c683a9474 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.21.1-SNAPSHOT + 2.21.1 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.21.1-SNAPSHOT + 2.21.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.1-SNAPSHOT + 2.21.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.1-SNAPSHOT + 0.112.1 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.1-SNAPSHOT + 2.21.1 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6e8fc6b8f..29bb63d3d 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.21.1-SNAPSHOT + 2.21.1 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.21.1-SNAPSHOT + 2.21.1 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index c74367bf9..373333ce3 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.1-SNAPSHOT + 2.21.1 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.1-SNAPSHOT + 2.21.1 diff --git a/pom.xml b/pom.xml index 85eeafc8e..72d70b386 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.21.1-SNAPSHOT + 2.21.1 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.1-SNAPSHOT + 2.21.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.1-SNAPSHOT + 2.21.1 com.google.cloud google-cloud-datastore - 2.21.1-SNAPSHOT + 2.21.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.1-SNAPSHOT + 0.112.1 com.google.cloud.datastore datastore-v1-proto-client - 2.21.1-SNAPSHOT + 2.21.1 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 533ad8ad3..1c660d581 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.1-SNAPSHOT + 2.21.1 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.1-SNAPSHOT + 2.21.1 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index b8bb530fa..4740a89c4 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.1-SNAPSHOT + 0.112.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.21.1-SNAPSHOT + 2.21.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b182ec319..3d3b267eb 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.21.1-SNAPSHOT + 2.21.1 diff --git a/versions.txt b/versions.txt index 5141114d4..478c0b62e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.21.0:2.21.1-SNAPSHOT -google-cloud-datastore-bom:2.21.0:2.21.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.112.0:0.112.1-SNAPSHOT -datastore-v1-proto-client:2.21.0:2.21.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.21.0:2.21.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.21.0:2.21.1-SNAPSHOT +google-cloud-datastore:2.21.1:2.21.1 +google-cloud-datastore-bom:2.21.1:2.21.1 +proto-google-cloud-datastore-v1:0.112.1:0.112.1 +datastore-v1-proto-client:2.21.1:2.21.1 +proto-google-cloud-datastore-admin-v1:2.21.1:2.21.1 +grpc-google-cloud-datastore-admin-v1:2.21.1:2.21.1 From af6831d51285fe851f0999c613ad4a52aadfdb1d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 17:28:27 +0000 Subject: [PATCH 055/292] chore(main): release 2.21.2-SNAPSHOT (#1541) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index eb7a28713..38ede6074 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.21.1 + 2.21.2-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.21.1 + 2.21.2-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index c683a9474..234946cf0 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.21.1 + 2.21.2-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.21.1 + 2.21.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.1 + 2.21.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.1 + 0.112.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.1 + 2.21.2-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 29bb63d3d..b9e2da34a 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.21.1 + 2.21.2-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.21.1 + 2.21.2-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 373333ce3..793e30422 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.1 + 2.21.2-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.1 + 2.21.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 72d70b386..4fcdfc0e2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.21.1 + 2.21.2-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.1 + 2.21.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.1 + 2.21.2-SNAPSHOT com.google.cloud google-cloud-datastore - 2.21.1 + 2.21.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.1 + 0.112.2-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.21.1 + 2.21.2-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 1c660d581..4032680c9 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.1 + 2.21.2-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.1 + 2.21.2-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 4740a89c4..0e9cb5736 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.1 + 0.112.2-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.21.1 + 2.21.2-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 3d3b267eb..aea2bd2f3 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.21.1 + 2.21.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index 478c0b62e..8b0985906 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.21.1:2.21.1 -google-cloud-datastore-bom:2.21.1:2.21.1 -proto-google-cloud-datastore-v1:0.112.1:0.112.1 -datastore-v1-proto-client:2.21.1:2.21.1 -proto-google-cloud-datastore-admin-v1:2.21.1:2.21.1 -grpc-google-cloud-datastore-admin-v1:2.21.1:2.21.1 +google-cloud-datastore:2.21.1:2.21.2-SNAPSHOT +google-cloud-datastore-bom:2.21.1:2.21.2-SNAPSHOT +proto-google-cloud-datastore-v1:0.112.1:0.112.2-SNAPSHOT +datastore-v1-proto-client:2.21.1:2.21.2-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.21.1:2.21.2-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.21.1:2.21.2-SNAPSHOT From 642e12f0929a3def103cb5e1339a8224bb434658 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 20 Aug 2024 13:59:45 -0400 Subject: [PATCH 056/292] chore: secure hermetic_library_generation workflow (#1552) * chore: secure hermetic_library_generation workflow Thanks to @diogoteles08 for the inspection on our repos. This PR inlines environment variables to avoid overriding script injections. * fix wording --- .github/workflows/hermetic_library_generation.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 7146cc3dc..ab23b9fec 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -17,10 +17,14 @@ name: Hermetic library generation upon generation config change through pull req on: pull_request: +env: + HEAD_REF: ${{ github.head_ref }} + REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }} + jobs: library_generation: # skip pull requests coming from a forked repository - if: github.event.pull_request.head.repo.full_name == github.repository + if: github.env.REPO_FULL_NAME == github.repository runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -30,11 +34,11 @@ jobs: - name: Generate changed libraries shell: bash run: | - set -x + set -ex [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com" [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot" bash .github/scripts/hermetic_library_generation.sh \ --target_branch ${{ github.base_ref }} \ - --current_branch ${{ github.head_ref }} + --current_branch $HEAD_REF env: GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} From 8c5f5954d88732ab929b4477a3f15b0052adc2ff Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 22 Aug 2024 19:30:09 +0200 Subject: [PATCH 057/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 (#1547) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index ffc858543..84c86037f 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.33.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.34.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index a452e7c8c..639683e72 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.33.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.34.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index ad15d4f7f..b2121a633 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.33.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.34.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 234946cf0..435b6e894 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.33.0 + 3.34.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 4fcdfc0e2..85ab3c70b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.33.0 + 3.34.0 From e368dc5f87020212f6ef4bde82fa958ac1ccbcfe Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 09:14:44 -0700 Subject: [PATCH 058/292] chore(main): release 2.21.2 (#1553) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 35 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6234e13b..e953fa33f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.21.2](https://github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) (2024-08-22) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#1547](https://github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff)) + ## [2.21.1](https://github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) (2024-08-06) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 38ede6074..ae1f83917 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.21.2-SNAPSHOT + 2.21.2 com.google.cloud google-cloud-datastore-parent - 2.21.2-SNAPSHOT + 2.21.2 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 435b6e894..63beb11f1 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.21.2-SNAPSHOT + 2.21.2 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.21.2-SNAPSHOT + 2.21.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.2-SNAPSHOT + 2.21.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.2-SNAPSHOT + 0.112.2 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.2-SNAPSHOT + 2.21.2 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index b9e2da34a..e928bea4e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.21.2-SNAPSHOT + 2.21.2 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.21.2-SNAPSHOT + 2.21.2 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 793e30422..6527e96f3 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.2-SNAPSHOT + 2.21.2 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.2-SNAPSHOT + 2.21.2 diff --git a/pom.xml b/pom.xml index 85ab3c70b..fda01b132 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.21.2-SNAPSHOT + 2.21.2 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.2-SNAPSHOT + 2.21.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.2-SNAPSHOT + 2.21.2 com.google.cloud google-cloud-datastore - 2.21.2-SNAPSHOT + 2.21.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.2-SNAPSHOT + 0.112.2 com.google.cloud.datastore datastore-v1-proto-client - 2.21.2-SNAPSHOT + 2.21.2 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 4032680c9..a8c91f4dd 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.2-SNAPSHOT + 2.21.2 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.2-SNAPSHOT + 2.21.2 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 0e9cb5736..bf896574d 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.2-SNAPSHOT + 0.112.2 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.21.2-SNAPSHOT + 2.21.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index aea2bd2f3..5f2e900a8 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.21.2-SNAPSHOT + 2.21.2 diff --git a/versions.txt b/versions.txt index 8b0985906..3cee21923 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.21.1:2.21.2-SNAPSHOT -google-cloud-datastore-bom:2.21.1:2.21.2-SNAPSHOT -proto-google-cloud-datastore-v1:0.112.1:0.112.2-SNAPSHOT -datastore-v1-proto-client:2.21.1:2.21.2-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.21.1:2.21.2-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.21.1:2.21.2-SNAPSHOT +google-cloud-datastore:2.21.2:2.21.2 +google-cloud-datastore-bom:2.21.2:2.21.2 +proto-google-cloud-datastore-v1:0.112.2:0.112.2 +datastore-v1-proto-client:2.21.2:2.21.2 +proto-google-cloud-datastore-admin-v1:2.21.2:2.21.2 +grpc-google-cloud-datastore-admin-v1:2.21.2:2.21.2 From f209ad4302cdaa95f5e98824457878a09d6f71f9 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 27 Aug 2024 12:16:23 -0400 Subject: [PATCH 059/292] chore: remove datastore native image sample in favor of sample hosted in google-cloud-java (#1519) --- samples/native-image-sample/README.md | 96 ------------ samples/native-image-sample/pom.xml | 141 ------------------ .../datastore/NativeImageDatastoreSample.java | 131 ---------------- .../ITNativeImageDatastoreSample.java | 75 ---------- samples/pom.xml | 1 - 5 files changed, 444 deletions(-) delete mode 100644 samples/native-image-sample/README.md delete mode 100644 samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java delete mode 100644 samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java diff --git a/samples/native-image-sample/README.md b/samples/native-image-sample/README.md deleted file mode 100644 index 5f2cfbd27..000000000 --- a/samples/native-image-sample/README.md +++ /dev/null @@ -1,96 +0,0 @@ -# Datastore Sample Application with Native Image - -This application uses the [Google Cloud Datastore client library](https://cloud.google.com/datastore/docs/reference/libraries) and is compatible with Native Image compilation. - -This sample runs through some basic operations of creating/deleting entities, running queries, and running transaction code. - -## Setup Instructions - -You will need to follow these prerequisite steps in order to run the samples: - -1. If you have not already, [create a Google Cloud Platform Project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#creating_a_project). - -2. Install the [Google Cloud SDK](https://cloud.google.com/sdk/) which will allow you to run the sample with your project's credentials. - - Once installed, log in with Application Default Credentials using the following command: - - ``` - gcloud auth application-default login - ``` - - **Note:** Authenticating with Application Default Credentials is convenient to use during development, but we recommend [alternate methods of authentication](https://cloud.google.com/docs/authentication/production) during production use. - -3. Install the native image compiler. - - You can follow the [installation instructions](https://www.graalvm.org/docs/getting-started/#install-graalvm). - After following the instructions, ensure that you install the native image extension installed by running: - - ``` - gu install native-image - ``` - - Once you finish following the instructions, verify that the default version of Java is set to the correct version by running `java -version` in a terminal. - - You will see something similar to the below output: - - ``` - $ java -version - - openjdk version "17.0.3" 2022-04-19 - OpenJDK Runtime Environment GraalVM CE 22.1.0 (build 17.0.3+7-jvmci-22.1-b06) - OpenJDK 64-Bit Server VM GraalVM CE 22.1.0 (build 17.0.3+7-jvmci-22.1-b06, mixed mode, sharing) - ``` -## Sample -1. **(Optional)** If you wish to run the application against the [Datastore emulator](https://cloud.google.com/sdk/gcloud/reference/beta/emulators/datastore), ensure that you have the [Google Cloud SDK](https://cloud.google.com/sdk) installed. - - In a new terminal window, start the emulator via `gcloud`: - - ``` - gcloud beta emulators datastore start --host-port=localhost:9010 - ``` - - Leave the emulator running in this terminal for now. - In the next section, we will run the sample application against the Datastore emulator instance. - -2. Navigate to this directory and compile the application with the native image compiler. - - ``` - mvn package -P native -DskipTests - ``` - -3. **(Optional)** If you're using the emulator, export the `DATASTORE_EMULATOR_HOST` as an environment variable in your terminal. - - ``` - export DATASTORE_EMULATOR_HOST=localhost:9010 - ``` - - The Datastore Client Libraries will detect this environment variable and automatically connect to the emulator instance if this variable is set. - -4. Run the application. - - ``` - ./target/native-image-sample - ``` - -5. The application will run through some basic Datastore operations and log some output statements. - - ``` - Successfully added entity. - Reading entity: 1cf34cc1-2b8a-4945-9fc4-058f03dcd08e - Successfully deleted entity: 1cf34cc1-2b8a-4945-9fc4-058f03dcd08e - Run fake transaction code. - Found entity: - name=de4f36f4-3936-4252-98d3-e0d56d485254 - kind=test-kind - namespace=nativeimage-test-namespace - properties={description=StringValue{valueType=STRING, excludeFromIndexes=false, meaning=0, value=hello world}} - Ran transaction callable. - ``` - -### Sample Integration test with Native Image Support - -In order to run the sample integration test as a native image, call the following command: - - ``` - mvn test -Pnative - ``` diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 5a0ee2386..e69de29bb 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -1,141 +0,0 @@ - - - 4.0.0 - com.example.datastore - native-image-sample - Native Image Sample - https://github.com/googleapis/java-datastore - - - - com.google.cloud.samples - shared-configuration - 1.2.0 - - - - - 1.8 - 1.8 - UTF-8 - - - - - - com.google.cloud - libraries-bom - 26.43.0 - pom - import - - - - - - - com.google.cloud - google-cloud-datastore - - - - junit - junit - 4.13.2 - test - - - com.google.truth - truth - 1.4.3 - test - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - com.example.datastore.NativeImageDatastoreSample - - - - - - - - - - - native - - - - org.junit.vintage - junit-vintage-engine - 5.10.2 - test - - - org.graalvm.buildtools - junit-platform-native - 0.10.2 - test - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - 3.2.5 - - - **/IT* - - - - - org.graalvm.buildtools - native-maven-plugin - 0.10.2 - true - - com.example.datastore.NativeImageDatastoreSample - - --no-fallback - --no-server - - - - - build-native - - build - test - - package - - - test-native - - test - - test - - - - - - - - \ No newline at end of file diff --git a/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java b/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java deleted file mode 100644 index 7ce5c900a..000000000 --- a/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright 2020-2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.datastore; - -import com.google.cloud.datastore.Datastore; -import com.google.cloud.datastore.DatastoreOptions; -import com.google.cloud.datastore.Entity; -import com.google.cloud.datastore.Key; -import com.google.cloud.datastore.Query; -import com.google.cloud.datastore.QueryResults; -import com.google.cloud.datastore.StructuredQuery; -import com.google.cloud.datastore.Transaction; -import java.time.Duration; -import java.time.Instant; -import java.util.UUID; - -/** Sample Datastore Application. */ -public class NativeImageDatastoreSample { - - /* Datastore namespace where entities will be created. */ - private static final String TEST_NAMESPACE = "nativeimage-test-namespace"; - - /* Datastore kind used. */ - private static final String TEST_KIND = "test-kind"; - - /** Entrypoint to the Datastore sample application. */ - public static void main(String[] args) { - Instant startTime = Instant.now(); - Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); - - String testId = UUID.randomUUID().toString(); - - addEntity(datastore, testId); - getEntity(datastore, testId); - deleteEntity(datastore, testId); - - runTransaction(datastore); - - String id = UUID.randomUUID().toString(); - Key key = createKey(datastore, id); - runTransactionCallable(datastore, key); - Instant endTime = Instant.now(); - Duration duration = Duration.between(startTime, endTime); - System.out.println("Duration: " + duration.toString()); - } - - static void addEntity(Datastore datastore, String id) { - Key key = createKey(datastore, id); - Entity entity = Entity.newBuilder(key).set("description", "hello world").build(); - datastore.add(entity); - System.out.println("Successfully added entity."); - } - - static void getEntity(Datastore datastore, String id) { - Key key = createKey(datastore, id); - Entity entity = datastore.get(key); - System.out.println("Reading entity: " + entity.getKey().getName()); - } - - static void deleteEntity(Datastore datastore, String id) { - Key key = createKey(datastore, id); - datastore.delete(key); - - Entity entity = datastore.get(key); - if (entity == null) { - System.out.println("Successfully deleted entity: " + id); - } else { - throw new RuntimeException("Failed to delete entity: " + id); - } - } - - static void runTransactionCallable(Datastore datastore, Key entityKey) { - datastore.runInTransaction( - client -> { - Entity entity = Entity.newBuilder(entityKey).set("description", "hello world").build(); - datastore.add(entity); - - StructuredQuery query = - Query.newEntityQueryBuilder().setNamespace(TEST_NAMESPACE).setKind(TEST_KIND).build(); - - QueryResults results = datastore.run(query); - while (results.hasNext()) { - Entity result = results.next(); - String name = result.getKey().getName(); - String kind = result.getKey().getKind(); - String namespace = result.getKey().getNamespace(); - System.out.println( - "Found entity:" - + "\n\t\tname=" - + name - + "\n\t\tkind=" - + kind - + "\n\t\tnamespace=" - + namespace - + "\n\t\tproperties=" - + result.getProperties().toString()); - } - - datastore.delete(entityKey); - return null; - }); - - System.out.println("Ran transaction callable."); - } - - private static void runTransaction(Datastore datastore) { - Transaction transaction = datastore.newTransaction(); - transaction.commit(); - transaction = datastore.newTransaction(); - transaction.rollback(); - System.out.println("Run fake transaction code."); - } - - static Key createKey(Datastore datastore, String id) { - return datastore.newKeyFactory().setNamespace(TEST_NAMESPACE).setKind(TEST_KIND).newKey(id); - } -} diff --git a/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java b/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java deleted file mode 100644 index 710f18367..000000000 --- a/samples/native-image-sample/src/test/java/com/example/datastore/ITNativeImageDatastoreSample.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.datastore; - -import static com.google.common.truth.Truth.assertThat; - -import com.google.cloud.datastore.Datastore; -import com.google.cloud.datastore.DatastoreOptions; -import com.google.cloud.datastore.Key; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.util.UUID; -import org.junit.Before; -import org.junit.Test; - -/** Tests for {@link com.example.datastore.NativeImageDatastoreSample} */ -public class ITNativeImageDatastoreSample { - - private Datastore datastore; - private ByteArrayOutputStream bout; - private PrintStream out; - - @Before - public void setUp() { - datastore = DatastoreOptions.getDefaultInstance().getService(); - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - System.setOut(out); - } - - @Test - public void testAddAndGetEntity() { - bout.reset(); - String testId = "test-id-" + UUID.randomUUID(); - NativeImageDatastoreSample.addEntity(datastore, testId); - NativeImageDatastoreSample.getEntity(datastore, testId); - assertThat(bout.toString()).contains("Reading entity: " + testId); - - NativeImageDatastoreSample.deleteEntity(datastore, testId); - } - - @Test - public void testRunTransactionalCallable() { - bout.reset(); - String testId = "test-id-" + UUID.randomUUID(); - Key key = NativeImageDatastoreSample.createKey(datastore, testId); - NativeImageDatastoreSample.runTransactionCallable(datastore, key); - assertThat(bout.toString()) - .contains( - "Found entity:" - + "\n\t\tname=" - + testId - + "\n\t\tkind=test-kind" - + "\n\t\tnamespace=nativeimage-test-namespace" - + "\n\t\tproperties={description=StringValue{valueType=STRING, excludeFromIndexes=false," - + " meaning=0, value=hello world}}\n" - + "Ran transaction callable."); - - NativeImageDatastoreSample.deleteEntity(datastore, "test-id"); - } -} diff --git a/samples/pom.xml b/samples/pom.xml index e81bec450..2e970d081 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -31,7 +31,6 @@ install-without-bom snapshot snippets - native-image-sample From da529327d2d0de790b1011ad01de29d7429cef10 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Thu, 5 Sep 2024 13:16:06 -0400 Subject: [PATCH 060/292] chore: remove unused image tag in .OwlBot-hermetic.yaml (#1559) This removes the unused image tag in this file. Part of the cleanup after enabling Hermetic Library generation in this repo. Newline at EOF automatically added - see [this SO](https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-newline). --- .github/.OwlBot-hermetic.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/.OwlBot-hermetic.yaml b/.github/.OwlBot-hermetic.yaml index d89045599..02f0dd37b 100644 --- a/.github/.OwlBot-hermetic.yaml +++ b/.github/.OwlBot-hermetic.yaml @@ -11,9 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -docker: - image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" deep-remove-regex: - "/proto-google-.*/src" @@ -29,4 +26,4 @@ deep-copy-regex: dest: "/owl-bot-staging/$1/grpc-google-cloud-datastore-admin-$1/src" # Admin & Data APIs share the same wrapper library. - source: "/google/datastore/admin/(v.*)/.*-java/gapic-google-.*/src" - dest: "/owl-bot-staging/$1/google-cloud-datastore/src" \ No newline at end of file + dest: "/owl-bot-staging/$1/google-cloud-datastore/src" From a9e8a670c1bcd8ff836200d8fd3d909f11a6bcdb Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:30:25 +0000 Subject: [PATCH 061/292] chore(main): release 2.21.3-SNAPSHOT (#1554) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index ae1f83917..52758f476 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.21.2 + 2.21.3-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.21.2 + 2.21.3-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 63beb11f1..452c69153 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.21.2 + 2.21.3-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.21.2 + 2.21.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.2 + 2.21.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.2 + 0.112.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.2 + 2.21.3-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e928bea4e..85359ce26 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.21.2 + 2.21.3-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.21.2 + 2.21.3-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 6527e96f3..0464bed48 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.2 + 2.21.3-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.2 + 2.21.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index fda01b132..054bcb009 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.21.2 + 2.21.3-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.2 + 2.21.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.2 + 2.21.3-SNAPSHOT com.google.cloud google-cloud-datastore - 2.21.2 + 2.21.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.2 + 0.112.3-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.21.2 + 2.21.3-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index a8c91f4dd..e9a85dc5e 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.2 + 2.21.3-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.2 + 2.21.3-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index bf896574d..a8d6064ca 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.2 + 0.112.3-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.21.2 + 2.21.3-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 5f2e900a8..662500308 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.21.2 + 2.21.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index 3cee21923..a22a8396e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.21.2:2.21.2 -google-cloud-datastore-bom:2.21.2:2.21.2 -proto-google-cloud-datastore-v1:0.112.2:0.112.2 -datastore-v1-proto-client:2.21.2:2.21.2 -proto-google-cloud-datastore-admin-v1:2.21.2:2.21.2 -grpc-google-cloud-datastore-admin-v1:2.21.2:2.21.2 +google-cloud-datastore:2.21.2:2.21.3-SNAPSHOT +google-cloud-datastore-bom:2.21.2:2.21.3-SNAPSHOT +proto-google-cloud-datastore-v1:0.112.2:0.112.3-SNAPSHOT +datastore-v1-proto-client:2.21.2:2.21.3-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.21.2:2.21.3-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.21.2:2.21.3-SNAPSHOT From 99e9d175d7df36c356c35101c0a01d803b676131 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:13:22 -0400 Subject: [PATCH 062/292] chore: Update generation configuration at Tue Sep 10 17:00:48 UTC 2024 (#1564) --- generation_config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generation_config.yaml b/generation_config.yaml index ae6c9c9be..941eaaef0 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ -gapic_generator_version: 2.42.0 -googleapis_commitish: bcaed39fd1a805a6411a3992ea32dc1ba0ba7ec3 -libraries_bom_version: 26.38.0 +gapic_generator_version: 2.45.0 +googleapis_commitish: 02f62c8e241a9f95f0d183785354e90e35388cbd +libraries_bom_version: 26.45.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From 27e6063656dc22dbc3e9909d57274762b0ed2615 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 10 Sep 2024 20:20:28 +0200 Subject: [PATCH 063/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.45.0 (#1544) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.43.0` -> `26.45.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-cloud-bom (com.google.cloud:libraries-bom) ### [`v26.45.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26450-2024-08-27) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.44.0...v26.45.0) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.34.0 ([#​6707](https://redirect.github.com/googleapis/java-cloud-bom/issues/6707)) ([412f4ba](https://redirect.github.com/googleapis/java-cloud-bom/commit/412f4ba5c2223aabff39c0a60bf07cbd147f02da)) - update dependency com.google.cloud:gapic-libraries-bom to v1.42.0 ([#​6716](https://redirect.github.com/googleapis/java-cloud-bom/issues/6716)) ([6fc3557](https://redirect.github.com/googleapis/java-cloud-bom/commit/6fc35575193baf1d458b63ba166e92b64421c383)) - update dependency com.google.cloud:google-cloud-bigquery to v2.42.1 ([#​6730](https://redirect.github.com/googleapis/java-cloud-bom/issues/6730)) ([b0d939d](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0d939dbbd3a94673206d206369f81429c1a6a7f)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.1 ([#​6712](https://redirect.github.com/googleapis/java-cloud-bom/issues/6712)) ([0121887](https://redirect.github.com/googleapis/java-cloud-bom/commit/0121887c7db48c48d14098d9643a3b73574bf851)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.9.0 ([#​6729](https://redirect.github.com/googleapis/java-cloud-bom/issues/6729)) ([406333e](https://redirect.github.com/googleapis/java-cloud-bom/commit/406333e7870405673e014f6871a31ac9c8822866)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.43.0 ([#​6723](https://redirect.github.com/googleapis/java-cloud-bom/issues/6723)) ([0754a10](https://redirect.github.com/googleapis/java-cloud-bom/commit/0754a10b89b628179d4f115e162e326765de33b3)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.2 ([#​6725](https://redirect.github.com/googleapis/java-cloud-bom/issues/6725)) ([6d96ff4](https://redirect.github.com/googleapis/java-cloud-bom/commit/6d96ff40b279c73700cf85633445880721739d1e)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.25.1 ([#​6705](https://redirect.github.com/googleapis/java-cloud-bom/issues/6705)) ([b0440a8](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0440a82a5b1f66f123b3014ccc5ecdfa783285a)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.20.1 ([#​6720](https://redirect.github.com/googleapis/java-cloud-bom/issues/6720)) ([479182a](https://redirect.github.com/googleapis/java-cloud-bom/commit/479182af6afc7db95fac0bfafc3aaa587a23ff7c)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.131.11-alpha ([#​6721](https://redirect.github.com/googleapis/java-cloud-bom/issues/6721)) ([9394259](https://redirect.github.com/googleapis/java-cloud-bom/commit/93942598cc7b42ad66ebad5557aeff795a9a8644)) - update dependency com.google.cloud:google-cloud-nio to v0.127.22 ([#​6713](https://redirect.github.com/googleapis/java-cloud-bom/issues/6713)) ([f7563bd](https://redirect.github.com/googleapis/java-cloud-bom/commit/f7563bd2822dff72ec01a148b14774bc641b3678)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.1 ([#​6714](https://redirect.github.com/googleapis/java-cloud-bom/issues/6714)) ([439460a](https://redirect.github.com/googleapis/java-cloud-bom/commit/439460a340a4954117ba1f0c49e0f7ab99c0cf73)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.1 ([#​6715](https://redirect.github.com/googleapis/java-cloud-bom/issues/6715)) ([27a374b](https://redirect.github.com/googleapis/java-cloud-bom/commit/27a374b7a8318d5a8b100d3c1edfd420d8cf3cd4)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.73.0 ([#​6722](https://redirect.github.com/googleapis/java-cloud-bom/issues/6722)) ([b93b322](https://redirect.github.com/googleapis/java-cloud-bom/commit/b93b3222f36b8701ed59cb42ddb7636b822a8ece)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.74.0 ([#​6728](https://redirect.github.com/googleapis/java-cloud-bom/issues/6728)) ([9ca5a25](https://redirect.github.com/googleapis/java-cloud-bom/commit/9ca5a25c1772f8283598b4a8fbb64c08d0346557)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.21.0 ([#​6724](https://redirect.github.com/googleapis/java-cloud-bom/issues/6724)) ([4e32a3d](https://redirect.github.com/googleapis/java-cloud-bom/commit/4e32a3d0a5598c3f2a09bbd2155d7c589c81c796)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.42.0 ([#​6717](https://redirect.github.com/googleapis/java-cloud-bom/issues/6717)) ([8302476](https://redirect.github.com/googleapis/java-cloud-bom/commit/8302476bac2908beeb0be2ac4f3a7b766bb9c011)) - update dependency commons-cli:commons-cli to v1.9.0 ([#​6706](https://redirect.github.com/googleapis/java-cloud-bom/issues/6706)) ([539f86c](https://redirect.github.com/googleapis/java-cloud-bom/commit/539f86cf0fab014d0c306bf230253569fab8494f)) ### [`v26.44.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26440-2024-08-08) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.43.0...v26.44.0) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.33.0 ([#​6687](https://redirect.github.com/googleapis/java-cloud-bom/issues/6687)) ([d93c7c1](https://redirect.github.com/googleapis/java-cloud-bom/commit/d93c7c1e5c8cfea5f0bb3b570282af1d17ac9992)) - update dependency com.google.cloud:gapic-libraries-bom to v1.41.0 ([#​6689](https://redirect.github.com/googleapis/java-cloud-bom/issues/6689)) ([e5afcc8](https://redirect.github.com/googleapis/java-cloud-bom/commit/e5afcc8a5afd362f7cdb6d19f446c99db7832fb9)) - update dependency com.google.cloud:google-cloud-bigquery to v2.42.0 ([#​6688](https://redirect.github.com/googleapis/java-cloud-bom/issues/6688)) ([58ed9ce](https://redirect.github.com/googleapis/java-cloud-bom/commit/58ed9cef18361489756bafdf9b6159077f498608)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.0 ([#​6685](https://redirect.github.com/googleapis/java-cloud-bom/issues/6685)) ([c6968cb](https://redirect.github.com/googleapis/java-cloud-bom/commit/c6968cb3315c37d21539daa5001c6b297f600ba4)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.41.0 ([#​6686](https://redirect.github.com/googleapis/java-cloud-bom/issues/6686)) ([256f1b0](https://redirect.github.com/googleapis/java-cloud-bom/commit/256f1b0e97dc1c28453fd0c302e5ecc6958a5a55)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.42.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.0 ([#​6697](https://redirect.github.com/googleapis/java-cloud-bom/issues/6697)) ([046ad04](https://redirect.github.com/googleapis/java-cloud-bom/commit/046ad04177bca0cfd2aecce6bc1170617939bfbb)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.1 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.2 ([#​6681](https://redirect.github.com/googleapis/java-cloud-bom/issues/6681)) ([91673de](https://redirect.github.com/googleapis/java-cloud-bom/commit/91673debfaec89f2c6b49249966f9ed772acc3bd)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.3 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.20.0 ([#​6694](https://redirect.github.com/googleapis/java-cloud-bom/issues/6694)) ([780736c](https://redirect.github.com/googleapis/java-cloud-bom/commit/780736c2b35f8f657b686bd1f4e61946835736ec)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.131.10-alpha ([#​6695](https://redirect.github.com/googleapis/java-cloud-bom/issues/6695)) ([6ecff38](https://redirect.github.com/googleapis/java-cloud-bom/commit/6ecff38a39d0bbc2516ffcba64507afc9b4ac027)) - update dependency com.google.cloud:google-cloud-nio to v0.127.21 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.0 ([#​6693](https://redirect.github.com/googleapis/java-cloud-bom/issues/6693)) ([b0483b9](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0483b95065ae38522547c736a753c751279f014)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.0 ([#​6696](https://redirect.github.com/googleapis/java-cloud-bom/issues/6696)) ([ad905cc](https://redirect.github.com/googleapis/java-cloud-bom/commit/ad905ccb7d41bd64cc519bd855dabb0523bd7fa8)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.72.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.20.2 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.41.0 ([#​6690](https://redirect.github.com/googleapis/java-cloud-bom/issues/6690)) ([43aef8e](https://redirect.github.com/googleapis/java-cloud-bom/commit/43aef8e9bf082ce98afd0c34163b016b8f315ee0)) - update dependency com.google.googlejavaformat:google-java-format to v1.23.0 ([#​6692](https://redirect.github.com/googleapis/java-cloud-bom/issues/6692)) ([b403c50](https://redirect.github.com/googleapis/java-cloud-bom/commit/b403c5040d47ba87dd32162e3be71ded6fdd127c))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 7e4de0be6..bd49599d3 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.43.0 + 26.45.0 pom import From 5a79fd8d1202e65c02423fe40402c41af6050efa Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 10 Sep 2024 22:56:12 +0200 Subject: [PATCH 064/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 (#1561) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 84c86037f..9d1576d94 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.34.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.35.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 639683e72..41590566e 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.34.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.35.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index b2121a633..d6941e80e 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.34.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.35.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 452c69153..0fe170fa1 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.34.0 + 3.35.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 054bcb009..503e5e530 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.34.0 + 3.35.0 From 18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 10 Sep 2024 22:56:39 +0200 Subject: [PATCH 065/292] deps: update dependency com.google.guava:guava-testlib to v33.3.0-jre (#1548) --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 85359ce26..c80548fe5 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -122,7 +122,7 @@ com.google.guava guava-testlib - 33.2.1-jre + 33.3.0-jre test From 8d3af322fb56032cd7a9d29e60fd93d1f3e7e632 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 10 Sep 2024 23:00:40 +0200 Subject: [PATCH 066/292] deps: update dependency com.google.errorprone:error_prone_core to v2.31.0 (#1523) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.errorprone:error_prone_core](https://errorprone.info) ([source](https://redirect.github.com/google/error-prone)) | `2.28.0` -> `2.31.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
google/error-prone (com.google.errorprone:error_prone_core) ### [`v2.31.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.31.0): Error Prone 2.31.0 This is the last planned minor release of Error Prone that will support running on JDK 11, see [#​3803](https://redirect.github.com/google/error-prone/issues/3803). Using Error Prone to compile code that is deployed to earlier versions will continue to be fully supported, but will require using JDK 17 or newer for compilation and setting `--release` or `-source`/`-target`/`-bootclasspath`. Changes: - Introduce [`@ThreadSafeTypeParameter`](https://redirect.github.com/google/error-prone/blob/2656f48902f6723f3147caa117372309dbc6c15f/type_annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java) with enforcement by [ThreadSafe](https://errorprone.info/bugpattern/ThreadSafe) - Improved support for latest JDK 24 EA builds - Error Prone is now distributed as a Multi-Release jar ([#​3756](https://redirect.github.com/google/error-prone/issues/3756)) New checks: - [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): AutoValue instances should not usually contain boxed types that are not Nullable. We recommend removing the unnecessary boxing. Full changelog: https://togithub.com/google/error-prone/compare/v2.30.0...v2.31.0 ### [`v2.30.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.30.0): Error Prone 2.30.0 New checks: - [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): Detects unnecessary boxing in AutoValue classes. - [`DefaultLocale`](https://errorprone.info/bugpattern/DefaultLocale): Detects implicit use of the JVM default locale, which can result in differing behaviour between JVM executions. - [`UnnecessaryBreakInSwitch`](https://errorprone.info/bugpattern/UnnecessaryBreakInSwitch): Remove unnecessary `break` statements in `->` switches. Closed issues: [#​632](https://redirect.github.com/google/error-prone/issues/632), [#​4487](https://redirect.github.com/google/error-prone/issues/4487) Full changelog: https://togithub.com/google/error-prone/compare/v2.29.2...v2.30.0 ### [`v2.29.2`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.2): Error Prone 2.29.2 This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0) and [2.29.1](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1), plus: - a bug fix for a crash in `TraditionalSwitchExpression` ([https://togithub.com/google/error-prone/issues/4479](https://redirect.github.com/google/error-prone/issues/4479)) - restores the `module-info` for the annotations jar, which was accidentally removed ([https://togithub.com/google/error-prone/issues/4480](https://redirect.github.com/google/error-prone/issues/4480)) Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.1...v2.29.2 ### [`v2.29.1`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1): Error Prone 2.29.1 This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0), plus: - a bug fix to `UnusedVariable` to handle unnamed `_` variables ([https://togithub.com/google/error-prone/issues/4451](https://redirect.github.com/google/error-prone/issues/4451)) - a bug fix for a crash in `SetUnrecognized` ([https://togithub.com/google/error-prone/issues/4475](https://redirect.github.com/google/error-prone/issues/4475)) Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.0...v2.29.1 ### [`v2.29.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0): Error Prone 2.29.0 New checks: - [`MissingRuntimeRetention`](https://errorprone.info/bugpattern/MissingRuntimeRetention) - [`SetUnrecognized`](https://errorprone.info/bugpattern/SetUnrecognized) - [`StatementSwitchToExpressionSwitch`](https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch) Closed issues: [#​4318](https://redirect.github.com/google/error-prone/issues/4318), [#​4429](https://redirect.github.com/google/error-prone/issues/4429), [#​4467](https://redirect.github.com/google/error-prone/issues/4467) Full Changelog: https://togithub.com/google/error-prone/compare/v2.28.0...v2.29.0
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 503e5e530..6ab0ec448 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ github google-cloud-datastore-parent https://googleapis.dev/java/google-api-grpc/latest - 2.28.0 + 2.31.0 From 90811b6bda565701fe8be59ac589591d002e8001 Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:40:09 +0000 Subject: [PATCH 067/292] chore: change if condition in workflow (#1567) * chore: change if condition in workflow * add head_ref * add var --- .../hermetic_library_generation.yaml | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index ab23b9fec..0266fbc96 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -18,27 +18,37 @@ on: pull_request: env: - HEAD_REF: ${{ github.head_ref }} REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }} + GITHUB_REPOSITORY: ${{ github.repository }} jobs: library_generation: - # skip pull requests coming from a forked repository - if: github.env.REPO_FULL_NAME == github.repository runs-on: ubuntu-latest steps: + - name: Determine whether the pull request comes from a fork + run: | + if [[ "${GITHUB_REPOSITORY}" != "${REPO_FULL_NAME}" ]]; then + echo "This PR comes from a fork. Skip library generation." + echo "SHOULD_RUN=false" >> $GITHUB_ENV + else + echo "SHOULD_RUN=true" >> $GITHUB_ENV + fi - uses: actions/checkout@v4 + if: env.SHOULD_RUN == 'true' with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - name: Generate changed libraries + if: env.SHOULD_RUN == 'true' shell: bash run: | set -ex [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com" [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot" bash .github/scripts/hermetic_library_generation.sh \ - --target_branch ${{ github.base_ref }} \ - --current_branch $HEAD_REF + --target_branch "${BASE_REF}" \ + --current_branch "${HEAD_REF}" env: + BASE_REF: ${{ github.base_ref }} + HEAD_REF: ${{ github.head_ref }} GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} From 4ce30824c4dc0a57ae5ad84a5749f7dda99ab319 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 11 Sep 2024 14:59:24 -0400 Subject: [PATCH 068/292] chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 (#1568) * chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 * chore: generate libraries at Wed Sep 11 15:41:06 UTC 2024 --- .repo-metadata.json | 12 +++-- README.md | 25 +++++----- generation_config.yaml | 2 +- .../admin/v1/DatastoreAdminSettings.java | 43 +++++++++++++++- .../v1/stub/DatastoreAdminStubSettings.java | 49 +++++++++++++++++-- .../reflect-config.json | 18 +++++++ .../datastore/admin/v1/CommonMetadata.java | 2 +- .../admin/v1/CommonMetadataOrBuilder.java | 2 +- .../admin/v1/CreateIndexRequest.java | 2 +- .../admin/v1/CreateIndexRequestOrBuilder.java | 2 +- .../admin/v1/DatastoreAdminProto.java | 2 +- .../DatastoreFirestoreMigrationMetadata.java | 2 +- ...reFirestoreMigrationMetadataOrBuilder.java | 2 +- .../admin/v1/DeleteIndexRequest.java | 2 +- .../admin/v1/DeleteIndexRequestOrBuilder.java | 2 +- .../datastore/admin/v1/EntityFilter.java | 2 +- .../admin/v1/EntityFilterOrBuilder.java | 2 +- .../admin/v1/ExportEntitiesMetadata.java | 2 +- .../v1/ExportEntitiesMetadataOrBuilder.java | 2 +- .../admin/v1/ExportEntitiesRequest.java | 2 +- .../v1/ExportEntitiesRequestOrBuilder.java | 2 +- .../admin/v1/ExportEntitiesResponse.java | 2 +- .../v1/ExportEntitiesResponseOrBuilder.java | 2 +- .../datastore/admin/v1/GetIndexRequest.java | 2 +- .../admin/v1/GetIndexRequestOrBuilder.java | 2 +- .../admin/v1/ImportEntitiesMetadata.java | 2 +- .../v1/ImportEntitiesMetadataOrBuilder.java | 2 +- .../admin/v1/ImportEntitiesRequest.java | 2 +- .../v1/ImportEntitiesRequestOrBuilder.java | 2 +- .../com/google/datastore/admin/v1/Index.java | 2 +- .../admin/v1/IndexOperationMetadata.java | 2 +- .../v1/IndexOperationMetadataOrBuilder.java | 2 +- .../datastore/admin/v1/IndexOrBuilder.java | 2 +- .../google/datastore/admin/v1/IndexProto.java | 2 +- .../admin/v1/ListIndexesRequest.java | 2 +- .../admin/v1/ListIndexesRequestOrBuilder.java | 2 +- .../admin/v1/ListIndexesResponse.java | 2 +- .../v1/ListIndexesResponseOrBuilder.java | 2 +- .../admin/v1/MigrationProgressEvent.java | 2 +- .../v1/MigrationProgressEventOrBuilder.java | 2 +- .../datastore/admin/v1/MigrationProto.java | 2 +- .../datastore/admin/v1/MigrationState.java | 2 +- .../admin/v1/MigrationStateEvent.java | 2 +- .../v1/MigrationStateEventOrBuilder.java | 2 +- .../datastore/admin/v1/MigrationStep.java | 2 +- .../datastore/admin/v1/OperationType.java | 2 +- .../google/datastore/admin/v1/Progress.java | 2 +- .../datastore/admin/v1/ProgressOrBuilder.java | 2 +- .../google/datastore/v1/AggregationQuery.java | 2 +- .../v1/AggregationQueryOrBuilder.java | 2 +- .../datastore/v1/AggregationResult.java | 2 +- .../datastore/v1/AggregationResultBatch.java | 2 +- .../v1/AggregationResultBatchOrBuilder.java | 2 +- .../v1/AggregationResultOrBuilder.java | 2 +- .../datastore/v1/AggregationResultProto.java | 14 +++--- .../datastore/v1/AllocateIdsRequest.java | 2 +- .../v1/AllocateIdsRequestOrBuilder.java | 2 +- .../datastore/v1/AllocateIdsResponse.java | 2 +- .../v1/AllocateIdsResponseOrBuilder.java | 2 +- .../com/google/datastore/v1/ArrayValue.java | 2 +- .../datastore/v1/ArrayValueOrBuilder.java | 2 +- .../datastore/v1/BeginTransactionRequest.java | 2 +- .../v1/BeginTransactionRequestOrBuilder.java | 2 +- .../v1/BeginTransactionResponse.java | 2 +- .../v1/BeginTransactionResponseOrBuilder.java | 2 +- .../google/datastore/v1/CommitRequest.java | 2 +- .../datastore/v1/CommitRequestOrBuilder.java | 2 +- .../google/datastore/v1/CommitResponse.java | 2 +- .../datastore/v1/CommitResponseOrBuilder.java | 2 +- .../google/datastore/v1/CompositeFilter.java | 2 +- .../v1/CompositeFilterOrBuilder.java | 2 +- .../google/datastore/v1/DatastoreProto.java | 14 +++--- .../java/com/google/datastore/v1/Entity.java | 2 +- .../google/datastore/v1/EntityOrBuilder.java | 2 +- .../com/google/datastore/v1/EntityProto.java | 12 ++--- .../com/google/datastore/v1/EntityResult.java | 2 +- .../datastore/v1/EntityResultOrBuilder.java | 2 +- .../google/datastore/v1/ExecutionStats.java | 2 +- .../datastore/v1/ExecutionStatsOrBuilder.java | 2 +- .../google/datastore/v1/ExplainMetrics.java | 2 +- .../datastore/v1/ExplainMetricsOrBuilder.java | 2 +- .../google/datastore/v1/ExplainOptions.java | 2 +- .../datastore/v1/ExplainOptionsOrBuilder.java | 2 +- .../java/com/google/datastore/v1/Filter.java | 2 +- .../google/datastore/v1/FilterOrBuilder.java | 2 +- .../com/google/datastore/v1/GqlQuery.java | 2 +- .../datastore/v1/GqlQueryOrBuilder.java | 2 +- .../datastore/v1/GqlQueryParameter.java | 2 +- .../v1/GqlQueryParameterOrBuilder.java | 2 +- .../java/com/google/datastore/v1/Key.java | 2 +- .../com/google/datastore/v1/KeyOrBuilder.java | 2 +- .../google/datastore/v1/KindExpression.java | 2 +- .../datastore/v1/KindExpressionOrBuilder.java | 2 +- .../google/datastore/v1/LookupRequest.java | 2 +- .../datastore/v1/LookupRequestOrBuilder.java | 2 +- .../google/datastore/v1/LookupResponse.java | 2 +- .../datastore/v1/LookupResponseOrBuilder.java | 2 +- .../com/google/datastore/v1/Mutation.java | 2 +- .../datastore/v1/MutationOrBuilder.java | 2 +- .../google/datastore/v1/MutationResult.java | 2 +- .../datastore/v1/MutationResultOrBuilder.java | 2 +- .../com/google/datastore/v1/PartitionId.java | 2 +- .../datastore/v1/PartitionIdOrBuilder.java | 2 +- .../com/google/datastore/v1/PlanSummary.java | 2 +- .../datastore/v1/PlanSummaryOrBuilder.java | 2 +- .../com/google/datastore/v1/Projection.java | 2 +- .../datastore/v1/ProjectionOrBuilder.java | 2 +- .../google/datastore/v1/PropertyFilter.java | 2 +- .../datastore/v1/PropertyFilterOrBuilder.java | 2 +- .../com/google/datastore/v1/PropertyMask.java | 2 +- .../datastore/v1/PropertyMaskOrBuilder.java | 2 +- .../google/datastore/v1/PropertyOrder.java | 2 +- .../datastore/v1/PropertyOrderOrBuilder.java | 2 +- .../datastore/v1/PropertyReference.java | 2 +- .../v1/PropertyReferenceOrBuilder.java | 2 +- .../java/com/google/datastore/v1/Query.java | 2 +- .../google/datastore/v1/QueryOrBuilder.java | 2 +- .../datastore/v1/QueryProfileProto.java | 14 +++--- .../com/google/datastore/v1/QueryProto.java | 14 +++--- .../google/datastore/v1/QueryResultBatch.java | 2 +- .../v1/QueryResultBatchOrBuilder.java | 2 +- .../com/google/datastore/v1/ReadOptions.java | 2 +- .../datastore/v1/ReadOptionsOrBuilder.java | 2 +- .../datastore/v1/ReserveIdsRequest.java | 2 +- .../v1/ReserveIdsRequestOrBuilder.java | 2 +- .../datastore/v1/ReserveIdsResponse.java | 2 +- .../v1/ReserveIdsResponseOrBuilder.java | 2 +- .../google/datastore/v1/RollbackRequest.java | 2 +- .../v1/RollbackRequestOrBuilder.java | 2 +- .../google/datastore/v1/RollbackResponse.java | 2 +- .../v1/RollbackResponseOrBuilder.java | 2 +- .../v1/RunAggregationQueryRequest.java | 2 +- .../RunAggregationQueryRequestOrBuilder.java | 2 +- .../v1/RunAggregationQueryResponse.java | 2 +- .../RunAggregationQueryResponseOrBuilder.java | 2 +- .../google/datastore/v1/RunQueryRequest.java | 2 +- .../v1/RunQueryRequestOrBuilder.java | 2 +- .../google/datastore/v1/RunQueryResponse.java | 2 +- .../v1/RunQueryResponseOrBuilder.java | 2 +- .../datastore/v1/TransactionOptions.java | 2 +- .../v1/TransactionOptionsOrBuilder.java | 2 +- .../java/com/google/datastore/v1/Value.java | 2 +- .../google/datastore/v1/ValueOrBuilder.java | 2 +- .../datastore/v1/aggregation_result.proto | 2 +- .../proto/google/datastore/v1/datastore.proto | 2 +- .../proto/google/datastore/v1/entity.proto | 2 +- .../proto/google/datastore/v1/query.proto | 2 +- .../google/datastore/v1/query_profile.proto | 2 +- renovate.json | 12 +++-- 149 files changed, 303 insertions(+), 200 deletions(-) diff --git a/.repo-metadata.json b/.repo-metadata.json index e6ebd09de..6ae8c95c0 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -2,19 +2,21 @@ "api_shortname": "datastore", "name_pretty": "Cloud Datastore", "product_documentation": "https://cloud.google.com/datastore", + "api_description": "is a fully managed, schemaless database for\\nstoring non-relational data. Cloud Datastore automatically scales with\\nyour users and supports ACID transactions, high availability of reads and\\nwrites, strong consistency for reads and ancestor queries, and eventual\\nconsistency for all other queries.", "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history", - "issue_tracker": "https://issuetracker.google.com/savedsearches/559768", "release_level": "stable", + "transport": "both", "language": "java", "repo": "googleapis/java-datastore", "repo_short": "java-datastore", "distribution_name": "com.google.cloud:google-cloud-datastore", - "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners", "api_id": "datastore.googleapis.com", "library_type": "GAPIC_COMBO", - "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.", + "requires_billing": true, + "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners", "excluded_dependencies": "grpc-google-cloud-datastore-v1", - "extra_versioned_modules": "datastore-v1-proto-client", "excluded_poms": "grpc-google-cloud-datastore-v1", + "issue_tracker": "https://issuetracker.google.com/savedsearches/559768", + "extra_versioned_modules": "datastore-v1-proto-client", "recommended_package": "com.google.cloud.datastore" -} +} \ No newline at end of file diff --git a/README.md b/README.md index 9089655ec..e6d69755b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.41.0 + 26.45.0 pom import @@ -50,20 +50,20 @@ 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.42.0') +implementation platform('com.google.cloud:libraries-bom:26.45.0') implementation 'com.google.cloud:google-cloud-datastore' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.20.2' +implementation 'com.google.cloud:google-cloud-datastore:2.21.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.20.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.21.2" ``` @@ -80,7 +80,7 @@ The client application making API calls must be granted [authorization scopes][a ### Prerequisites You will need a [Google Cloud Platform Console][developer-console] project with the Cloud Datastore [API enabled][enable-api]. - +You will need to [enable billing][enable-billing] to use Google Cloud Datastore. [Follow these instructions][create-project] to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud Command Line Interface][cloud-cli] and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`. @@ -93,11 +93,7 @@ to add `google-cloud-datastore` as a dependency in your code. ## About Cloud Datastore -[Cloud Datastore][product-docs] is a fully managed, schemaless database for -storing non-relational data. Cloud Datastore automatically scales with -your users and supports ACID transactions, high availability of reads and -writes, strong consistency for reads and ancestor queries, and eventual -consistency for all other queries. +[Cloud Datastore][product-docs] is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries. See the [Cloud Datastore client library docs][javadocs] to learn how to use this Cloud Datastore Client Library. @@ -356,7 +352,6 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | -| Native Image Datastore Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/native-image-sample/src/main/java/com/example/datastore/NativeImageDatastoreSample.java) | | Quickstart Sample | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/QuickstartSample.java) | | Avg Aggregation On Kind | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationOnKind.java) | | Avg Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/AvgAggregationWithLimit.java) | @@ -388,6 +383,10 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting]. +## Transport + +Cloud Datastore uses both gRPC and HTTP/JSON for the transport layer. + ## Supported Java Versions Java 8 or above is required for using this client. @@ -480,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.20.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.21.2 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles @@ -492,7 +491,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [contributing]: https://github.com/googleapis/java-datastore/blob/main/CONTRIBUTING.md [code-of-conduct]: https://github.com/googleapis/java-datastore/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct [license]: https://github.com/googleapis/java-datastore/blob/main/LICENSE - +[enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=datastore.googleapis.com [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png diff --git a/generation_config.yaml b/generation_config.yaml index 941eaaef0..e030af441 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.45.0 -googleapis_commitish: 02f62c8e241a9f95f0d183785354e90e35388cbd +googleapis_commitish: 41cd9dba9e88f707a663d6686148ae3dc24116b8 libraries_bom_version: 26.45.0 libraries: - api_shortname: datastore diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java index 4bae1f6f3..cafef310e 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java @@ -65,7 +65,9 @@ *

The builder of this class is recursive, so contained classes are themselves builders. When * build() is called, the tree of builders is called to create the complete settings object. * - *

For example, to set the total timeout of getIndex to 30 seconds: + *

For example, to set the + * [RetrySettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.retrying.RetrySettings) + * of getIndex: * * 

{@code
  * // This snippet has been automatically generated and should be regarded as a code template only.
@@ -82,10 +84,47 @@
  *             .getIndexSettings()
  *             .getRetrySettings()
  *             .toBuilder()
- *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .setInitialRetryDelayDuration(Duration.ofSeconds(1))
+ *             .setInitialRpcTimeoutDuration(Duration.ofSeconds(5))
+ *             .setMaxAttempts(5)
+ *             .setMaxRetryDelayDuration(Duration.ofSeconds(30))
+ *             .setMaxRpcTimeoutDuration(Duration.ofSeconds(60))
+ *             .setRetryDelayMultiplier(1.3)
+ *             .setRpcTimeoutMultiplier(1.5)
+ *             .setTotalTimeoutDuration(Duration.ofSeconds(300))
  *             .build());
  * DatastoreAdminSettings datastoreAdminSettings = datastoreAdminSettingsBuilder.build();
  * }
+ * + * Please refer to the [Client Side Retry + * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for + * additional support in setting retries. + * + *

To configure the RetrySettings of a Long Running Operation method, create an + * OperationTimedPollAlgorithm object and update the RPC's polling algorithm. For example, to + * configure the RetrySettings for exportEntities: + * + * 

{@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
+ * DatastoreAdminSettings.Builder datastoreAdminSettingsBuilder =
+ *     DatastoreAdminSettings.newBuilder();
+ * TimedRetryAlgorithm timedRetryAlgorithm =
+ *     OperationalTimedPollAlgorithm.create(
+ *         RetrySettings.newBuilder()
+ *             .setInitialRetryDelayDuration(Duration.ofMillis(500))
+ *             .setRetryDelayMultiplier(1.5)
+ *             .setMaxRetryDelay(Duration.ofMillis(5000))
+ *             .setTotalTimeoutDuration(Duration.ofHours(24))
+ *             .build());
+ * datastoreAdminSettingsBuilder
+ *     .createClusterOperationSettings()
+ *     .setPollingAlgorithm(timedRetryAlgorithm)
+ *     .build();
+ * }
*/ @Generated("by gapic-generator-java") public class DatastoreAdminSettings extends ClientSettings { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java index fc346d38c..82df00c03 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java @@ -21,6 +21,7 @@ import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.BetaApi; +import com.google.api.core.ObsoleteApi; import com.google.api.gax.core.GaxProperties; import com.google.api.gax.core.GoogleCredentialsProvider; import com.google.api.gax.core.InstantiatingExecutorProvider; @@ -85,7 +86,9 @@ *

The builder of this class is recursive, so contained classes are themselves builders. When * build() is called, the tree of builders is called to create the complete settings object. * - *

For example, to set the total timeout of getIndex to 30 seconds: + *

For example, to set the + * [RetrySettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.retrying.RetrySettings) + * of getIndex: * * 

{@code
  * // This snippet has been automatically generated and should be regarded as a code template only.
@@ -102,10 +105,47 @@
  *             .getIndexSettings()
  *             .getRetrySettings()
  *             .toBuilder()
- *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .setInitialRetryDelayDuration(Duration.ofSeconds(1))
+ *             .setInitialRpcTimeoutDuration(Duration.ofSeconds(5))
+ *             .setMaxAttempts(5)
+ *             .setMaxRetryDelayDuration(Duration.ofSeconds(30))
+ *             .setMaxRpcTimeoutDuration(Duration.ofSeconds(60))
+ *             .setRetryDelayMultiplier(1.3)
+ *             .setRpcTimeoutMultiplier(1.5)
+ *             .setTotalTimeoutDuration(Duration.ofSeconds(300))
  *             .build());
  * DatastoreAdminStubSettings datastoreAdminSettings = datastoreAdminSettingsBuilder.build();
  * }
+ * + * Please refer to the [Client Side Retry + * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for + * additional support in setting retries. + * + *

To configure the RetrySettings of a Long Running Operation method, create an + * OperationTimedPollAlgorithm object and update the RPC's polling algorithm. For example, to + * configure the RetrySettings for exportEntities: + * + * 

{@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
+ * DatastoreAdminStubSettings.Builder datastoreAdminSettingsBuilder =
+ *     DatastoreAdminStubSettings.newBuilder();
+ * TimedRetryAlgorithm timedRetryAlgorithm =
+ *     OperationalTimedPollAlgorithm.create(
+ *         RetrySettings.newBuilder()
+ *             .setInitialRetryDelayDuration(Duration.ofMillis(500))
+ *             .setRetryDelayMultiplier(1.5)
+ *             .setMaxRetryDelay(Duration.ofMillis(5000))
+ *             .setTotalTimeoutDuration(Duration.ofHours(24))
+ *             .build());
+ * datastoreAdminSettingsBuilder
+ *     .createClusterOperationSettings()
+ *     .setPollingAlgorithm(timedRetryAlgorithm)
+ *     .build();
+ * }
*/ @Generated("by gapic-generator-java") public class DatastoreAdminStubSettings extends StubSettings { @@ -163,9 +203,7 @@ public String extractNextToken(ListIndexesResponse payload) { @Override public Iterable extractResources(ListIndexesResponse payload) { - return payload.getIndexesList() == null - ? ImmutableList.of() - : payload.getIndexesList(); + return payload.getIndexesList(); } }; @@ -270,6 +308,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild } /** Returns the default service endpoint. */ + @ObsoleteApi("Use getEndpoint() instead") public static String getDefaultEndpoint() { return "datastore.googleapis.com:443"; } diff --git a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json index 5ed5e01e5..e4ca7ae5f 100644 --- a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json +++ b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json @@ -305,6 +305,24 @@ "allDeclaredClasses": true, "allPublicClasses": true }, + { + "name": "com.google.api.PythonSettings$ExperimentalFeatures", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.PythonSettings$ExperimentalFeatures$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, { "name": "com.google.api.ResourceDescriptor", "queryAllDeclaredConstructors": true, diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java index 2c078756d..27c9ab448 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java index fa127dc7c..913db1a5a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface CommonMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java index c86b9a967..f9e6986e1 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java index 537fb10b9..6440f28fc 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface CreateIndexRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java index 9a4bb925f..bcea2e23a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public final class DatastoreAdminProto { diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java index a0695ffd0..072da0b59 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java index 3bf3c03f8..1476b0451 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface DatastoreFirestoreMigrationMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java index 0b82ce7cc..19311057e 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java index 9ac5d5411..b2e5e6325 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface DeleteIndexRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java index a4c6617c3..f48b9fc16 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java index 59fff0657..ff9abf72c 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface EntityFilterOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java index 360a2c5c6..a48521aab 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java index a65dedc9c..dd09e14bf 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface ExportEntitiesMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java index acad36a3e..a87805a6c 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java index 01f5ec35d..e54ff1d1e 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface ExportEntitiesRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java index fd3350685..f629356dd 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java index 77bf913fb..a71ac8e9d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface ExportEntitiesResponseOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java index 00fb79822..e1d6886b2 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java index e33a2bd2e..5c5d811d7 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface GetIndexRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java index f89135ebd..47de2e41e 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java index 71c6928af..462bfacf2 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface ImportEntitiesMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java index 596bbfa1a..43f3a746e 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java index 922616586..a38f50917 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface ImportEntitiesRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java index 7244182dc..a2649edfb 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/index.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java index 96b2a12ac..a153b6848 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java index 20348e044..538df9521 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface IndexOperationMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java index 25373353b..459a0ef57 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/index.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface IndexOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java index 9dbdecdf1..f350301db 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/index.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public final class IndexProto { diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java index 5eb553c33..8dcdac9b9 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java index 389feb19a..4a3ea0672 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface ListIndexesRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java index 05da1f24d..63bc8361f 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java index e6b8e4376..83ee6d607 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface ListIndexesResponseOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java index d69e36b88..34b32c5c9 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java index 68441b30b..1b746f571 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface MigrationProgressEventOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java index 0c1110444..c5eae4353 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public final class MigrationProto { diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java index 1cc537677..0ffd47e82 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java index 54f20a287..0e3913ecd 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java index 3920f71c7..a96dd7999 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface MigrationStateEventOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java index 6810cfd53..ad98ba777 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java index b8a5f327b..644f8de69 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java index 347508413..bacd7cd7e 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java index faa613564..57bc88fc4 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.admin.v1; public interface ProgressOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java index 654257a1d..5207578bd 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java index bfb5e8448..4d34dc107 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.v1; public interface AggregationQueryOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java index 5a6afdcff..9ad3eb613 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java index 040d282df..8b0a4ddad 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java index 5c1fb1daa..6dc72d389 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.v1; public interface AggregationResultBatchOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java index 4bcde0f95..27ab61915 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.v1; public interface AggregationResultOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java index a924705f1..254cef18a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.3 +// Protobuf Java Version: 3.25.4 package com.google.datastore.v1; public final class AggregationResultProto { @@ -63,13 +63,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "tastore.v1.AggregationResult\022K\n\014more_res" + "ults\030\002 \001(\01625.google.datastore.v1.QueryRe" + "sultBatch.MoreResultsType\022-\n\tread_time\030\003" - + " \001(\0132\032.google.protobuf.TimestampB\310\001\n\027com" + + " \001(\0132\032.google.protobuf.TimestampB\307\001\n\027com" + ".google.datastore.v1B\026AggregationResultP" - + "rotoP\001Z.*?)\""], + "matchStrings": [ + "value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\"" + ], "depNameTemplate": "com.google.cloud:sdk-platform-java-config", "datasourceTemplate": "maven" }, @@ -32,7 +36,9 @@ "fileMatch": [ "^.github/workflows/unmanaged_dependency_check.yaml$" ], - "matchStrings": ["uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"], + "matchStrings": [ + "uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n" + ], "depNameTemplate": "com.google.cloud:sdk-platform-java-config", "datasourceTemplate": "maven" } @@ -99,4 +105,4 @@ ], "semanticCommits": true, "dependencyDashboard": true -} +} \ No newline at end of file From 266f703cafc9616086dd142fd385b502a7a2ce10 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 11 Sep 2024 22:26:27 +0200 Subject: [PATCH 069/292] build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 (#1551) --- samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/pom.xml b/samples/pom.xml index 2e970d081..56fd2ae2c 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -38,7 +38,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 true From 0478c55bc2bef6c691fe69511fd3152636c58c0e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 11 Sep 2024 23:08:07 +0200 Subject: [PATCH 070/292] test(deps): update dependency com.google.truth:truth to v1.4.4 (#1520) --- datastore-v1-proto-client/pom.xml | 2 +- google-cloud-datastore/pom.xml | 2 +- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 52758f476..177de84c7 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -98,7 +98,7 @@ com.google.truth truth - 1.4.3 + 1.4.4 test diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index c80548fe5..55f4ecf52 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -157,7 +157,7 @@ com.google.truth truth - 1.4.3 + 1.4.4 test diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 715d7154c..284584221 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -42,7 +42,7 @@ com.google.truth truth - 1.4.3 + 1.4.4 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 662500308..f44b9f8bc 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -41,7 +41,7 @@ com.google.truth truth - 1.4.3 + 1.4.4 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index bd49599d3..1cc4e9152 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -53,7 +53,7 @@ com.google.truth truth - 1.4.3 + 1.4.4 test From ee788a162841994e09a61bb81b94cbe93353a78e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 11 Sep 2024 23:08:16 +0200 Subject: [PATCH 071/292] deps: update dependency org.easymock:easymock to v5.4.0 (#1482) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ab0ec448..1397398f8 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,7 @@ org.easymock easymock - 5.2.0 + 5.4.0 test From 37a4f58124cb3cdde409dc54f3ab1047dfaf2234 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 11 Sep 2024 23:08:29 +0200 Subject: [PATCH 072/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1480) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff)) ### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed)) ### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) ##### Features - Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) ### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) ### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a)) - Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49)) - Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 284584221..d884dbf55 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.20.0 + 2.21.2 From 7e7a0308f73a14228ba9cf0a9fd26afa2f93869e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 14:28:21 -0700 Subject: [PATCH 073/292] chore(main): release 2.21.3 (#1565) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 10 ++++++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 39 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e953fa33f..a38532a81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [2.21.3](https://github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3) (2024-09-11) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#1561](https://github.com/googleapis/java-datastore/issues/1561)) ([5a79fd8](https://github.com/googleapis/java-datastore/commit/5a79fd8d1202e65c02423fe40402c41af6050efa)) +* Update dependency com.google.errorprone:error_prone_core to v2.31.0 ([#1523](https://github.com/googleapis/java-datastore/issues/1523)) ([8d3af32](https://github.com/googleapis/java-datastore/commit/8d3af322fb56032cd7a9d29e60fd93d1f3e7e632)) +* Update dependency com.google.guava:guava-testlib to v33.3.0-jre ([#1548](https://github.com/googleapis/java-datastore/issues/1548)) ([18ba37f](https://github.com/googleapis/java-datastore/commit/18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9)) +* Update dependency org.easymock:easymock to v5.4.0 ([#1482](https://github.com/googleapis/java-datastore/issues/1482)) ([ee788a1](https://github.com/googleapis/java-datastore/commit/ee788a162841994e09a61bb81b94cbe93353a78e)) + ## [2.21.2](https://github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) (2024-08-22) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 177de84c7..3922a2757 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.21.3-SNAPSHOT + 2.21.3 com.google.cloud google-cloud-datastore-parent - 2.21.3-SNAPSHOT + 2.21.3 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 0fe170fa1..a13792e8f 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.21.3-SNAPSHOT + 2.21.3 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.21.3-SNAPSHOT + 2.21.3 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.3-SNAPSHOT + 2.21.3 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.3-SNAPSHOT + 0.112.3 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.3-SNAPSHOT + 2.21.3 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 55f4ecf52..595f04ba4 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.21.3-SNAPSHOT + 2.21.3 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.21.3-SNAPSHOT + 2.21.3 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 0464bed48..fe38bbef1 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.3-SNAPSHOT + 2.21.3 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.3-SNAPSHOT + 2.21.3 diff --git a/pom.xml b/pom.xml index 1397398f8..23737d6b3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.21.3-SNAPSHOT + 2.21.3 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.3-SNAPSHOT + 2.21.3 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.3-SNAPSHOT + 2.21.3 com.google.cloud google-cloud-datastore - 2.21.3-SNAPSHOT + 2.21.3 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.3-SNAPSHOT + 0.112.3 com.google.cloud.datastore datastore-v1-proto-client - 2.21.3-SNAPSHOT + 2.21.3 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index e9a85dc5e..5ddd934ff 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.3-SNAPSHOT + 2.21.3 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.3-SNAPSHOT + 2.21.3 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a8d6064ca..a2bceec90 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.3-SNAPSHOT + 0.112.3 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.21.3-SNAPSHOT + 2.21.3 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index d884dbf55..284584221 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.21.2 + 2.20.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index f44b9f8bc..af7856d35 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.21.3-SNAPSHOT + 2.21.3 diff --git a/versions.txt b/versions.txt index a22a8396e..9cc37ac81 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.21.2:2.21.3-SNAPSHOT -google-cloud-datastore-bom:2.21.2:2.21.3-SNAPSHOT -proto-google-cloud-datastore-v1:0.112.2:0.112.3-SNAPSHOT -datastore-v1-proto-client:2.21.2:2.21.3-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.21.2:2.21.3-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.21.2:2.21.3-SNAPSHOT +google-cloud-datastore:2.21.3:2.21.3 +google-cloud-datastore-bom:2.21.3:2.21.3 +proto-google-cloud-datastore-v1:0.112.3:0.112.3 +datastore-v1-proto-client:2.21.3:2.21.3 +proto-google-cloud-datastore-admin-v1:2.21.3:2.21.3 +grpc-google-cloud-datastore-admin-v1:2.21.3:2.21.3 From 3e33c4cb3c3066e1281edfab7e84adb73b7fb1cd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 11 Sep 2024 23:40:34 +0200 Subject: [PATCH 074/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1570) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff)) ### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed)) ### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) ##### Features - Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) ### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) ### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a)) - Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49)) - Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 284584221..d884dbf55 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.20.0 + 2.21.2 From e95d878986a0a5aa35341764b56de7e9a4d8ed23 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 12 Sep 2024 18:40:25 +0200 Subject: [PATCH 075/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.3 (#1572) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.21.2` -> `2.21.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.3`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2213-2024-09-11) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#​1561](https://redirect.github.com/googleapis/java-datastore/issues/1561)) ([5a79fd8](https://redirect.github.com/googleapis/java-datastore/commit/5a79fd8d1202e65c02423fe40402c41af6050efa)) - Update dependency com.google.errorprone:error_prone_core to v2.31.0 ([#​1523](https://redirect.github.com/googleapis/java-datastore/issues/1523)) ([8d3af32](https://redirect.github.com/googleapis/java-datastore/commit/8d3af322fb56032cd7a9d29e60fd93d1f3e7e632)) - Update dependency com.google.guava:guava-testlib to v33.3.0-jre ([#​1548](https://redirect.github.com/googleapis/java-datastore/issues/1548)) ([18ba37f](https://redirect.github.com/googleapis/java-datastore/commit/18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9)) - Update dependency org.easymock:easymock to v5.4.0 ([#​1482](https://redirect.github.com/googleapis/java-datastore/issues/1482)) ([ee788a1](https://redirect.github.com/googleapis/java-datastore/commit/ee788a162841994e09a61bb81b94cbe93353a78e))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index d884dbf55..9187ea8ce 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.21.2 + 2.21.3 From 3e9bf506c8dea79697f924398e8738fc8394ba7e Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Fri, 13 Sep 2024 20:02:59 +0000 Subject: [PATCH 076/292] chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime (#1575) --- .../clirr-ignored-differences.xml | 62 +++++++++++++++++++ .../clirr-ignored-differences.xml | 62 +++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml b/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml index c384c422e..7cf3ac808 100644 --- a/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-datastore-admin-v1/clirr-ignored-differences.xml @@ -16,4 +16,66 @@ com/google/datastore/admin/v1/*OrBuilder boolean has*(*) + + + + 7006 + com/google/datastore/admin/v1/** + * getDefaultInstanceForType() + ** + + + 7006 + com/google/datastore/admin/v1/** + * addRepeatedField(*) + ** + + + 7006 + com/google/datastore/admin/v1/** + * clear() + ** + + + 7006 + com/google/datastore/admin/v1/** + * clearField(*) + ** + + + 7006 + com/google/datastore/admin/v1/** + * clearOneof(*) + ** + + + 7006 + com/google/datastore/admin/v1/** + * clone() + ** + + + 7006 + com/google/datastore/admin/v1/** + * mergeUnknownFields(*) + ** + + + 7006 + com/google/datastore/admin/v1/** + * setField(*) + ** + + + 7006 + com/google/datastore/admin/v1/** + * setRepeatedField(*) + ** + + + 7006 + com/google/datastore/admin/v1/** + * setUnknownFields(*) + ** + diff --git a/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml b/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml index 064bc1b32..34662f77c 100644 --- a/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-datastore-v1/clirr-ignored-differences.xml @@ -58,4 +58,66 @@ STATS_FIELD_NUMBER 6011 + + + + 7006 + com/google/datastore/v1/** + * getDefaultInstanceForType() + ** + + + 7006 + com/google/datastore/v1/** + * addRepeatedField(*) + ** + + + 7006 + com/google/datastore/v1/** + * clear() + ** + + + 7006 + com/google/datastore/v1/** + * clearField(*) + ** + + + 7006 + com/google/datastore/v1/** + * clearOneof(*) + ** + + + 7006 + com/google/datastore/v1/** + * clone() + ** + + + 7006 + com/google/datastore/v1/** + * mergeUnknownFields(*) + ** + + + 7006 + com/google/datastore/v1/** + * setField(*) + ** + + + 7006 + com/google/datastore/v1/** + * setRepeatedField(*) + ** + + + 7006 + com/google/datastore/v1/** + * setUnknownFields(*) + ** + From 224b13781baa96f94ca36c47220291273164127a Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:08:22 -0400 Subject: [PATCH 077/292] chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 (#1573) * chore: Update generation configuration at Thu Sep 12 02:19:58 UTC 2024 * chore: generate libraries at Thu Sep 12 02:20:21 UTC 2024 * chore: Update generation configuration at Fri Sep 13 02:20:43 UTC 2024 * chore: Update generation configuration at Sat Sep 14 02:18:54 UTC 2024 * chore: Update generation configuration at Mon Sep 16 02:25:16 UTC 2024 * chore: Update generation configuration at Tue Sep 17 02:08:30 UTC 2024 * chore: Update generation configuration at Wed Sep 18 02:20:33 UTC 2024 * chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 * chore: generate libraries at Thu Sep 19 02:22:20 UTC 2024 --- README.md | 10 +++++----- generation_config.yaml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e6d69755b..e5e9c1afe 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.20.0 + 2.21.2 ``` @@ -50,20 +50,20 @@ 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.45.0') +implementation platform('com.google.cloud:libraries-bom:26.46.0') implementation 'com.google.cloud:google-cloud-datastore' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.21.2' +implementation 'com.google.cloud:google-cloud-datastore:2.21.3' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.21.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.21.3" ``` @@ -479,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.21.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.21.3 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/generation_config.yaml b/generation_config.yaml index e030af441..cd940462a 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.45.0 -googleapis_commitish: 41cd9dba9e88f707a663d6686148ae3dc24116b8 -libraries_bom_version: 26.45.0 +googleapis_commitish: 607c2ae82620153880a66898bcbf0a46d38d7d10 +libraries_bom_version: 26.46.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From 5440c22364074c108450c3a748a6a17d5f1dddda Mon Sep 17 00:00:00 2001 From: Jimit Shah <57637300+jimit-j-shah@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:56:26 -0700 Subject: [PATCH 078/292] feat: Introducing Tracing with OpenTelemetry API #1537 (#1576) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Adding TraceUtil interface and its implementation to enable Tracing controls via DatastoreOptions (#1431) * Adding EnabledTraceUtil, DisabledTraceUtil and TraceUtilTest * Annotating DatastoreOpenTelemetryOptions to be transient as they're not serializable * Adding google-auth-library-credentials dependency due to https://github.com/googleapis/java-datastore/actions/runs/8944472794/job/24571458116?pr=1431 * feat: Adding Lookup RPC OpenTelemetry Tracing (#1437) * feat: Adding Lookup RPC OpenTelemetry Tracing - Removed OpenCensus Tracing - Added E2E tests with Global and Local OTel SDK - Moved OTel SDK setup to RemoteDatastoreHelper - Fixed pom to depend on BOM for all shared dependencies * feat: Adding Commit RPC Trace Instrumentation (#1440) - Added end-to-end test for Datastore operationsput, add, update and delete. - Updated E2E Test to use the namespace correctly for efficient clean-up of test data * feat: RunQuery trace instrumentation (#1441) * feat: RunQuery trace instrumentation * feat: RunAggregationQuery instrumentation (#1447) * feat: RunQuery trace instrumentation * Formatting * Formatting * Refactor: s/RUNQUERY/RUN_QUERY * feat: RunAggregationQuery Trace Instrumentation * Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java). * Formatting * Fixing @Test annotation missed after merge * Formatting * feat: RunQuery trace instrumentation * Formatting * Formatting * Refactor: s/RUNQUERY/RUN_QUERY * feat: RunAggregationQuery Trace Instrumentation * Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java). * Formatting * Fixing @Test annotation missed after merge * Formatting * feat: Add Transaction tracing test: transactionalLookupTest * test: Transaction test for RunInTransaction - need to fix trace instrumentation for RunIn.. * Adding transaction span names * TransactionLookupTest * feat: support for transactional operations - tested using newTransaction() and runInTransaction() * Revert "feat: support for transactional operations" This reverts commit 10341c0b97cbc2025f9f928ce8cb09d5c036a5b3. * feat: support for transactional operations (#1468) * feat: support for transactional operations - tested using newTransaction() and runInTransaction() * feat: Allocateid tracing (#1488) * feat: Adding tracing for AllocateIds RPC * formatting * 🦉 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 * feat: Add tracing for ReserveIds operation (#1490) - added end-to-end test * fix: Fixed Span nesting for `ReadWriteTransactionCallable` by using parent SpanContext instead of just parent Context (#1495) * fix: Fixed the TraceUtil.startSpan method to use `SpanContext` for linking with the parent instead of `Context`. - This fixes the hierarchy of Spans appearing in a transaction under a Run method. - Tested using existing transaction test * Fixed commit reordering and typos * fix: lint errors * fix: Refactored the ReadWriteTransactioncallable.call method to use startSpan idiomatically - TraceUtil.startSpan needs more debugging - return DefaultTracerProvider instance (no-op) when initializing DisabledTraceUtil - this fixes the unit tests in DatastoreTest.testRunInTransactionWithReadWriteOption * feat: Added tracing for Transaction.RunQuery (#1499) * feat: Added span for Transactional RunQuery - tested * fix: lint * fix: patch apply issues * fix: refactor using boolean flag * fix: s/startSpan/startSpanWithParentContext * test: Additional Transaction Testing and cleanup OpenCensus usage (#1505) * test: newTransactionReadWriteTraceTest * fix: test literal * feat: Added tests for transaction cases * fix: Cleanup OpenCensus dead code * fix: updating version from 2.20.1 -> 2.21.0 * fix: reverting version from 2.21.0 -> 2.20.1 * fix: Adding an exception to the clirr-maven-plugin for an internal API parameter change from com.google.cloud.datastore.TraceUtil -> com.google.cloud.datastore.telemetry.TraceUtil * fix: Fixing the differenceType in clirr exception * fix: add an exception for removal of an internal class (com.google.cloud.datastore.TraceUtil) * fix: fixing incomplete difference details for type 7005 * fix: Fixing `to` of the difference to be the entire signature * fix: typo * test: Adding ITTracingTest to verify events and span attributes (whic… (#1514) * test: Adding ITTracingTest to verify events and span attributes (which are not verified in ITE2ETracingTest) due to TraceClient API limitations. - This test uses InMemorySpanExporter to read the generated Otel span data by the test process to verify generated span data as it were before exporting to a backend. None of the span data is exported to a durable backend. - This test is still an E2E test as it requires a project to send RPCs to. * fix: fixing compilation error due to missing pom dependency. * test: Test for AllocateId and ReserveId rpcs * test: Commit/Put/Update/Delete tests * test: Added fixes and test for RunQuery event * test: Additional Transaction tests and AggregationQuery test (#1518) * test: ReadWrite Transaction test * test: Added test for Transactional RunQuery and Transaction Rollback * test: runInTransaction API tracing test - Fixed setting of common span attributes to spans in runInTransaction - Removed some gRPC related channel attributes that are not present in this Datastore version, yet. * fix: Undelete gRPC upgrade docs * fix: Undo merge mistakes * fix: Updating span event strings (#1539) * fix: Fixing user-facing span names in line with go/firestore-client-trace-catalog * fix: updating bom dependency version to fix https://github.com/googleapis/java-datastore/actions/runs/10256441634/job/28375496112?pr=1539 * Fix: typo in test causing integration test failure (#1556) https://btx.cloud.google.com/invocations/c11a2e8b-4494-4ddc-a77e-cf2bcbcf5254/targets/cloud-devrel%2Fclient-libraries%2Fjava%2Fjava-datastore%2Fpresubmit%2Fintegration;config=default/log * fix: opentelemetry-sdk should only be used as a Test Dependency * fix: Update opentelemetry.version - this also fixes the tests failing in https://github.com/googleapis/java-datastore/actions/runs/10891578591/job/30222786908 * fix: Replacing attribute key values w/ constants * fix: opentelemetry.version to fix RequireUpperBoundDeps check https://github.com/googleapis/java-datastore/actions/runs/10892403348/job/30225154043?pr=1576 * fix: Create Span hierarchy using parent Span (#1580) * fix: Replace use of TraceUtil.SpanContext w/ TraceUtil.Context * fix: Fixing how span hierarchy is created across threads - using Span instead of Context * fix: cleaning up startSpan(spanName, parentContext) variant * fix: add TracedReadWriteTransactionCallable to bifurcate tracing enabled/disabled paths for the Transaction callback. - This change implements the idiomatic way to express nested spans as described in https://opentelemetry.io/docs/languages/java/instrumentation/#create-nested-spans * fix: cleanup * fix: cleanup * fix: cleanup * fix: formatting and import refactoring * chore: generate libraries at Thu Sep 19 18:35:54 UTC 2024 --------- Co-authored-by: Owl Bot Co-authored-by: cloud-java-bot --- README.md | 2 +- .../clirr-ignored-differences.xml | 12 + google-cloud-datastore/pom.xml | 86 +- .../google/cloud/datastore/DatastoreImpl.java | 289 +++-- .../DatastoreOpenTelemetryOptions.java | 97 ++ .../cloud/datastore/DatastoreOptions.java | 40 + .../RetryAndTraceDatastoreRpcDecorator.java | 30 +- .../com/google/cloud/datastore/TraceUtil.java | 76 -- .../cloud/datastore/TransactionImpl.java | 5 + .../datastore/spi/v1/HttpDatastoreRpc.java | 5 +- .../telemetry/DisabledTraceUtil.java | 131 +++ .../datastore/telemetry/EnabledTraceUtil.java | 323 ++++++ .../cloud/datastore/telemetry/TraceUtil.java | 167 +++ .../testing/RemoteDatastoreHelper.java | 29 +- .../cloud/datastore/DatastoreOptionsTest.java | 14 + .../google/cloud/datastore/DatastoreTest.java | 2 + ...etryAndTraceDatastoreRpcDecoratorTest.java | 84 -- .../cloud/datastore/it/ITE2ETracingTest.java | 1009 +++++++++++++++++ .../cloud/datastore/it/ITTracingTest.java | 849 ++++++++++++++ .../telemetry/DisabledTraceUtilTest.java | 54 + .../telemetry/EnabledTraceUtilTest.java | 106 ++ .../datastore/telemetry/TraceUtilTest.java | 62 + 22 files changed, 3216 insertions(+), 256 deletions(-) create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java delete mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java delete mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java diff --git a/README.md b/README.md index e5e9c1afe..d8b43bd0a 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.21.2 + 2.21.3 ``` diff --git a/google-cloud-datastore/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml index 1620fd752..847ba4f4c 100644 --- a/google-cloud-datastore/clirr-ignored-differences.xml +++ b/google-cloud-datastore/clirr-ignored-differences.xml @@ -55,4 +55,16 @@ java.lang.Object execute(com.google.cloud.datastore.Query, com.google.cloud.datastore.ReadOption[]) 7004 + + com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator + RetryAndTraceDatastoreRpcDecorator(com.google.cloud.datastore.spi.v1.DatastoreRpc, com.google.cloud.datastore.TraceUtil, com.google.api.gax.retrying.RetrySettings, com.google.cloud.datastore.DatastoreOptions) + RetryAndTraceDatastoreRpcDecorator(com.google.cloud.datastore.spi.v1.DatastoreRpc, com.google.cloud.datastore.telemetry.TraceUtil, com.google.api.gax.retrying.RetrySettings, com.google.cloud.datastore.DatastoreOptions) + 7005 + + + + + com/google/cloud/datastore/TraceUtil + 8001 + diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 595f04ba4..5137728ea 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -16,7 +16,20 @@ google-cloud-datastore + 1.42.0 + + + + + com.google.cloud + gapic-libraries-bom + 1.37.0 + pom + import + + + com.google.api.grpc @@ -38,6 +51,10 @@ com.google.cloud.datastore datastore-v1-proto-client + + com.google.auth + google-auth-library-credentials + io.grpc grpc-api @@ -111,6 +128,19 @@ jsr305 + + + io.opentelemetry + opentelemetry-api + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-context + ${opentelemetry.version} + + + ${project.groupId} @@ -118,7 +148,6 @@ test-jar test - com.google.guava guava-testlib @@ -160,6 +189,61 @@ 1.4.4 test + + com.google.testparameterinjector + test-parameter-injector + 1.16 + test + + + + io.opentelemetry + opentelemetry-sdk + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-common + ${opentelemetry.version} + test + + + io.opentelemetry + opentelemetry-sdk-testing + ${opentelemetry.version} + test + + + io.opentelemetry + opentelemetry-sdk-trace + ${opentelemetry.version} + test + + + io.opentelemetry + opentelemetry-semconv + 1.1.0-alpha + test + + + + + com.google.cloud.opentelemetry + exporter-trace + 0.15.0 + test + + + com.google.cloud + google-cloud-trace + test + + + com.google.api.grpc + proto-google-cloud-trace-v1 + test + + diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java index a3bfb3796..2bf8389fd 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java @@ -16,6 +16,26 @@ package com.google.cloud.datastore; +import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_DEFERRED; +import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_DOCUMENT_COUNT; +import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_MISSING; +import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_MORE_RESULTS; +import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_READ_CONSISTENCY; +import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_RECEIVED; +import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_TRANSACTIONAL; +import static com.google.cloud.datastore.telemetry.TraceUtil.ATTRIBUTES_KEY_TRANSACTION_ID; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_ALLOCATE_IDS; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_BEGIN_TRANSACTION; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_COMMIT; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_LOOKUP; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RESERVE_IDS; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_ROLLBACK; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RUN_QUERY; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_COMMIT; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_LOOKUP; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_RUN; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_RUN_QUERY; + import com.google.api.core.BetaApi; import com.google.api.gax.retrying.RetrySettings; import com.google.cloud.BaseService; @@ -25,20 +45,23 @@ import com.google.cloud.ServiceOptions; import com.google.cloud.datastore.execution.AggregationQueryExecutor; import com.google.cloud.datastore.spi.v1.DatastoreRpc; +import com.google.cloud.datastore.telemetry.TraceUtil; +import com.google.cloud.datastore.telemetry.TraceUtil.Scope; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.google.datastore.v1.CommitResponse; import com.google.datastore.v1.ExplainOptions; import com.google.datastore.v1.ReadOptions; import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.RunQueryResponse; import com.google.datastore.v1.TransactionOptions; import com.google.protobuf.ByteString; -import io.opencensus.common.Scope; -import io.opencensus.trace.Span; -import io.opencensus.trace.Status; +import io.opentelemetry.context.Context; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -50,6 +73,7 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.Callable; +import javax.annotation.Nullable; final class DatastoreImpl extends BaseService implements Datastore { @@ -59,7 +83,9 @@ final class DatastoreImpl extends BaseService implements Datas TransactionExceptionHandler.build(); private static final ExceptionHandler TRANSACTION_OPERATION_EXCEPTION_HANDLER = TransactionOperationExceptionHandler.build(); - private final TraceUtil traceUtil = TraceUtil.getInstance(); + + private final com.google.cloud.datastore.telemetry.TraceUtil otelTraceUtil = + getOptions().getTraceUtil(); private final ReadOptionProtoPreparer readOptionProtoPreparer; private final AggregationQueryExecutor aggregationQueryExecutor; @@ -73,7 +99,8 @@ final class DatastoreImpl extends BaseService implements Datas readOptionProtoPreparer = new ReadOptionProtoPreparer(); aggregationQueryExecutor = new AggregationQueryExecutor( - new RetryAndTraceDatastoreRpcDecorator(datastoreRpc, traceUtil, retrySettings, options), + new RetryAndTraceDatastoreRpcDecorator( + datastoreRpc, otelTraceUtil, retrySettings, options), options); } @@ -92,8 +119,68 @@ public Transaction newTransaction() { return new TransactionImpl(this); } - static class ReadWriteTransactionCallable implements Callable { + static class TracedReadWriteTransactionCallable implements Callable { + private final Datastore datastore; + private final TransactionCallable callable; + private volatile TransactionOptions options; + private volatile Transaction transaction; + + private final TraceUtil.Span parentSpan; + + TracedReadWriteTransactionCallable( + Datastore datastore, + TransactionCallable callable, + TransactionOptions options, + @Nullable com.google.cloud.datastore.telemetry.TraceUtil.Span parentSpan) { + this.datastore = datastore; + this.callable = callable; + this.options = options; + this.transaction = null; + this.parentSpan = parentSpan; + } + + Datastore getDatastore() { + return datastore; + } + + TransactionOptions getOptions() { + return options; + } + + Transaction getTransaction() { + return transaction; + } + + void setPrevTransactionId(ByteString transactionId) { + TransactionOptions.ReadWrite readWrite = + TransactionOptions.ReadWrite.newBuilder().setPreviousTransaction(transactionId).build(); + options = options.toBuilder().setReadWrite(readWrite).build(); + } + + @Override + public T call() throws DatastoreException { + try (io.opentelemetry.context.Scope ignored = + Context.current().with(parentSpan.getSpan()).makeCurrent()) { + transaction = datastore.newTransaction(options); + T value = callable.run(transaction); + transaction.commit(); + return value; + } catch (Exception ex) { + transaction.rollback(); + throw DatastoreException.propagateUserException(ex); + } finally { + if (transaction.isActive()) { + transaction.rollback(); + } + if (options != null + && options.getModeCase().equals(TransactionOptions.ModeCase.READ_WRITE)) { + setPrevTransactionId(transaction.getTransactionId()); + } + } + } + } + static class ReadWriteTransactionCallable implements Callable { private final Datastore datastore; private final TransactionCallable callable; private volatile TransactionOptions options; @@ -127,8 +214,8 @@ void setPrevTransactionId(ByteString transactionId) { @Override public T call() throws DatastoreException { - transaction = datastore.newTransaction(options); try { + transaction = datastore.newTransaction(options); T value = callable.run(transaction); transaction.commit(); return value; @@ -149,36 +236,47 @@ public T call() throws DatastoreException { @Override public T runInTransaction(final TransactionCallable callable) { - Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_TRANSACTION); - try (Scope scope = traceUtil.getTracer().withSpan(span)) { + TraceUtil.Span span = otelTraceUtil.startSpan(SPAN_NAME_TRANSACTION_RUN); + Callable transactionCallable = + (getOptions().getOpenTelemetryOptions().isEnabled() + ? new TracedReadWriteTransactionCallable( + this, callable, /*transactionOptions=*/ null, span) + : new ReadWriteTransactionCallable(this, callable, /*transactionOptions=*/ null)); + try (Scope ignored = span.makeCurrent()) { return RetryHelper.runWithRetries( - new ReadWriteTransactionCallable(this, callable, null), + transactionCallable, retrySettings, TRANSACTION_EXCEPTION_HANDLER, getOptions().getClock()); } catch (RetryHelperException e) { - span.setStatus(Status.UNKNOWN.withDescription(e.getMessage())); + span.end(e); throw DatastoreException.translateAndThrow(e); } finally { - span.end(TraceUtil.END_SPAN_OPTIONS); + span.end(); } } @Override public T runInTransaction( final TransactionCallable callable, TransactionOptions transactionOptions) { - Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_TRANSACTION); - try (Scope scope = traceUtil.getTracer().withSpan(span)) { + TraceUtil.Span span = otelTraceUtil.startSpan(SPAN_NAME_TRANSACTION_RUN); + + Callable transactionCallable = + (getOptions().getOpenTelemetryOptions().isEnabled() + ? new TracedReadWriteTransactionCallable(this, callable, transactionOptions, span) + : new ReadWriteTransactionCallable(this, callable, transactionOptions)); + + try (Scope ignored = span.makeCurrent()) { return RetryHelper.runWithRetries( - new ReadWriteTransactionCallable(this, callable, transactionOptions), + transactionCallable, retrySettings, TRANSACTION_EXCEPTION_HANDLER, getOptions().getClock()); } catch (RetryHelperException e) { - span.setStatus(Status.UNKNOWN.withDescription(e.getMessage())); + span.end(e); throw DatastoreException.translateAndThrow(e); } finally { - span.end(TraceUtil.END_SPAN_OPTIONS); + span.end(); } } @@ -236,20 +334,39 @@ public AggregationResults runAggregation( com.google.datastore.v1.RunQueryResponse runQuery( final com.google.datastore.v1.RunQueryRequest requestPb) { - Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_RUNQUERY); - try (Scope scope = traceUtil.getTracer().withSpan(span)) { - return RetryHelper.runWithRetries( - () -> datastoreRpc.runQuery(requestPb), - retrySettings, - requestPb.getReadOptions().getTransaction().isEmpty() - ? EXCEPTION_HANDLER - : TRANSACTION_OPERATION_EXCEPTION_HANDLER, - getOptions().getClock()); + ReadOptions readOptions = requestPb.getReadOptions(); + boolean isTransactional = readOptions.hasTransaction() || readOptions.hasNewTransaction(); + String spanName = (isTransactional ? SPAN_NAME_TRANSACTION_RUN_QUERY : SPAN_NAME_RUN_QUERY); + com.google.cloud.datastore.telemetry.TraceUtil.Span span = otelTraceUtil.startSpan(spanName); + + try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) { + RunQueryResponse response = + RetryHelper.runWithRetries( + () -> datastoreRpc.runQuery(requestPb), + retrySettings, + requestPb.getReadOptions().getTransaction().isEmpty() + ? EXCEPTION_HANDLER + : TRANSACTION_OPERATION_EXCEPTION_HANDLER, + getOptions().getClock()); + span.addEvent( + spanName + " complete.", + new ImmutableMap.Builder() + .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, response.getBatch().getEntityResultsCount()) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, isTransactional) + .put(ATTRIBUTES_KEY_READ_CONSISTENCY, readOptions.getReadConsistency().toString()) + .put( + ATTRIBUTES_KEY_TRANSACTION_ID, + (isTransactional + ? requestPb.getReadOptions().getTransaction().toStringUtf8() + : "")) + .put(ATTRIBUTES_KEY_MORE_RESULTS, response.getBatch().getMoreResults().toString()) + .build()); + return response; } catch (RetryHelperException e) { - span.setStatus(Status.UNKNOWN.withDescription(e.getMessage())); + span.end(e); throw DatastoreException.translateAndThrow(e); } finally { - span.end(TraceUtil.END_SPAN_OPTIONS); + span.end(); } } @@ -291,8 +408,9 @@ public List allocateId(IncompleteKey... keys) { private com.google.datastore.v1.AllocateIdsResponse allocateIds( final com.google.datastore.v1.AllocateIdsRequest requestPb) { - Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_ALLOCATEIDS); - try (Scope scope = traceUtil.getTracer().withSpan(span)) { + com.google.cloud.datastore.telemetry.TraceUtil.Span span = + otelTraceUtil.startSpan(SPAN_NAME_ALLOCATE_IDS); + try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) { return RetryHelper.runWithRetries( new Callable() { @Override @@ -304,10 +422,10 @@ public com.google.datastore.v1.AllocateIdsResponse call() throws DatastoreExcept EXCEPTION_HANDLER, getOptions().getClock()); } catch (RetryHelperException e) { - span.setStatus(Status.UNKNOWN.withDescription(e.getMessage())); + span.end(e); throw DatastoreException.translateAndThrow(e); } finally { - span.end(TraceUtil.END_SPAN_OPTIONS); + span.end(); } } @@ -450,14 +568,27 @@ protected Entity computeNext() { com.google.datastore.v1.LookupResponse lookup( final com.google.datastore.v1.LookupRequest requestPb) { - Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_LOOKUP); - try (Scope scope = traceUtil.getTracer().withSpan(span)) { + ReadOptions readOptions = requestPb.getReadOptions(); + boolean isTransactional = readOptions.hasTransaction() || readOptions.hasNewTransaction(); + String spanName = (isTransactional ? SPAN_NAME_TRANSACTION_LOOKUP : SPAN_NAME_LOOKUP); + com.google.cloud.datastore.telemetry.TraceUtil.Span span = otelTraceUtil.startSpan(spanName); + + try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) { return RetryHelper.runWithRetries( - new Callable() { - @Override - public com.google.datastore.v1.LookupResponse call() throws DatastoreException { - return datastoreRpc.lookup(requestPb); - } + () -> { + com.google.datastore.v1.LookupResponse response = datastoreRpc.lookup(requestPb); + span.addEvent( + spanName + " complete.", + new ImmutableMap.Builder() + .put(ATTRIBUTES_KEY_RECEIVED, response.getFoundCount()) + .put(ATTRIBUTES_KEY_MISSING, response.getMissingCount()) + .put(ATTRIBUTES_KEY_DEFERRED, response.getDeferredCount()) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, isTransactional) + .put( + ATTRIBUTES_KEY_TRANSACTION_ID, + isTransactional ? readOptions.getTransaction().toStringUtf8() : "") + .build()); + return response; }, retrySettings, requestPb.getReadOptions().getTransaction().isEmpty() @@ -465,10 +596,10 @@ public com.google.datastore.v1.LookupResponse call() throws DatastoreException { : TRANSACTION_OPERATION_EXCEPTION_HANDLER, getOptions().getClock()); } catch (RetryHelperException e) { - span.setStatus(Status.UNKNOWN.withDescription(e.getMessage())); + span.end(e); throw DatastoreException.translateAndThrow(e); } finally { - span.end(TraceUtil.END_SPAN_OPTIONS); + span.end(); } } @@ -492,8 +623,9 @@ public List reserveIds(Key... keys) { com.google.datastore.v1.ReserveIdsResponse reserveIds( final com.google.datastore.v1.ReserveIdsRequest requestPb) { - Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_RESERVEIDS); - try (Scope scope = traceUtil.getTracer().withSpan(span)) { + com.google.cloud.datastore.telemetry.TraceUtil.Span span = + otelTraceUtil.startSpan(SPAN_NAME_RESERVE_IDS); + try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) { return RetryHelper.runWithRetries( new Callable() { @Override @@ -505,10 +637,10 @@ public com.google.datastore.v1.ReserveIdsResponse call() throws DatastoreExcepti EXCEPTION_HANDLER, getOptions().getClock()); } catch (RetryHelperException e) { - span.setStatus(Status.UNKNOWN.withDescription(e.getMessage())); + span.end(e); throw DatastoreException.translateAndThrow(e); } finally { - span.end(TraceUtil.END_SPAN_OPTIONS); + span.end(); } } @@ -602,20 +734,34 @@ private com.google.datastore.v1.CommitResponse commitMutation( com.google.datastore.v1.CommitResponse commit( final com.google.datastore.v1.CommitRequest requestPb) { - Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_COMMIT); - try (Scope scope = traceUtil.getTracer().withSpan(span)) { - return RetryHelper.runWithRetries( - () -> datastoreRpc.commit(requestPb), - retrySettings, - requestPb.getTransaction().isEmpty() - ? EXCEPTION_HANDLER - : TRANSACTION_OPERATION_EXCEPTION_HANDLER, - getOptions().getClock()); + final boolean isTransactional = + requestPb.hasTransaction() || requestPb.hasSingleUseTransaction(); + final String spanName = isTransactional ? SPAN_NAME_TRANSACTION_COMMIT : SPAN_NAME_COMMIT; + com.google.cloud.datastore.telemetry.TraceUtil.Span span = otelTraceUtil.startSpan(spanName); + try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) { + CommitResponse response = + RetryHelper.runWithRetries( + () -> datastoreRpc.commit(requestPb), + retrySettings, + requestPb.getTransaction().isEmpty() + ? EXCEPTION_HANDLER + : TRANSACTION_OPERATION_EXCEPTION_HANDLER, + getOptions().getClock()); + span.addEvent( + spanName + " complete.", + new ImmutableMap.Builder() + .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, response.getMutationResultsCount()) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, isTransactional) + .put( + ATTRIBUTES_KEY_TRANSACTION_ID, + isTransactional ? requestPb.getTransaction().toStringUtf8() : "") + .build()); + return response; } catch (RetryHelperException e) { - span.setStatus(Status.UNKNOWN.withDescription(e.getMessage())); + span.end(e); throw DatastoreException.translateAndThrow(e); } finally { - span.end(TraceUtil.END_SPAN_OPTIONS); + span.end(); } } @@ -626,24 +772,19 @@ ByteString requestTransactionId( com.google.datastore.v1.BeginTransactionResponse beginTransaction( final com.google.datastore.v1.BeginTransactionRequest requestPb) { - Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_BEGINTRANSACTION); - try (Scope scope = traceUtil.getTracer().withSpan(span)) { + com.google.cloud.datastore.telemetry.TraceUtil.Span span = + otelTraceUtil.startSpan(SPAN_NAME_BEGIN_TRANSACTION); + try (com.google.cloud.datastore.telemetry.TraceUtil.Scope scope = span.makeCurrent()) { return RetryHelper.runWithRetries( - new Callable() { - @Override - public com.google.datastore.v1.BeginTransactionResponse call() - throws DatastoreException { - return datastoreRpc.beginTransaction(requestPb); - } - }, + () -> datastoreRpc.beginTransaction(requestPb), retrySettings, EXCEPTION_HANDLER, getOptions().getClock()); } catch (RetryHelperException e) { - span.setStatus(Status.UNKNOWN.withDescription(e.getMessage())); + span.end(e); throw DatastoreException.translateAndThrow(e); } finally { - span.end(TraceUtil.END_SPAN_OPTIONS); + span.end(); } } @@ -657,8 +798,9 @@ void rollbackTransaction(ByteString transaction) { } void rollback(final com.google.datastore.v1.RollbackRequest requestPb) { - Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_ROLLBACK); - try (Scope scope = traceUtil.getTracer().withSpan(span)) { + com.google.cloud.datastore.telemetry.TraceUtil.Span span = + otelTraceUtil.startSpan(SPAN_NAME_ROLLBACK); + try (Scope scope = span.makeCurrent()) { RetryHelper.runWithRetries( new Callable() { @Override @@ -670,11 +812,16 @@ public Void call() throws DatastoreException { retrySettings, EXCEPTION_HANDLER, getOptions().getClock()); + span.addEvent( + SPAN_NAME_ROLLBACK, + new ImmutableMap.Builder() + .put(ATTRIBUTES_KEY_TRANSACTION_ID, requestPb.getTransaction().toStringUtf8()) + .build()); } catch (RetryHelperException e) { - span.setStatus(Status.UNKNOWN.withDescription(e.getMessage())); + span.end(e); throw DatastoreException.translateAndThrow(e); } finally { - span.end(TraceUtil.END_SPAN_OPTIONS); + span.end(); } } } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java new file mode 100644 index 000000000..ac266562e --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOpenTelemetryOptions.java @@ -0,0 +1,97 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore; + +import io.opentelemetry.api.OpenTelemetry; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public class DatastoreOpenTelemetryOptions { + private final boolean enabled; + private final @Nullable OpenTelemetry openTelemetry; + + DatastoreOpenTelemetryOptions(Builder builder) { + this.enabled = builder.enabled; + this.openTelemetry = builder.openTelemetry; + } + + public boolean isEnabled() { + return enabled; + } + + @Nullable + public OpenTelemetry getOpenTelemetry() { + return openTelemetry; + } + + @Nonnull + public DatastoreOpenTelemetryOptions.Builder toBuilder() { + return new DatastoreOpenTelemetryOptions.Builder(this); + } + + @Nonnull + public static DatastoreOpenTelemetryOptions.Builder newBuilder() { + return new DatastoreOpenTelemetryOptions.Builder(); + } + + public static class Builder { + + private boolean enabled; + + @Nullable private OpenTelemetry openTelemetry; + + private Builder() { + enabled = false; + openTelemetry = null; + } + + private Builder(DatastoreOpenTelemetryOptions options) { + this.enabled = options.enabled; + this.openTelemetry = options.openTelemetry; + } + + @Nonnull + public DatastoreOpenTelemetryOptions build() { + return new DatastoreOpenTelemetryOptions(this); + } + + /** + * Sets whether tracing should be enabled. + * + * @param enabled Whether tracing should be enabled. + */ + @Nonnull + public DatastoreOpenTelemetryOptions.Builder setTracingEnabled(boolean enabled) { + this.enabled = enabled; + return this; + } + + /** + * Sets the {@link OpenTelemetry} to use with this Datastore instance. If telemetry collection + * is enabled, but an `OpenTelemetry` is not provided, the Datastore SDK will attempt to use the + * `GlobalOpenTelemetry`. + * + * @param openTelemetry The OpenTelemetry that should be used by this Datastore instance. + */ + @Nonnull + public DatastoreOpenTelemetryOptions.Builder setOpenTelemetry( + @Nonnull OpenTelemetry openTelemetry) { + this.openTelemetry = openTelemetry; + return this; + } + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java index 8437c3e22..cef40eedd 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java @@ -18,6 +18,7 @@ import static com.google.cloud.datastore.Validator.validateNamespace; +import com.google.api.core.BetaApi; import com.google.cloud.ServiceDefaults; import com.google.cloud.ServiceOptions; import com.google.cloud.ServiceRpc; @@ -31,6 +32,8 @@ import java.lang.reflect.Method; import java.util.Objects; import java.util.Set; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class DatastoreOptions extends ServiceOptions { @@ -43,6 +46,9 @@ public class DatastoreOptions extends ServiceOptions { private String namespace; private String databaseId; + @Nullable private DatastoreOpenTelemetryOptions openTelemetryOptions = null; + private Builder() {} private Builder(DatastoreOptions options) { super(options); namespace = options.namespace; databaseId = options.databaseId; + this.openTelemetryOptions = options.openTelemetryOptions; } @Override @@ -100,10 +120,30 @@ public Builder setDatabaseId(String databaseId) { this.databaseId = databaseId; return this; } + + /** + * Sets the {@link DatastoreOpenTelemetryOptions} to be used for this Firestore instance. + * + * @param openTelemetryOptions The `DatastoreOpenTelemetryOptions` to use. + */ + @BetaApi + @Nonnull + public Builder setOpenTelemetryOptions( + @Nonnull DatastoreOpenTelemetryOptions openTelemetryOptions) { + this.openTelemetryOptions = openTelemetryOptions; + return this; + } } private DatastoreOptions(Builder builder) { super(DatastoreFactory.class, DatastoreRpcFactory.class, builder, new DatastoreDefaults()); + + this.openTelemetryOptions = + builder.openTelemetryOptions != null + ? builder.openTelemetryOptions + : DatastoreOpenTelemetryOptions.newBuilder().build(); + this.traceUtil = com.google.cloud.datastore.telemetry.TraceUtil.getInstance(this); + namespace = MoreObjects.firstNonNull(builder.namespace, defaultNamespace()); databaseId = MoreObjects.firstNonNull(builder.databaseId, DEFAULT_DATABASE_ID); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java index c4a85caab..e1ea6e8dd 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java @@ -16,13 +16,13 @@ package com.google.cloud.datastore; import static com.google.cloud.BaseService.EXCEPTION_HANDLER; -import static com.google.cloud.datastore.TraceUtil.SPAN_NAME_RUN_AGGREGATION_QUERY; import com.google.api.core.InternalApi; import com.google.api.gax.retrying.RetrySettings; import com.google.cloud.RetryHelper; import com.google.cloud.RetryHelper.RetryHelperException; import com.google.cloud.datastore.spi.v1.DatastoreRpc; +import com.google.cloud.datastore.telemetry.TraceUtil; import com.google.datastore.v1.AllocateIdsRequest; import com.google.datastore.v1.AllocateIdsResponse; import com.google.datastore.v1.BeginTransactionRequest; @@ -31,6 +31,7 @@ import com.google.datastore.v1.CommitResponse; import com.google.datastore.v1.LookupRequest; import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.ReadOptions; import com.google.datastore.v1.ReserveIdsRequest; import com.google.datastore.v1.ReserveIdsResponse; import com.google.datastore.v1.RollbackRequest; @@ -39,9 +40,6 @@ import com.google.datastore.v1.RunAggregationQueryResponse; import com.google.datastore.v1.RunQueryRequest; import com.google.datastore.v1.RunQueryResponse; -import io.opencensus.common.Scope; -import io.opencensus.trace.Span; -import io.opencensus.trace.Status; import java.util.concurrent.Callable; /** @@ -52,19 +50,19 @@ public class RetryAndTraceDatastoreRpcDecorator implements DatastoreRpc { private final DatastoreRpc datastoreRpc; - private final TraceUtil traceUtil; + private final com.google.cloud.datastore.telemetry.TraceUtil otelTraceUtil; private final RetrySettings retrySettings; private final DatastoreOptions datastoreOptions; public RetryAndTraceDatastoreRpcDecorator( DatastoreRpc datastoreRpc, - TraceUtil traceUtil, + TraceUtil otelTraceUtil, RetrySettings retrySettings, DatastoreOptions datastoreOptions) { this.datastoreRpc = datastoreRpc; - this.traceUtil = traceUtil; this.retrySettings = retrySettings; this.datastoreOptions = datastoreOptions; + this.otelTraceUtil = otelTraceUtil; } @Override @@ -105,20 +103,26 @@ public RunQueryResponse runQuery(RunQueryRequest request) { @Override public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) { - return invokeRpc( - () -> datastoreRpc.runAggregationQuery(request), SPAN_NAME_RUN_AGGREGATION_QUERY); + ReadOptions readOptions = request.getReadOptions(); + boolean isTransactional = readOptions.hasTransaction() || readOptions.hasNewTransaction(); + String spanName = + (isTransactional + ? com.google.cloud.datastore.telemetry.TraceUtil + .SPAN_NAME_TRANSACTION_RUN_AGGREGATION_QUERY + : com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RUN_AGGREGATION_QUERY); + return invokeRpc(() -> datastoreRpc.runAggregationQuery(request), spanName); } public O invokeRpc(Callable block, String startSpan) { - Span span = traceUtil.startSpan(startSpan); - try (Scope scope = traceUtil.getTracer().withSpan(span)) { + com.google.cloud.datastore.telemetry.TraceUtil.Span span = otelTraceUtil.startSpan(startSpan); + try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) { return RetryHelper.runWithRetries( block, this.retrySettings, EXCEPTION_HANDLER, this.datastoreOptions.getClock()); } catch (RetryHelperException e) { - span.setStatus(Status.UNKNOWN.withDescription(e.getMessage())); + span.end(e); throw DatastoreException.translateAndThrow(e); } finally { - span.end(TraceUtil.END_SPAN_OPTIONS); + span.end(); } } } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java deleted file mode 100644 index 57525d15d..000000000 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TraceUtil.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.datastore; - -import com.google.cloud.datastore.spi.v1.HttpDatastoreRpc; -import io.opencensus.trace.EndSpanOptions; -import io.opencensus.trace.Span; -import io.opencensus.trace.Tracer; -import io.opencensus.trace.Tracing; - -/** - * Helper class for tracing utility. It is used for instrumenting {@link HttpDatastoreRpc} with - * OpenCensus APIs. - * - *

TraceUtil instances are created by the {@link TraceUtil#getInstance()} method. - */ -public class TraceUtil { - private final Tracer tracer = Tracing.getTracer(); - private static final TraceUtil traceUtil = new TraceUtil(); - static final String SPAN_NAME_ALLOCATEIDS = "CloudDatastoreOperation.allocateIds"; - static final String SPAN_NAME_TRANSACTION = "CloudDatastoreOperation.readWriteTransaction"; - static final String SPAN_NAME_BEGINTRANSACTION = "CloudDatastoreOperation.beginTransaction"; - static final String SPAN_NAME_COMMIT = "CloudDatastoreOperation.commit"; - static final String SPAN_NAME_LOOKUP = "CloudDatastoreOperation.lookup"; - static final String SPAN_NAME_RESERVEIDS = "CloudDatastoreOperation.reserveIds"; - static final String SPAN_NAME_ROLLBACK = "CloudDatastoreOperation.rollback"; - static final String SPAN_NAME_RUNQUERY = "CloudDatastoreOperation.runQuery"; - static final String SPAN_NAME_RUN_AGGREGATION_QUERY = - "CloudDatastoreOperation.runAggregationQuery"; - static final EndSpanOptions END_SPAN_OPTIONS = - EndSpanOptions.builder().setSampleToLocalSpanStore(true).build(); - - /** - * Starts a new span. - * - * @param spanName The name of the returned Span. - * @return The newly created {@link Span}. - */ - protected Span startSpan(String spanName) { - return tracer.spanBuilder(spanName).startSpan(); - } - - /** - * Return the global {@link Tracer}. - * - * @return The global {@link Tracer}. - */ - public Tracer getTracer() { - return tracer; - } - - /** - * Return TraceUtil Object. - * - * @return An instance of {@link TraceUtil} - */ - public static TraceUtil getInstance() { - return traceUtil; - } - - private TraceUtil() {} -} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java index f08a908ec..e730db81f 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java @@ -20,6 +20,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.datastore.models.ExplainOptions; +import com.google.cloud.datastore.telemetry.TraceUtil; import com.google.common.collect.ImmutableList; import com.google.datastore.v1.ReadOptions; import com.google.datastore.v1.TransactionOptions; @@ -28,6 +29,7 @@ import java.util.Iterator; import java.util.List; import java.util.Optional; +import javax.annotation.Nonnull; final class TransactionImpl extends BaseDatastoreBatchWriter implements Transaction { @@ -37,6 +39,8 @@ final class TransactionImpl extends BaseDatastoreBatchWriter implements Transact private final ReadOptionProtoPreparer readOptionProtoPreparer; + @Nonnull private final TraceUtil traceUtil; + static class ResponseImpl implements Transaction.Response { private final com.google.datastore.v1.CommitResponse response; @@ -78,6 +82,7 @@ public List getGeneratedKeys() { transactionId = datastore.requestTransactionId(requestPb); this.readOptionProtoPreparer = new ReadOptionProtoPreparer(); + this.traceUtil = datastore.getOptions().getTraceUtil(); } @Override diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java index fd3cdc658..d927a2d7f 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java @@ -21,7 +21,6 @@ import com.google.api.client.http.HttpTransport; import com.google.cloud.datastore.DatastoreException; import com.google.cloud.datastore.DatastoreOptions; -import com.google.cloud.datastore.TraceUtil; import com.google.cloud.http.CensusHttpModule; import com.google.cloud.http.HttpTransportOptions; import com.google.datastore.v1.AllocateIdsRequest; @@ -40,6 +39,7 @@ import com.google.datastore.v1.RunAggregationQueryResponse; import com.google.datastore.v1.RunQueryRequest; import com.google.datastore.v1.RunQueryResponse; +import io.opencensus.trace.Tracing; import java.io.IOException; import java.net.InetAddress; import java.net.URL; @@ -80,8 +80,7 @@ public HttpDatastoreRpc(DatastoreOptions options) { private HttpRequestInitializer getHttpRequestInitializer( final DatastoreOptions options, HttpTransportOptions httpTransportOptions) { // Open Census initialization - CensusHttpModule censusHttpModule = - new CensusHttpModule(TraceUtil.getInstance().getTracer(), true); + CensusHttpModule censusHttpModule = new CensusHttpModule(Tracing.getTracer(), true); final HttpRequestInitializer censusHttpModuleHttpRequestInitializer = censusHttpModule.getHttpRequestInitializer( httpTransportOptions.getHttpRequestInitializer(options)); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java new file mode 100644 index 000000000..ebb630515 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java @@ -0,0 +1,131 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.telemetry; + +import com.google.api.core.ApiFunction; +import com.google.api.core.ApiFuture; +import com.google.api.core.InternalApi; +import com.google.cloud.datastore.telemetry.TraceUtil.Context; +import io.grpc.ManagedChannelBuilder; +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.SpanBuilder; +import io.opentelemetry.api.trace.Tracer; +import io.opentelemetry.api.trace.TracerProvider; +import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +/** + * Tracing utility implementation, used to stub out tracing instrumentation when tracing is + * disabled. + */ +@InternalApi +public class DisabledTraceUtil implements TraceUtil { + static class Span implements TraceUtil.Span { + @Override + public void end() {} + + @Override + public void end(Throwable error) {} + + @Override + public void endAtFuture(ApiFuture futureValue) {} + + @Override + public TraceUtil.Span addEvent(String name) { + return this; + } + + @Override + public TraceUtil.Span addEvent(String name, Map attributes) { + return this; + } + + @Override + public TraceUtil.Span setAttribute(String key, int value) { + return this; + } + + @Override + public TraceUtil.Span setAttribute(String key, String value) { + return this; + } + + @Override + public TraceUtil.Span setAttribute(String key, boolean value) { + return this; + } + + public io.opentelemetry.api.trace.Span getSpan() { + return null; + } + + @Override + public Scope makeCurrent() { + return new Scope(); + } + } + + static class Context implements TraceUtil.Context { + @Override + public Scope makeCurrent() { + return new Scope(); + } + } + + static class Scope implements TraceUtil.Scope { + @Override + public void close() {} + } + + @Nullable + @Override + public ApiFunction getChannelConfigurator() { + return null; + } + + @Override + public Span startSpan(String spanName) { + return new Span(); + } + + @Override + public TraceUtil.Span startSpan(String spanName, TraceUtil.Span parentSpan) { + return new Span(); + } + + public SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder) { + return getTracer().spanBuilder("TRACING_DISABLED_NO_OP"); + } + + @Nonnull + @Override + public TraceUtil.Span getCurrentSpan() { + return new Span(); + } + + @Nonnull + @Override + public TraceUtil.Context getCurrentContext() { + return new Context(); + } + + @Override + public Tracer getTracer() { + return TracerProvider.noop().get(LIBRARY_NAME); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java new file mode 100644 index 000000000..40fc7308e --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java @@ -0,0 +1,323 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.telemetry; + +import com.google.api.core.ApiFunction; +import com.google.api.core.ApiFuture; +import com.google.api.core.ApiFutureCallback; +import com.google.api.core.ApiFutures; +import com.google.api.core.InternalApi; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.telemetry.TraceUtil.Context; +import com.google.cloud.datastore.telemetry.TraceUtil.Scope; +import com.google.cloud.datastore.telemetry.TraceUtil.Span; +import com.google.common.base.Throwables; +import io.grpc.ManagedChannelBuilder; +import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.common.AttributesBuilder; +import io.opentelemetry.api.trace.SpanBuilder; +import io.opentelemetry.api.trace.SpanKind; +import io.opentelemetry.api.trace.StatusCode; +import io.opentelemetry.api.trace.Tracer; +import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +/** + * Tracing utility implementation, used to stub out tracing instrumentation when tracing is enabled. + */ +@InternalApi +public class EnabledTraceUtil implements TraceUtil { + private final Tracer tracer; + private final OpenTelemetry openTelemetry; + private final DatastoreOptions datastoreOptions; + + EnabledTraceUtil(DatastoreOptions datastoreOptions) { + OpenTelemetry openTelemetry = datastoreOptions.getOpenTelemetryOptions().getOpenTelemetry(); + + // If tracing is enabled, but an OpenTelemetry instance is not provided, fall back + // to using GlobalOpenTelemetry. + if (openTelemetry == null) { + openTelemetry = GlobalOpenTelemetry.get(); + } + + this.datastoreOptions = datastoreOptions; + this.openTelemetry = openTelemetry; + this.tracer = openTelemetry.getTracer(LIBRARY_NAME); + } + + public OpenTelemetry getOpenTelemetry() { + return openTelemetry; + } + + @Override + @Nullable + public ApiFunction getChannelConfigurator() { + // TODO(jimit) Update this to return a gRPC Channel Configurator after gRPC upgrade. + return null; + } + + static class Span implements TraceUtil.Span { + private final io.opentelemetry.api.trace.Span span; + private final String spanName; + + public Span(io.opentelemetry.api.trace.Span span, String spanName) { + this.span = span; + this.spanName = spanName; + } + + @Override + public io.opentelemetry.api.trace.Span getSpan() { + return this.span; + } + + /** Ends this span. */ + @Override + public void end() { + span.end(); + } + + /** Ends this span in an error. */ + @Override + public void end(Throwable error) { + span.setStatus(StatusCode.ERROR, error.getMessage()); + span.recordException( + error, + Attributes.builder() + .put("exception.message", error.getMessage()) + .put("exception.type", error.getClass().getName()) + .put("exception.stacktrace", Throwables.getStackTraceAsString(error)) + .build()); + span.end(); + } + + /** + * If an operation ends in the future, its relevant span should end _after_ the future has been + * completed. This method "appends" the span completion code at the completion of the given + * future. In order for telemetry info to be recorded, the future returned by this method should + * be completed. + */ + @Override + public void endAtFuture(ApiFuture futureValue) { + io.opentelemetry.context.Context asyncContext = io.opentelemetry.context.Context.current(); + ApiFutures.addCallback( + futureValue, + new ApiFutureCallback() { + @Override + public void onFailure(Throwable t) { + try (io.opentelemetry.context.Scope scope = asyncContext.makeCurrent()) { + span.addEvent(spanName + " failed."); + end(t); + } + } + + @Override + public void onSuccess(T result) { + try (io.opentelemetry.context.Scope scope = asyncContext.makeCurrent()) { + span.addEvent(spanName + " succeeded."); + end(); + } + } + }); + } + + /** Adds the given event to this span. */ + @Override + public TraceUtil.Span addEvent(String name) { + span.addEvent(name); + return this; + } + + @Override + public TraceUtil.Span addEvent(String name, Map attributes) { + AttributesBuilder attributesBuilder = Attributes.builder(); + attributes.forEach( + (key, value) -> { + if (value instanceof Integer) { + attributesBuilder.put(key, (int) value); + } else if (value instanceof Long) { + attributesBuilder.put(key, (long) value); + } else if (value instanceof Double) { + attributesBuilder.put(key, (double) value); + } else if (value instanceof Float) { + attributesBuilder.put(key, (float) value); + } else if (value instanceof Boolean) { + attributesBuilder.put(key, (boolean) value); + } else if (value instanceof String) { + attributesBuilder.put(key, (String) value); + } else { + // OpenTelemetry APIs do not support any other type. + throw new IllegalArgumentException( + "Unknown attribute type:" + value.getClass().getSimpleName()); + } + }); + span.addEvent(name, attributesBuilder.build()); + return this; + } + + @Override + public TraceUtil.Span setAttribute(String key, int value) { + span.setAttribute(ATTRIBUTE_SERVICE_PREFIX + key, value); + return this; + } + + @Override + public TraceUtil.Span setAttribute(String key, String value) { + span.setAttribute(ATTRIBUTE_SERVICE_PREFIX + key, value); + return this; + } + + @Override + public TraceUtil.Span setAttribute(String key, boolean value) { + span.setAttribute(ATTRIBUTE_SERVICE_PREFIX + key, value); + return this; + } + + @Override + public Scope makeCurrent() { + try (io.opentelemetry.context.Scope scope = span.makeCurrent()) { + return new Scope(scope); + } + } + } + + static class Scope implements TraceUtil.Scope { + private final io.opentelemetry.context.Scope scope; + + Scope(io.opentelemetry.context.Scope scope) { + this.scope = scope; + } + + @Override + public void close() { + scope.close(); + } + } + + static class Context implements TraceUtil.Context { + private final io.opentelemetry.context.Context context; + + Context(io.opentelemetry.context.Context context) { + this.context = context; + } + + @Override + public Scope makeCurrent() { + try (io.opentelemetry.context.Scope scope = context.makeCurrent()) { + return new Scope(scope); + } + } + } + + /** Applies the current Datastore instance settings as attributes to the current Span */ + @Override + public SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder) { + spanBuilder = + spanBuilder.setAllAttributes( + Attributes.builder() + .put( + ATTRIBUTE_SERVICE_PREFIX + "settings.databaseId", + datastoreOptions.getDatabaseId()) + .put(ATTRIBUTE_SERVICE_PREFIX + "settings.host", datastoreOptions.getHost()) + .build()); + + if (datastoreOptions.getCredentials() != null) { + spanBuilder = + spanBuilder.setAttribute( + ATTRIBUTE_SERVICE_PREFIX + "settings.credentials.authenticationType", + datastoreOptions.getCredentials().getAuthenticationType()); + } + + if (datastoreOptions.getRetrySettings() != null) { + spanBuilder = + spanBuilder.setAllAttributes( + Attributes.builder() + .put( + ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.initialRetryDelay", + datastoreOptions.getRetrySettings().getInitialRetryDelay().toString()) + .put( + ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.maxRetryDelay", + datastoreOptions.getRetrySettings().getMaxRetryDelay().toString()) + .put( + ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.retryDelayMultiplier", + String.valueOf(datastoreOptions.getRetrySettings().getRetryDelayMultiplier())) + .put( + ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.maxAttempts", + String.valueOf(datastoreOptions.getRetrySettings().getMaxAttempts())) + .put( + ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.initialRpcTimeout", + datastoreOptions.getRetrySettings().getInitialRpcTimeout().toString()) + .put( + ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.maxRpcTimeout", + datastoreOptions.getRetrySettings().getMaxRpcTimeout().toString()) + .put( + ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.rpcTimeoutMultiplier", + String.valueOf(datastoreOptions.getRetrySettings().getRpcTimeoutMultiplier())) + .put( + ATTRIBUTE_SERVICE_PREFIX + "settings.retrySettings.totalTimeout", + datastoreOptions.getRetrySettings().getTotalTimeout().toString()) + .build()); + } + + // Add the memory utilization of the client at the time this trace was collected. + long totalMemory = Runtime.getRuntime().totalMemory(); + long freeMemory = Runtime.getRuntime().freeMemory(); + double memoryUtilization = ((double) (totalMemory - freeMemory)) / totalMemory; + spanBuilder.setAttribute( + ATTRIBUTE_SERVICE_PREFIX + "memoryUtilization", + String.format("%.2f", memoryUtilization * 100) + "%"); + + return spanBuilder; + } + + @Override + public Span startSpan(String spanName) { + SpanBuilder spanBuilder = tracer.spanBuilder(spanName).setSpanKind(SpanKind.PRODUCER); + io.opentelemetry.api.trace.Span span = + addSettingsAttributesToCurrentSpan(spanBuilder).startSpan(); + return new Span(span, spanName); + } + + @Override + public TraceUtil.Span startSpan(String spanName, TraceUtil.Span parentSpan) { + SpanBuilder spanBuilder = + tracer + .spanBuilder(spanName) + .setSpanKind(SpanKind.PRODUCER) + .setParent(io.opentelemetry.context.Context.current().with(parentSpan.getSpan())); + return new Span(addSettingsAttributesToCurrentSpan(spanBuilder).startSpan(), spanName); + } + + @Nonnull + @Override + public TraceUtil.Span getCurrentSpan() { + return new Span(io.opentelemetry.api.trace.Span.current(), ""); + } + + @Nonnull + @Override + public TraceUtil.Context getCurrentContext() { + return new Context(io.opentelemetry.context.Context.current()); + } + + @Override + public Tracer getTracer() { + return this.tracer; + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java new file mode 100644 index 000000000..fd616a733 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java @@ -0,0 +1,167 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.telemetry; + +import com.google.api.core.ApiFunction; +import com.google.api.core.ApiFuture; +import com.google.api.core.InternalExtensionOnly; +import com.google.cloud.datastore.DatastoreOptions; +import io.grpc.ManagedChannelBuilder; +import io.opentelemetry.api.trace.SpanBuilder; +import io.opentelemetry.api.trace.Tracer; +import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +/** Utility interface to manage OpenTelemetry tracing instrumentation based on the configuration. */ +@InternalExtensionOnly +public interface TraceUtil { + static final String ATTRIBUTE_SERVICE_PREFIX = "gcp.datastore."; + static final String ENABLE_TRACING_ENV_VAR = "DATASTORE_ENABLE_TRACING"; + static final String LIBRARY_NAME = "com.google.cloud.datastore"; + static final String SPAN_NAME_LOOKUP = "Lookup"; + static final String SPAN_NAME_ALLOCATE_IDS = "AllocateIds"; + static final String SPAN_NAME_RESERVE_IDS = "ReserveIds"; + static final String SPAN_NAME_COMMIT = "Commit"; + static final String SPAN_NAME_RUN_QUERY = "RunQuery"; + static final String SPAN_NAME_RUN_AGGREGATION_QUERY = "RunAggregationQuery"; + static final String SPAN_NAME_TRANSACTION_RUN = "Transaction.Run"; + static final String SPAN_NAME_BEGIN_TRANSACTION = "Transaction.Begin"; + static final String SPAN_NAME_TRANSACTION_LOOKUP = "Transaction.Lookup"; + static final String SPAN_NAME_TRANSACTION_COMMIT = "Transaction.Commit"; + static final String SPAN_NAME_TRANSACTION_RUN_QUERY = "Transaction.RunQuery"; + static final String SPAN_NAME_ROLLBACK = "Transaction.Rollback"; + static final String SPAN_NAME_TRANSACTION_RUN_AGGREGATION_QUERY = + "Transaction.RunAggregationQuery"; + static final String ATTRIBUTES_KEY_DOCUMENT_COUNT = "doc_count"; + static final String ATTRIBUTES_KEY_TRANSACTIONAL = "transactional"; + static final String ATTRIBUTES_KEY_TRANSACTION_ID = "transaction_id"; + static final String ATTRIBUTES_KEY_READ_CONSISTENCY = "read_consistency"; + static final String ATTRIBUTES_KEY_RECEIVED = "Received"; + static final String ATTRIBUTES_KEY_MISSING = "Missing"; + static final String ATTRIBUTES_KEY_DEFERRED = "Deferred"; + static final String ATTRIBUTES_KEY_MORE_RESULTS = "mor_results"; + + /** + * Creates and returns an instance of the TraceUtil class. + * + * @param datastoreOptions The DatastoreOptions object that is requesting an instance of + * TraceUtil. + * @return An instance of the TraceUtil class. + */ + static TraceUtil getInstance(@Nonnull DatastoreOptions datastoreOptions) { + boolean createEnabledInstance = datastoreOptions.getOpenTelemetryOptions().isEnabled(); + + // The environment variable can override options to enable/disable telemetry collection. + String enableTracingEnvVar = System.getenv(ENABLE_TRACING_ENV_VAR); + if (enableTracingEnvVar != null) { + if (enableTracingEnvVar.equalsIgnoreCase("true") + || enableTracingEnvVar.equalsIgnoreCase("on")) { + createEnabledInstance = true; + } + if (enableTracingEnvVar.equalsIgnoreCase("false") + || enableTracingEnvVar.equalsIgnoreCase("off")) { + createEnabledInstance = false; + } + } + + if (createEnabledInstance) { + return new EnabledTraceUtil(datastoreOptions); + } else { + return new DisabledTraceUtil(); + } + } + + /** Returns a channel configurator for gRPC, or {@code null} if tracing is disabled. */ + @Nullable + ApiFunction getChannelConfigurator(); + + /** Represents a trace span. */ + interface Span { + /** Adds the given event to this span. */ + Span addEvent(String name); + + /** Adds the given event with the given attributes to this span. */ + Span addEvent(String name, Map attributes); + + /** Adds the given attribute to this span. */ + Span setAttribute(String key, int value); + + /** Adds the given attribute to this span. */ + Span setAttribute(String key, String value); + + /** Adds the given attribute to this span. */ + Span setAttribute(String key, boolean value); + + io.opentelemetry.api.trace.Span getSpan(); + + /** Marks this span as the current span. */ + Scope makeCurrent(); + + /** Ends this span. */ + void end(); + + /** Ends this span in an error. */ + void end(Throwable error); + + /** + * If an operation ends in the future, its relevant span should end _after_ the future has been + * completed. This method "appends" the span completion code at the completion of the given + * future. In order for telemetry info to be recorded, the future returned by this method should + * be completed. + */ + void endAtFuture(ApiFuture futureValue); + } + + /** Represents a trace context. */ + interface Context { + /** Makes this context the current context. */ + Scope makeCurrent(); + } + + /** Represents a trace scope. */ + interface Scope extends AutoCloseable { + /** Closes the current scope. */ + void close(); + } + + /** Starts a new span with the given name, sets it as the current span, and returns it. */ + Span startSpan(String spanName); + + /** + * Starts a new span with the given name and the span represented by the parentSpan as its parent, + * sets it as the current span and returns it. + */ + Span startSpan(String spanName, Span parentSpan); + + /** + * Adds common SpanAttributes to the current span, useful when hand-creating a new Span without + * using the TraceUtil.Span interface. + */ + SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder); + + /** Returns the current span. */ + @Nonnull + Span getCurrentSpan(); + + /** Returns the current Context. */ + @Nonnull + Context getCurrentContext(); + + /** Returns the current OpenTelemetry Tracer when OpenTelemetry SDK is provided. */ + Tracer getTracer(); +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java index 596ce96d8..6167cedca 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java @@ -19,13 +19,16 @@ import com.google.api.core.InternalApi; import com.google.api.gax.retrying.RetrySettings; import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOpenTelemetryOptions; import com.google.cloud.datastore.DatastoreOptions; import com.google.cloud.datastore.Key; import com.google.cloud.datastore.Query; import com.google.cloud.datastore.QueryResults; import com.google.cloud.datastore.StructuredQuery; import com.google.cloud.http.HttpTransportOptions; +import io.opentelemetry.sdk.OpenTelemetrySdk; import java.util.UUID; +import javax.annotation.Nullable; import org.threeten.bp.Duration; /** @@ -38,13 +41,13 @@ * RetrySettings#getTotalTimeout()} is {@code 120000} and {@link * RetrySettings#getInitialRetryDelay()} is {@code 250}. {@link * HttpTransportOptions#getConnectTimeout()} and {@link HttpTransportOptions#getReadTimeout()} are - * both both set to {@code 60000}. + * both both set to {@code 60000}. If an OpenTelemetrySdk object is passed in, OpenTelemetry Trace + * collection will be enabled for the Client application. * *

Internal testing use only */ @InternalApi public class RemoteDatastoreHelper { - private final DatastoreOptions options; private final Datastore datastore; private final String namespace; @@ -78,18 +81,30 @@ public static RemoteDatastoreHelper create() { } /** Creates a {@code RemoteStorageHelper} object. */ - public static RemoteDatastoreHelper create(String databaseId) { + public static RemoteDatastoreHelper create( + String databaseId, @Nullable OpenTelemetrySdk openTelemetrySdk) { HttpTransportOptions transportOptions = DatastoreOptions.getDefaultHttpTransportOptions(); transportOptions = transportOptions.toBuilder().setConnectTimeout(60000).setReadTimeout(60000).build(); - DatastoreOptions datastoreOption = + DatastoreOptions.Builder datastoreOptionBuilder = DatastoreOptions.newBuilder() .setDatabaseId(databaseId) .setNamespace(UUID.randomUUID().toString()) .setRetrySettings(retrySettings()) - .setTransportOptions(transportOptions) - .build(); - return new RemoteDatastoreHelper(datastoreOption); + .setTransportOptions(transportOptions); + + if (openTelemetrySdk != null) { + datastoreOptionBuilder.setOpenTelemetryOptions( + DatastoreOpenTelemetryOptions.newBuilder() + .setOpenTelemetry(openTelemetrySdk) + .setTracingEnabled(true) + .build()); + } + return new RemoteDatastoreHelper(datastoreOptionBuilder.build()); + } + + public static RemoteDatastoreHelper create(String databaseId) { + return create(databaseId, /*openTelemetrySdk=*/ null); } private static RetrySettings retrySettings() { diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java index a545580e2..85703f739 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java @@ -70,6 +70,20 @@ public void testHost() { assertEquals("http://localhost:" + PORT, options.build().getHost()); } + @Test + public void testOpenTelemetryOptionsEnabled() { + options.setOpenTelemetryOptions( + DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build()); + assertTrue(options.build().getOpenTelemetryOptions().isEnabled()); + } + + @Test + public void testOpenTelemetryOptionsDisabled() { + options.setOpenTelemetryOptions( + DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(false).build()); + assertTrue(!options.build().getOpenTelemetryOptions().isEnabled()); + } + @Test public void testNamespace() { assertTrue(options.build().getNamespace().isEmpty()); diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java index cd768f986..d88e1d1ec 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java @@ -176,6 +176,8 @@ public static void beforeClass() throws IOException, InterruptedException { public void setUp() { rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class); rpcMock = EasyMock.createStrictMock(DatastoreRpc.class); + DatastoreOpenTelemetryOptions.Builder otelOptionsBuilder = + DatastoreOpenTelemetryOptions.newBuilder(); rpcMockOptions = options .toBuilder() diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java deleted file mode 100644 index b86355afa..000000000 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecoratorTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2022 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.cloud.datastore; - -import static com.google.cloud.datastore.TraceUtil.END_SPAN_OPTIONS; -import static com.google.cloud.datastore.TraceUtil.SPAN_NAME_RUN_AGGREGATION_QUERY; -import static com.google.common.truth.Truth.assertThat; -import static com.google.rpc.Code.UNAVAILABLE; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.createStrictMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; - -import com.google.api.gax.retrying.RetrySettings; -import com.google.cloud.datastore.spi.v1.DatastoreRpc; -import com.google.datastore.v1.RunAggregationQueryRequest; -import com.google.datastore.v1.RunAggregationQueryResponse; -import io.opencensus.trace.Span; -import io.opencensus.trace.Tracer; -import org.junit.Before; -import org.junit.Test; - -public class RetryAndTraceDatastoreRpcDecoratorTest { - - public static final int MAX_ATTEMPTS = 3; - private DatastoreRpc mockDatastoreRpc; - private TraceUtil mockTraceUtil; - private DatastoreOptions datastoreOptions = - DatastoreOptions.newBuilder().setProjectId("project-id").build(); - private RetrySettings retrySettings = - RetrySettings.newBuilder().setMaxAttempts(MAX_ATTEMPTS).build(); - - private RetryAndTraceDatastoreRpcDecorator datastoreRpcDecorator; - - @Before - public void setUp() throws Exception { - mockDatastoreRpc = createStrictMock(DatastoreRpc.class); - mockTraceUtil = createStrictMock(TraceUtil.class); - datastoreRpcDecorator = - new RetryAndTraceDatastoreRpcDecorator( - mockDatastoreRpc, mockTraceUtil, retrySettings, datastoreOptions); - } - - @Test - public void testRunAggregationQuery() { - Span mockSpan = createStrictMock(Span.class); - RunAggregationQueryRequest aggregationQueryRequest = - RunAggregationQueryRequest.getDefaultInstance(); - RunAggregationQueryResponse aggregationQueryResponse = - RunAggregationQueryResponse.getDefaultInstance(); - - expect(mockDatastoreRpc.runAggregationQuery(aggregationQueryRequest)) - .andThrow( - new DatastoreException( - UNAVAILABLE.getNumber(), "API not accessible currently", UNAVAILABLE.name())) - .times(2) - .andReturn(aggregationQueryResponse); - expect(mockTraceUtil.startSpan(SPAN_NAME_RUN_AGGREGATION_QUERY)).andReturn(mockSpan); - expect(mockTraceUtil.getTracer()).andReturn(createNiceMock(Tracer.class)); - mockSpan.end(END_SPAN_OPTIONS); - - replay(mockDatastoreRpc, mockTraceUtil, mockSpan); - - RunAggregationQueryResponse actualAggregationQueryResponse = - datastoreRpcDecorator.runAggregationQuery(aggregationQueryRequest); - - assertThat(actualAggregationQueryResponse).isSameInstanceAs(aggregationQueryResponse); - verify(mockDatastoreRpc, mockTraceUtil, mockSpan); - } -} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java new file mode 100644 index 000000000..bee54a1f0 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java @@ -0,0 +1,1009 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.it; + +import static com.google.cloud.datastore.aggregation.Aggregation.count; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_ALLOCATE_IDS; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_BEGIN_TRANSACTION; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_COMMIT; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_LOOKUP; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RESERVE_IDS; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_ROLLBACK; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RUN_AGGREGATION_QUERY; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_RUN_QUERY; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_COMMIT; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_LOOKUP; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_RUN; +import static com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_TRANSACTION_RUN_QUERY; +import static com.google.common.truth.Truth.assertThat; +import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import com.google.api.gax.rpc.NotFoundException; +import com.google.cloud.datastore.AggregationQuery; +import com.google.cloud.datastore.AggregationResult; +import com.google.cloud.datastore.AggregationResults; +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.IncompleteKey; +import com.google.cloud.datastore.Key; +import com.google.cloud.datastore.KeyFactory; +import com.google.cloud.datastore.Query; +import com.google.cloud.datastore.QueryResults; +import com.google.cloud.datastore.ReadOption; +import com.google.cloud.datastore.StructuredQuery; +import com.google.cloud.datastore.StructuredQuery.PropertyFilter; +import com.google.cloud.datastore.Transaction; +import com.google.cloud.datastore.testing.RemoteDatastoreHelper; +import com.google.cloud.opentelemetry.trace.TraceConfiguration; +import com.google.cloud.opentelemetry.trace.TraceExporter; +import com.google.cloud.trace.v1.TraceServiceClient; +import com.google.common.base.Preconditions; +import com.google.devtools.cloudtrace.v1.Trace; +import com.google.devtools.cloudtrace.v1.TraceSpan; +import com.google.testing.junit.testparameterinjector.TestParameter; +import com.google.testing.junit.testparameterinjector.TestParameterInjector; +import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.SpanContext; +import io.opentelemetry.api.trace.TraceFlags; +import io.opentelemetry.api.trace.TraceState; +import io.opentelemetry.api.trace.Tracer; +import io.opentelemetry.context.Context; +import io.opentelemetry.context.Scope; +import io.opentelemetry.sdk.OpenTelemetrySdk; +import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.sdk.trace.SdkTracerProvider; +import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; +import io.opentelemetry.sdk.trace.samplers.Sampler; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.TreeMap; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + +// This End-to-End test verifies Client-side Tracing Functionality instrumented using the +// OpenTelemetry API. +// The test depends on the following external APIs/Services: +// 1. Java OpenTelemetry SDK +// 2. Cloud Trace Exporter +// 3. TraceServiceClient from Cloud Trace API v1. +// +// Permissions required to run this test (https://cloud.google.com/trace/docs/iam#trace-roles): +// 1. gcloud auth application-default login must be run with the test user. +// 2. To write traces, test user must have one of roles/cloudtrace.[admin|agent|user] roles. +// 3. To read traces, test user must have one of roles/cloudtrace.[admin|user] roles. +// +// Each test-case has the following workflow: +// 1. OpenTelemetry SDK is initialized with Cloud Trace Exporter and 100% Trace Sampling +// 2. On initialization, Datastore client is provided the OpenTelemetry SDK object from (1) +// 3. A custom TraceID is generated and injected using a custom SpanContext +// 4. Datastore operations are run inside a root TraceSpan created using the custom SpanContext from +// (3). +// 5. Traces are read-back using TraceServiceClient and verified against expected Call Stacks. +@RunWith(TestParameterInjector.class) +public class ITE2ETracingTest { + + protected boolean isUsingGlobalOpenTelemetrySDK() { + return useGlobalOpenTelemetrySDK; + } + + protected String datastoreNamedDatabase() { + return datastoreNamedDatabase; + } + + // Helper class to track call-stacks in a trace + protected static class TraceContainer { + + // Maps Span ID to TraceSpan + private final Map idSpanMap; + + // Maps Parent Span ID to a list of Child SpanIDs, useful for top-down traversal + private final Map> parentChildIdMap; + + // Tracks the Root Span ID + private long rootId; + + public TraceContainer(String rootSpanName, Trace trace) { + idSpanMap = new TreeMap<>(); + parentChildIdMap = new TreeMap<>(); + for (TraceSpan span : trace.getSpansList()) { + long spanId = span.getSpanId(); + idSpanMap.put(spanId, span); + if (rootSpanName.equals(span.getName())) { + rootId = span.getSpanId(); + } + + // Add self as a child of the parent span + if (!parentChildIdMap.containsKey(span.getParentSpanId())) { + parentChildIdMap.put(span.getParentSpanId(), new ArrayList<>()); + } + parentChildIdMap.get(span.getParentSpanId()).add(spanId); + } + } + + String spanName(long spanId) { + return idSpanMap.get(spanId).getName(); + } + + List childSpans(long spanId) { + return parentChildIdMap.get(spanId); + } + + // This method only works for matching call stacks with traces which have children of distinct + // type at all levels. This is good enough as the intention is to validate if the e2e path is + // WAI - the intention is not to validate Cloud Trace's correctness w.r.t. durability of all + // kinds of traces. + boolean containsCallStack(String... callStack) throws RuntimeException { + List expectedCallStack = Arrays.asList(callStack); + if (expectedCallStack.isEmpty()) { + throw new RuntimeException("Input callStack is empty"); + } + return dfsContainsCallStack(rootId, expectedCallStack); + } + + // Depth-first check for call stack in the trace + private boolean dfsContainsCallStack(long spanId, List expectedCallStack) { + logger.info( + "span=" + + spanName(spanId) + + ", expectedCallStack[0]=" + + (expectedCallStack.isEmpty() ? "null" : expectedCallStack.get(0))); + if (expectedCallStack.isEmpty()) { + return false; + } + if (spanName(spanId).equals(expectedCallStack.get(0))) { + // Recursion termination + if (childSpans(spanId) == null) { + logger.info("No more children for " + spanName(spanId)); + return expectedCallStack.size() <= 1; + } else { + // Examine the child spans + for (Long childSpan : childSpans(spanId)) { + int callStackListSize = expectedCallStack.size(); + logger.info( + "childSpan=" + + spanName(childSpan) + + ", expectedCallStackSize=" + + callStackListSize); + if (dfsContainsCallStack( + childSpan, + expectedCallStack.subList( + /*fromIndexInclusive=*/ 1, /*toIndexExclusive*/ callStackListSize))) { + return true; + } + } + } + } else { + logger.info(spanName(spanId) + " didn't match " + expectedCallStack.get(0)); + } + return false; + } + } + + private static final Logger logger = Logger.getLogger(ITE2ETracingTest.class.getName()); + + private static final String RUN_AGGREGATION_QUERY_RPC_NAME = "RunAggregationQuery"; + + private static final String RUN_QUERY_RPC_NAME = "RunQuery"; + + private static final int NUM_TRACE_ID_BYTES = 32; + + private static final int NUM_SPAN_ID_BYTES = 16; + + private static final int GET_TRACE_RETRY_COUNT = 60; + + private static final int GET_TRACE_RETRY_BACKOFF_MILLIS = 1000; + + private static final int TRACE_FORCE_FLUSH_MILLIS = 5000; + + private static final int TRACE_PROVIDER_SHUTDOWN_MILLIS = 1000; + + private static Key KEY1; + + private static Key KEY2; + + private static Key KEY3; + + private static Key KEY4; + + // Random int generator for trace ID and span ID + private static Random random; + + private static TraceExporter traceExporter; + + // Required for reading back traces from Cloud Trace for validation + private static TraceServiceClient traceClient_v1; + + // Custom SpanContext for each test, required for TraceID injection + private static SpanContext customSpanContext; + + // Trace read back from Cloud Trace using traceClient_v1 for verification + private static Trace retrievedTrace; + + private static String rootSpanName; + private static Tracer tracer; + + // Required to set custom-root span + private static OpenTelemetrySdk openTelemetrySdk; + + private static String projectId; + + private static DatastoreOptions options; + + private static Datastore datastore; + + private static RemoteDatastoreHelper remoteDatastoreHelper; + + @TestParameter boolean useGlobalOpenTelemetrySDK; + + @TestParameter({ + /*(default)*/ + "", + "test-db" + }) + String datastoreNamedDatabase; + + @BeforeClass + public static void setup() throws IOException { + projectId = DatastoreOptions.getDefaultProjectId(); + traceExporter = + TraceExporter.createWithConfiguration( + TraceConfiguration.builder().setProjectId(projectId).build()); + traceClient_v1 = TraceServiceClient.create(); + random = new Random(); + } + + @Before + public void before() throws Exception { + // Set up OTel SDK + Resource resource = + Resource.getDefault().merge(Resource.builder().put(SERVICE_NAME, "Sparky").build()); + + if (isUsingGlobalOpenTelemetrySDK()) { + openTelemetrySdk = + OpenTelemetrySdk.builder() + .setTracerProvider( + SdkTracerProvider.builder() + .setResource(resource) + .addSpanProcessor(BatchSpanProcessor.builder(traceExporter).build()) + .setSampler(Sampler.alwaysOn()) + .build()) + .buildAndRegisterGlobal(); + } else { + openTelemetrySdk = + OpenTelemetrySdk.builder() + .setTracerProvider( + SdkTracerProvider.builder() + .setResource(resource) + .addSpanProcessor(BatchSpanProcessor.builder(traceExporter).build()) + .setSampler(Sampler.alwaysOn()) + .build()) + .build(); + } + + // Initialize the Datastore DB w/ the OTel SDK. Ideally we'd do this is the @BeforeAll method + // but because gRPC traces need to be deterministically force-flushed for every test + String namedDb = datastoreNamedDatabase(); + logger.log(Level.INFO, "Integration test using named database " + namedDb); + remoteDatastoreHelper = RemoteDatastoreHelper.create(namedDb, openTelemetrySdk); + options = remoteDatastoreHelper.getOptions(); + datastore = options.getService(); + + Preconditions.checkNotNull( + datastore, + "Error instantiating Datastore. Check that the service account credentials " + + "were properly set."); + + String projectId = options.getProjectId(); + String kind1 = "kind1"; + KEY1 = + Key.newBuilder(projectId, kind1, "key1", options.getDatabaseId()) + .setNamespace(options.getNamespace()) + .build(); + KEY2 = + Key.newBuilder(projectId, kind1, "key2", options.getDatabaseId()) + .setNamespace(options.getNamespace()) + .build(); + KEY3 = + Key.newBuilder(projectId, kind1, "key3", options.getDatabaseId()) + .setNamespace(options.getNamespace()) + .build(); + KEY4 = + Key.newBuilder(projectId, kind1, "key4", options.getDatabaseId()) + .setNamespace(options.getNamespace()) + .build(); + // Set up the tracer for custom TraceID injection + rootSpanName = + String.format("%s%d", this.getClass().getSimpleName(), System.currentTimeMillis()); + if (isUsingGlobalOpenTelemetrySDK()) { + tracer = GlobalOpenTelemetry.getTracer(rootSpanName); + } else { + tracer = + datastore + .getOptions() + .getOpenTelemetryOptions() + .getOpenTelemetry() + .getTracer(rootSpanName); + } + + // Get up a new SpanContext (ergo TraceId) for each test + customSpanContext = getNewSpanContext(); + assertNotNull(customSpanContext); + assertNull(retrievedTrace); + } + + @After + public void after() throws Exception { + if (isUsingGlobalOpenTelemetrySDK()) { + GlobalOpenTelemetry.resetForTest(); + } + remoteDatastoreHelper.deleteNamespace(); + rootSpanName = null; + tracer = null; + retrievedTrace = null; + customSpanContext = null; + openTelemetrySdk = null; + } + + @AfterClass + public static void teardown() throws Exception { + traceClient_v1.close(); + } + + // Generates a random hex string of length `numBytes` + private String generateRandomHexString(int numBytes) { + StringBuilder newTraceId = new StringBuilder(); + while (newTraceId.length() < numBytes) { + newTraceId.append(Integer.toHexString(random.nextInt())); + } + return newTraceId.substring(0, numBytes); + } + + protected String generateNewTraceId() { + return generateRandomHexString(NUM_TRACE_ID_BYTES); + } + + // Generates a random 16-byte hex string + protected String generateNewSpanId() { + return generateRandomHexString(NUM_SPAN_ID_BYTES); + } + + // Generates a new SpanContext w/ random traceId,spanId + protected SpanContext getNewSpanContext() { + String traceId = generateNewTraceId(); + String spanId = generateNewSpanId(); + logger.info("traceId=" + traceId + ", spanId=" + spanId); + + return SpanContext.create(traceId, spanId, TraceFlags.getSampled(), TraceState.getDefault()); + } + + protected Span getNewRootSpanWithContext() { + // Execute the DB operation in the context of the custom root span. + return tracer + .spanBuilder(rootSpanName) + .setParent(Context.root().with(Span.wrap(customSpanContext))) + .startSpan(); + } + + protected void waitForTracesToComplete() throws Exception { + logger.info("Flushing traces..."); + CompletableResultCode completableResultCode = + openTelemetrySdk.getSdkTracerProvider().forceFlush(); + completableResultCode.join(TRACE_FORCE_FLUSH_MILLIS, TimeUnit.MILLISECONDS); + } + + // Validates `retrievedTrace`. Cloud Trace indexes traces w/ eventual consistency, even when + // indexing traceId, therefore the test must retry a few times before the complete trace is + // available. + // For Transaction traces, there may be more spans than in the trace than specified in + // `callStack`. So `numExpectedSpans` is the expected total number of spans (and not just the + // spans in `callStack`) + protected void fetchAndValidateTrace( + String traceId, int numExpectedSpans, List> callStackList) + throws InterruptedException { + // Large enough count to accommodate eventually consistent Cloud Trace backend + int numRetries = GET_TRACE_RETRY_COUNT; + // Account for rootSpanName + numExpectedSpans++; + + // Fetch traces + do { + try { + retrievedTrace = traceClient_v1.getTrace(projectId, traceId); + assertEquals(traceId, retrievedTrace.getTraceId()); + + logger.info( + "expectedSpanCount=" + + numExpectedSpans + + ", retrievedSpanCount=" + + retrievedTrace.getSpansCount()); + } catch (NotFoundException notFound) { + logger.info("Trace not found, retrying in " + GET_TRACE_RETRY_BACKOFF_MILLIS + " ms"); + } catch (IndexOutOfBoundsException outOfBoundsException) { + logger.info("Call stack not found in trace. Retrying."); + } + if (retrievedTrace == null || numExpectedSpans != retrievedTrace.getSpansCount()) { + Thread.sleep(GET_TRACE_RETRY_BACKOFF_MILLIS); + } + } while (numRetries-- > 0 + && (retrievedTrace == null || numExpectedSpans != retrievedTrace.getSpansCount())); + + if (retrievedTrace == null || numExpectedSpans != retrievedTrace.getSpansCount()) { + throw new RuntimeException( + "Expected number of spans: " + + numExpectedSpans + + ", Actual number of spans: " + + (retrievedTrace != null + ? retrievedTrace.getSpansList().toString() + : "Trace NOT_FOUND")); + } + + TraceContainer traceContainer = new TraceContainer(rootSpanName, retrievedTrace); + + for (List callStack : callStackList) { + // Update all call stacks to be rooted at rootSpanName + ArrayList expectedCallStack = new ArrayList<>(callStack); + + // numExpectedSpans should account for rootSpanName (not passed in callStackList) + expectedCallStack.add(0, rootSpanName); + + // *May be* the full trace was returned + logger.info("Checking if TraceContainer contains the callStack"); + String[] expectedCallList = new String[expectedCallStack.size()]; + if (!traceContainer.containsCallStack(expectedCallStack.toArray(expectedCallList))) { + throw new RuntimeException( + "Expected spans: " + + Arrays.toString(expectedCallList) + + ", Actual spans: " + + (retrievedTrace != null + ? retrievedTrace.getSpansList().toString() + : "Trace NOT_FOUND")); + } + logger.severe("CallStack not found in TraceContainer."); + } + } + + // Validates `retrievedTrace`. Cloud Trace indexes traces w/ eventual consistency, even when + // indexing traceId, therefore the test must retry a few times before the complete trace is + // available. + // For Non-Transaction traces, there is a 1:1 ratio of spans in `spanNames` and in the trace. + protected void fetchAndValidateTrace(String traceId, String... spanNames) + throws InterruptedException { + fetchAndValidateTrace(traceId, spanNames.length, Arrays.asList(Arrays.asList(spanNames))); + } + + @Test + public void traceContainerTest() throws Exception { + // Make sure the test has a new SpanContext (and TraceId for injection) + assertNotNull(customSpanContext); + + // Inject new trace ID + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + Entity entity = datastore.get(KEY1); + assertNull(entity); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + Trace traceResp = null; + int expectedSpanCount = 2; + + int numRetries = GET_TRACE_RETRY_COUNT; + do { + try { + traceResp = traceClient_v1.getTrace(projectId, customSpanContext.getTraceId()); + if (traceResp.getSpansCount() == expectedSpanCount) { + logger.info("Success: Got " + expectedSpanCount + " spans."); + break; + } + } catch (NotFoundException notFoundException) { + Thread.sleep(GET_TRACE_RETRY_BACKOFF_MILLIS); + logger.info("Trace not found, retrying in " + GET_TRACE_RETRY_BACKOFF_MILLIS + " ms"); + } + logger.info( + "Trace Found. The trace did not contain " + + expectedSpanCount + + " spans. Going to retry."); + numRetries--; + } while (numRetries > 0); + + // Make sure we got as many spans as we expected. + assertNotNull(traceResp); + assertEquals(expectedSpanCount, traceResp.getSpansCount()); + + TraceContainer traceCont = new TraceContainer(rootSpanName, traceResp); + + // Contains exact path + assertTrue(traceCont.containsCallStack(rootSpanName, SPAN_NAME_LOOKUP)); + + // Top-level mismatch + assertFalse(traceCont.containsCallStack(SPAN_NAME_LOOKUP, RUN_QUERY_RPC_NAME)); + + // Leaf-level mismatch/missing + assertFalse( + traceCont.containsCallStack( + rootSpanName, SPAN_NAME_LOOKUP, RUN_AGGREGATION_QUERY_RPC_NAME)); + } + + @Test + public void lookupTraceTest() throws Exception { + // Make sure the test has a new SpanContext (and TraceId for injection) + assertNotNull(customSpanContext); + + // Inject new trace ID + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + Entity entity = datastore.get(KEY1); + assertNull(entity); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_LOOKUP); + } + + @Test + public void allocateIdsTraceTest() throws Exception { + assertNotNull(customSpanContext); + + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + String kind1 = "kind1"; + KeyFactory keyFactory = datastore.newKeyFactory().setKind(kind1); + IncompleteKey pk1 = keyFactory.newKey(); + Key key1 = datastore.allocateId(pk1); + assertEquals(key1.getProjectId(), pk1.getProjectId()); + assertEquals(key1.getNamespace(), pk1.getNamespace()); + assertEquals(key1.getAncestors(), pk1.getAncestors()); + assertEquals(key1.getKind(), pk1.getKind()); + assertTrue(key1.hasId()); + assertFalse(key1.hasName()); + assertEquals(Key.newBuilder(pk1, key1.getId()).build(), key1); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_ALLOCATE_IDS); + } + + @Test + public void reserveIdsTraceTest() throws Exception { + assertNotNull(customSpanContext); + + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind"); + Key key1 = keyFactory.newKey(10); + Key key2 = keyFactory.newKey("name"); + List keyList = datastore.reserveIds(key1, key2); + assertEquals(2, keyList.size()); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_RESERVE_IDS); + } + + @Test + public void commitTraceTest() throws Exception { + assertNotNull(customSpanContext); + + Span rootSpan = getNewRootSpanWithContext(); + + Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build(); + try (Scope ignored = rootSpan.makeCurrent()) { + Entity response = datastore.add(entity1); + assertEquals(entity1, response); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_COMMIT); + } + + @Test + public void putTraceTest() throws Exception { + assertNotNull(customSpanContext); + + Span rootSpan = getNewRootSpanWithContext(); + + Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build(); + try (Scope ignored = rootSpan.makeCurrent()) { + Entity response = datastore.put(entity1); + assertEquals(entity1, response); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_COMMIT); + } + + @Test + public void updateTraceTest() throws Exception { + assertNotNull(customSpanContext); + + Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + Entity entity1_update = + Entity.newBuilder(entity1).set("test_field", "new_test_value1").build(); + Entity entity2_update = + Entity.newBuilder(entity2).set("test_field", "new_test_value1").build(); + datastore.update(entity1_update, entity2_update); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_COMMIT); + } + + @Test + public void deleteTraceTest() throws Exception { + assertNotNull(customSpanContext); + + Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build(); + Entity response = datastore.put(entity1); + assertEquals(entity1, response); + + Span rootSpan = getNewRootSpanWithContext(); + + try (Scope ignored = rootSpan.makeCurrent()) { + datastore.delete(entity1.getKey()); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_COMMIT); + } + + @Test + public void runQueryTraceTest() throws Exception { + Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field")); + Query query = + Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build(); + QueryResults queryResults = datastore.run(query); + assertTrue(queryResults.hasNext()); + assertEquals(entity1, queryResults.next()); + assertFalse(queryResults.hasNext()); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_RUN_QUERY); + } + + @Test + public void runAggregationQueryTraceTest() throws Exception { + Entity entity1 = + Entity.newBuilder(KEY1) + .set("pepper_name", "jalapeno") + .set("max_scoville_level", 10000) + .build(); + Entity entity2 = + Entity.newBuilder(KEY2) + .set("pepper_name", "serrano") + .set("max_scoville_level", 25000) + .build(); + Entity entity3 = + Entity.newBuilder(KEY3) + .set("pepper_name", "habanero") + .set("max_scoville_level", 350000) + .build(); + Entity entity4 = + Entity.newBuilder(KEY4) + .set("pepper_name", "ghost") + .set("max_scoville_level", 1500000) + .build(); + + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + entityList.add(entity3); + entityList.add(entity4); + + List response = datastore.add(entity1, entity2, entity3, entity4); + assertEquals(entityList, response); + + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + PropertyFilter mediumSpicyFilters = PropertyFilter.lt("max_scoville_level", 100000); + StructuredQuery mediumSpicyQuery = + Query.newEntityQueryBuilder() + .setKind(KEY1.getKind()) + .setFilter(mediumSpicyFilters) + .build(); + AggregationQuery countSpicyPeppers = + Query.newAggregationQueryBuilder() + .addAggregation(count().as("count")) + .over(mediumSpicyQuery) + .build(); + AggregationResults results = datastore.runAggregation(countSpicyPeppers); + assertThat(results.size()).isEqualTo(1); + AggregationResult result = results.get(0); + assertThat(result.getLong("count")).isEqualTo(2L); + } finally { + rootSpan.end(); + } + + waitForTracesToComplete(); + + fetchAndValidateTrace(customSpanContext.getTraceId(), SPAN_NAME_RUN_AGGREGATION_QUERY); + } + + @Test + public void newTransactionReadTest() throws Exception { + assertNotNull(customSpanContext); + + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + Transaction transaction = datastore.newTransaction(); + Entity entity = datastore.get(KEY1, ReadOption.transactionId(transaction.getTransactionId())); + transaction.commit(); + assertNull(entity); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + fetchAndValidateTrace( + customSpanContext.getTraceId(), + /*numExpectedSpans=*/ 3, + Arrays.asList( + Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION), + Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP), + Collections.singletonList(SPAN_NAME_TRANSACTION_COMMIT))); + } + + @Test + public void newTransactionQueryTest() throws Exception { + // Set up + Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + assertNotNull(customSpanContext); + + // Test + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + Transaction transaction = datastore.newTransaction(); + PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field")); + Query query = + Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build(); + QueryResults queryResults = transaction.run(query); + transaction.commit(); + assertTrue(queryResults.hasNext()); + assertEquals(entity1, queryResults.next()); + assertFalse(queryResults.hasNext()); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + fetchAndValidateTrace( + customSpanContext.getTraceId(), + /*numExpectedSpans=*/ 3, + Arrays.asList( + Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION), + Collections.singletonList(SPAN_NAME_TRANSACTION_RUN_QUERY), + Collections.singletonList(SPAN_NAME_TRANSACTION_COMMIT))); + } + + @Test + public void newTransactionReadWriteTraceTest() throws Exception { + // Set up + Entity entity1 = Entity.newBuilder(KEY1).set("pepper_type", "jalapeno").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("pepper_type", "habanero").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + String simplified_spice_level = "not_spicy"; + Entity entity1update = + Entity.newBuilder(entity1).set("spice_level", simplified_spice_level).build(); + + assertNotNull(customSpanContext); + + // Test + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + Transaction transaction = datastore.newTransaction(); + entity1 = transaction.get(KEY1); + switch (entity1.getString("pepper_type")) { + case "jalapeno": + simplified_spice_level = "mild"; + break; + + case "habanero": + simplified_spice_level = "hot"; + break; + } + transaction.update(entity1update); + transaction.delete(KEY2); + transaction.commit(); + assertFalse(transaction.isActive()); + } finally { + rootSpan.end(); + } + + waitForTracesToComplete(); + + List list = datastore.fetch(KEY1, KEY2); + assertEquals(list.get(0), entity1update); + assertNull(list.get(1)); + + fetchAndValidateTrace( + customSpanContext.getTraceId(), + /*numExpectedSpans=*/ 3, + Arrays.asList( + Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION), + Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP), + Collections.singletonList(SPAN_NAME_TRANSACTION_COMMIT))); + } + + @Test + public void newTransactionRollbackTest() throws Exception { + // Set up + Entity entity1 = Entity.newBuilder(KEY1).set("pepper_type", "jalapeno").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("pepper_type", "habanero").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + String simplified_spice_level = "not_spicy"; + Entity entity1update = + Entity.newBuilder(entity1).set("spice_level", simplified_spice_level).build(); + + assertNotNull(customSpanContext); + + // Test + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + Transaction transaction = datastore.newTransaction(); + entity1 = transaction.get(KEY1); + switch (entity1.getString("pepper_type")) { + case "jalapeno": + simplified_spice_level = "mild"; + break; + + case "habanero": + simplified_spice_level = "hot"; + break; + } + transaction.update(entity1update); + transaction.delete(KEY2); + transaction.rollback(); + assertFalse(transaction.isActive()); + } finally { + rootSpan.end(); + } + + waitForTracesToComplete(); + + List list = datastore.fetch(KEY1, KEY2); + assertEquals(list.get(0), entity1); + assertEquals(list.get(1), entity2); + + fetchAndValidateTrace( + customSpanContext.getTraceId(), + /*numExpectedSpans=*/ 3, + Arrays.asList( + Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION), + Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP), + Collections.singletonList(SPAN_NAME_ROLLBACK))); + } + + @Test + public void runInTransactionQueryTest() throws Exception { + // Set up + Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + assertNotNull(customSpanContext); + + Span rootSpan = getNewRootSpanWithContext(); + try (Scope ignored = rootSpan.makeCurrent()) { + PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field")); + Query query = + Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build(); + Datastore.TransactionCallable callable = + transaction -> { + QueryResults queryResults = datastore.run(query); + assertTrue(queryResults.hasNext()); + assertEquals(entity1, queryResults.next()); + assertFalse(queryResults.hasNext()); + return true; + }; + datastore.runInTransaction(callable); + } finally { + rootSpan.end(); + } + waitForTracesToComplete(); + + fetchAndValidateTrace( + customSpanContext.getTraceId(), + /*numExpectedSpans=*/ 4, + Arrays.asList( + Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_BEGIN_TRANSACTION), + Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_RUN_QUERY), + Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_TRANSACTION_COMMIT))); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java new file mode 100644 index 000000000..aefb51352 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java @@ -0,0 +1,849 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.it; + +import static com.google.cloud.datastore.aggregation.Aggregation.count; +import static com.google.cloud.datastore.telemetry.TraceUtil.*; +import static com.google.common.truth.Truth.assertThat; +import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.datastore.AggregationQuery; +import com.google.cloud.datastore.AggregationResult; +import com.google.cloud.datastore.AggregationResults; +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOpenTelemetryOptions; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.IncompleteKey; +import com.google.cloud.datastore.Key; +import com.google.cloud.datastore.KeyFactory; +import com.google.cloud.datastore.Query; +import com.google.cloud.datastore.QueryResults; +import com.google.cloud.datastore.ReadOption; +import com.google.cloud.datastore.StructuredQuery; +import com.google.cloud.datastore.StructuredQuery.PropertyFilter; +import com.google.cloud.datastore.Transaction; +import com.google.cloud.datastore.testing.RemoteDatastoreHelper; +import com.google.common.base.Preconditions; +import com.google.testing.junit.testparameterinjector.TestParameter; +import com.google.testing.junit.testparameterinjector.TestParameterInjector; +import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.sdk.OpenTelemetrySdk; +import io.opentelemetry.sdk.OpenTelemetrySdkBuilder; +import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; +import io.opentelemetry.sdk.trace.SdkTracerProvider; +import io.opentelemetry.sdk.trace.SpanProcessor; +import io.opentelemetry.sdk.trace.data.EventData; +import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; +import io.opentelemetry.sdk.trace.samplers.Sampler; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.annotation.Nullable; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestName; +import org.junit.runner.RunWith; + +@RunWith(TestParameterInjector.class) +public class ITTracingTest { + protected boolean isUsingGlobalOpenTelemetrySDK() { + return useGlobalOpenTelemetrySDK; + } + + protected String datastoreNamedDatabase() { + return datastoreNamedDatabase; + } + + private static final Logger logger = + Logger.getLogger(com.google.cloud.datastore.it.ITTracingTest.class.getName()); + + private static final int TRACE_FORCE_FLUSH_MILLIS = 1000; + private static final int TRACE_PROVIDER_SHUTDOWN_MILLIS = 1000; + private static final int IN_MEMORY_SPAN_EXPORTER_DELAY_MILLIS = 50; + private static final String SERVICE = "google.datastore.v1.Datastore/"; + + private static Key KEY1; + + private static Key KEY2; + + private static Key KEY3; + + private static Key KEY4; + + private static OpenTelemetrySdk openTelemetrySdk; + + // We use an InMemorySpanExporter for testing which keeps all generated trace spans + // in memory so that we can check their correctness. + protected InMemorySpanExporter inMemorySpanExporter; + private static DatastoreOptions options; + + protected Datastore datastore; + private static RemoteDatastoreHelper remoteDatastoreHelper; + + @TestParameter boolean useGlobalOpenTelemetrySDK; + + @TestParameter({ + /*(default)*/ + "", + "test-db" + }) + String datastoreNamedDatabase; + + Map spanNameToSpanId = new HashMap<>(); + Map spanIdToParentSpanId = new HashMap<>(); + Map spanNameToSpanData = new HashMap<>(); + + @Rule public TestName testName = new TestName(); + + @Before + public void before() { + inMemorySpanExporter = InMemorySpanExporter.create(); + + Resource resource = + Resource.getDefault().merge(Resource.builder().put(SERVICE_NAME, "Sparky").build()); + SpanProcessor inMemorySpanProcessor = SimpleSpanProcessor.create(inMemorySpanExporter); + DatastoreOptions.Builder optionsBuilder = DatastoreOptions.newBuilder(); + DatastoreOpenTelemetryOptions.Builder otelOptionsBuilder = + DatastoreOpenTelemetryOptions.newBuilder(); + OpenTelemetrySdkBuilder openTelemetrySdkBuilder = + OpenTelemetrySdk.builder() + .setTracerProvider( + SdkTracerProvider.builder() + .setResource(resource) + .addSpanProcessor(inMemorySpanProcessor) + .setSampler(Sampler.alwaysOn()) + .build()); + + if (isUsingGlobalOpenTelemetrySDK()) { + GlobalOpenTelemetry.resetForTest(); + openTelemetrySdk = openTelemetrySdkBuilder.buildAndRegisterGlobal(); + optionsBuilder.setOpenTelemetryOptions(otelOptionsBuilder.setTracingEnabled(true).build()); + } else { + openTelemetrySdk = openTelemetrySdkBuilder.build(); + optionsBuilder.setOpenTelemetryOptions( + otelOptionsBuilder.setTracingEnabled(true).setOpenTelemetry(openTelemetrySdk).build()); + } + + String namedDb = datastoreNamedDatabase(); + logger.log(Level.INFO, "Integration test using named database " + namedDb); + remoteDatastoreHelper = RemoteDatastoreHelper.create(namedDb, openTelemetrySdk); + options = remoteDatastoreHelper.getOptions(); + datastore = options.getService(); + + Preconditions.checkNotNull( + datastore, + "Error instantiating Datastore. Check that the service account credentials " + + "were properly set."); + + String projectId = options.getProjectId(); + String kind1 = "kind1"; + KEY1 = + Key.newBuilder(projectId, kind1, "key1", options.getDatabaseId()) + .setNamespace(options.getNamespace()) + .build(); + KEY2 = + Key.newBuilder(projectId, kind1, "key2", options.getDatabaseId()) + .setNamespace(options.getNamespace()) + .build(); + KEY3 = + Key.newBuilder(projectId, kind1, "key3", options.getDatabaseId()) + .setNamespace(options.getNamespace()) + .build(); + KEY4 = + Key.newBuilder(projectId, kind1, "key4", options.getDatabaseId()) + .setNamespace(options.getNamespace()) + .build(); + cleanupTestSpanContext(); + } + + @After + public void after() throws Exception { + if (isUsingGlobalOpenTelemetrySDK()) { + GlobalOpenTelemetry.resetForTest(); + } + remoteDatastoreHelper.deleteNamespace(); + inMemorySpanExporter.reset(); + CompletableResultCode completableResultCode = + openTelemetrySdk.getSdkTracerProvider().shutdown(); + completableResultCode.join(TRACE_PROVIDER_SHUTDOWN_MILLIS, TimeUnit.MILLISECONDS); + openTelemetrySdk = null; + } + + @AfterClass + public static void teardown() {} + + void waitForTracesToComplete() throws Exception { + // The same way that querying the Cloud Trace backend may not give us the + // full trace on the first try, querying the in-memory traces may not result + // in the full trace immediately. Note that performing the `flush` is not + // enough. This doesn't pose an issue in practice, but can make tests flaky. + // Therefore, we're adding a delay to make sure we avoid any flakiness. + inMemorySpanExporter.flush().join(IN_MEMORY_SPAN_EXPORTER_DELAY_MILLIS, TimeUnit.MILLISECONDS); + TimeUnit.MILLISECONDS.sleep(IN_MEMORY_SPAN_EXPORTER_DELAY_MILLIS); + + CompletableResultCode completableResultCode = + openTelemetrySdk.getSdkTracerProvider().forceFlush(); + completableResultCode.join(TRACE_FORCE_FLUSH_MILLIS, TimeUnit.MILLISECONDS); + } + + // Prepares all the spans in memory for inspection. + List prepareSpans() throws Exception { + waitForTracesToComplete(); + List spans = inMemorySpanExporter.getFinishedSpanItems(); + buildSpanMaps(spans); + printSpans(); + return spans; + } + + void buildSpanMaps(List spans) { + for (SpanData spanData : spans) { + spanNameToSpanData.put(spanData.getName(), spanData); + spanNameToSpanId.put(spanData.getName(), spanData.getSpanId()); + spanIdToParentSpanId.put(spanData.getSpanId(), spanData.getParentSpanId()); + } + } + + // Returns the SpanData object for the span with the given name. + // Returns null if no span with the given name exists. + @Nullable + SpanData getSpanByName(String spanName) { + return spanNameToSpanData.get(spanName); + } + + // Returns the SpanData object for the gRPC span with the given RPC name. + // Returns null if no such span exists. + @Nullable + SpanData getGrpcSpanByName(String rpcName) { + return getSpanByName(SERVICE + rpcName); + } + + String grpcSpanName(String rpcName) { + return SERVICE + rpcName; + } + + void assertSameTrace(SpanData... spans) { + if (spans.length > 1) { + String traceId = spans[0].getTraceId(); + for (SpanData spanData : spans) { + assertEquals(traceId, spanData.getTraceId()); + } + } + } + + // Helper to see the spans in standard output while developing tests + void printSpans() { + for (SpanData spanData : spanNameToSpanData.values()) { + logger.log( + Level.FINE, + String.format( + "SPAN ID:%s, ParentID:%s, KIND:%s, TRACE ID:%s, NAME:%s, ATTRIBUTES:%s, EVENTS:%s\n", + spanData.getSpanId(), + spanData.getParentSpanId(), + spanData.getKind(), + spanData.getTraceId(), + spanData.getName(), + spanData.getAttributes().toString(), + spanData.getEvents().toString())); + } + } + + // Asserts that the span hierarchy exists for the given span names. The hierarchy starts with the + // root span, followed + // by the child span, grandchild span, and so on. It also asserts that all the given spans belong + // to the same trace, + // and that datastore-generated spans contain the expected datastore attributes. + void assertSpanHierarchy(String... spanNamesHierarchy) { + List spanNames = Arrays.asList(spanNamesHierarchy); + + for (int i = 0; i + 1 < spanNames.size(); ++i) { + String parentSpanName = spanNames.get(i); + String childSpanName = spanNames.get(i + 1); + SpanData parentSpan = getSpanByName(parentSpanName); + SpanData childSpan = getSpanByName(childSpanName); + assertNotNull(parentSpan); + assertNotNull(childSpan); + assertEquals(childSpan.getParentSpanId(), parentSpan.getSpanId()); + assertSameTrace(childSpan, parentSpan); + // gRPC spans do not have datastore attributes. + if (!parentSpanName.startsWith(SERVICE)) { + assertHasExpectedAttributes(parentSpan); + } + if (!childSpanName.startsWith(SERVICE)) { + assertHasExpectedAttributes(childSpan); + } + } + } + + void assertHasExpectedAttributes(SpanData spanData, String... additionalExpectedAttributes) { + // All datastore-generated spans have the settings attributes. + List expectedAttributes = + Arrays.asList( + "gcp.datastore.memoryUtilization", + "gcp.datastore.settings.host", + "gcp.datastore.settings.databaseId", + "gcp.datastore.settings.retrySettings.maxRpcTimeout", + "gcp.datastore.settings.retrySettings.retryDelayMultiplier", + "gcp.datastore.settings.retrySettings.initialRetryDelay", + "gcp.datastore.settings.credentials.authenticationType", + "gcp.datastore.settings.retrySettings.maxAttempts", + "gcp.datastore.settings.retrySettings.maxRetryDelay", + "gcp.datastore.settings.retrySettings.rpcTimeoutMultiplier", + "gcp.datastore.settings.retrySettings.totalTimeout", + "gcp.datastore.settings.retrySettings.initialRpcTimeout"); + + expectedAttributes.addAll(Arrays.asList(additionalExpectedAttributes)); + + Attributes spanAttributes = spanData.getAttributes(); + for (String expectedAttribute : expectedAttributes) { + assertNotNull(spanAttributes.get(AttributeKey.stringKey(expectedAttribute))); + } + } + + // Returns true if and only if the given span data contains an event with the given name and the + // given expected + // attributes. + boolean hasEvent(SpanData spanData, String eventName, @Nullable Attributes expectedAttributes) { + if (spanData == null) { + return false; + } + + logger.log( + Level.INFO, + String.format( + "Checking if span named '%s' (ID='%s') contains an event named '%s'", + spanData.getName(), spanData.getSpanId(), eventName)); + + List events = spanData.getEvents(); + for (EventData event : events) { + if (event.getName().equals(eventName)) { + if (expectedAttributes == null) { + return true; + } + + // Make sure attributes also match. + Attributes eventAttributes = event.getAttributes(); + return expectedAttributes.equals(eventAttributes); + } + } + return false; + } + + void cleanupTestSpanContext() { + inMemorySpanExporter.reset(); + spanNameToSpanId.clear(); + spanIdToParentSpanId.clear(); + spanNameToSpanData.clear(); + } + + // This is a POJO used for testing APIs that take a POJO. + public static class Pojo { + public int bar; + + public Pojo() { + bar = 0; + } + + public Pojo(int bar) { + this.bar = bar; + } + + public int getBar() { + return bar; + } + + public void setBar(int bar) { + this.bar = bar; + } + } + + @Test + public void lookupTraceTest() throws Exception { + Entity entity = datastore.get(KEY1); + assertNull(entity); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_LOOKUP); + SpanData span = getSpanByName(SPAN_NAME_LOOKUP); + assertTrue( + hasEvent( + span, + SPAN_NAME_LOOKUP + " complete.", + Attributes.builder() + .put(ATTRIBUTES_KEY_RECEIVED, 0) + .put(ATTRIBUTES_KEY_MISSING, 1) + .put(ATTRIBUTES_KEY_DEFERRED, 0) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, false) + .put(ATTRIBUTES_KEY_TRANSACTION_ID, "") + .build())); + } + + @Test + public void allocateIdsTraceTest() throws Exception { + String kind1 = "kind1"; + KeyFactory keyFactory = datastore.newKeyFactory().setKind(kind1); + IncompleteKey pk1 = keyFactory.newKey(); + Key key1 = datastore.allocateId(pk1); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_ALLOCATE_IDS); + } + + @Test + public void reserveIdsTraceTest() throws Exception { + KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind"); + Key key1 = keyFactory.newKey(10); + Key key2 = keyFactory.newKey("name"); + List keyList = datastore.reserveIds(key1, key2); + assertEquals(2, keyList.size()); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_RESERVE_IDS); + } + + @Test + public void commitTraceTest() throws Exception { + Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build(); + Entity response = datastore.add(entity1); + assertEquals(entity1, response); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_COMMIT); + } + + @Test + public void putTraceTest() throws Exception { + Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build(); + Entity response = datastore.put(entity1); + assertEquals(entity1, response); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_COMMIT); + } + + @Test + public void updateTraceTest() throws Exception { + Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + List spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_COMMIT); + + SpanData spanData = getSpanByName(SPAN_NAME_COMMIT); + assertTrue( + hasEvent( + spanData, + SPAN_NAME_COMMIT + " complete.", + Attributes.builder() + .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, response.size()) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, false) + .put(ATTRIBUTES_KEY_TRANSACTION_ID, "") + .build())); + + // Clean Up test span context to verify update spans + cleanupTestSpanContext(); + + Entity entity1_update = Entity.newBuilder(entity1).set("test_field", "new_test_value1").build(); + Entity entity2_update = Entity.newBuilder(entity2).set("test_field", "new_test_value1").build(); + datastore.update(entity1_update, entity2_update); + + waitForTracesToComplete(); + + spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_COMMIT); + } + + @Test + public void deleteTraceTest() throws Exception { + Entity entity1 = Entity.newBuilder(KEY1).set("test_key", "test_value").build(); + Entity response = datastore.put(entity1); + assertEquals(entity1, response); + + List spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_COMMIT); + + SpanData spanData = getSpanByName(SPAN_NAME_COMMIT); + assertTrue( + hasEvent( + spanData, + SPAN_NAME_COMMIT + " complete.", + Attributes.builder() + .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, 1) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, false) + .put(ATTRIBUTES_KEY_TRANSACTION_ID, "") + .build())); + + // Clean Up test span context to verify update spans + cleanupTestSpanContext(); + + datastore.delete(entity1.getKey()); + + waitForTracesToComplete(); + + spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_COMMIT); + + spanData = getSpanByName(SPAN_NAME_COMMIT); + assertTrue( + hasEvent( + spanData, + SPAN_NAME_COMMIT + " complete.", + Attributes.builder() + .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, 1) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, false) + .put(ATTRIBUTES_KEY_TRANSACTION_ID, "") + .build())); + } + + @Test + public void runQueryTraceTest() throws Exception { + Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + // Clean Up test span context to verify RunQuery spans + cleanupTestSpanContext(); + + PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field")); + Query query = + Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build(); + QueryResults queryResults = datastore.run(query); + assertTrue(queryResults.hasNext()); + assertEquals(entity1, queryResults.next()); + assertFalse(queryResults.hasNext()); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_RUN_QUERY); + + SpanData span = getSpanByName(SPAN_NAME_RUN_QUERY); + assertTrue( + hasEvent( + span, + SPAN_NAME_RUN_QUERY + " complete.", + Attributes.builder() + .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, 1) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, false) + .put(ATTRIBUTES_KEY_READ_CONSISTENCY, "READ_CONSISTENCY_UNSPECIFIED") + .put(ATTRIBUTES_KEY_MORE_RESULTS, "NO_MORE_RESULTS") + .put(ATTRIBUTES_KEY_TRANSACTION_ID, "") + .build())); + } + + @Test + public void runAggregationQueryTraceTest() throws Exception { + Entity entity1 = + Entity.newBuilder(KEY1) + .set("pepper_name", "jalapeno") + .set("max_scoville_level", 10000) + .build(); + Entity entity2 = + Entity.newBuilder(KEY2) + .set("pepper_name", "serrano") + .set("max_scoville_level", 25000) + .build(); + Entity entity3 = + Entity.newBuilder(KEY3) + .set("pepper_name", "habanero") + .set("max_scoville_level", 350000) + .build(); + Entity entity4 = + Entity.newBuilder(KEY4) + .set("pepper_name", "ghost") + .set("max_scoville_level", 1500000) + .build(); + + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + entityList.add(entity3); + entityList.add(entity4); + + List response = datastore.add(entity1, entity2, entity3, entity4); + assertEquals(entityList, response); + + // Clean Up test span context to verify RunAggregationQuery spans + cleanupTestSpanContext(); + + PropertyFilter mediumSpicyFilters = PropertyFilter.lt("max_scoville_level", 100000); + StructuredQuery mediumSpicyQuery = + Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(mediumSpicyFilters).build(); + AggregationQuery countSpicyPeppers = + Query.newAggregationQueryBuilder() + .addAggregation(count().as("count")) + .over(mediumSpicyQuery) + .build(); + AggregationResults results = datastore.runAggregation(countSpicyPeppers); + assertThat(results.size()).isEqualTo(1); + AggregationResult result = results.get(0); + assertThat(result.getLong("count")).isEqualTo(2L); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(1, spans.size()); + assertSpanHierarchy(SPAN_NAME_RUN_AGGREGATION_QUERY); + } + + @Test + public void newTransactionReadWriteTraceTest() throws Exception { + // Transaction.Begin + Transaction transaction = datastore.newTransaction(); + + // Transaction.Lookup + Entity entity = datastore.get(KEY1, ReadOption.transactionId(transaction.getTransactionId())); + assertNull(entity); + + Entity updatedEntity = Entity.newBuilder(KEY1).set("test_field", "new_test_value1").build(); + transaction.put(updatedEntity); + + // Transaction.Commit + transaction.commit(); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(3, spans.size()); + + assertSpanHierarchy(SPAN_NAME_BEGIN_TRANSACTION); + assertSpanHierarchy(SPAN_NAME_TRANSACTION_LOOKUP); + SpanData span = getSpanByName(SPAN_NAME_TRANSACTION_LOOKUP); + assertTrue( + hasEvent( + span, + SPAN_NAME_TRANSACTION_LOOKUP + " complete.", + Attributes.builder() + .put(ATTRIBUTES_KEY_DEFERRED, 0) + .put(ATTRIBUTES_KEY_MISSING, 1) + .put(ATTRIBUTES_KEY_RECEIVED, 0) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, true) + .put(ATTRIBUTES_KEY_TRANSACTION_ID, transaction.getTransactionId().toStringUtf8()) + .build())); + + assertSpanHierarchy(SPAN_NAME_TRANSACTION_COMMIT); + span = getSpanByName(SPAN_NAME_TRANSACTION_COMMIT); + assertTrue( + hasEvent( + span, + SPAN_NAME_TRANSACTION_COMMIT + " complete.", + Attributes.builder() + .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, 1) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, true) + .put(ATTRIBUTES_KEY_TRANSACTION_ID, transaction.getTransactionId().toStringUtf8()) + .build())); + } + + @Test + public void newTransactionQueryTest() throws Exception { + Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + // Clean Up test span context to verify Transaction RunQuery spans + cleanupTestSpanContext(); + + Transaction transaction = datastore.newTransaction(); + PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field")); + Query query = + Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build(); + QueryResults queryResults = transaction.run(query); + transaction.commit(); + assertTrue(queryResults.hasNext()); + assertEquals(entity1, queryResults.next()); + assertFalse(queryResults.hasNext()); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(3, spans.size()); + + assertSpanHierarchy(SPAN_NAME_BEGIN_TRANSACTION); + assertSpanHierarchy(SPAN_NAME_TRANSACTION_RUN_QUERY); + assertSpanHierarchy(SPAN_NAME_TRANSACTION_COMMIT); + SpanData span = getSpanByName(SPAN_NAME_TRANSACTION_RUN_QUERY); + assertTrue( + hasEvent( + span, + SPAN_NAME_TRANSACTION_RUN_QUERY + " complete.", + Attributes.builder() + .put(ATTRIBUTES_KEY_DOCUMENT_COUNT, 1) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, true) + .put(ATTRIBUTES_KEY_READ_CONSISTENCY, "READ_CONSISTENCY_UNSPECIFIED") + .put(ATTRIBUTES_KEY_MORE_RESULTS, "NO_MORE_RESULTS") + .put(ATTRIBUTES_KEY_TRANSACTION_ID, transaction.getTransactionId().toStringUtf8()) + .build())); + } + + @Test + public void newTransactionRollbackTest() throws Exception { + Entity entity1 = Entity.newBuilder(KEY1).set("pepper_type", "jalapeno").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("pepper_type", "habanero").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + // Clean Up test span context to verify Transaction Rollback spans + cleanupTestSpanContext(); + + String simplified_spice_level = "not_spicy"; + Entity entity1update = + Entity.newBuilder(entity1).set("spice_level", simplified_spice_level).build(); + Transaction transaction = datastore.newTransaction(); + entity1 = transaction.get(KEY1); + switch (entity1.getString("pepper_type")) { + case "jalapeno": + simplified_spice_level = "mild"; + break; + + case "habanero": + simplified_spice_level = "hot"; + break; + } + transaction.update(entity1update); + transaction.delete(KEY2); + transaction.rollback(); + assertFalse(transaction.isActive()); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(3, spans.size()); + + assertSpanHierarchy(SPAN_NAME_BEGIN_TRANSACTION); + assertSpanHierarchy(SPAN_NAME_TRANSACTION_LOOKUP); + SpanData span = getSpanByName(SPAN_NAME_TRANSACTION_LOOKUP); + assertTrue( + hasEvent( + span, + SPAN_NAME_TRANSACTION_LOOKUP + " complete.", + Attributes.builder() + .put(ATTRIBUTES_KEY_DEFERRED, 0) + .put(ATTRIBUTES_KEY_MISSING, 0) + .put(ATTRIBUTES_KEY_RECEIVED, 1) + .put(ATTRIBUTES_KEY_TRANSACTIONAL, true) + .put(ATTRIBUTES_KEY_TRANSACTION_ID, transaction.getTransactionId().toStringUtf8()) + .build())); + + assertSpanHierarchy(SPAN_NAME_ROLLBACK); + span = getSpanByName(SPAN_NAME_ROLLBACK); + assertTrue( + hasEvent( + span, + SPAN_NAME_ROLLBACK, + Attributes.builder() + .put(ATTRIBUTES_KEY_TRANSACTION_ID, transaction.getTransactionId().toStringUtf8()) + .build())); + } + + @Test + public void runInTransactionQueryTest() throws Exception { + // Set up + Entity entity1 = Entity.newBuilder(KEY1).set("test_field", "test_value1").build(); + Entity entity2 = Entity.newBuilder(KEY2).set("test_field", "test_value2").build(); + List entityList = new ArrayList<>(); + entityList.add(entity1); + entityList.add(entity2); + + List response = datastore.add(entity1, entity2); + assertEquals(entityList, response); + + // Clean Up test span context to verify Transaction Rollback spans + cleanupTestSpanContext(); + + PropertyFilter filter = PropertyFilter.eq("test_field", entity1.getValue("test_field")); + Query query = + Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build(); + Datastore.TransactionCallable callable = + transaction -> { + QueryResults queryResults = datastore.run(query); + assertTrue(queryResults.hasNext()); + assertEquals(entity1, queryResults.next()); + assertFalse(queryResults.hasNext()); + return true; + }; + datastore.runInTransaction(callable); + + waitForTracesToComplete(); + + List spans = prepareSpans(); + assertEquals(4, spans.size()); + + // Since the runInTransaction method runs the TransactionCallable opaquely in a transaction + // there is no way for the API user to know the transaction ID, so we will not validate it here. + assertSpanHierarchy(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_BEGIN_TRANSACTION); + assertSpanHierarchy(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_RUN_QUERY); + assertSpanHierarchy(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_TRANSACTION_COMMIT); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java new file mode 100644 index 000000000..c80ef9353 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java @@ -0,0 +1,54 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.datastore.telemetry; + +import static com.google.common.truth.Truth.assertThat; + +import org.junit.Test; + +public class DisabledTraceUtilTest { + @Test + public void disabledTraceUtilDoesNotProvideChannelConfigurator() { + DisabledTraceUtil traceUtil = new DisabledTraceUtil(); + assertThat(traceUtil.getChannelConfigurator()).isNull(); + } + + @Test + public void usesDisabledContext() { + DisabledTraceUtil traceUtil = new DisabledTraceUtil(); + assertThat(traceUtil.getCurrentContext() instanceof DisabledTraceUtil.Context).isTrue(); + } + + @Test + public void usesDisabledSpan() { + DisabledTraceUtil traceUtil = new DisabledTraceUtil(); + assertThat(traceUtil.getCurrentSpan() instanceof DisabledTraceUtil.Span).isTrue(); + assertThat(traceUtil.startSpan("foo") instanceof DisabledTraceUtil.Span).isTrue(); + assertThat( + traceUtil.startSpan("foo", traceUtil.getCurrentSpan()) + instanceof DisabledTraceUtil.Span) + .isTrue(); + } + + @Test + public void usesDisabledScope() { + DisabledTraceUtil traceUtil = new DisabledTraceUtil(); + assertThat(traceUtil.getCurrentContext().makeCurrent() instanceof DisabledTraceUtil.Scope) + .isTrue(); + assertThat(traceUtil.getCurrentSpan().makeCurrent() instanceof DisabledTraceUtil.Scope) + .isTrue(); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java new file mode 100644 index 000000000..50d7b6820 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java @@ -0,0 +1,106 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.datastore.telemetry; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.cloud.NoCredentials; +import com.google.cloud.datastore.DatastoreOpenTelemetryOptions; +import com.google.cloud.datastore.DatastoreOptions; +import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.sdk.OpenTelemetrySdk; +import org.junit.Before; +import org.junit.Test; + +public class EnabledTraceUtilTest { + @Before + public void setUp() { + GlobalOpenTelemetry.resetForTest(); + } + + DatastoreOptions.Builder getBaseOptions() { + return DatastoreOptions.newBuilder() + .setProjectId("test-project") + .setCredentials(NoCredentials.getInstance()); + } + + DatastoreOptions getTracingEnabledOptions() { + return getBaseOptions() + .setOpenTelemetryOptions( + DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build()) + .build(); + } + + EnabledTraceUtil newEnabledTraceUtil() { + return new EnabledTraceUtil(getTracingEnabledOptions()); + } + + @Test + public void usesOpenTelemetryFromOptions() { + OpenTelemetrySdk myOpenTelemetrySdk = OpenTelemetrySdk.builder().build(); + DatastoreOptions firestoreOptions = + getBaseOptions() + .setOpenTelemetryOptions( + DatastoreOpenTelemetryOptions.newBuilder() + .setTracingEnabled(true) + .setOpenTelemetry(myOpenTelemetrySdk) + .build()) + .build(); + EnabledTraceUtil traceUtil = new EnabledTraceUtil(firestoreOptions); + assertThat(traceUtil.getOpenTelemetry()).isEqualTo(myOpenTelemetrySdk); + } + + @Test + public void usesGlobalOpenTelemetryIfOpenTelemetryInstanceNotProvided() { + OpenTelemetrySdk ignored = OpenTelemetrySdk.builder().buildAndRegisterGlobal(); + DatastoreOptions firestoreOptions = + getBaseOptions() + .setOpenTelemetryOptions( + DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build()) + .build(); + EnabledTraceUtil traceUtil = new EnabledTraceUtil(firestoreOptions); + assertThat(traceUtil.getOpenTelemetry()).isEqualTo(GlobalOpenTelemetry.get()); + } + + @Test + public void enabledTraceUtilProvidesChannelConfigurator() { + assertThat(newEnabledTraceUtil().getChannelConfigurator()).isNull(); + } + + @Test + public void usesEnabledContext() { + assertThat(newEnabledTraceUtil().getCurrentContext() instanceof EnabledTraceUtil.Context) + .isTrue(); + } + + @Test + public void usesEnabledSpan() { + EnabledTraceUtil traceUtil = newEnabledTraceUtil(); + assertThat(traceUtil.getCurrentSpan() instanceof EnabledTraceUtil.Span).isTrue(); + assertThat(traceUtil.startSpan("foo") != null).isTrue(); + assertThat( + traceUtil.startSpan("foo", traceUtil.getCurrentSpan()) instanceof EnabledTraceUtil.Span) + .isTrue(); + } + + @Test + public void usesEnabledScope() { + EnabledTraceUtil traceUtil = newEnabledTraceUtil(); + assertThat(traceUtil.getCurrentContext().makeCurrent() instanceof EnabledTraceUtil.Scope) + .isTrue(); + assertThat(traceUtil.getCurrentSpan().makeCurrent() instanceof EnabledTraceUtil.Scope).isTrue(); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java new file mode 100644 index 000000000..f1cce8006 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/TraceUtilTest.java @@ -0,0 +1,62 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.datastore.telemetry; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.cloud.NoCredentials; +import com.google.cloud.datastore.DatastoreOpenTelemetryOptions; +import com.google.cloud.datastore.DatastoreOptions; +import org.junit.Test; + +public class TraceUtilTest { + @Test + public void defaultOptionsUseDisabledTraceUtil() { + TraceUtil traceUtil = + TraceUtil.getInstance( + DatastoreOptions.newBuilder() + .setProjectId("test-project") + .setCredentials(NoCredentials.getInstance()) + .build()); + assertThat(traceUtil instanceof DisabledTraceUtil).isTrue(); + } + + @Test + public void tracingDisabledOptionsUseDisabledTraceUtil() { + TraceUtil traceUtil = + TraceUtil.getInstance( + DatastoreOptions.newBuilder() + .setProjectId("test-project") + .setCredentials(NoCredentials.getInstance()) + .setOpenTelemetryOptions( + DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(false).build()) + .build()); + assertThat(traceUtil instanceof DisabledTraceUtil).isTrue(); + } + + @Test + public void tracingEnabledOptionsUseEnabledTraceUtil() { + TraceUtil traceUtil = + TraceUtil.getInstance( + DatastoreOptions.newBuilder() + .setProjectId("test-project") + .setCredentials(NoCredentials.getInstance()) + .setOpenTelemetryOptions( + DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build()) + .build()); + assertThat(traceUtil instanceof EnabledTraceUtil).isTrue(); + } +} From 63218dc8bca3a408bcc8b72a0752a550032ddf7d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 20:50:24 +0000 Subject: [PATCH 079/292] chore(main): release 2.21.4-SNAPSHOT (#1571) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 3922a2757..d55ccc6af 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.21.3 + 2.21.4-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.21.3 + 2.21.4-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index a13792e8f..a3a740e7c 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.21.3 + 2.21.4-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.21.3 + 2.21.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.3 + 2.21.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.3 + 0.112.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.3 + 2.21.4-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 5137728ea..23d17e836 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.21.3 + 2.21.4-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.21.3 + 2.21.4-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index fe38bbef1..8f51e25fc 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.3 + 2.21.4-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.3 + 2.21.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 23737d6b3..1d30d1961 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.21.3 + 2.21.4-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.3 + 2.21.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.3 + 2.21.4-SNAPSHOT com.google.cloud google-cloud-datastore - 2.21.3 + 2.21.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.3 + 0.112.4-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.21.3 + 2.21.4-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 5ddd934ff..10b83d827 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.3 + 2.21.4-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.3 + 2.21.4-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a2bceec90..437485dc0 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.3 + 0.112.4-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.21.3 + 2.21.4-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index af7856d35..bf1562ed7 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.21.3 + 2.21.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 9cc37ac81..8622f54a2 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.21.3:2.21.3 -google-cloud-datastore-bom:2.21.3:2.21.3 -proto-google-cloud-datastore-v1:0.112.3:0.112.3 -datastore-v1-proto-client:2.21.3:2.21.3 -proto-google-cloud-datastore-admin-v1:2.21.3:2.21.3 -grpc-google-cloud-datastore-admin-v1:2.21.3:2.21.3 +google-cloud-datastore:2.21.3:2.21.4-SNAPSHOT +google-cloud-datastore-bom:2.21.3:2.21.4-SNAPSHOT +proto-google-cloud-datastore-v1:0.112.3:0.112.4-SNAPSHOT +datastore-v1-proto-client:2.21.3:2.21.4-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.21.3:2.21.4-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.21.3:2.21.4-SNAPSHOT From b43a5c3676792509bcc0ab56e6410923eb7b567b Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 23 Sep 2024 13:43:06 -0400 Subject: [PATCH 080/292] chore: Update generation configuration at Sat Sep 21 02:20:09 UTC 2024 (#1586) * chore: Update generation configuration at Fri Sep 20 02:21:45 UTC 2024 * chore: generate libraries at Fri Sep 20 02:22:36 UTC 2024 * chore: Update generation configuration at Sat Sep 21 02:20:09 UTC 2024 --- README.md | 2 +- generation_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d8b43bd0a..144f2e567 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.46.0') +implementation platform('com.google.cloud:libraries-bom:26.47.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index cd940462a..99ade5352 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.45.0 -googleapis_commitish: 607c2ae82620153880a66898bcbf0a46d38d7d10 -libraries_bom_version: 26.46.0 +googleapis_commitish: a18d9b2c3563527b26c4b713469e795b92795271 +libraries_bom_version: 26.47.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From 9d719e809ea830d8602399b72e432580f14ae6bd Mon Sep 17 00:00:00 2001 From: Jimit Shah <57637300+jimit-j-shah@users.noreply.github.com> Date: Tue, 24 Sep 2024 11:15:37 -0700 Subject: [PATCH 081/292] fix: Update opentelemetry-sdk dependency to be test-only (#1595) * fix: Update opentelemetry-sdk dependency to be test-only * fix: move RemoteDatastoreHelper into `test` * fix: Add CLIRR exception for 8001: Removed class for `RemoteDatastoreHelper` --- google-cloud-datastore/clirr-ignored-differences.xml | 5 +++++ google-cloud-datastore/pom.xml | 1 + .../cloud/datastore/testing/RemoteDatastoreHelper.java | 0 3 files changed, 6 insertions(+) rename google-cloud-datastore/src/{main => test}/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java (100%) diff --git a/google-cloud-datastore/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml index 847ba4f4c..6275f05c6 100644 --- a/google-cloud-datastore/clirr-ignored-differences.xml +++ b/google-cloud-datastore/clirr-ignored-differences.xml @@ -67,4 +67,9 @@ com/google/cloud/datastore/TraceUtil 8001 + + com/google/cloud/datastore/testing/RemoteDatastoreHelper + 8001 + + diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 23d17e836..26b2825c5 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -200,6 +200,7 @@ io.opentelemetry opentelemetry-sdk ${opentelemetry.version} + test io.opentelemetry diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java similarity index 100% rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java rename to google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java From 23c5c2662117370c66c611604c56b878d41f4738 Mon Sep 17 00:00:00 2001 From: Jimit Shah <57637300+jimit-j-shah@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:20:24 -0700 Subject: [PATCH 082/292] fix: Update opentelemetry.version to 1.42.1 to match the BOM version (#1598) --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 26b2825c5..d43a5e86e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -16,7 +16,7 @@ google-cloud-datastore - 1.42.0 + 1.42.1 From 2db9e439189baf8f97127f6cff1de5d47efb0073 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 25 Sep 2024 00:17:19 +0200 Subject: [PATCH 083/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.36.0 (#1590) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 9d1576d94..158a36c96 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.35.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.36.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 41590566e..5ca041eb2 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.35.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.36.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index d6941e80e..20592bf3e 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.35.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.36.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index a3a740e7c..34f4f9ec9 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.35.0 + 3.36.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 1d30d1961..04d25a179 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.35.0 + 3.36.0 From d2a214cd38bdac990d57603952a546c5fefe2acf Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:10:26 -0400 Subject: [PATCH 084/292] chore: Update generation configuration at Tue Sep 24 02:23:54 UTC 2024 (#1593) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 99ade5352..f707b9034 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.45.0 -googleapis_commitish: a18d9b2c3563527b26c4b713469e795b92795271 +googleapis_commitish: 534e49c0ca0b9297f4ede6f119a0db054b35dd1e libraries_bom_version: 26.47.0 libraries: - api_shortname: datastore From fae3b74eaa3494a27fd43f56435c01e8fc09e5ee Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 25 Sep 2024 17:41:43 +0200 Subject: [PATCH 085/292] deps: update dependency com.google.cloud:gapic-libraries-bom to v1.43.0 (#1584) --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index d43a5e86e..61426ea1e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -24,7 +24,7 @@ com.google.cloud gapic-libraries-bom - 1.37.0 + 1.43.0 pom import From 5d078a4b294d071716f51f0d4b9baa5d65a0fe90 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 25 Sep 2024 17:41:54 +0200 Subject: [PATCH 086/292] deps: update dependency com.google.guava:guava-testlib to v33.3.1-jre (#1592) --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 61426ea1e..e7a4971b3 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -151,7 +151,7 @@ com.google.guava guava-testlib - 33.3.0-jre + 33.3.1-jre test From 1286792d7b49229d698df652cd117d229a5cd97e Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:28:12 -0700 Subject: [PATCH 087/292] feat: add sample code for multiple inequalities indexing consideration query (#1579) * feat: add sample code for multiple inequalities indexing consideration query * fix formatting * fix formatting * fix formatting * fix formatting * Add index * Correct indexes * Add orderfileds query * fix orderby asc * Move region tag to include import statements --- .../filters/IndexingConsiderationQuery.java | 64 +++++++++++++ .../datastore/filters/OrderFieldsQuery.java | 63 ++++++++++++ .../filters/MultiIneqQuerySampleIT.java | 96 +++++++++++++++++++ .../snippets/src/test/resources/index.yaml | 4 + 4 files changed, 227 insertions(+) create mode 100644 samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java create mode 100644 samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java create mode 100644 samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java diff --git a/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java b/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java new file mode 100644 index 000000000..f0c9cd5da --- /dev/null +++ b/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java @@ -0,0 +1,64 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.datastore.filters; + +// sample-metadata: +// title: Queries with indexing considerations +// description: The following query produces a result set +// that is ordered according to the index definition. + +// [START datastore_query_indexing_considerations] + +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.Query; +import com.google.cloud.datastore.QueryResults; +import com.google.cloud.datastore.StructuredQuery.CompositeFilter; +import com.google.cloud.datastore.StructuredQuery.Filter; +import com.google.cloud.datastore.StructuredQuery.OrderBy; +import com.google.cloud.datastore.StructuredQuery.PropertyFilter; + +public class IndexingConsiderationQuery { + public static void invoke() throws Exception { + + // Instantiates a client + Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); + + // Build a query with multi inequal filters and optimized index order of index properties. + Query query = Query.newEntityQueryBuilder() + .setKind("employees") + .setFilter(CompositeFilter.and( + PropertyFilter.gt("salary", 100000), + PropertyFilter.gt("experience", 0))) + .setOrderBy(OrderBy.asc("salary"), OrderBy.asc("experience")) + .build(); + + // Get the results back from Datastore + QueryResults results = datastore.run(query); + + if (!results.hasNext()) { + throw new Exception("query yielded no results"); + } + + while (results.hasNext()) { + Entity entity = results.next(); + System.out.printf("Entity: %s%n", entity); + } + } +} +// [END datastore_query_indexing_considerations] diff --git a/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java b/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java new file mode 100644 index 000000000..1739dbade --- /dev/null +++ b/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java @@ -0,0 +1,63 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.datastore.filters; + +// sample-metadata: +// title: Queries with order fileds +// description: The following query order properties +// in the decreasing order of query constraint selectivity. + +// [START datastore_query_order_fields] + +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.Query; +import com.google.cloud.datastore.QueryResults; +import com.google.cloud.datastore.StructuredQuery.Filter; +import com.google.cloud.datastore.StructuredQuery.OrderBy; +import com.google.cloud.datastore.StructuredQuery.PropertyFilter; + +public class OrderFieldsQuery { + public static void invoke() throws Exception { + + // Instantiates a client + Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); + + // Build a query with order properties in the decreasing order of query constraint selectivity. + Query query = + Query.newEntityQueryBuilder() + .setKind("employees") + .setFilter(PropertyFilter.gt("salary", 100000)) + .setOrderBy(OrderBy.asc("salary")) + .build(); + + // Get the results back from Datastore + QueryResults results = datastore.run(query); + // Order results by `experience` + + if (!results.hasNext()) { + throw new Exception("query yielded no results"); + } + + while (results.hasNext()) { + Entity entity = results.next(); + System.out.printf("Entity: %s%n", entity); + } + } +} +// [END datastore_query_order_fields] diff --git a/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java b/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java new file mode 100644 index 000000000..6fee2a806 --- /dev/null +++ b/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java @@ -0,0 +1,96 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.datastore.filters; + +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.Entity; +import com.google.cloud.datastore.Key; +import com.rule.SystemsOutRule; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +@RunWith(JUnit4.class) +@SuppressWarnings("checkstyle:abbreviationaswordinname") +public class MultiIneqQuerySampleIT { + + private final Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); + + private Key employeeKey1; + private Key employeeKey2; + private Key employeeKey3; + + @Rule + public final SystemsOutRule systemsOutRule = new SystemsOutRule(); + + @Before + public void setUp() { + employeeKey1 = datastore.newKeyFactory().setKind("employees").newKey("employee1"); + Entity employee1 = Entity.newBuilder(employeeKey1) + .set("name", "Alice") + .set("salary", 100001) + .set("experience", 10) + .build(); + + employeeKey2 = datastore.newKeyFactory().setKind("employees").newKey("employee2"); + Entity employee2 = Entity.newBuilder(employeeKey2) + .set("name", "Bob") + .set("salary", 90000) + .set("experience", 5) + .build(); + + employeeKey3 = datastore.newKeyFactory().setKind("employees").newKey("employee3"); + Entity employee3 = Entity.newBuilder(employeeKey3) + .set("name", "Jay") + .set("salary", 120000) + .set("experience", 15) + .build(); + + datastore.put(employee1); + datastore.put(employee2); + datastore.put(employee3); + } + + @After + public void tearDown() { + datastore.delete(employeeKey1); + datastore.delete(employeeKey2); + datastore.delete(employeeKey3); + } + + @Test + public void testIndexingConsiderationQuery() throws Exception { + // Act + IndexingConsiderationQuery.invoke(); + + // Assert + systemsOutRule.assertContains("Entity"); + } + + @Test + public void testOrderFieldsQuery() throws Exception { + // Act + OrderFieldsQuery.invoke(); + + // Assert + systemsOutRule.assertContains("Entity"); + } +} diff --git a/samples/snippets/src/test/resources/index.yaml b/samples/snippets/src/test/resources/index.yaml index 8652a0ee0..5f2f0c74a 100644 --- a/samples/snippets/src/test/resources/index.yaml +++ b/samples/snippets/src/test/resources/index.yaml @@ -23,3 +23,7 @@ indexes: properties: - name: tag - name: tag +- kind: employees + properties: + - name: salary + - name: experience \ No newline at end of file From 9e9786e7c11c800abd29724284fdf2b7aaf45819 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Sep 2024 16:38:40 +0200 Subject: [PATCH 088/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.47.0 (#1578) --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 1cc4e9152..677692680 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.45.0 + 26.47.0 pom import From e1b7d4b205312d7d4c2a285f3d1f61388da65c83 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Sep 2024 22:26:06 +0200 Subject: [PATCH 089/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 (#1602) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 158a36c96..aabf59292 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.36.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.36.1 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 5ca041eb2..b39cf017d 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.36.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.36.1" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 20592bf3e..c59887969 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.36.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.36.1" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 34f4f9ec9..fc281ecdd 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.36.0 + 3.36.1 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 04d25a179..0942649db 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.36.0 + 3.36.1 From 8f74a49c5982d00bd168e78671163683f7b41126 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Sep 2024 22:27:04 +0200 Subject: [PATCH 090/292] deps: update dependency com.google.testparameterinjector:test-parameter-injector to v1.17 (#1585) --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e7a4971b3..8f7b315a7 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -192,7 +192,7 @@ com.google.testparameterinjector test-parameter-injector - 1.16 + 1.17 test From df9705b0c9cb561336ac4dd1e8a4bf09b3f51ebd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 09:25:46 -0700 Subject: [PATCH 091/292] chore(main): release 2.22.0 (#1589) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 23 +++++++++++++++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 ++++---- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 +++++----- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 +++++----- 10 files changed, 51 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a38532a81..e2670cb02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Changelog +## [2.22.0](https://github.com/googleapis/java-datastore/compare/v2.21.3...v2.22.0) (2024-09-26) + + +### Features + +* Add sample code for multiple inequalities indexing consideration query ([#1579](https://github.com/googleapis/java-datastore/issues/1579)) ([1286792](https://github.com/googleapis/java-datastore/commit/1286792d7b49229d698df652cd117d229a5cd97e)) +* Introducing Tracing with OpenTelemetry API [#1537](https://github.com/googleapis/java-datastore/issues/1537) ([#1576](https://github.com/googleapis/java-datastore/issues/1576)) ([5440c22](https://github.com/googleapis/java-datastore/commit/5440c22364074c108450c3a748a6a17d5f1dddda)) + + +### Bug Fixes + +* Update opentelemetry-sdk dependency to be test-only ([#1595](https://github.com/googleapis/java-datastore/issues/1595)) ([9d719e8](https://github.com/googleapis/java-datastore/commit/9d719e809ea830d8602399b72e432580f14ae6bd)) +* Update opentelemetry.version to 1.42.1 to match the BOM version ([#1598](https://github.com/googleapis/java-datastore/issues/1598)) ([23c5c26](https://github.com/googleapis/java-datastore/commit/23c5c2662117370c66c611604c56b878d41f4738)) + + +### Dependencies + +* Update dependency com.google.cloud:gapic-libraries-bom to v1.43.0 ([#1584](https://github.com/googleapis/java-datastore/issues/1584)) ([fae3b74](https://github.com/googleapis/java-datastore/commit/fae3b74eaa3494a27fd43f56435c01e8fc09e5ee)) +* Update dependency com.google.cloud:sdk-platform-java-config to v3.36.0 ([#1590](https://github.com/googleapis/java-datastore/issues/1590)) ([2db9e43](https://github.com/googleapis/java-datastore/commit/2db9e439189baf8f97127f6cff1de5d47efb0073)) +* Update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#1602](https://github.com/googleapis/java-datastore/issues/1602)) ([e1b7d4b](https://github.com/googleapis/java-datastore/commit/e1b7d4b205312d7d4c2a285f3d1f61388da65c83)) +* Update dependency com.google.guava:guava-testlib to v33.3.1-jre ([#1592](https://github.com/googleapis/java-datastore/issues/1592)) ([5d078a4](https://github.com/googleapis/java-datastore/commit/5d078a4b294d071716f51f0d4b9baa5d65a0fe90)) +* Update dependency com.google.testparameterinjector:test-parameter-injector to v1.17 ([#1585](https://github.com/googleapis/java-datastore/issues/1585)) ([8f74a49](https://github.com/googleapis/java-datastore/commit/8f74a49c5982d00bd168e78671163683f7b41126)) + ## [2.21.3](https://github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3) (2024-09-11) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index d55ccc6af..34c4d9475 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.21.4-SNAPSHOT + 2.22.0 com.google.cloud google-cloud-datastore-parent - 2.21.4-SNAPSHOT + 2.22.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index fc281ecdd..4c3ab17bb 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.21.4-SNAPSHOT + 2.22.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.21.4-SNAPSHOT + 2.22.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.4-SNAPSHOT + 2.22.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.4-SNAPSHOT + 0.113.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.4-SNAPSHOT + 2.22.0 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 8f7b315a7..9e91f9ca5 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.21.4-SNAPSHOT + 2.22.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.21.4-SNAPSHOT + 2.22.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 8f51e25fc..966e0c054 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.4-SNAPSHOT + 2.22.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.4-SNAPSHOT + 2.22.0 diff --git a/pom.xml b/pom.xml index 0942649db..a90b44f5e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.21.4-SNAPSHOT + 2.22.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.4-SNAPSHOT + 2.22.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.21.4-SNAPSHOT + 2.22.0 com.google.cloud google-cloud-datastore - 2.21.4-SNAPSHOT + 2.22.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.4-SNAPSHOT + 0.113.0 com.google.cloud.datastore datastore-v1-proto-client - 2.21.4-SNAPSHOT + 2.22.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 10b83d827..9d3256b3f 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.21.4-SNAPSHOT + 2.22.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.21.4-SNAPSHOT + 2.22.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 437485dc0..2e34da3af 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.112.4-SNAPSHOT + 0.113.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.21.4-SNAPSHOT + 2.22.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index bf1562ed7..973390f5d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.21.4-SNAPSHOT + 2.22.0 diff --git a/versions.txt b/versions.txt index 8622f54a2..191d0abf1 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.21.3:2.21.4-SNAPSHOT -google-cloud-datastore-bom:2.21.3:2.21.4-SNAPSHOT -proto-google-cloud-datastore-v1:0.112.3:0.112.4-SNAPSHOT -datastore-v1-proto-client:2.21.3:2.21.4-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.21.3:2.21.4-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.21.3:2.21.4-SNAPSHOT +google-cloud-datastore:2.22.0:2.22.0 +google-cloud-datastore-bom:2.22.0:2.22.0 +proto-google-cloud-datastore-v1:0.113.0:0.113.0 +datastore-v1-proto-client:2.22.0:2.22.0 +proto-google-cloud-datastore-admin-v1:2.22.0:2.22.0 +grpc-google-cloud-datastore-admin-v1:2.22.0:2.22.0 From 678eee2dfb6d447a852edd436137f8ebfbe50d74 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 30 Sep 2024 12:27:32 -0400 Subject: [PATCH 092/292] chore: Update generation configuration at Sat Sep 28 02:22:38 UTC 2024 (#1599) * chore: Update generation configuration at Wed Sep 25 02:24:24 UTC 2024 * update gen script * chore: generate libraries at Wed Sep 25 23:31:54 UTC 2024 * chore: Update generation configuration at Thu Sep 26 02:23:26 UTC 2024 * chore: Update generation configuration at Fri Sep 27 02:23:56 UTC 2024 * chore: Update generation configuration at Sat Sep 28 02:22:38 UTC 2024 --------- Co-authored-by: Joe Wang --- .../scripts/hermetic_library_generation.sh | 45 +++++++++---------- generation_config.yaml | 4 +- .../datastore/admin/v1/CommonMetadata.java | 2 +- .../admin/v1/CommonMetadataOrBuilder.java | 2 +- .../admin/v1/CreateIndexRequest.java | 2 +- .../admin/v1/CreateIndexRequestOrBuilder.java | 2 +- .../admin/v1/DatastoreAdminProto.java | 2 +- .../DatastoreFirestoreMigrationMetadata.java | 2 +- ...reFirestoreMigrationMetadataOrBuilder.java | 2 +- .../admin/v1/DeleteIndexRequest.java | 2 +- .../admin/v1/DeleteIndexRequestOrBuilder.java | 2 +- .../datastore/admin/v1/EntityFilter.java | 2 +- .../admin/v1/EntityFilterOrBuilder.java | 2 +- .../admin/v1/ExportEntitiesMetadata.java | 2 +- .../v1/ExportEntitiesMetadataOrBuilder.java | 2 +- .../admin/v1/ExportEntitiesRequest.java | 2 +- .../v1/ExportEntitiesRequestOrBuilder.java | 2 +- .../admin/v1/ExportEntitiesResponse.java | 2 +- .../v1/ExportEntitiesResponseOrBuilder.java | 2 +- .../datastore/admin/v1/GetIndexRequest.java | 2 +- .../admin/v1/GetIndexRequestOrBuilder.java | 2 +- .../admin/v1/ImportEntitiesMetadata.java | 2 +- .../v1/ImportEntitiesMetadataOrBuilder.java | 2 +- .../admin/v1/ImportEntitiesRequest.java | 2 +- .../v1/ImportEntitiesRequestOrBuilder.java | 2 +- .../com/google/datastore/admin/v1/Index.java | 2 +- .../admin/v1/IndexOperationMetadata.java | 2 +- .../v1/IndexOperationMetadataOrBuilder.java | 2 +- .../datastore/admin/v1/IndexOrBuilder.java | 2 +- .../google/datastore/admin/v1/IndexProto.java | 2 +- .../admin/v1/ListIndexesRequest.java | 2 +- .../admin/v1/ListIndexesRequestOrBuilder.java | 2 +- .../admin/v1/ListIndexesResponse.java | 2 +- .../v1/ListIndexesResponseOrBuilder.java | 2 +- .../admin/v1/MigrationProgressEvent.java | 2 +- .../v1/MigrationProgressEventOrBuilder.java | 2 +- .../datastore/admin/v1/MigrationProto.java | 2 +- .../datastore/admin/v1/MigrationState.java | 2 +- .../admin/v1/MigrationStateEvent.java | 2 +- .../v1/MigrationStateEventOrBuilder.java | 2 +- .../datastore/admin/v1/MigrationStep.java | 2 +- .../datastore/admin/v1/OperationType.java | 2 +- .../google/datastore/admin/v1/Progress.java | 2 +- .../datastore/admin/v1/ProgressOrBuilder.java | 2 +- .../google/datastore/v1/AggregationQuery.java | 2 +- .../v1/AggregationQueryOrBuilder.java | 2 +- .../datastore/v1/AggregationResult.java | 2 +- .../datastore/v1/AggregationResultBatch.java | 2 +- .../v1/AggregationResultBatchOrBuilder.java | 2 +- .../v1/AggregationResultOrBuilder.java | 2 +- .../datastore/v1/AggregationResultProto.java | 2 +- .../datastore/v1/AllocateIdsRequest.java | 2 +- .../v1/AllocateIdsRequestOrBuilder.java | 2 +- .../datastore/v1/AllocateIdsResponse.java | 2 +- .../v1/AllocateIdsResponseOrBuilder.java | 2 +- .../com/google/datastore/v1/ArrayValue.java | 2 +- .../datastore/v1/ArrayValueOrBuilder.java | 2 +- .../datastore/v1/BeginTransactionRequest.java | 2 +- .../v1/BeginTransactionRequestOrBuilder.java | 2 +- .../v1/BeginTransactionResponse.java | 2 +- .../v1/BeginTransactionResponseOrBuilder.java | 2 +- .../google/datastore/v1/CommitRequest.java | 2 +- .../datastore/v1/CommitRequestOrBuilder.java | 2 +- .../google/datastore/v1/CommitResponse.java | 2 +- .../datastore/v1/CommitResponseOrBuilder.java | 2 +- .../google/datastore/v1/CompositeFilter.java | 2 +- .../v1/CompositeFilterOrBuilder.java | 2 +- .../google/datastore/v1/DatastoreProto.java | 2 +- .../java/com/google/datastore/v1/Entity.java | 2 +- .../google/datastore/v1/EntityOrBuilder.java | 2 +- .../com/google/datastore/v1/EntityProto.java | 2 +- .../com/google/datastore/v1/EntityResult.java | 2 +- .../datastore/v1/EntityResultOrBuilder.java | 2 +- .../google/datastore/v1/ExecutionStats.java | 2 +- .../datastore/v1/ExecutionStatsOrBuilder.java | 2 +- .../google/datastore/v1/ExplainMetrics.java | 2 +- .../datastore/v1/ExplainMetricsOrBuilder.java | 2 +- .../google/datastore/v1/ExplainOptions.java | 2 +- .../datastore/v1/ExplainOptionsOrBuilder.java | 2 +- .../java/com/google/datastore/v1/Filter.java | 2 +- .../google/datastore/v1/FilterOrBuilder.java | 2 +- .../com/google/datastore/v1/GqlQuery.java | 2 +- .../datastore/v1/GqlQueryOrBuilder.java | 2 +- .../datastore/v1/GqlQueryParameter.java | 2 +- .../v1/GqlQueryParameterOrBuilder.java | 2 +- .../java/com/google/datastore/v1/Key.java | 2 +- .../com/google/datastore/v1/KeyOrBuilder.java | 2 +- .../google/datastore/v1/KindExpression.java | 2 +- .../datastore/v1/KindExpressionOrBuilder.java | 2 +- .../google/datastore/v1/LookupRequest.java | 2 +- .../datastore/v1/LookupRequestOrBuilder.java | 2 +- .../google/datastore/v1/LookupResponse.java | 2 +- .../datastore/v1/LookupResponseOrBuilder.java | 2 +- .../com/google/datastore/v1/Mutation.java | 2 +- .../datastore/v1/MutationOrBuilder.java | 2 +- .../google/datastore/v1/MutationResult.java | 2 +- .../datastore/v1/MutationResultOrBuilder.java | 2 +- .../com/google/datastore/v1/PartitionId.java | 2 +- .../datastore/v1/PartitionIdOrBuilder.java | 2 +- .../com/google/datastore/v1/PlanSummary.java | 2 +- .../datastore/v1/PlanSummaryOrBuilder.java | 2 +- .../com/google/datastore/v1/Projection.java | 2 +- .../datastore/v1/ProjectionOrBuilder.java | 2 +- .../google/datastore/v1/PropertyFilter.java | 2 +- .../datastore/v1/PropertyFilterOrBuilder.java | 2 +- .../com/google/datastore/v1/PropertyMask.java | 2 +- .../datastore/v1/PropertyMaskOrBuilder.java | 2 +- .../google/datastore/v1/PropertyOrder.java | 2 +- .../datastore/v1/PropertyOrderOrBuilder.java | 2 +- .../datastore/v1/PropertyReference.java | 2 +- .../v1/PropertyReferenceOrBuilder.java | 2 +- .../java/com/google/datastore/v1/Query.java | 2 +- .../google/datastore/v1/QueryOrBuilder.java | 2 +- .../datastore/v1/QueryProfileProto.java | 2 +- .../com/google/datastore/v1/QueryProto.java | 2 +- .../google/datastore/v1/QueryResultBatch.java | 2 +- .../v1/QueryResultBatchOrBuilder.java | 2 +- .../com/google/datastore/v1/ReadOptions.java | 2 +- .../datastore/v1/ReadOptionsOrBuilder.java | 2 +- .../datastore/v1/ReserveIdsRequest.java | 2 +- .../v1/ReserveIdsRequestOrBuilder.java | 2 +- .../datastore/v1/ReserveIdsResponse.java | 2 +- .../v1/ReserveIdsResponseOrBuilder.java | 2 +- .../google/datastore/v1/RollbackRequest.java | 2 +- .../v1/RollbackRequestOrBuilder.java | 2 +- .../google/datastore/v1/RollbackResponse.java | 2 +- .../v1/RollbackResponseOrBuilder.java | 2 +- .../v1/RunAggregationQueryRequest.java | 2 +- .../RunAggregationQueryRequestOrBuilder.java | 2 +- .../v1/RunAggregationQueryResponse.java | 2 +- .../RunAggregationQueryResponseOrBuilder.java | 2 +- .../google/datastore/v1/RunQueryRequest.java | 2 +- .../v1/RunQueryRequestOrBuilder.java | 2 +- .../google/datastore/v1/RunQueryResponse.java | 2 +- .../v1/RunQueryResponseOrBuilder.java | 2 +- .../datastore/v1/TransactionOptions.java | 2 +- .../v1/TransactionOptionsOrBuilder.java | 2 +- .../java/com/google/datastore/v1/Value.java | 2 +- .../google/datastore/v1/ValueOrBuilder.java | 2 +- 139 files changed, 161 insertions(+), 162 deletions(-) diff --git a/.github/scripts/hermetic_library_generation.sh b/.github/scripts/hermetic_library_generation.sh index 6c3f22d8f..49a7414cf 100644 --- a/.github/scripts/hermetic_library_generation.sh +++ b/.github/scripts/hermetic_library_generation.sh @@ -67,20 +67,24 @@ message="chore: generate libraries at $(date)" git checkout "${target_branch}" git checkout "${current_branch}" -# if the last commit doesn't contain changes to generation configuration, -# do not generate again as the result will be the same. -change_of_last_commit="$(git diff-tree --no-commit-id --name-only HEAD~1..HEAD -r)" -if [[ ! ("${change_of_last_commit}" == *"${generation_config}"*) ]]; then - echo "The last commit doesn't contain any changes to the generation_config.yaml, skipping the whole generation process." || true - exit 0 -fi + # copy generation configuration from target branch to current branch. git show "${target_branch}":"${generation_config}" > "${baseline_generation_config}" -config_diff=$(diff "${generation_config}" "${baseline_generation_config}" || true) # parse image tag from the generation configuration. image_tag=$(grep "gapic_generator_version" "${generation_config}" | cut -d ':' -f 2 | xargs) +repo_root_dir=$(pwd) +mkdir -p "${repo_root_dir}/output" +# download api definitions from googleapis repository +googleapis_commitish=$(grep googleapis_commitish "${generation_config}" | cut -d ":" -f 2 | xargs) +api_def_dir=$(mktemp -d) +git clone https://github.com/googleapis/googleapis.git "${api_def_dir}" +pushd "${api_def_dir}" +git checkout "${googleapis_commitish}" +cp -r google/ grafeas/ "${repo_root_dir}/output" +popd + # run hermetic code generation docker image. docker run \ --rm \ @@ -90,26 +94,21 @@ docker run \ --baseline-generation-config-path="${workspace_name}/${baseline_generation_config}" \ --current-generation-config-path="${workspace_name}/${generation_config}" +# remove api definitions after generation +rm -rf "${api_def_dir}" # commit the change to the pull request. -if [[ $(basename $(pwd)) == "google-cloud-java" ]]; then - git add java-* pom.xml gapic-libraries-bom/pom.xml versions.txt -else - # The image leaves intermediate folders and files it works with. Here we remove them - rm -rdf output googleapis "${baseline_generation_config}" - git add --all -- ':!pr_description.txt' -fi +rm -rdf output googleapis "${baseline_generation_config}" +git add --all -- ':!pr_description.txt' ':!hermetic_library_generation.sh' changed_files=$(git diff --cached --name-only) -if [[ "${changed_files}" == "" ]]; then - echo "There is no generated code change with the generation config change ${config_diff}." - echo "Skip committing to the pull request." - exit 0 +if [[ "${changed_files}" != "" ]]; then + echo "Commit changes..." + git commit -m "${message}" + git push +else + echo "There is no generated code change, skip commit." fi -echo "Configuration diff:" -echo "${config_diff}" -git commit -m "${message}" -git push # set pr body if pr_description.txt is generated. if [[ -f "pr_description.txt" ]]; then pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number") diff --git a/generation_config.yaml b/generation_config.yaml index f707b9034..bff4d8b41 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.45.0 -googleapis_commitish: 534e49c0ca0b9297f4ede6f119a0db054b35dd1e +gapic_generator_version: 2.46.1 +googleapis_commitish: d6f184876ec67295addccbb70aa4af622e049a7e libraries_bom_version: 26.47.0 libraries: - api_shortname: datastore diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java index 27c9ab448..3bd274168 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java index 913db1a5a..3ef2919c4 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface CommonMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java index f9e6986e1..6a14a8152 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java index 6440f28fc..0d87e8faa 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface CreateIndexRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java index bcea2e23a..838a55b36 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public final class DatastoreAdminProto { diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java index 072da0b59..ea0e28ff1 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java index 1476b0451..2f6c2ae7c 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface DatastoreFirestoreMigrationMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java index 19311057e..d4f87d2a8 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java index b2e5e6325..ab53b6df5 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface DeleteIndexRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java index f48b9fc16..3a6b14377 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java index ff9abf72c..3f75daeff 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface EntityFilterOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java index a48521aab..a6bded093 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java index dd09e14bf..099f4bb5b 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface ExportEntitiesMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java index a87805a6c..88eeb5b0f 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java index e54ff1d1e..9ddd587f9 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface ExportEntitiesRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java index f629356dd..b4f183c04 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java index a71ac8e9d..338f4ff99 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface ExportEntitiesResponseOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java index e1d6886b2..2513a6c2b 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java index 5c5d811d7..da3d4617d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface GetIndexRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java index 47de2e41e..9e8265e49 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java index 462bfacf2..2ed2c3684 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface ImportEntitiesMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java index 43f3a746e..1ca992dd5 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java index a38f50917..c1d8424fe 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface ImportEntitiesRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java index a2649edfb..cb5c4b96c 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/index.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java index a153b6848..c524fb3b2 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java index 538df9521..e85b0747a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface IndexOperationMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java index 459a0ef57..b45823f6a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/index.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface IndexOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java index f350301db..e44ad1c73 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/index.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public final class IndexProto { diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java index 8dcdac9b9..8472db7dc 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java index 4a3ea0672..dc18f1b63 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface ListIndexesRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java index 63bc8361f..abce952f3 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java index 83ee6d607..a305da039 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface ListIndexesResponseOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java index 34b32c5c9..a35cd49ca 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java index 1b746f571..4db619cd0 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface MigrationProgressEventOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java index c5eae4353..63e6e1186 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public final class MigrationProto { diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java index 0ffd47e82..a5b46ab83 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java index 0e3913ecd..203980b3a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java index a96dd7999..de901f9e3 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface MigrationStateEventOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java index ad98ba777..46a80ff31 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java index 644f8de69..34316b3be 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java index bacd7cd7e..7e010b15d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java index 57bc88fc4..cc6b6c27b 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.admin.v1; public interface ProgressOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java index 5207578bd..fa056f1b1 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java index 4d34dc107..d71b7a7ec 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface AggregationQueryOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java index 9ad3eb613..5566884f0 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java index 8b0a4ddad..d40e87f16 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java index 6dc72d389..280f19bd4 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface AggregationResultBatchOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java index 27ab61915..470d13243 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface AggregationResultOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java index 254cef18a..5a3b32a73 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public final class AggregationResultProto { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java index 9a7568b5e..6aeec8c61 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java index 67bc67b1d..e39eca958 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface AllocateIdsRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java index 091cc9964..25b3b348c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java index 5ff577f9f..2204290ae 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface AllocateIdsResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java index e0d23c6c8..245cb4b38 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java index 9c6910f1c..021a8ba56 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface ArrayValueOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java index dfd89d0de..79747e7ba 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java index 6d3aa722f..8a8bbadd2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface BeginTransactionRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java index 45f35d980..c9cbae64e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java index 4c7010782..ef98909fd 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface BeginTransactionResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java index 4be4d798d..baefc371e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java index a3dd50817..137b69963 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface CommitRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java index 030da5583..e24a08499 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java index f46c69b6c..ac4da4033 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface CommitResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java index 73941db09..10fb06dfd 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java index e2739044e..3e53e363a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface CompositeFilterOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java index 605c6a093..851692f0f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public final class DatastoreProto { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java index 7e2d68fc6..6688af1dc 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java index 5eb6072df..8359303a8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface EntityOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java index c9da99a31..8d131a68a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public final class EntityProto { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java index 976833f13..4fac83ece 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java index 034c02f56..6d1020451 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface EntityResultOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java index e779bf33e..2e17827a8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java index a18726ef8..237bd2909 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface ExecutionStatsOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java index cc0c25272..e6fefcd17 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java index 47d09d250..3b4d3578b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface ExplainMetricsOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java index 7ea6f45b7..0871c6cbb 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java index ff52c5a15..764b080ee 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface ExplainOptionsOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java index e226df025..55d69597d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java index 411b5d2aa..49f3eb708 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface FilterOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java index 4dd8adb21..49a298590 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java index a66357c22..48a1a92de 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface GqlQueryOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java index 0b1d8bf8c..d22732f68 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java index c8c219e27..dfa3547b8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface GqlQueryParameterOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java index 52ca92469..90c1fe1fc 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java index eef38ea7b..ca5be689d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface KeyOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java index 670d287dd..8d4782909 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java index 43569465b..08dc4b3d2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface KindExpressionOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java index f899d37c0..4a9d52439 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java index 9494c3480..e417f3306 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface LookupRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java index bb517bcdc..f624e5d4d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java index 9def5c181..9dfacb3d6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface LookupResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java index 4f82c423b..71c310516 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java index 2082fb48e..0bee88325 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface MutationOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java index ee39e9010..03e96876d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java index c3586b7e4..7d3b4f895 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface MutationResultOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java index 7b87a1df5..09ea652c9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java index 1146a856d..7c418fe37 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface PartitionIdOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java index 2e45efb7b..365b11d31 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java index 4b405e880..8088a8c24 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface PlanSummaryOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java index f5257355a..cfd0dc705 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java index f492feebb..71920236c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface ProjectionOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java index 7bb7d77cb..814bfe7fa 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java index da06f4f42..fd74ed8e9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface PropertyFilterOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java index 54f084786..432846ebc 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java index 6b4c91336..e36a55be5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface PropertyMaskOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java index 6b9cd57ba..c12f8741b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java index 2590df078..4e4e8b986 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface PropertyOrderOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java index 89ca784eb..d1ce5477e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java index 12e3c0344..0d80ea0ea 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface PropertyReferenceOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java index d925fbd82..2c0c40f79 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java index bda9dcb7c..70533577f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface QueryOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java index 5b1d59a7a..83e5d1763 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public final class QueryProfileProto { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java index 749fbb368..60c35e2e1 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public final class QueryProto { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java index 264b04c2b..49bb3799f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java index 10e886e97..57ae675f6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface QueryResultBatchOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java index 195a26679..dd545344e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java index 22210bac5..64500abd9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface ReadOptionsOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java index 4fb3a324a..d37792b79 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java index 1509951d0..74644db43 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface ReserveIdsRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java index b64df8ca4..9cf9adff3 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java index 93ad913d3..8858bddf2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface ReserveIdsResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java index b8efa3620..1e3b5e93d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java index 76f2ec4f7..5c4ac4664 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface RollbackRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java index 7ecae56a6..a8de2a48b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java index c5f5cddac..3b89b7ed5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface RollbackResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java index a3e4b5fbb..85021f6fa 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java index 181e67626..6137bb693 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface RunAggregationQueryRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java index e15917183..f122b0943 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java index 518244e3a..cacfa52e8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface RunAggregationQueryResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java index 42a25c70e..7886ca3c7 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java index 66125f517..858455723 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface RunQueryRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java index 50de039e4..714256e65 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java index 2eb2df5c7..c7fceec74 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface RunQueryResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java index 1460d75c9..7e73f6826 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java index 915877a31..551969802 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface TransactionOptionsOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java index d8db3277e..56b6fae30 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java index 6024a74d7..a375525d9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.4 +// Protobuf Java Version: 3.25.5 package com.google.datastore.v1; public interface ValueOrBuilder From 0da1219b49b27263783ee336d7078e5ccb796d2d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 30 Sep 2024 23:32:27 +0200 Subject: [PATCH 093/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.22.0 (#1607) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.21.3` -> `2.22.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.21.3/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.21.3/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes

googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.22.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2220-2024-09-26) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.3...v2.22.0) ##### Features - Add sample code for multiple inequalities indexing consideration query ([#​1579](https://redirect.github.com/googleapis/java-datastore/issues/1579)) ([1286792](https://redirect.github.com/googleapis/java-datastore/commit/1286792d7b49229d698df652cd117d229a5cd97e)) - Introducing Tracing with OpenTelemetry API [#​1537](https://redirect.github.com/googleapis/java-datastore/issues/1537) ([#​1576](https://redirect.github.com/googleapis/java-datastore/issues/1576)) ([5440c22](https://redirect.github.com/googleapis/java-datastore/commit/5440c22364074c108450c3a748a6a17d5f1dddda)) ##### Bug Fixes - Update opentelemetry-sdk dependency to be test-only ([#​1595](https://redirect.github.com/googleapis/java-datastore/issues/1595)) ([9d719e8](https://redirect.github.com/googleapis/java-datastore/commit/9d719e809ea830d8602399b72e432580f14ae6bd)) - Update opentelemetry.version to 1.42.1 to match the BOM version ([#​1598](https://redirect.github.com/googleapis/java-datastore/issues/1598)) ([23c5c26](https://redirect.github.com/googleapis/java-datastore/commit/23c5c2662117370c66c611604c56b878d41f4738)) ##### Dependencies - Update dependency com.google.cloud:gapic-libraries-bom to v1.43.0 ([#​1584](https://redirect.github.com/googleapis/java-datastore/issues/1584)) ([fae3b74](https://redirect.github.com/googleapis/java-datastore/commit/fae3b74eaa3494a27fd43f56435c01e8fc09e5ee)) - Update dependency com.google.cloud:sdk-platform-java-config to v3.36.0 ([#​1590](https://redirect.github.com/googleapis/java-datastore/issues/1590)) ([2db9e43](https://redirect.github.com/googleapis/java-datastore/commit/2db9e439189baf8f97127f6cff1de5d47efb0073)) - Update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#​1602](https://redirect.github.com/googleapis/java-datastore/issues/1602)) ([e1b7d4b](https://redirect.github.com/googleapis/java-datastore/commit/e1b7d4b205312d7d4c2a285f3d1f61388da65c83)) - Update dependency com.google.guava:guava-testlib to v33.3.1-jre ([#​1592](https://redirect.github.com/googleapis/java-datastore/issues/1592)) ([5d078a4](https://redirect.github.com/googleapis/java-datastore/commit/5d078a4b294d071716f51f0d4b9baa5d65a0fe90)) - Update dependency com.google.testparameterinjector:test-parameter-injector to v1.17 ([#​1585](https://redirect.github.com/googleapis/java-datastore/issues/1585)) ([8f74a49](https://redirect.github.com/googleapis/java-datastore/commit/8f74a49c5982d00bd168e78671163683f7b41126))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 9187ea8ce..c39bbf20b 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.21.3 + 2.22.0 From 742d059f444e41985142553514b0a0abd033c5cb Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Wed, 2 Oct 2024 16:22:44 +0000 Subject: [PATCH 094/292] chore: use composite action (#1610) * chore: use composite action * chore: generate libraries at Wed Oct 2 13:35:35 UTC 2024 --------- Co-authored-by: cloud-java-bot --- .../scripts/hermetic_library_generation.sh | 116 ------------------ .../hermetic_library_generation.yaml | 19 +-- README.md | 12 +- 3 files changed, 12 insertions(+), 135 deletions(-) delete mode 100644 .github/scripts/hermetic_library_generation.sh diff --git a/.github/scripts/hermetic_library_generation.sh b/.github/scripts/hermetic_library_generation.sh deleted file mode 100644 index 49a7414cf..000000000 --- a/.github/scripts/hermetic_library_generation.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/bash -set -e -# This script should be run at the root of the repository. -# This script is used to, when a pull request changes the generation -# configuration (generation_config.yaml by default): -# 1. Find whether the last commit in this pull request contains changes to -# the generation configuration and exit early if it doesn't have such a change -# since the generation result would be the same. -# 2. Compare generation configurations in the current branch (with which the -# pull request associated) and target branch (into which the pull request is -# merged); -# 3. Generate changed libraries using library_generation image; -# 4. Commit the changes to the pull request, if any. -# 5. Edit the PR body with generated pull request description, if applicable. - -# The following commands need to be installed before running the script: -# 1. git -# 2. gh -# 3. docker - -# The parameters of this script is: -# 1. target_branch, the branch into which the pull request is merged. -# 2. current_branch, the branch with which the pull request is associated. -# 3. [optional] generation_config, the path to the generation configuration, -# the default value is generation_config.yaml in the repository root. -while [[ $# -gt 0 ]]; do -key="$1" -case "${key}" in - --target_branch) - target_branch="$2" - shift - ;; - --current_branch) - current_branch="$2" - shift - ;; - --generation_config) - generation_config="$2" - shift - ;; - *) - echo "Invalid option: [$1]" - exit 1 - ;; -esac -shift -done - -if [ -z "${target_branch}" ]; then - echo "missing required argument --target_branch" - exit 1 -fi - -if [ -z "${current_branch}" ]; then - echo "missing required argument --current_branch" - exit 1 -fi - -if [ -z "${generation_config}" ]; then - generation_config=generation_config.yaml - echo "Using default generation config: ${generation_config}" -fi - -workspace_name="/workspace" -baseline_generation_config="baseline_generation_config.yaml" -message="chore: generate libraries at $(date)" - -git checkout "${target_branch}" -git checkout "${current_branch}" - -# copy generation configuration from target branch to current branch. -git show "${target_branch}":"${generation_config}" > "${baseline_generation_config}" - -# parse image tag from the generation configuration. -image_tag=$(grep "gapic_generator_version" "${generation_config}" | cut -d ':' -f 2 | xargs) - -repo_root_dir=$(pwd) -mkdir -p "${repo_root_dir}/output" -# download api definitions from googleapis repository -googleapis_commitish=$(grep googleapis_commitish "${generation_config}" | cut -d ":" -f 2 | xargs) -api_def_dir=$(mktemp -d) -git clone https://github.com/googleapis/googleapis.git "${api_def_dir}" -pushd "${api_def_dir}" -git checkout "${googleapis_commitish}" -cp -r google/ grafeas/ "${repo_root_dir}/output" -popd - -# run hermetic code generation docker image. -docker run \ - --rm \ - -u "$(id -u):$(id -g)" \ - -v "$(pwd):${workspace_name}" \ - gcr.io/cloud-devrel-public-resources/java-library-generation:"${image_tag}" \ - --baseline-generation-config-path="${workspace_name}/${baseline_generation_config}" \ - --current-generation-config-path="${workspace_name}/${generation_config}" - -# remove api definitions after generation -rm -rf "${api_def_dir}" - -# commit the change to the pull request. -rm -rdf output googleapis "${baseline_generation_config}" -git add --all -- ':!pr_description.txt' ':!hermetic_library_generation.sh' -changed_files=$(git diff --cached --name-only) -if [[ "${changed_files}" != "" ]]; then - echo "Commit changes..." - git commit -m "${message}" - git push -else - echo "There is no generated code change, skip commit." -fi - -# set pr body if pr_description.txt is generated. -if [[ -f "pr_description.txt" ]]; then - pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number") - gh pr edit "${pr_num}" --body "$(cat pr_description.txt)" -fi diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 0266fbc96..4caa5567a 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -20,7 +20,6 @@ on: env: REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }} GITHUB_REPOSITORY: ${{ github.repository }} - jobs: library_generation: runs-on: ubuntu-latest @@ -38,17 +37,9 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - name: Generate changed libraries + - uses: googleapis/sdk-platform-java/.github/scripts@v2.46.0 if: env.SHOULD_RUN == 'true' - shell: bash - run: | - set -ex - [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com" - [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot" - bash .github/scripts/hermetic_library_generation.sh \ - --target_branch "${BASE_REF}" \ - --current_branch "${HEAD_REF}" - env: - BASE_REF: ${{ github.base_ref }} - HEAD_REF: ${{ github.head_ref }} - GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} + with: + base_ref: ${{ github.base_ref }} + head_ref: ${{ github.head_ref }} + token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} diff --git a/README.md b/README.md index 144f2e567..da7d93a81 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.45.0 + 26.47.0 pom import @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.21.3 + 2.22.0 ``` @@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.21.3' +implementation 'com.google.cloud:google-cloud-datastore:2.22.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.21.3" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.22.0" ``` @@ -370,7 +370,9 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datastore/tre | Sum Aggregation With Limit | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithLimit.java) | | Sum Aggregation With Order By | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithOrderBy.java) | | Sum Aggregation With Property Filter | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/aggregation/SumAggregationWithPropertyFilter.java) | +| Indexing Consideration Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java) | | Create a union between two filters | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java) | +| Order Fields Query | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java) | | Query Profile Explain | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplain.java) | | Query Profile Explain Aggregation | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAggregation.java) | | Query Profile Explain Analyze | [source code](https://github.com/googleapis/java-datastore/blob/main/samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datastore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datastore/queryprofile/QueryProfileExplainAnalyze.java) | @@ -479,7 +481,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.21.3 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.22.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles From b299266e42037b731ee7bbba21dbded73a37323c Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:03:50 -0400 Subject: [PATCH 095/292] chore: Update generation configuration at Wed Oct 9 02:23:35 UTC 2024 (#1608) * chore: Update generation configuration at Tue Oct 1 02:27:19 UTC 2024 * chore: generate libraries at Tue Oct 1 02:27:43 UTC 2024 * chore: Update generation configuration at Wed Oct 2 02:23:35 UTC 2024 * chore: Update generation configuration at Thu Oct 3 02:23:49 UTC 2024 * chore: Update generation configuration at Fri Oct 4 02:23:55 UTC 2024 * chore: generate libraries at Fri Oct 4 02:24:21 UTC 2024 * chore: Update generation configuration at Sat Oct 5 02:26:12 UTC 2024 * chore: Update generation configuration at Sun Oct 6 02:25:59 UTC 2024 * chore: generate libraries at Sun Oct 6 02:26:25 UTC 2024 * chore: Update generation configuration at Tue Oct 8 02:25:05 UTC 2024 * chore: generate libraries at Tue Oct 8 02:25:30 UTC 2024 * chore: Update generation configuration at Wed Oct 9 02:23:35 UTC 2024 --- README.md | 2 +- generation_config.yaml | 6 +- .../google/datastore/v1/DatastoreProto.java | 200 +- .../com/google/datastore/v1/Mutation.java | 1014 +++++- .../datastore/v1/MutationOrBuilder.java | 115 + .../google/datastore/v1/MutationResult.java | 544 ++- .../datastore/v1/MutationResultOrBuilder.java | 62 + .../datastore/v1/PropertyTransform.java | 3197 +++++++++++++++++ .../v1/PropertyTransformOrBuilder.java | 438 +++ .../proto/google/datastore/v1/datastore.proto | 141 +- renovate.json | 17 + 11 files changed, 5633 insertions(+), 103 deletions(-) create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java diff --git a/README.md b/README.md index da7d93a81..d5e61c715 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.47.0') +implementation platform('com.google.cloud:libraries-bom:26.48.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index bff4d8b41..44eb5d8aa 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ -gapic_generator_version: 2.46.1 -googleapis_commitish: d6f184876ec67295addccbb70aa4af622e049a7e -libraries_bom_version: 26.47.0 +gapic_generator_version: 2.47.0 +googleapis_commitish: 8692273ae7e0ef95d264e1bb8bcb900fa950674f +libraries_bom_version: 26.48.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java index 851692f0f..b186c25f0 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java @@ -96,6 +96,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r internal_static_google_datastore_v1_Mutation_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_google_datastore_v1_Mutation_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_PropertyTransform_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_PropertyTransform_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_google_datastore_v1_MutationResult_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable @@ -208,87 +212,106 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "v1.Key\"n\n\021ReserveIdsRequest\022\027\n\nproject_i" + "d\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022+\n\004key" + "s\030\001 \003(\0132\030.google.datastore.v1.KeyB\003\340A\002\"\024" - + "\n\022ReserveIdsResponse\"\364\002\n\010Mutation\022-\n\006ins" + + "\n\022ReserveIdsResponse\"\362\004\n\010Mutation\022-\n\006ins" + "ert\030\004 \001(\0132\033.google.datastore.v1.EntityH\000" + "\022-\n\006update\030\005 \001(\0132\033.google.datastore.v1.E" + "ntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google.datasto" + "re.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030.google." + "datastore.v1.KeyH\000\022\026\n\014base_version\030\010 \001(\003" + "H\001\0221\n\013update_time\030\013 \001(\0132\032.google.protobu" - + "f.TimestampH\001\0228\n\rproperty_mask\030\t \001(\0132!.g" - + "oogle.datastore.v1.PropertyMaskB\013\n\topera" - + "tionB\035\n\033conflict_detection_strategy\"\305\001\n\016" - + "MutationResult\022%\n\003key\030\003 \001(\0132\030.google.dat" - + "astore.v1.Key\022\017\n\007version\030\004 \001(\003\022/\n\013create" - + "_time\030\007 \001(\0132\032.google.protobuf.Timestamp\022" - + "/\n\013update_time\030\006 \001(\0132\032.google.protobuf.T" - + "imestamp\022\031\n\021conflict_detected\030\005 \001(\010\"\035\n\014P" - + "ropertyMask\022\r\n\005paths\030\001 \003(\t\"\312\002\n\013ReadOptio" - + "ns\022L\n\020read_consistency\030\001 \001(\01620.google.da" - + "tastore.v1.ReadOptions.ReadConsistencyH\000" - + "\022\025\n\013transaction\030\002 \001(\014H\000\022B\n\017new_transacti" - + "on\030\003 \001(\0132\'.google.datastore.v1.Transacti" - + "onOptionsH\000\022/\n\tread_time\030\004 \001(\0132\032.google." - + "protobuf.TimestampH\000\"M\n\017ReadConsistency\022" - + " \n\034READ_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STR" - + "ONG\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\"" - + "\222\002\n\022TransactionOptions\022G\n\nread_write\030\001 \001" - + "(\01321.google.datastore.v1.TransactionOpti" - + "ons.ReadWriteH\000\022E\n\tread_only\030\002 \001(\01320.goo" - + "gle.datastore.v1.TransactionOptions.Read" - + "OnlyH\000\032)\n\tReadWrite\022\034\n\024previous_transact" - + "ion\030\001 \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\013" - + "2\032.google.protobuf.TimestampB\006\n\004mode2\341\r\n" - + "\tDatastore\022\300\001\n\006Lookup\022\".google.datastore" - + ".v1.LookupRequest\032#.google.datastore.v1." - + "LookupResponse\"m\332A\034project_id,read_optio" - + "ns,keys\202\323\344\223\002%\" /v1/projects/{project_id}" - + ":lookup:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013databa" - + "se_id\022\251\001\n\010RunQuery\022$.google.datastore.v1" - + ".RunQueryRequest\032%.google.datastore.v1.R" - + "unQueryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{p" - + "roject_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_" - + "id\022\r\n\013database_id\022\325\001\n\023RunAggregationQuer" - + "y\022/.google.datastore.v1.RunAggregationQu" - + "eryRequest\0320.google.datastore.v1.RunAggr" - + "egationQueryResponse\"[\202\323\344\223\0022\"-/v1/projec" - + "ts/{project_id}:runAggregationQuery:\001*\212\323" - + "\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\326\001\n\020Be" - + "ginTransaction\022,.google.datastore.v1.Beg" - + "inTransactionRequest\032-.google.datastore." - + "v1.BeginTransactionResponse\"e\332A\nproject_" - + "id\202\323\344\223\002/\"*/v1/projects/{project_id}:begi" - + "nTransaction:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013d" - + "atabase_id\022\346\001\n\006Commit\022\".google.datastore" - + ".v1.CommitRequest\032#.google.datastore.v1." - + "CommitResponse\"\222\001\332A%project_id,mode,tran" - + "saction,mutations\332A\031project_id,mode,muta" - + "tions\202\323\344\223\002%\" /v1/projects/{project_id}:c" - + "ommit:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database" - + "_id\022\302\001\n\010Rollback\022$.google.datastore.v1.R" - + "ollbackRequest\032%.google.datastore.v1.Rol" - + "lbackResponse\"i\332A\026project_id,transaction" - + "\202\323\344\223\002\'\"\"/v1/projects/{project_id}:rollba" - + "ck:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id" - + "\022\307\001\n\013AllocateIds\022\'.google.datastore.v1.A" - + "llocateIdsRequest\032(.google.datastore.v1." - + "AllocateIdsResponse\"e\332A\017project_id,keys\202" - + "\323\344\223\002*\"%/v1/projects/{project_id}:allocat" - + "eIds:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_" - + "id\022\303\001\n\nReserveIds\022&.google.datastore.v1." - + "ReserveIdsRequest\032\'.google.datastore.v1." - + "ReserveIdsResponse\"d\332A\017project_id,keys\202\323" - + "\344\223\002)\"$/v1/projects/{project_id}:reserveI" - + "ds:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id" - + "\032v\312A\030datastore.googleapis.com\322AXhttps://" - + "www.googleapis.com/auth/cloud-platform,h" - + "ttps://www.googleapis.com/auth/datastore" - + "B\277\001\n\027com.google.datastore.v1B\016DatastoreP" - + "rotoP\001Z;cloud.google.com/go/datastore/ap" - + "iv1/datastorepb;datastorepb\252\002\031Google.Clo" - + "ud.Datastore.V1\312\002\031Google\\Cloud\\Datastore" - + "\\V1\352\002\034Google::Cloud::Datastore::V1b\006prot" - + "o3" + + "f.TimestampH\001\022^\n\034conflict_resolution_str" + + "ategy\030\n \001(\01628.google.datastore.v1.Mutati" + + "on.ConflictResolutionStrategy\0228\n\rpropert" + + "y_mask\030\t \001(\0132!.google.datastore.v1.Prope" + + "rtyMask\022H\n\023property_transforms\030\014 \003(\0132&.g" + + "oogle.datastore.v1.PropertyTransformB\003\340A" + + "\001\"R\n\032ConflictResolutionStrategy\022\030\n\024STRAT" + + "EGY_UNSPECIFIED\020\000\022\020\n\014SERVER_VALUE\020\001\022\010\n\004F" + + "AIL\020\003B\013\n\toperationB\035\n\033conflict_detection" + + "_strategy\"\343\003\n\021PropertyTransform\022\025\n\010prope" + + "rty\030\001 \001(\tB\003\340A\001\022Q\n\023set_to_server_value\030\002 " + + "\001(\01622.google.datastore.v1.PropertyTransf" + + "orm.ServerValueH\000\022/\n\tincrement\030\003 \001(\0132\032.g" + + "oogle.datastore.v1.ValueH\000\022-\n\007maximum\030\004 " + + "\001(\0132\032.google.datastore.v1.ValueH\000\022-\n\007min" + + "imum\030\005 \001(\0132\032.google.datastore.v1.ValueH\000" + + "\022B\n\027append_missing_elements\030\006 \001(\0132\037.goog" + + "le.datastore.v1.ArrayValueH\000\022@\n\025remove_a" + + "ll_from_array\030\007 \001(\0132\037.google.datastore.v" + + "1.ArrayValueH\000\"=\n\013ServerValue\022\034\n\030SERVER_" + + "VALUE_UNSPECIFIED\020\000\022\020\n\014REQUEST_TIME\020\001B\020\n" + + "\016transform_type\"\374\001\n\016MutationResult\022%\n\003ke" + + "y\030\003 \001(\0132\030.google.datastore.v1.Key\022\017\n\007ver" + + "sion\030\004 \001(\003\022/\n\013create_time\030\007 \001(\0132\032.google" + + ".protobuf.Timestamp\022/\n\013update_time\030\006 \001(\013" + + "2\032.google.protobuf.Timestamp\022\031\n\021conflict" + + "_detected\030\005 \001(\010\0225\n\021transform_results\030\010 \003" + + "(\0132\032.google.datastore.v1.Value\"\035\n\014Proper" + + "tyMask\022\r\n\005paths\030\001 \003(\t\"\312\002\n\013ReadOptions\022L\n" + + "\020read_consistency\030\001 \001(\01620.google.datasto" + + "re.v1.ReadOptions.ReadConsistencyH\000\022\025\n\013t" + + "ransaction\030\002 \001(\014H\000\022B\n\017new_transaction\030\003 " + + "\001(\0132\'.google.datastore.v1.TransactionOpt" + + "ionsH\000\022/\n\tread_time\030\004 \001(\0132\032.google.proto" + + "buf.TimestampH\000\"M\n\017ReadConsistency\022 \n\034RE" + + "AD_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STRONG\020\001" + + "\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\"\222\002\n\022T" + + "ransactionOptions\022G\n\nread_write\030\001 \001(\01321." + + "google.datastore.v1.TransactionOptions.R" + + "eadWriteH\000\022E\n\tread_only\030\002 \001(\01320.google.d" + + "atastore.v1.TransactionOptions.ReadOnlyH" + + "\000\032)\n\tReadWrite\022\034\n\024previous_transaction\030\001" + + " \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\0132\032.go" + + "ogle.protobuf.TimestampB\006\n\004mode2\341\r\n\tData" + + "store\022\300\001\n\006Lookup\022\".google.datastore.v1.L" + + "ookupRequest\032#.google.datastore.v1.Looku" + + "pResponse\"m\332A\034project_id,read_options,ke" + + "ys\202\323\344\223\002%\" /v1/projects/{project_id}:look" + + "up:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id" + + "\022\251\001\n\010RunQuery\022$.google.datastore.v1.RunQ" + + "ueryRequest\032%.google.datastore.v1.RunQue" + + "ryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{projec" + + "t_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n" + + "\013database_id\022\325\001\n\023RunAggregationQuery\022/.g" + + "oogle.datastore.v1.RunAggregationQueryRe" + + "quest\0320.google.datastore.v1.RunAggregati" + + "onQueryResponse\"[\202\323\344\223\0022\"-/v1/projects/{p" + + "roject_id}:runAggregationQuery:\001*\212\323\344\223\002\035\022" + + "\014\n\nproject_id\022\r\n\013database_id\022\326\001\n\020BeginTr" + + "ansaction\022,.google.datastore.v1.BeginTra" + + "nsactionRequest\032-.google.datastore.v1.Be" + + "ginTransactionResponse\"e\332A\nproject_id\202\323\344" + + "\223\002/\"*/v1/projects/{project_id}:beginTran" + + "saction:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013databa" + + "se_id\022\346\001\n\006Commit\022\".google.datastore.v1.C" + + "ommitRequest\032#.google.datastore.v1.Commi" + + "tResponse\"\222\001\332A%project_id,mode,transacti" + + "on,mutations\332A\031project_id,mode,mutations" + + "\202\323\344\223\002%\" /v1/projects/{project_id}:commit" + + ":\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\302" + + "\001\n\010Rollback\022$.google.datastore.v1.Rollba" + + "ckRequest\032%.google.datastore.v1.Rollback" + + "Response\"i\332A\026project_id,transaction\202\323\344\223\002" + + "\'\"\"/v1/projects/{project_id}:rollback:\001*" + + "\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\307\001\n\013" + + "AllocateIds\022\'.google.datastore.v1.Alloca" + + "teIdsRequest\032(.google.datastore.v1.Alloc" + + "ateIdsResponse\"e\332A\017project_id,keys\202\323\344\223\002*" + + "\"%/v1/projects/{project_id}:allocateIds:" + + "\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\303\001" + + "\n\nReserveIds\022&.google.datastore.v1.Reser" + + "veIdsRequest\032\'.google.datastore.v1.Reser" + + "veIdsResponse\"d\332A\017project_id,keys\202\323\344\223\002)\"" + + "$/v1/projects/{project_id}:reserveIds:\001*" + + "\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\032v\312A\030" + + "datastore.googleapis.com\322AXhttps://www.g" + + "oogleapis.com/auth/cloud-platform,https:" + + "//www.googleapis.com/auth/datastoreB\277\001\n\027" + + "com.google.datastore.v1B\016DatastoreProtoP" + + "\001Z;cloud.google.com/go/datastore/apiv1/d" + + "atastorepb;datastorepb\252\002\031Google.Cloud.Da" + + "tastore.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002" + + "\034Google::Cloud::Datastore::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -461,20 +484,37 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Delete", "BaseVersion", "UpdateTime", + "ConflictResolutionStrategy", "PropertyMask", + "PropertyTransforms", "Operation", "ConflictDetectionStrategy", }); - internal_static_google_datastore_v1_MutationResult_descriptor = + internal_static_google_datastore_v1_PropertyTransform_descriptor = getDescriptor().getMessageTypes().get(17); + internal_static_google_datastore_v1_PropertyTransform_fieldAccessorTable = + new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_google_datastore_v1_PropertyTransform_descriptor, + new java.lang.String[] { + "Property", + "SetToServerValue", + "Increment", + "Maximum", + "Minimum", + "AppendMissingElements", + "RemoveAllFromArray", + "TransformType", + }); + internal_static_google_datastore_v1_MutationResult_descriptor = + getDescriptor().getMessageTypes().get(18); internal_static_google_datastore_v1_MutationResult_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_datastore_v1_MutationResult_descriptor, new java.lang.String[] { - "Key", "Version", "CreateTime", "UpdateTime", "ConflictDetected", + "Key", "Version", "CreateTime", "UpdateTime", "ConflictDetected", "TransformResults", }); internal_static_google_datastore_v1_PropertyMask_descriptor = - getDescriptor().getMessageTypes().get(18); + getDescriptor().getMessageTypes().get(19); internal_static_google_datastore_v1_PropertyMask_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_datastore_v1_PropertyMask_descriptor, @@ -482,7 +522,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Paths", }); internal_static_google_datastore_v1_ReadOptions_descriptor = - getDescriptor().getMessageTypes().get(19); + getDescriptor().getMessageTypes().get(20); internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_datastore_v1_ReadOptions_descriptor, @@ -490,7 +530,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ReadConsistency", "Transaction", "NewTransaction", "ReadTime", "ConsistencyType", }); internal_static_google_datastore_v1_TransactionOptions_descriptor = - getDescriptor().getMessageTypes().get(20); + getDescriptor().getMessageTypes().get(21); internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_datastore_v1_TransactionOptions_descriptor, diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java index 71c310516..ff6a54f5b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java @@ -38,7 +38,10 @@ private Mutation(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Mutation() {} + private Mutation() { + conflictResolutionStrategy_ = 0; + propertyTransforms_ = java.util.Collections.emptyList(); + } @java.lang.Override @SuppressWarnings({"unused"}) @@ -60,6 +63,166 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.datastore.v1.Mutation.class, com.google.datastore.v1.Mutation.Builder.class); } + /** + * + * + * 
+   * The possible ways to resolve a conflict detected in a mutation.
+   *
+ * + * Protobuf enum {@code google.datastore.v1.Mutation.ConflictResolutionStrategy} + */ + public enum ConflictResolutionStrategy implements com.google.protobuf.ProtocolMessageEnum { + /** + * + * + * 
+     * Unspecified. Defaults to `SERVER_VALUE`.
+     *
+ * + * STRATEGY_UNSPECIFIED = 0; + */ + STRATEGY_UNSPECIFIED(0), + /** + * + * + * 
+     * The server entity is kept.
+     *
+ * + * SERVER_VALUE = 1; + */ + SERVER_VALUE(1), + /** + * + * + * 
+     * The whole commit request fails.
+     *
+ * + * FAIL = 3; + */ + FAIL(3), + UNRECOGNIZED(-1), + ; + + /** + * + * + * 
+     * Unspecified. Defaults to `SERVER_VALUE`.
+     *
+ * + * STRATEGY_UNSPECIFIED = 0; + */ + public static final int STRATEGY_UNSPECIFIED_VALUE = 0; + /** + * + * + * 
+     * The server entity is kept.
+     *
+ * + * SERVER_VALUE = 1; + */ + public static final int SERVER_VALUE_VALUE = 1; + /** + * + * + * 
+     * The whole commit request fails.
+     *
+ * + * FAIL = 3; + */ + public static final int FAIL_VALUE = 3; + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ConflictResolutionStrategy valueOf(int value) { + return forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + */ + public static ConflictResolutionStrategy forNumber(int value) { + switch (value) { + case 0: + return STRATEGY_UNSPECIFIED; + case 1: + return SERVER_VALUE; + case 3: + return FAIL; + default: + return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + + private static final com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public ConflictResolutionStrategy findValueByNumber(int number) { + return ConflictResolutionStrategy.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } + return getDescriptor().getValues().get(ordinal()); + } + + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { + return getDescriptor(); + } + + public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { + return com.google.datastore.v1.Mutation.getDescriptor().getEnumTypes().get(0); + } + + private static final ConflictResolutionStrategy[] VALUES = values(); + + public static ConflictResolutionStrategy valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private ConflictResolutionStrategy(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.datastore.v1.Mutation.ConflictResolutionStrategy) + } + private int bitField0_; private int operationCase_ = 0; @@ -477,6 +640,53 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { return com.google.protobuf.Timestamp.getDefaultInstance(); } + public static final int CONFLICT_RESOLUTION_STRATEGY_FIELD_NUMBER = 10; + private int conflictResolutionStrategy_ = 0; + /** + * + * + * 
+   * The strategy to use when a conflict is detected. Defaults to
+   * `SERVER_VALUE`.
+   * If this is set, then `conflict_detection_strategy` must also be set.
+   *
+ * + * + * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10; + * + * + * @return The enum numeric value on the wire for conflictResolutionStrategy. + */ + @java.lang.Override + public int getConflictResolutionStrategyValue() { + return conflictResolutionStrategy_; + } + /** + * + * + * 
+   * The strategy to use when a conflict is detected. Defaults to
+   * `SERVER_VALUE`.
+   * If this is set, then `conflict_detection_strategy` must also be set.
+   *
+ * + * + * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10; + * + * + * @return The conflictResolutionStrategy. + */ + @java.lang.Override + public com.google.datastore.v1.Mutation.ConflictResolutionStrategy + getConflictResolutionStrategy() { + com.google.datastore.v1.Mutation.ConflictResolutionStrategy result = + com.google.datastore.v1.Mutation.ConflictResolutionStrategy.forNumber( + conflictResolutionStrategy_); + return result == null + ? com.google.datastore.v1.Mutation.ConflictResolutionStrategy.UNRECOGNIZED + : result; + } + public static final int PROPERTY_MASK_FIELD_NUMBER = 9; private com.google.datastore.v1.PropertyMask propertyMask_; /** @@ -548,6 +758,108 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() : propertyMask_; } + public static final int PROPERTY_TRANSFORMS_FIELD_NUMBER = 12; + + @SuppressWarnings("serial") + private java.util.List propertyTransforms_; + /** + * + * + * 
+   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public java.util.List getPropertyTransformsList() { + return propertyTransforms_; + } + /** + * + * + * 
+   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public java.util.List + getPropertyTransformsOrBuilderList() { + return propertyTransforms_; + } + /** + * + * + * 
+   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public int getPropertyTransformsCount() { + return propertyTransforms_.size(); + } + /** + * + * + * 
+   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index) { + return propertyTransforms_.get(index); + } + /** + * + * + * 
+   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public com.google.datastore.v1.PropertyTransformOrBuilder getPropertyTransformsOrBuilder( + int index) { + return propertyTransforms_.get(index); + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -580,9 +892,17 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000001) != 0)) { output.writeMessage(9, getPropertyMask()); } + if (conflictResolutionStrategy_ + != com.google.datastore.v1.Mutation.ConflictResolutionStrategy.STRATEGY_UNSPECIFIED + .getNumber()) { + output.writeEnum(10, conflictResolutionStrategy_); + } if (conflictDetectionStrategyCase_ == 11) { output.writeMessage(11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_); } + for (int i = 0; i < propertyTransforms_.size(); i++) { + output.writeMessage(12, propertyTransforms_.get(i)); + } getUnknownFields().writeTo(output); } @@ -620,11 +940,21 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getPropertyMask()); } + if (conflictResolutionStrategy_ + != com.google.datastore.v1.Mutation.ConflictResolutionStrategy.STRATEGY_UNSPECIFIED + .getNumber()) { + size += + com.google.protobuf.CodedOutputStream.computeEnumSize(10, conflictResolutionStrategy_); + } if (conflictDetectionStrategyCase_ == 11) { size += com.google.protobuf.CodedOutputStream.computeMessageSize( 11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_); } + for (int i = 0; i < propertyTransforms_.size(); i++) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize(12, propertyTransforms_.get(i)); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -640,10 +970,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.Mutation other = (com.google.datastore.v1.Mutation) obj; + if (conflictResolutionStrategy_ != other.conflictResolutionStrategy_) return false; if (hasPropertyMask() != other.hasPropertyMask()) return false; if (hasPropertyMask()) { if (!getPropertyMask().equals(other.getPropertyMask())) return false; } + if (!getPropertyTransformsList().equals(other.getPropertyTransformsList())) return false; if (!getOperationCase().equals(other.getOperationCase())) return false; switch (operationCase_) { case 4: @@ -684,10 +1016,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + CONFLICT_RESOLUTION_STRATEGY_FIELD_NUMBER; + hash = (53 * hash) + conflictResolutionStrategy_; if (hasPropertyMask()) { hash = (37 * hash) + PROPERTY_MASK_FIELD_NUMBER; hash = (53 * hash) + getPropertyMask().hashCode(); } + if (getPropertyTransformsCount() > 0) { + hash = (37 * hash) + PROPERTY_TRANSFORMS_FIELD_NUMBER; + hash = (53 * hash) + getPropertyTransformsList().hashCode(); + } switch (operationCase_) { case 4: hash = (37 * hash) + INSERT_FIELD_NUMBER; @@ -860,6 +1198,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { getPropertyMaskFieldBuilder(); + getPropertyTransformsFieldBuilder(); } } @@ -882,11 +1221,19 @@ public Builder clear() { if (updateTimeBuilder_ != null) { updateTimeBuilder_.clear(); } + conflictResolutionStrategy_ = 0; propertyMask_ = null; if (propertyMaskBuilder_ != null) { propertyMaskBuilder_.dispose(); propertyMaskBuilder_ = null; } + if (propertyTransformsBuilder_ == null) { + propertyTransforms_ = java.util.Collections.emptyList(); + } else { + propertyTransforms_ = null; + propertyTransformsBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000100); operationCase_ = 0; operation_ = null; conflictDetectionStrategyCase_ = 0; @@ -917,6 +1264,7 @@ public com.google.datastore.v1.Mutation build() { @java.lang.Override public com.google.datastore.v1.Mutation buildPartial() { com.google.datastore.v1.Mutation result = new com.google.datastore.v1.Mutation(this); + buildPartialRepeatedFields(result); if (bitField0_ != 0) { buildPartial0(result); } @@ -925,10 +1273,25 @@ public com.google.datastore.v1.Mutation buildPartial() { return result; } + private void buildPartialRepeatedFields(com.google.datastore.v1.Mutation result) { + if (propertyTransformsBuilder_ == null) { + if (((bitField0_ & 0x00000100) != 0)) { + propertyTransforms_ = java.util.Collections.unmodifiableList(propertyTransforms_); + bitField0_ = (bitField0_ & ~0x00000100); + } + result.propertyTransforms_ = propertyTransforms_; + } else { + result.propertyTransforms_ = propertyTransformsBuilder_.build(); + } + } + private void buildPartial0(com.google.datastore.v1.Mutation result) { int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000040) != 0)) { + result.conflictResolutionStrategy_ = conflictResolutionStrategy_; + } + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000080) != 0)) { result.propertyMask_ = propertyMaskBuilder_ == null ? propertyMask_ : propertyMaskBuilder_.build(); to_bitField0_ |= 0x00000001; @@ -1003,9 +1366,39 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.datastore.v1.Mutation other) { if (other == com.google.datastore.v1.Mutation.getDefaultInstance()) return this; + if (other.conflictResolutionStrategy_ != 0) { + setConflictResolutionStrategyValue(other.getConflictResolutionStrategyValue()); + } if (other.hasPropertyMask()) { mergePropertyMask(other.getPropertyMask()); } + if (propertyTransformsBuilder_ == null) { + if (!other.propertyTransforms_.isEmpty()) { + if (propertyTransforms_.isEmpty()) { + propertyTransforms_ = other.propertyTransforms_; + bitField0_ = (bitField0_ & ~0x00000100); + } else { + ensurePropertyTransformsIsMutable(); + propertyTransforms_.addAll(other.propertyTransforms_); + } + onChanged(); + } + } else { + if (!other.propertyTransforms_.isEmpty()) { + if (propertyTransformsBuilder_.isEmpty()) { + propertyTransformsBuilder_.dispose(); + propertyTransformsBuilder_ = null; + propertyTransforms_ = other.propertyTransforms_; + bitField0_ = (bitField0_ & ~0x00000100); + propertyTransformsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders + ? getPropertyTransformsFieldBuilder() + : null; + } else { + propertyTransformsBuilder_.addAllMessages(other.propertyTransforms_); + } + } + } switch (other.getOperationCase()) { case INSERT: { @@ -1107,15 +1500,34 @@ public Builder mergeFrom( case 74: { input.readMessage(getPropertyMaskFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; break; } // case 74 + case 80: + { + conflictResolutionStrategy_ = input.readEnum(); + bitField0_ |= 0x00000040; + break; + } // case 80 case 90: { input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); conflictDetectionStrategyCase_ = 11; break; } // case 90 + case 98: + { + com.google.datastore.v1.PropertyTransform m = + input.readMessage( + com.google.datastore.v1.PropertyTransform.parser(), extensionRegistry); + if (propertyTransformsBuilder_ == null) { + ensurePropertyTransformsIsMutable(); + propertyTransforms_.add(m); + } else { + propertyTransformsBuilder_.addMessage(m); + } + break; + } // case 98 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -2322,6 +2734,121 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { return updateTimeBuilder_; } + private int conflictResolutionStrategy_ = 0; + /** + * + * + * 
+     * The strategy to use when a conflict is detected. Defaults to
+     * `SERVER_VALUE`.
+     * If this is set, then `conflict_detection_strategy` must also be set.
+     *
+ * + * + * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10; + * + * + * @return The enum numeric value on the wire for conflictResolutionStrategy. + */ + @java.lang.Override + public int getConflictResolutionStrategyValue() { + return conflictResolutionStrategy_; + } + /** + * + * + * 
+     * The strategy to use when a conflict is detected. Defaults to
+     * `SERVER_VALUE`.
+     * If this is set, then `conflict_detection_strategy` must also be set.
+     *
+ * + * + * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10; + * + * + * @param value The enum numeric value on the wire for conflictResolutionStrategy to set. + * @return This builder for chaining. + */ + public Builder setConflictResolutionStrategyValue(int value) { + conflictResolutionStrategy_ = value; + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + /** + * + * + * 
+     * The strategy to use when a conflict is detected. Defaults to
+     * `SERVER_VALUE`.
+     * If this is set, then `conflict_detection_strategy` must also be set.
+     *
+ * + * + * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10; + * + * + * @return The conflictResolutionStrategy. + */ + @java.lang.Override + public com.google.datastore.v1.Mutation.ConflictResolutionStrategy + getConflictResolutionStrategy() { + com.google.datastore.v1.Mutation.ConflictResolutionStrategy result = + com.google.datastore.v1.Mutation.ConflictResolutionStrategy.forNumber( + conflictResolutionStrategy_); + return result == null + ? com.google.datastore.v1.Mutation.ConflictResolutionStrategy.UNRECOGNIZED + : result; + } + /** + * + * + * 
+     * The strategy to use when a conflict is detected. Defaults to
+     * `SERVER_VALUE`.
+     * If this is set, then `conflict_detection_strategy` must also be set.
+     *
+ * + * + * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10; + * + * + * @param value The conflictResolutionStrategy to set. + * @return This builder for chaining. + */ + public Builder setConflictResolutionStrategy( + com.google.datastore.v1.Mutation.ConflictResolutionStrategy value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000040; + conflictResolutionStrategy_ = value.getNumber(); + onChanged(); + return this; + } + /** + * + * + * 
+     * The strategy to use when a conflict is detected. Defaults to
+     * `SERVER_VALUE`.
+     * If this is set, then `conflict_detection_strategy` must also be set.
+     *
+ * + * + * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10; + * + * + * @return This builder for chaining. + */ + public Builder clearConflictResolutionStrategy() { + bitField0_ = (bitField0_ & ~0x00000040); + conflictResolutionStrategy_ = 0; + onChanged(); + return this; + } + private com.google.datastore.v1.PropertyMask propertyMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.PropertyMask, @@ -2347,7 +2874,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { * @return Whether the propertyMask field is set. */ public boolean hasPropertyMask() { - return ((bitField0_ & 0x00000040) != 0); + return ((bitField0_ & 0x00000080) != 0); } /** * @@ -2401,7 +2928,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) { } else { propertyMaskBuilder_.setMessage(value); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -2427,7 +2954,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder buil } else { propertyMaskBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -2449,7 +2976,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder buil */ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) { if (propertyMaskBuilder_ == null) { - if (((bitField0_ & 0x00000040) != 0) + if (((bitField0_ & 0x00000080) != 0) && propertyMask_ != null && propertyMask_ != com.google.datastore.v1.PropertyMask.getDefaultInstance()) { getPropertyMaskBuilder().mergeFrom(value); @@ -2460,7 +2987,7 @@ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) { propertyMaskBuilder_.mergeFrom(value); } if (propertyMask_ != null) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); } return this; @@ -2482,7 +3009,7 @@ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) { * .google.datastore.v1.PropertyMask property_mask = 9; */ public Builder clearPropertyMask() { - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000080); propertyMask_ = null; if (propertyMaskBuilder_ != null) { propertyMaskBuilder_.dispose(); @@ -2508,7 +3035,7 @@ public Builder clearPropertyMask() { * .google.datastore.v1.PropertyMask property_mask = 9; */ public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return getPropertyMaskFieldBuilder().getBuilder(); } @@ -2570,6 +3097,473 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() return propertyMaskBuilder_; } + private java.util.List propertyTransforms_ = + java.util.Collections.emptyList(); + + private void ensurePropertyTransformsIsMutable() { + if (!((bitField0_ & 0x00000100) != 0)) { + propertyTransforms_ = + new java.util.ArrayList(propertyTransforms_); + bitField0_ |= 0x00000100; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.PropertyTransform, + com.google.datastore.v1.PropertyTransform.Builder, + com.google.datastore.v1.PropertyTransformOrBuilder> + propertyTransformsBuilder_; + + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public java.util.List getPropertyTransformsList() { + if (propertyTransformsBuilder_ == null) { + return java.util.Collections.unmodifiableList(propertyTransforms_); + } else { + return propertyTransformsBuilder_.getMessageList(); + } + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public int getPropertyTransformsCount() { + if (propertyTransformsBuilder_ == null) { + return propertyTransforms_.size(); + } else { + return propertyTransformsBuilder_.getCount(); + } + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index) { + if (propertyTransformsBuilder_ == null) { + return propertyTransforms_.get(index); + } else { + return propertyTransformsBuilder_.getMessage(index); + } + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder setPropertyTransforms( + int index, com.google.datastore.v1.PropertyTransform value) { + if (propertyTransformsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePropertyTransformsIsMutable(); + propertyTransforms_.set(index, value); + onChanged(); + } else { + propertyTransformsBuilder_.setMessage(index, value); + } + return this; + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder setPropertyTransforms( + int index, com.google.datastore.v1.PropertyTransform.Builder builderForValue) { + if (propertyTransformsBuilder_ == null) { + ensurePropertyTransformsIsMutable(); + propertyTransforms_.set(index, builderForValue.build()); + onChanged(); + } else { + propertyTransformsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder addPropertyTransforms(com.google.datastore.v1.PropertyTransform value) { + if (propertyTransformsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePropertyTransformsIsMutable(); + propertyTransforms_.add(value); + onChanged(); + } else { + propertyTransformsBuilder_.addMessage(value); + } + return this; + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder addPropertyTransforms( + int index, com.google.datastore.v1.PropertyTransform value) { + if (propertyTransformsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePropertyTransformsIsMutable(); + propertyTransforms_.add(index, value); + onChanged(); + } else { + propertyTransformsBuilder_.addMessage(index, value); + } + return this; + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder addPropertyTransforms( + com.google.datastore.v1.PropertyTransform.Builder builderForValue) { + if (propertyTransformsBuilder_ == null) { + ensurePropertyTransformsIsMutable(); + propertyTransforms_.add(builderForValue.build()); + onChanged(); + } else { + propertyTransformsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder addPropertyTransforms( + int index, com.google.datastore.v1.PropertyTransform.Builder builderForValue) { + if (propertyTransformsBuilder_ == null) { + ensurePropertyTransformsIsMutable(); + propertyTransforms_.add(index, builderForValue.build()); + onChanged(); + } else { + propertyTransformsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder addAllPropertyTransforms( + java.lang.Iterable values) { + if (propertyTransformsBuilder_ == null) { + ensurePropertyTransformsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll(values, propertyTransforms_); + onChanged(); + } else { + propertyTransformsBuilder_.addAllMessages(values); + } + return this; + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder clearPropertyTransforms() { + if (propertyTransformsBuilder_ == null) { + propertyTransforms_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000100); + onChanged(); + } else { + propertyTransformsBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder removePropertyTransforms(int index) { + if (propertyTransformsBuilder_ == null) { + ensurePropertyTransformsIsMutable(); + propertyTransforms_.remove(index); + onChanged(); + } else { + propertyTransformsBuilder_.remove(index); + } + return this; + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.PropertyTransform.Builder getPropertyTransformsBuilder( + int index) { + return getPropertyTransformsFieldBuilder().getBuilder(index); + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.PropertyTransformOrBuilder getPropertyTransformsOrBuilder( + int index) { + if (propertyTransformsBuilder_ == null) { + return propertyTransforms_.get(index); + } else { + return propertyTransformsBuilder_.getMessageOrBuilder(index); + } + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public java.util.List + getPropertyTransformsOrBuilderList() { + if (propertyTransformsBuilder_ != null) { + return propertyTransformsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(propertyTransforms_); + } + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.PropertyTransform.Builder addPropertyTransformsBuilder() { + return getPropertyTransformsFieldBuilder() + .addBuilder(com.google.datastore.v1.PropertyTransform.getDefaultInstance()); + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.PropertyTransform.Builder addPropertyTransformsBuilder( + int index) { + return getPropertyTransformsFieldBuilder() + .addBuilder(index, com.google.datastore.v1.PropertyTransform.getDefaultInstance()); + } + /** + * + * + * 
+     * Optional. The transforms to perform on the entity.
+     *
+     * This field can be set only when the operation is `insert`, `update`,
+     * or `upsert`. If present, the transforms are be applied to the entity
+     * regardless of the property mask, in order, after the operation.
+     *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public java.util.List + getPropertyTransformsBuilderList() { + return getPropertyTransformsFieldBuilder().getBuilderList(); + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.PropertyTransform, + com.google.datastore.v1.PropertyTransform.Builder, + com.google.datastore.v1.PropertyTransformOrBuilder> + getPropertyTransformsFieldBuilder() { + if (propertyTransformsBuilder_ == null) { + propertyTransformsBuilder_ = + new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.PropertyTransform, + com.google.datastore.v1.PropertyTransform.Builder, + com.google.datastore.v1.PropertyTransformOrBuilder>( + propertyTransforms_, + ((bitField0_ & 0x00000100) != 0), + getParentForChildren(), + isClean()); + propertyTransforms_ = null; + } + return propertyTransformsBuilder_; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java index 0bee88325..131454c79 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java @@ -246,6 +246,39 @@ public interface MutationOrBuilder */ com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder(); + /** + * + * + * 
+   * The strategy to use when a conflict is detected. Defaults to
+   * `SERVER_VALUE`.
+   * If this is set, then `conflict_detection_strategy` must also be set.
+   *
+ * + * + * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10; + * + * + * @return The enum numeric value on the wire for conflictResolutionStrategy. + */ + int getConflictResolutionStrategyValue(); + /** + * + * + * 
+   * The strategy to use when a conflict is detected. Defaults to
+   * `SERVER_VALUE`.
+   * If this is set, then `conflict_detection_strategy` must also be set.
+   *
+ * + * + * .google.datastore.v1.Mutation.ConflictResolutionStrategy conflict_resolution_strategy = 10; + * + * + * @return The conflictResolutionStrategy. + */ + com.google.datastore.v1.Mutation.ConflictResolutionStrategy getConflictResolutionStrategy(); + /** * * @@ -302,6 +335,88 @@ public interface MutationOrBuilder */ com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder(); + /** + * + * + * 
+   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + java.util.List getPropertyTransformsList(); + /** + * + * + * 
+   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index); + /** + * + * + * 
+   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + int getPropertyTransformsCount(); + /** + * + * + * 
+   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + java.util.List + getPropertyTransformsOrBuilderList(); + /** + * + * + * 
+   * Optional. The transforms to perform on the entity.
+   *
+   * This field can be set only when the operation is `insert`, `update`,
+   * or `upsert`. If present, the transforms are be applied to the entity
+   * regardless of the property mask, in order, after the operation.
+   *
+ * + * + * repeated .google.datastore.v1.PropertyTransform property_transforms = 12 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + com.google.datastore.v1.PropertyTransformOrBuilder getPropertyTransformsOrBuilder(int index); + com.google.datastore.v1.Mutation.OperationCase getOperationCase(); com.google.datastore.v1.Mutation.ConflictDetectionStrategyCase getConflictDetectionStrategyCase(); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java index 03e96876d..aa05f03da 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java @@ -38,7 +38,9 @@ private MutationResult(com.google.protobuf.GeneratedMessageV3.Builder builder super(builder); } - private MutationResult() {} + private MutationResult() { + transformResults_ = java.util.Collections.emptyList(); + } @java.lang.Override @SuppressWarnings({"unused"}) @@ -253,6 +255,87 @@ public boolean getConflictDetected() { return conflictDetected_; } + public static final int TRANSFORM_RESULTS_FIELD_NUMBER = 8; + + @SuppressWarnings("serial") + private java.util.List transformResults_; + /** + * + * + * 
+   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + @java.lang.Override + public java.util.List getTransformResultsList() { + return transformResults_; + } + /** + * + * + * 
+   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + @java.lang.Override + public java.util.List + getTransformResultsOrBuilderList() { + return transformResults_; + } + /** + * + * + * 
+   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + @java.lang.Override + public int getTransformResultsCount() { + return transformResults_.size(); + } + /** + * + * + * 
+   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + @java.lang.Override + public com.google.datastore.v1.Value getTransformResults(int index) { + return transformResults_.get(index); + } + /** + * + * + * 
+   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + @java.lang.Override + public com.google.datastore.v1.ValueOrBuilder getTransformResultsOrBuilder(int index) { + return transformResults_.get(index); + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -282,6 +365,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000002) != 0)) { output.writeMessage(7, getCreateTime()); } + for (int i = 0; i < transformResults_.size(); i++) { + output.writeMessage(8, transformResults_.get(i)); + } getUnknownFields().writeTo(output); } @@ -306,6 +392,9 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getCreateTime()); } + for (int i = 0; i < transformResults_.size(); i++) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, transformResults_.get(i)); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -335,6 +424,7 @@ public boolean equals(final java.lang.Object obj) { if (!getUpdateTime().equals(other.getUpdateTime())) return false; } if (getConflictDetected() != other.getConflictDetected()) return false; + if (!getTransformResultsList().equals(other.getTransformResultsList())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -362,6 +452,10 @@ public int hashCode() { } hash = (37 * hash) + CONFLICT_DETECTED_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getConflictDetected()); + if (getTransformResultsCount() > 0) { + hash = (37 * hash) + TRANSFORM_RESULTS_FIELD_NUMBER; + hash = (53 * hash) + getTransformResultsList().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -505,6 +599,7 @@ private void maybeForceBuilderInitialization() { getKeyFieldBuilder(); getCreateTimeFieldBuilder(); getUpdateTimeFieldBuilder(); + getTransformResultsFieldBuilder(); } } @@ -529,6 +624,13 @@ public Builder clear() { updateTimeBuilder_ = null; } conflictDetected_ = false; + if (transformResultsBuilder_ == null) { + transformResults_ = java.util.Collections.emptyList(); + } else { + transformResults_ = null; + transformResultsBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -556,6 +658,7 @@ public com.google.datastore.v1.MutationResult build() { public com.google.datastore.v1.MutationResult buildPartial() { com.google.datastore.v1.MutationResult result = new com.google.datastore.v1.MutationResult(this); + buildPartialRepeatedFields(result); if (bitField0_ != 0) { buildPartial0(result); } @@ -563,6 +666,18 @@ public com.google.datastore.v1.MutationResult buildPartial() { return result; } + private void buildPartialRepeatedFields(com.google.datastore.v1.MutationResult result) { + if (transformResultsBuilder_ == null) { + if (((bitField0_ & 0x00000020) != 0)) { + transformResults_ = java.util.Collections.unmodifiableList(transformResults_); + bitField0_ = (bitField0_ & ~0x00000020); + } + result.transformResults_ = transformResults_; + } else { + result.transformResults_ = transformResultsBuilder_.build(); + } + } + private void buildPartial0(com.google.datastore.v1.MutationResult result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; @@ -647,6 +762,33 @@ public Builder mergeFrom(com.google.datastore.v1.MutationResult other) { if (other.getConflictDetected() != false) { setConflictDetected(other.getConflictDetected()); } + if (transformResultsBuilder_ == null) { + if (!other.transformResults_.isEmpty()) { + if (transformResults_.isEmpty()) { + transformResults_ = other.transformResults_; + bitField0_ = (bitField0_ & ~0x00000020); + } else { + ensureTransformResultsIsMutable(); + transformResults_.addAll(other.transformResults_); + } + onChanged(); + } + } else { + if (!other.transformResults_.isEmpty()) { + if (transformResultsBuilder_.isEmpty()) { + transformResultsBuilder_.dispose(); + transformResultsBuilder_ = null; + transformResults_ = other.transformResults_; + bitField0_ = (bitField0_ & ~0x00000020); + transformResultsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders + ? getTransformResultsFieldBuilder() + : null; + } else { + transformResultsBuilder_.addAllMessages(other.transformResults_); + } + } + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -703,6 +845,18 @@ public Builder mergeFrom( bitField0_ |= 0x00000004; break; } // case 58 + case 66: + { + com.google.datastore.v1.Value m = + input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry); + if (transformResultsBuilder_ == null) { + ensureTransformResultsIsMutable(); + transformResults_.add(m); + } else { + transformResultsBuilder_.addMessage(m); + } + break; + } // case 66 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -1429,6 +1583,394 @@ public Builder clearConflictDetected() { return this; } + private java.util.List transformResults_ = + java.util.Collections.emptyList(); + + private void ensureTransformResultsIsMutable() { + if (!((bitField0_ & 0x00000020) != 0)) { + transformResults_ = + new java.util.ArrayList(transformResults_); + bitField0_ |= 0x00000020; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder> + transformResultsBuilder_; + + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public java.util.List getTransformResultsList() { + if (transformResultsBuilder_ == null) { + return java.util.Collections.unmodifiableList(transformResults_); + } else { + return transformResultsBuilder_.getMessageList(); + } + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public int getTransformResultsCount() { + if (transformResultsBuilder_ == null) { + return transformResults_.size(); + } else { + return transformResultsBuilder_.getCount(); + } + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public com.google.datastore.v1.Value getTransformResults(int index) { + if (transformResultsBuilder_ == null) { + return transformResults_.get(index); + } else { + return transformResultsBuilder_.getMessage(index); + } + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public Builder setTransformResults(int index, com.google.datastore.v1.Value value) { + if (transformResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTransformResultsIsMutable(); + transformResults_.set(index, value); + onChanged(); + } else { + transformResultsBuilder_.setMessage(index, value); + } + return this; + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public Builder setTransformResults( + int index, com.google.datastore.v1.Value.Builder builderForValue) { + if (transformResultsBuilder_ == null) { + ensureTransformResultsIsMutable(); + transformResults_.set(index, builderForValue.build()); + onChanged(); + } else { + transformResultsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public Builder addTransformResults(com.google.datastore.v1.Value value) { + if (transformResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTransformResultsIsMutable(); + transformResults_.add(value); + onChanged(); + } else { + transformResultsBuilder_.addMessage(value); + } + return this; + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public Builder addTransformResults(int index, com.google.datastore.v1.Value value) { + if (transformResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTransformResultsIsMutable(); + transformResults_.add(index, value); + onChanged(); + } else { + transformResultsBuilder_.addMessage(index, value); + } + return this; + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public Builder addTransformResults(com.google.datastore.v1.Value.Builder builderForValue) { + if (transformResultsBuilder_ == null) { + ensureTransformResultsIsMutable(); + transformResults_.add(builderForValue.build()); + onChanged(); + } else { + transformResultsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public Builder addTransformResults( + int index, com.google.datastore.v1.Value.Builder builderForValue) { + if (transformResultsBuilder_ == null) { + ensureTransformResultsIsMutable(); + transformResults_.add(index, builderForValue.build()); + onChanged(); + } else { + transformResultsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public Builder addAllTransformResults( + java.lang.Iterable values) { + if (transformResultsBuilder_ == null) { + ensureTransformResultsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll(values, transformResults_); + onChanged(); + } else { + transformResultsBuilder_.addAllMessages(values); + } + return this; + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public Builder clearTransformResults() { + if (transformResultsBuilder_ == null) { + transformResults_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000020); + onChanged(); + } else { + transformResultsBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public Builder removeTransformResults(int index) { + if (transformResultsBuilder_ == null) { + ensureTransformResultsIsMutable(); + transformResults_.remove(index); + onChanged(); + } else { + transformResultsBuilder_.remove(index); + } + return this; + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public com.google.datastore.v1.Value.Builder getTransformResultsBuilder(int index) { + return getTransformResultsFieldBuilder().getBuilder(index); + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public com.google.datastore.v1.ValueOrBuilder getTransformResultsOrBuilder(int index) { + if (transformResultsBuilder_ == null) { + return transformResults_.get(index); + } else { + return transformResultsBuilder_.getMessageOrBuilder(index); + } + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public java.util.List + getTransformResultsOrBuilderList() { + if (transformResultsBuilder_ != null) { + return transformResultsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(transformResults_); + } + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public com.google.datastore.v1.Value.Builder addTransformResultsBuilder() { + return getTransformResultsFieldBuilder() + .addBuilder(com.google.datastore.v1.Value.getDefaultInstance()); + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public com.google.datastore.v1.Value.Builder addTransformResultsBuilder(int index) { + return getTransformResultsFieldBuilder() + .addBuilder(index, com.google.datastore.v1.Value.getDefaultInstance()); + } + /** + * + * + * 
+     * The results of applying each
+     * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+     * order of the request.
+     *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + public java.util.List getTransformResultsBuilderList() { + return getTransformResultsFieldBuilder().getBuilderList(); + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder> + getTransformResultsFieldBuilder() { + if (transformResultsBuilder_ == null) { + transformResultsBuilder_ = + new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder>( + transformResults_, + ((bitField0_ & 0x00000020) != 0), + getParentForChildren(), + isClean()); + transformResults_ = null; + } + return transformResultsBuilder_; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java index 7d3b4f895..e4f8c7561 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java @@ -171,4 +171,66 @@ public interface MutationResultOrBuilder * @return The conflictDetected. */ boolean getConflictDetected(); + + /** + * + * + * 
+   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + java.util.List getTransformResultsList(); + /** + * + * + * 
+   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + com.google.datastore.v1.Value getTransformResults(int index); + /** + * + * + * 
+   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + int getTransformResultsCount(); + /** + * + * + * 
+   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + java.util.List + getTransformResultsOrBuilderList(); + /** + * + * + * 
+   * The results of applying each
+   * [PropertyTransform][google.datastore.v1.PropertyTransform], in the same
+   * order of the request.
+   *
+ * + * repeated .google.datastore.v1.Value transform_results = 8; + */ + com.google.datastore.v1.ValueOrBuilder getTransformResultsOrBuilder(int index); } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java new file mode 100644 index 000000000..520ccb0f2 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java @@ -0,0 +1,3197 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +// Protobuf Java Version: 3.25.5 +package com.google.datastore.v1; + +/** + * + * + * 
+ * A transformation of an entity property.
+ *
+ * + * Protobuf type {@code google.datastore.v1.PropertyTransform} + */ +public final class PropertyTransform extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyTransform) + PropertyTransformOrBuilder { + private static final long serialVersionUID = 0L; + // Use PropertyTransform.newBuilder() to construct. + private PropertyTransform(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + + private PropertyTransform() { + property_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new PropertyTransform(); + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_PropertyTransform_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_PropertyTransform_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PropertyTransform.class, + com.google.datastore.v1.PropertyTransform.Builder.class); + } + + /** + * + * + * 
+   * A value that is calculated by the server.
+   *
+ * + * Protobuf enum {@code google.datastore.v1.PropertyTransform.ServerValue} + */ + public enum ServerValue implements com.google.protobuf.ProtocolMessageEnum { + /** + * + * + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * SERVER_VALUE_UNSPECIFIED = 0; + */ + SERVER_VALUE_UNSPECIFIED(0), + /** + * + * + * 
+     * The time at which the server processed the request, with millisecond
+     * precision. If used on multiple properties (same or different entities)
+     * in a transaction, all the properties will get the same server timestamp.
+     *
+ * + * REQUEST_TIME = 1; + */ + REQUEST_TIME(1), + UNRECOGNIZED(-1), + ; + + /** + * + * + * 
+     * Unspecified. This value must not be used.
+     *
+ * + * SERVER_VALUE_UNSPECIFIED = 0; + */ + public static final int SERVER_VALUE_UNSPECIFIED_VALUE = 0; + /** + * + * + * 
+     * The time at which the server processed the request, with millisecond
+     * precision. If used on multiple properties (same or different entities)
+     * in a transaction, all the properties will get the same server timestamp.
+     *
+ * + * REQUEST_TIME = 1; + */ + public static final int REQUEST_TIME_VALUE = 1; + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ServerValue valueOf(int value) { + return forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + */ + public static ServerValue forNumber(int value) { + switch (value) { + case 0: + return SERVER_VALUE_UNSPECIFIED; + case 1: + return REQUEST_TIME; + default: + return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { + return internalValueMap; + } + + private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public ServerValue findValueByNumber(int number) { + return ServerValue.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } + return getDescriptor().getValues().get(ordinal()); + } + + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { + return getDescriptor(); + } + + public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { + return com.google.datastore.v1.PropertyTransform.getDescriptor().getEnumTypes().get(0); + } + + private static final ServerValue[] VALUES = values(); + + public static ServerValue valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private ServerValue(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.datastore.v1.PropertyTransform.ServerValue) + } + + private int transformTypeCase_ = 0; + + @SuppressWarnings("serial") + private java.lang.Object transformType_; + + public enum TransformTypeCase + implements + com.google.protobuf.Internal.EnumLite, + com.google.protobuf.AbstractMessage.InternalOneOfEnum { + SET_TO_SERVER_VALUE(2), + INCREMENT(3), + MAXIMUM(4), + MINIMUM(5), + APPEND_MISSING_ELEMENTS(6), + REMOVE_ALL_FROM_ARRAY(7), + TRANSFORMTYPE_NOT_SET(0); + private final int value; + + private TransformTypeCase(int value) { + this.value = value; + } + /** + * @param value The number of the enum to look for. + * @return The enum associated with the given number. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static TransformTypeCase valueOf(int value) { + return forNumber(value); + } + + public static TransformTypeCase forNumber(int value) { + switch (value) { + case 2: + return SET_TO_SERVER_VALUE; + case 3: + return INCREMENT; + case 4: + return MAXIMUM; + case 5: + return MINIMUM; + case 6: + return APPEND_MISSING_ELEMENTS; + case 7: + return REMOVE_ALL_FROM_ARRAY; + case 0: + return TRANSFORMTYPE_NOT_SET; + default: + return null; + } + } + + public int getNumber() { + return this.value; + } + }; + + public TransformTypeCase getTransformTypeCase() { + return TransformTypeCase.forNumber(transformTypeCase_); + } + + public static final int PROPERTY_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") + private volatile java.lang.Object property_ = ""; + /** + * + * + * 
+   * Optional. The name of the property.
+   *
+   * Property paths (a list of property names separated by dots (`.`)) may be
+   * used to refer to properties inside entity values. For example `foo.bar`
+   * means the property `bar` inside the entity property `foo`.
+   *
+   * If a property name contains a dot `.` or a backlslash `\`, then that name
+   * must be escaped.
+   *
+ * + * string property = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The property. + */ + @java.lang.Override + public java.lang.String getProperty() { + java.lang.Object ref = property_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + property_ = s; + return s; + } + } + /** + * + * + * 
+   * Optional. The name of the property.
+   *
+   * Property paths (a list of property names separated by dots (`.`)) may be
+   * used to refer to properties inside entity values. For example `foo.bar`
+   * means the property `bar` inside the entity property `foo`.
+   *
+   * If a property name contains a dot `.` or a backlslash `\`, then that name
+   * must be escaped.
+   *
+ * + * string property = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for property. + */ + @java.lang.Override + public com.google.protobuf.ByteString getPropertyBytes() { + java.lang.Object ref = property_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + property_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int SET_TO_SERVER_VALUE_FIELD_NUMBER = 2; + /** + * + * + * 
+   * Sets the property to the given server value.
+   *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @return Whether the setToServerValue field is set. + */ + public boolean hasSetToServerValue() { + return transformTypeCase_ == 2; + } + /** + * + * + * 
+   * Sets the property to the given server value.
+   *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @return The enum numeric value on the wire for setToServerValue. + */ + public int getSetToServerValueValue() { + if (transformTypeCase_ == 2) { + return (java.lang.Integer) transformType_; + } + return 0; + } + /** + * + * + * 
+   * Sets the property to the given server value.
+   *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @return The setToServerValue. + */ + public com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue() { + if (transformTypeCase_ == 2) { + com.google.datastore.v1.PropertyTransform.ServerValue result = + com.google.datastore.v1.PropertyTransform.ServerValue.forNumber( + (java.lang.Integer) transformType_); + return result == null + ? com.google.datastore.v1.PropertyTransform.ServerValue.UNRECOGNIZED + : result; + } + return com.google.datastore.v1.PropertyTransform.ServerValue.SERVER_VALUE_UNSPECIFIED; + } + + public static final int INCREMENT_FIELD_NUMBER = 3; + /** + * + * + * 
+   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   *
+ * + * .google.datastore.v1.Value increment = 3; + * + * @return Whether the increment field is set. + */ + @java.lang.Override + public boolean hasIncrement() { + return transformTypeCase_ == 3; + } + /** + * + * + * 
+   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   *
+ * + * .google.datastore.v1.Value increment = 3; + * + * @return The increment. + */ + @java.lang.Override + public com.google.datastore.v1.Value getIncrement() { + if (transformTypeCase_ == 3) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + /** + * + * + * 
+   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   *
+ * + * .google.datastore.v1.Value increment = 3; + */ + @java.lang.Override + public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() { + if (transformTypeCase_ == 3) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + + public static final int MAXIMUM_FIELD_NUMBER = 4; + /** + * + * + * 
+   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value maximum = 4; + * + * @return Whether the maximum field is set. + */ + @java.lang.Override + public boolean hasMaximum() { + return transformTypeCase_ == 4; + } + /** + * + * + * 
+   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value maximum = 4; + * + * @return The maximum. + */ + @java.lang.Override + public com.google.datastore.v1.Value getMaximum() { + if (transformTypeCase_ == 4) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + /** + * + * + * 
+   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value maximum = 4; + */ + @java.lang.Override + public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() { + if (transformTypeCase_ == 4) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + + public static final int MINIMUM_FIELD_NUMBER = 5; + /** + * + * + * 
+   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value minimum = 5; + * + * @return Whether the minimum field is set. + */ + @java.lang.Override + public boolean hasMinimum() { + return transformTypeCase_ == 5; + } + /** + * + * + * 
+   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value minimum = 5; + * + * @return The minimum. + */ + @java.lang.Override + public com.google.datastore.v1.Value getMinimum() { + if (transformTypeCase_ == 5) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + /** + * + * + * 
+   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value minimum = 5; + */ + @java.lang.Override + public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() { + if (transformTypeCase_ == 5) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + + public static final int APPEND_MISSING_ELEMENTS_FIELD_NUMBER = 6; + /** + * + * + * 
+   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + * + * @return Whether the appendMissingElements field is set. + */ + @java.lang.Override + public boolean hasAppendMissingElements() { + return transformTypeCase_ == 6; + } + /** + * + * + * 
+   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + * + * @return The appendMissingElements. + */ + @java.lang.Override + public com.google.datastore.v1.ArrayValue getAppendMissingElements() { + if (transformTypeCase_ == 6) { + return (com.google.datastore.v1.ArrayValue) transformType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + /** + * + * + * 
+   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + */ + @java.lang.Override + public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBuilder() { + if (transformTypeCase_ == 6) { + return (com.google.datastore.v1.ArrayValue) transformType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + + public static final int REMOVE_ALL_FROM_ARRAY_FIELD_NUMBER = 7; + /** + * + * + * 
+   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + * + * @return Whether the removeAllFromArray field is set. + */ + @java.lang.Override + public boolean hasRemoveAllFromArray() { + return transformTypeCase_ == 7; + } + /** + * + * + * 
+   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + * + * @return The removeAllFromArray. + */ + @java.lang.Override + public com.google.datastore.v1.ArrayValue getRemoveAllFromArray() { + if (transformTypeCase_ == 7) { + return (com.google.datastore.v1.ArrayValue) transformType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + /** + * + * + * 
+   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + */ + @java.lang.Override + public com.google.datastore.v1.ArrayValueOrBuilder getRemoveAllFromArrayOrBuilder() { + if (transformTypeCase_ == 7) { + return (com.google.datastore.v1.ArrayValue) transformType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(property_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, property_); + } + if (transformTypeCase_ == 2) { + output.writeEnum(2, ((java.lang.Integer) transformType_)); + } + if (transformTypeCase_ == 3) { + output.writeMessage(3, (com.google.datastore.v1.Value) transformType_); + } + if (transformTypeCase_ == 4) { + output.writeMessage(4, (com.google.datastore.v1.Value) transformType_); + } + if (transformTypeCase_ == 5) { + output.writeMessage(5, (com.google.datastore.v1.Value) transformType_); + } + if (transformTypeCase_ == 6) { + output.writeMessage(6, (com.google.datastore.v1.ArrayValue) transformType_); + } + if (transformTypeCase_ == 7) { + output.writeMessage(7, (com.google.datastore.v1.ArrayValue) transformType_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(property_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, property_); + } + if (transformTypeCase_ == 2) { + size += + com.google.protobuf.CodedOutputStream.computeEnumSize( + 2, ((java.lang.Integer) transformType_)); + } + if (transformTypeCase_ == 3) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 3, (com.google.datastore.v1.Value) transformType_); + } + if (transformTypeCase_ == 4) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 4, (com.google.datastore.v1.Value) transformType_); + } + if (transformTypeCase_ == 5) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 5, (com.google.datastore.v1.Value) transformType_); + } + if (transformTypeCase_ == 6) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 6, (com.google.datastore.v1.ArrayValue) transformType_); + } + if (transformTypeCase_ == 7) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 7, (com.google.datastore.v1.ArrayValue) transformType_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.PropertyTransform)) { + return super.equals(obj); + } + com.google.datastore.v1.PropertyTransform other = + (com.google.datastore.v1.PropertyTransform) obj; + + if (!getProperty().equals(other.getProperty())) return false; + if (!getTransformTypeCase().equals(other.getTransformTypeCase())) return false; + switch (transformTypeCase_) { + case 2: + if (getSetToServerValueValue() != other.getSetToServerValueValue()) return false; + break; + case 3: + if (!getIncrement().equals(other.getIncrement())) return false; + break; + case 4: + if (!getMaximum().equals(other.getMaximum())) return false; + break; + case 5: + if (!getMinimum().equals(other.getMinimum())) return false; + break; + case 6: + if (!getAppendMissingElements().equals(other.getAppendMissingElements())) return false; + break; + case 7: + if (!getRemoveAllFromArray().equals(other.getRemoveAllFromArray())) return false; + break; + case 0: + default: + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PROPERTY_FIELD_NUMBER; + hash = (53 * hash) + getProperty().hashCode(); + switch (transformTypeCase_) { + case 2: + hash = (37 * hash) + SET_TO_SERVER_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getSetToServerValueValue(); + break; + case 3: + hash = (37 * hash) + INCREMENT_FIELD_NUMBER; + hash = (53 * hash) + getIncrement().hashCode(); + break; + case 4: + hash = (37 * hash) + MAXIMUM_FIELD_NUMBER; + hash = (53 * hash) + getMaximum().hashCode(); + break; + case 5: + hash = (37 * hash) + MINIMUM_FIELD_NUMBER; + hash = (53 * hash) + getMinimum().hashCode(); + break; + case 6: + hash = (37 * hash) + APPEND_MISSING_ELEMENTS_FIELD_NUMBER; + hash = (53 * hash) + getAppendMissingElements().hashCode(); + break; + case 7: + hash = (37 * hash) + REMOVE_ALL_FROM_ARRAY_FIELD_NUMBER; + hash = (53 * hash) + getRemoveAllFromArray().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.PropertyTransform parseFrom(java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.PropertyTransform parseFrom( + java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.PropertyTransform parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.PropertyTransform parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.PropertyTransform parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.PropertyTransform parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.PropertyTransform parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.PropertyTransform parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.PropertyTransform parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.PropertyTransform parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.PropertyTransform parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.PropertyTransform parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(com.google.datastore.v1.PropertyTransform prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * + * + * 
+   * A transformation of an entity property.
+   *
+ * + * Protobuf type {@code google.datastore.v1.PropertyTransform} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder + implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyTransform) + com.google.datastore.v1.PropertyTransformOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_PropertyTransform_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_PropertyTransform_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.PropertyTransform.class, + com.google.datastore.v1.PropertyTransform.Builder.class); + } + + // Construct using com.google.datastore.v1.PropertyTransform.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + property_ = ""; + if (incrementBuilder_ != null) { + incrementBuilder_.clear(); + } + if (maximumBuilder_ != null) { + maximumBuilder_.clear(); + } + if (minimumBuilder_ != null) { + minimumBuilder_.clear(); + } + if (appendMissingElementsBuilder_ != null) { + appendMissingElementsBuilder_.clear(); + } + if (removeAllFromArrayBuilder_ != null) { + removeAllFromArrayBuilder_.clear(); + } + transformTypeCase_ = 0; + transformType_ = null; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_PropertyTransform_descriptor; + } + + @java.lang.Override + public com.google.datastore.v1.PropertyTransform getDefaultInstanceForType() { + return com.google.datastore.v1.PropertyTransform.getDefaultInstance(); + } + + @java.lang.Override + public com.google.datastore.v1.PropertyTransform build() { + com.google.datastore.v1.PropertyTransform result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.datastore.v1.PropertyTransform buildPartial() { + com.google.datastore.v1.PropertyTransform result = + new com.google.datastore.v1.PropertyTransform(this); + if (bitField0_ != 0) { + buildPartial0(result); + } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartial0(com.google.datastore.v1.PropertyTransform result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.property_ = property_; + } + } + + private void buildPartialOneofs(com.google.datastore.v1.PropertyTransform result) { + result.transformTypeCase_ = transformTypeCase_; + result.transformType_ = this.transformType_; + if (transformTypeCase_ == 3 && incrementBuilder_ != null) { + result.transformType_ = incrementBuilder_.build(); + } + if (transformTypeCase_ == 4 && maximumBuilder_ != null) { + result.transformType_ = maximumBuilder_.build(); + } + if (transformTypeCase_ == 5 && minimumBuilder_ != null) { + result.transformType_ = minimumBuilder_.build(); + } + if (transformTypeCase_ == 6 && appendMissingElementsBuilder_ != null) { + result.transformType_ = appendMissingElementsBuilder_.build(); + } + if (transformTypeCase_ == 7 && removeAllFromArrayBuilder_ != null) { + result.transformType_ = removeAllFromArrayBuilder_.build(); + } + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + return super.setField(field, value); + } + + @java.lang.Override + public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + + @java.lang.Override + public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + return super.addRepeatedField(field, value); + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.PropertyTransform) { + return mergeFrom((com.google.datastore.v1.PropertyTransform) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.PropertyTransform other) { + if (other == com.google.datastore.v1.PropertyTransform.getDefaultInstance()) return this; + if (!other.getProperty().isEmpty()) { + property_ = other.property_; + bitField0_ |= 0x00000001; + onChanged(); + } + switch (other.getTransformTypeCase()) { + case SET_TO_SERVER_VALUE: + { + setSetToServerValueValue(other.getSetToServerValueValue()); + break; + } + case INCREMENT: + { + mergeIncrement(other.getIncrement()); + break; + } + case MAXIMUM: + { + mergeMaximum(other.getMaximum()); + break; + } + case MINIMUM: + { + mergeMinimum(other.getMinimum()); + break; + } + case APPEND_MISSING_ELEMENTS: + { + mergeAppendMissingElements(other.getAppendMissingElements()); + break; + } + case REMOVE_ALL_FROM_ARRAY: + { + mergeRemoveAllFromArray(other.getRemoveAllFromArray()); + break; + } + case TRANSFORMTYPE_NOT_SET: + { + break; + } + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + property_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: + { + int rawValue = input.readEnum(); + transformTypeCase_ = 2; + transformType_ = rawValue; + break; + } // case 16 + case 26: + { + input.readMessage(getIncrementFieldBuilder().getBuilder(), extensionRegistry); + transformTypeCase_ = 3; + break; + } // case 26 + case 34: + { + input.readMessage(getMaximumFieldBuilder().getBuilder(), extensionRegistry); + transformTypeCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage(getMinimumFieldBuilder().getBuilder(), extensionRegistry); + transformTypeCase_ = 5; + break; + } // case 42 + case 50: + { + input.readMessage( + getAppendMissingElementsFieldBuilder().getBuilder(), extensionRegistry); + transformTypeCase_ = 6; + break; + } // case 50 + case 58: + { + input.readMessage( + getRemoveAllFromArrayFieldBuilder().getBuilder(), extensionRegistry); + transformTypeCase_ = 7; + break; + } // case 58 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private int transformTypeCase_ = 0; + private java.lang.Object transformType_; + + public TransformTypeCase getTransformTypeCase() { + return TransformTypeCase.forNumber(transformTypeCase_); + } + + public Builder clearTransformType() { + transformTypeCase_ = 0; + transformType_ = null; + onChanged(); + return this; + } + + private int bitField0_; + + private java.lang.Object property_ = ""; + /** + * + * + * 
+     * Optional. The name of the property.
+     *
+     * Property paths (a list of property names separated by dots (`.`)) may be
+     * used to refer to properties inside entity values. For example `foo.bar`
+     * means the property `bar` inside the entity property `foo`.
+     *
+     * If a property name contains a dot `.` or a backlslash `\`, then that name
+     * must be escaped.
+     *
+ * + * string property = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The property. + */ + public java.lang.String getProperty() { + java.lang.Object ref = property_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + property_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+     * Optional. The name of the property.
+     *
+     * Property paths (a list of property names separated by dots (`.`)) may be
+     * used to refer to properties inside entity values. For example `foo.bar`
+     * means the property `bar` inside the entity property `foo`.
+     *
+     * If a property name contains a dot `.` or a backlslash `\`, then that name
+     * must be escaped.
+     *
+ * + * string property = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for property. + */ + public com.google.protobuf.ByteString getPropertyBytes() { + java.lang.Object ref = property_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + property_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+     * Optional. The name of the property.
+     *
+     * Property paths (a list of property names separated by dots (`.`)) may be
+     * used to refer to properties inside entity values. For example `foo.bar`
+     * means the property `bar` inside the entity property `foo`.
+     *
+     * If a property name contains a dot `.` or a backlslash `\`, then that name
+     * must be escaped.
+     *
+ * + * string property = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * @param value The property to set. + * @return This builder for chaining. + */ + public Builder setProperty(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + property_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. The name of the property.
+     *
+     * Property paths (a list of property names separated by dots (`.`)) may be
+     * used to refer to properties inside entity values. For example `foo.bar`
+     * means the property `bar` inside the entity property `foo`.
+     *
+     * If a property name contains a dot `.` or a backlslash `\`, then that name
+     * must be escaped.
+     *
+ * + * string property = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return This builder for chaining. + */ + public Builder clearProperty() { + property_ = getDefaultInstance().getProperty(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. The name of the property.
+     *
+     * Property paths (a list of property names separated by dots (`.`)) may be
+     * used to refer to properties inside entity values. For example `foo.bar`
+     * means the property `bar` inside the entity property `foo`.
+     *
+     * If a property name contains a dot `.` or a backlslash `\`, then that name
+     * must be escaped.
+     *
+ * + * string property = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * @param value The bytes for property to set. + * @return This builder for chaining. + */ + public Builder setPropertyBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + property_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + /** + * + * + * 
+     * Sets the property to the given server value.
+     *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @return Whether the setToServerValue field is set. + */ + @java.lang.Override + public boolean hasSetToServerValue() { + return transformTypeCase_ == 2; + } + /** + * + * + * 
+     * Sets the property to the given server value.
+     *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @return The enum numeric value on the wire for setToServerValue. + */ + @java.lang.Override + public int getSetToServerValueValue() { + if (transformTypeCase_ == 2) { + return ((java.lang.Integer) transformType_).intValue(); + } + return 0; + } + /** + * + * + * 
+     * Sets the property to the given server value.
+     *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @param value The enum numeric value on the wire for setToServerValue to set. + * @return This builder for chaining. + */ + public Builder setSetToServerValueValue(int value) { + transformTypeCase_ = 2; + transformType_ = value; + onChanged(); + return this; + } + /** + * + * + * 
+     * Sets the property to the given server value.
+     *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @return The setToServerValue. + */ + @java.lang.Override + public com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue() { + if (transformTypeCase_ == 2) { + com.google.datastore.v1.PropertyTransform.ServerValue result = + com.google.datastore.v1.PropertyTransform.ServerValue.forNumber( + (java.lang.Integer) transformType_); + return result == null + ? com.google.datastore.v1.PropertyTransform.ServerValue.UNRECOGNIZED + : result; + } + return com.google.datastore.v1.PropertyTransform.ServerValue.SERVER_VALUE_UNSPECIFIED; + } + /** + * + * + * 
+     * Sets the property to the given server value.
+     *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @param value The setToServerValue to set. + * @return This builder for chaining. + */ + public Builder setSetToServerValue( + com.google.datastore.v1.PropertyTransform.ServerValue value) { + if (value == null) { + throw new NullPointerException(); + } + transformTypeCase_ = 2; + transformType_ = value.getNumber(); + onChanged(); + return this; + } + /** + * + * + * 
+     * Sets the property to the given server value.
+     *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @return This builder for chaining. + */ + public Builder clearSetToServerValue() { + if (transformTypeCase_ == 2) { + transformTypeCase_ = 0; + transformType_ = null; + onChanged(); + } + return this; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder> + incrementBuilder_; + /** + * + * + * 
+     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     *
+ * + * .google.datastore.v1.Value increment = 3; + * + * @return Whether the increment field is set. + */ + @java.lang.Override + public boolean hasIncrement() { + return transformTypeCase_ == 3; + } + /** + * + * + * 
+     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     *
+ * + * .google.datastore.v1.Value increment = 3; + * + * @return The increment. + */ + @java.lang.Override + public com.google.datastore.v1.Value getIncrement() { + if (incrementBuilder_ == null) { + if (transformTypeCase_ == 3) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } else { + if (transformTypeCase_ == 3) { + return incrementBuilder_.getMessage(); + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     *
+ * + * .google.datastore.v1.Value increment = 3; + */ + public Builder setIncrement(com.google.datastore.v1.Value value) { + if (incrementBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + transformType_ = value; + onChanged(); + } else { + incrementBuilder_.setMessage(value); + } + transformTypeCase_ = 3; + return this; + } + /** + * + * + * 
+     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     *
+ * + * .google.datastore.v1.Value increment = 3; + */ + public Builder setIncrement(com.google.datastore.v1.Value.Builder builderForValue) { + if (incrementBuilder_ == null) { + transformType_ = builderForValue.build(); + onChanged(); + } else { + incrementBuilder_.setMessage(builderForValue.build()); + } + transformTypeCase_ = 3; + return this; + } + /** + * + * + * 
+     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     *
+ * + * .google.datastore.v1.Value increment = 3; + */ + public Builder mergeIncrement(com.google.datastore.v1.Value value) { + if (incrementBuilder_ == null) { + if (transformTypeCase_ == 3 + && transformType_ != com.google.datastore.v1.Value.getDefaultInstance()) { + transformType_ = + com.google.datastore.v1.Value.newBuilder( + (com.google.datastore.v1.Value) transformType_) + .mergeFrom(value) + .buildPartial(); + } else { + transformType_ = value; + } + onChanged(); + } else { + if (transformTypeCase_ == 3) { + incrementBuilder_.mergeFrom(value); + } else { + incrementBuilder_.setMessage(value); + } + } + transformTypeCase_ = 3; + return this; + } + /** + * + * + * 
+     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     *
+ * + * .google.datastore.v1.Value increment = 3; + */ + public Builder clearIncrement() { + if (incrementBuilder_ == null) { + if (transformTypeCase_ == 3) { + transformTypeCase_ = 0; + transformType_ = null; + onChanged(); + } + } else { + if (transformTypeCase_ == 3) { + transformTypeCase_ = 0; + transformType_ = null; + } + incrementBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     *
+ * + * .google.datastore.v1.Value increment = 3; + */ + public com.google.datastore.v1.Value.Builder getIncrementBuilder() { + return getIncrementFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     *
+ * + * .google.datastore.v1.Value increment = 3; + */ + @java.lang.Override + public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() { + if ((transformTypeCase_ == 3) && (incrementBuilder_ != null)) { + return incrementBuilder_.getMessageOrBuilder(); + } else { + if (transformTypeCase_ == 3) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Adds the given value to the property's current value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If either of the given value or the current property value are doubles,
+     * both values will be interpreted as doubles. Double arithmetic and
+     * representation of double values follows IEEE 754 semantics.
+     * If there is positive/negative integer overflow, the property is resolved
+     * to the largest magnitude positive/negative integer.
+     *
+ * + * .google.datastore.v1.Value increment = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder> + getIncrementFieldBuilder() { + if (incrementBuilder_ == null) { + if (!(transformTypeCase_ == 3)) { + transformType_ = com.google.datastore.v1.Value.getDefaultInstance(); + } + incrementBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder>( + (com.google.datastore.v1.Value) transformType_, getParentForChildren(), isClean()); + transformType_ = null; + } + transformTypeCase_ = 3; + onChanged(); + return incrementBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder> + maximumBuilder_; + /** + * + * + * 
+     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value maximum = 4; + * + * @return Whether the maximum field is set. + */ + @java.lang.Override + public boolean hasMaximum() { + return transformTypeCase_ == 4; + } + /** + * + * + * 
+     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value maximum = 4; + * + * @return The maximum. + */ + @java.lang.Override + public com.google.datastore.v1.Value getMaximum() { + if (maximumBuilder_ == null) { + if (transformTypeCase_ == 4) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } else { + if (transformTypeCase_ == 4) { + return maximumBuilder_.getMessage(); + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value maximum = 4; + */ + public Builder setMaximum(com.google.datastore.v1.Value value) { + if (maximumBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + transformType_ = value; + onChanged(); + } else { + maximumBuilder_.setMessage(value); + } + transformTypeCase_ = 4; + return this; + } + /** + * + * + * 
+     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value maximum = 4; + */ + public Builder setMaximum(com.google.datastore.v1.Value.Builder builderForValue) { + if (maximumBuilder_ == null) { + transformType_ = builderForValue.build(); + onChanged(); + } else { + maximumBuilder_.setMessage(builderForValue.build()); + } + transformTypeCase_ = 4; + return this; + } + /** + * + * + * 
+     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value maximum = 4; + */ + public Builder mergeMaximum(com.google.datastore.v1.Value value) { + if (maximumBuilder_ == null) { + if (transformTypeCase_ == 4 + && transformType_ != com.google.datastore.v1.Value.getDefaultInstance()) { + transformType_ = + com.google.datastore.v1.Value.newBuilder( + (com.google.datastore.v1.Value) transformType_) + .mergeFrom(value) + .buildPartial(); + } else { + transformType_ = value; + } + onChanged(); + } else { + if (transformTypeCase_ == 4) { + maximumBuilder_.mergeFrom(value); + } else { + maximumBuilder_.setMessage(value); + } + } + transformTypeCase_ = 4; + return this; + } + /** + * + * + * 
+     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value maximum = 4; + */ + public Builder clearMaximum() { + if (maximumBuilder_ == null) { + if (transformTypeCase_ == 4) { + transformTypeCase_ = 0; + transformType_ = null; + onChanged(); + } + } else { + if (transformTypeCase_ == 4) { + transformTypeCase_ = 0; + transformType_ = null; + } + maximumBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value maximum = 4; + */ + public com.google.datastore.v1.Value.Builder getMaximumBuilder() { + return getMaximumFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value maximum = 4; + */ + @java.lang.Override + public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() { + if ((transformTypeCase_ == 4) && (maximumBuilder_ != null)) { + return maximumBuilder_.getMessageOrBuilder(); + } else { + if (transformTypeCase_ == 4) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Sets the property to the maximum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the given value.
+     * If a maximum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the larger operand. If the operands are
+     * equivalent (e.g. 3 and 3.0), the property does not change.
+     * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+     * zero input value is always the stored value.
+     * The maximum of any numeric value x and NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value maximum = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder> + getMaximumFieldBuilder() { + if (maximumBuilder_ == null) { + if (!(transformTypeCase_ == 4)) { + transformType_ = com.google.datastore.v1.Value.getDefaultInstance(); + } + maximumBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder>( + (com.google.datastore.v1.Value) transformType_, getParentForChildren(), isClean()); + transformType_ = null; + } + transformTypeCase_ = 4; + onChanged(); + return maximumBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder> + minimumBuilder_; + /** + * + * + * 
+     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value minimum = 5; + * + * @return Whether the minimum field is set. + */ + @java.lang.Override + public boolean hasMinimum() { + return transformTypeCase_ == 5; + } + /** + * + * + * 
+     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value minimum = 5; + * + * @return The minimum. + */ + @java.lang.Override + public com.google.datastore.v1.Value getMinimum() { + if (minimumBuilder_ == null) { + if (transformTypeCase_ == 5) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } else { + if (transformTypeCase_ == 5) { + return minimumBuilder_.getMessage(); + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value minimum = 5; + */ + public Builder setMinimum(com.google.datastore.v1.Value value) { + if (minimumBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + transformType_ = value; + onChanged(); + } else { + minimumBuilder_.setMessage(value); + } + transformTypeCase_ = 5; + return this; + } + /** + * + * + * 
+     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value minimum = 5; + */ + public Builder setMinimum(com.google.datastore.v1.Value.Builder builderForValue) { + if (minimumBuilder_ == null) { + transformType_ = builderForValue.build(); + onChanged(); + } else { + minimumBuilder_.setMessage(builderForValue.build()); + } + transformTypeCase_ = 5; + return this; + } + /** + * + * + * 
+     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value minimum = 5; + */ + public Builder mergeMinimum(com.google.datastore.v1.Value value) { + if (minimumBuilder_ == null) { + if (transformTypeCase_ == 5 + && transformType_ != com.google.datastore.v1.Value.getDefaultInstance()) { + transformType_ = + com.google.datastore.v1.Value.newBuilder( + (com.google.datastore.v1.Value) transformType_) + .mergeFrom(value) + .buildPartial(); + } else { + transformType_ = value; + } + onChanged(); + } else { + if (transformTypeCase_ == 5) { + minimumBuilder_.mergeFrom(value); + } else { + minimumBuilder_.setMessage(value); + } + } + transformTypeCase_ = 5; + return this; + } + /** + * + * + * 
+     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value minimum = 5; + */ + public Builder clearMinimum() { + if (minimumBuilder_ == null) { + if (transformTypeCase_ == 5) { + transformTypeCase_ = 0; + transformType_ = null; + onChanged(); + } + } else { + if (transformTypeCase_ == 5) { + transformTypeCase_ = 0; + transformType_ = null; + } + minimumBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value minimum = 5; + */ + public com.google.datastore.v1.Value.Builder getMinimumBuilder() { + return getMinimumFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value minimum = 5; + */ + @java.lang.Override + public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() { + if ((transformTypeCase_ == 5) && (minimumBuilder_ != null)) { + return minimumBuilder_.getMessageOrBuilder(); + } else { + if (transformTypeCase_ == 5) { + return (com.google.datastore.v1.Value) transformType_; + } + return com.google.datastore.v1.Value.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Sets the property to the minimum of its current value and the given
+     * value.
+     *
+     * This must be an integer or a double value.
+     * If the property is not an integer or double, or if the property does not
+     * yet exist, the transformation will set the property to the input value.
+     * If a minimum operation is applied where the property and the input value
+     * are of mixed types (that is - one is an integer and one is a double)
+     * the property takes on the type of the smaller operand. If the operands
+     * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+     * and -0.0 are all zero. The minimum of a zero stored value and zero input
+     * value is always the stored value. The minimum of any numeric value x and
+     * NaN is NaN.
+     *
+ * + * .google.datastore.v1.Value minimum = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder> + getMinimumFieldBuilder() { + if (minimumBuilder_ == null) { + if (!(transformTypeCase_ == 5)) { + transformType_ = com.google.datastore.v1.Value.getDefaultInstance(); + } + minimumBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder>( + (com.google.datastore.v1.Value) transformType_, getParentForChildren(), isClean()); + transformType_ = null; + } + transformTypeCase_ = 5; + onChanged(); + return minimumBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ArrayValue, + com.google.datastore.v1.ArrayValue.Builder, + com.google.datastore.v1.ArrayValueOrBuilder> + appendMissingElementsBuilder_; + /** + * + * + * 
+     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + * + * @return Whether the appendMissingElements field is set. + */ + @java.lang.Override + public boolean hasAppendMissingElements() { + return transformTypeCase_ == 6; + } + /** + * + * + * 
+     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + * + * @return The appendMissingElements. + */ + @java.lang.Override + public com.google.datastore.v1.ArrayValue getAppendMissingElements() { + if (appendMissingElementsBuilder_ == null) { + if (transformTypeCase_ == 6) { + return (com.google.datastore.v1.ArrayValue) transformType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } else { + if (transformTypeCase_ == 6) { + return appendMissingElementsBuilder_.getMessage(); + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + */ + public Builder setAppendMissingElements(com.google.datastore.v1.ArrayValue value) { + if (appendMissingElementsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + transformType_ = value; + onChanged(); + } else { + appendMissingElementsBuilder_.setMessage(value); + } + transformTypeCase_ = 6; + return this; + } + /** + * + * + * 
+     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + */ + public Builder setAppendMissingElements( + com.google.datastore.v1.ArrayValue.Builder builderForValue) { + if (appendMissingElementsBuilder_ == null) { + transformType_ = builderForValue.build(); + onChanged(); + } else { + appendMissingElementsBuilder_.setMessage(builderForValue.build()); + } + transformTypeCase_ = 6; + return this; + } + /** + * + * + * 
+     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + */ + public Builder mergeAppendMissingElements(com.google.datastore.v1.ArrayValue value) { + if (appendMissingElementsBuilder_ == null) { + if (transformTypeCase_ == 6 + && transformType_ != com.google.datastore.v1.ArrayValue.getDefaultInstance()) { + transformType_ = + com.google.datastore.v1.ArrayValue.newBuilder( + (com.google.datastore.v1.ArrayValue) transformType_) + .mergeFrom(value) + .buildPartial(); + } else { + transformType_ = value; + } + onChanged(); + } else { + if (transformTypeCase_ == 6) { + appendMissingElementsBuilder_.mergeFrom(value); + } else { + appendMissingElementsBuilder_.setMessage(value); + } + } + transformTypeCase_ = 6; + return this; + } + /** + * + * + * 
+     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + */ + public Builder clearAppendMissingElements() { + if (appendMissingElementsBuilder_ == null) { + if (transformTypeCase_ == 6) { + transformTypeCase_ = 0; + transformType_ = null; + onChanged(); + } + } else { + if (transformTypeCase_ == 6) { + transformTypeCase_ = 0; + transformType_ = null; + } + appendMissingElementsBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + */ + public com.google.datastore.v1.ArrayValue.Builder getAppendMissingElementsBuilder() { + return getAppendMissingElementsFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + */ + @java.lang.Override + public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBuilder() { + if ((transformTypeCase_ == 6) && (appendMissingElementsBuilder_ != null)) { + return appendMissingElementsBuilder_.getMessageOrBuilder(); + } else { + if (transformTypeCase_ == 6) { + return (com.google.datastore.v1.ArrayValue) transformType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Appends the given elements in order if they are not already present in
+     * the current property value.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is first set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when checking if a value is missing.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * If the input contains multiple equivalent values, only the first will
+     * be considered.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ArrayValue, + com.google.datastore.v1.ArrayValue.Builder, + com.google.datastore.v1.ArrayValueOrBuilder> + getAppendMissingElementsFieldBuilder() { + if (appendMissingElementsBuilder_ == null) { + if (!(transformTypeCase_ == 6)) { + transformType_ = com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + appendMissingElementsBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ArrayValue, + com.google.datastore.v1.ArrayValue.Builder, + com.google.datastore.v1.ArrayValueOrBuilder>( + (com.google.datastore.v1.ArrayValue) transformType_, + getParentForChildren(), + isClean()); + transformType_ = null; + } + transformTypeCase_ = 6; + onChanged(); + return appendMissingElementsBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ArrayValue, + com.google.datastore.v1.ArrayValue.Builder, + com.google.datastore.v1.ArrayValueOrBuilder> + removeAllFromArrayBuilder_; + /** + * + * + * 
+     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + * + * @return Whether the removeAllFromArray field is set. + */ + @java.lang.Override + public boolean hasRemoveAllFromArray() { + return transformTypeCase_ == 7; + } + /** + * + * + * 
+     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + * + * @return The removeAllFromArray. + */ + @java.lang.Override + public com.google.datastore.v1.ArrayValue getRemoveAllFromArray() { + if (removeAllFromArrayBuilder_ == null) { + if (transformTypeCase_ == 7) { + return (com.google.datastore.v1.ArrayValue) transformType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } else { + if (transformTypeCase_ == 7) { + return removeAllFromArrayBuilder_.getMessage(); + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + */ + public Builder setRemoveAllFromArray(com.google.datastore.v1.ArrayValue value) { + if (removeAllFromArrayBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + transformType_ = value; + onChanged(); + } else { + removeAllFromArrayBuilder_.setMessage(value); + } + transformTypeCase_ = 7; + return this; + } + /** + * + * + * 
+     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + */ + public Builder setRemoveAllFromArray( + com.google.datastore.v1.ArrayValue.Builder builderForValue) { + if (removeAllFromArrayBuilder_ == null) { + transformType_ = builderForValue.build(); + onChanged(); + } else { + removeAllFromArrayBuilder_.setMessage(builderForValue.build()); + } + transformTypeCase_ = 7; + return this; + } + /** + * + * + * 
+     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + */ + public Builder mergeRemoveAllFromArray(com.google.datastore.v1.ArrayValue value) { + if (removeAllFromArrayBuilder_ == null) { + if (transformTypeCase_ == 7 + && transformType_ != com.google.datastore.v1.ArrayValue.getDefaultInstance()) { + transformType_ = + com.google.datastore.v1.ArrayValue.newBuilder( + (com.google.datastore.v1.ArrayValue) transformType_) + .mergeFrom(value) + .buildPartial(); + } else { + transformType_ = value; + } + onChanged(); + } else { + if (transformTypeCase_ == 7) { + removeAllFromArrayBuilder_.mergeFrom(value); + } else { + removeAllFromArrayBuilder_.setMessage(value); + } + } + transformTypeCase_ = 7; + return this; + } + /** + * + * + * 
+     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + */ + public Builder clearRemoveAllFromArray() { + if (removeAllFromArrayBuilder_ == null) { + if (transformTypeCase_ == 7) { + transformTypeCase_ = 0; + transformType_ = null; + onChanged(); + } + } else { + if (transformTypeCase_ == 7) { + transformTypeCase_ = 0; + transformType_ = null; + } + removeAllFromArrayBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + */ + public com.google.datastore.v1.ArrayValue.Builder getRemoveAllFromArrayBuilder() { + return getRemoveAllFromArrayFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + */ + @java.lang.Override + public com.google.datastore.v1.ArrayValueOrBuilder getRemoveAllFromArrayOrBuilder() { + if ((transformTypeCase_ == 7) && (removeAllFromArrayBuilder_ != null)) { + return removeAllFromArrayBuilder_.getMessageOrBuilder(); + } else { + if (transformTypeCase_ == 7) { + return (com.google.datastore.v1.ArrayValue) transformType_; + } + return com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Removes all of the given elements from the array in the property.
+     * If the property is not an array, or if the property does not yet exist,
+     * it is set to the empty array.
+     *
+     * Equivalent numbers of different types (e.g. 3L and 3.0) are
+     * considered equal when deciding whether an element should be removed.
+     * NaN is equal to NaN, and the null value is equal to the null value.
+     * This will remove all equivalent values if there are duplicates.
+     *
+     * The corresponding transform result will be the null value.
+     *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ArrayValue, + com.google.datastore.v1.ArrayValue.Builder, + com.google.datastore.v1.ArrayValueOrBuilder> + getRemoveAllFromArrayFieldBuilder() { + if (removeAllFromArrayBuilder_ == null) { + if (!(transformTypeCase_ == 7)) { + transformType_ = com.google.datastore.v1.ArrayValue.getDefaultInstance(); + } + removeAllFromArrayBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.ArrayValue, + com.google.datastore.v1.ArrayValue.Builder, + com.google.datastore.v1.ArrayValueOrBuilder>( + (com.google.datastore.v1.ArrayValue) transformType_, + getParentForChildren(), + isClean()); + transformType_ = null; + } + transformTypeCase_ = 7; + onChanged(); + return removeAllFromArrayBuilder_; + } + + @java.lang.Override + public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyTransform) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyTransform) + private static final com.google.datastore.v1.PropertyTransform DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyTransform(); + } + + public static com.google.datastore.v1.PropertyTransform getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PropertyTransform parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.datastore.v1.PropertyTransform getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java new file mode 100644 index 000000000..34782a859 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java @@ -0,0 +1,438 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +// Protobuf Java Version: 3.25.5 +package com.google.datastore.v1; + +public interface PropertyTransformOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyTransform) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+   * Optional. The name of the property.
+   *
+   * Property paths (a list of property names separated by dots (`.`)) may be
+   * used to refer to properties inside entity values. For example `foo.bar`
+   * means the property `bar` inside the entity property `foo`.
+   *
+   * If a property name contains a dot `.` or a backlslash `\`, then that name
+   * must be escaped.
+   *
+ * + * string property = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The property. + */ + java.lang.String getProperty(); + /** + * + * + * 
+   * Optional. The name of the property.
+   *
+   * Property paths (a list of property names separated by dots (`.`)) may be
+   * used to refer to properties inside entity values. For example `foo.bar`
+   * means the property `bar` inside the entity property `foo`.
+   *
+   * If a property name contains a dot `.` or a backlslash `\`, then that name
+   * must be escaped.
+   *
+ * + * string property = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for property. + */ + com.google.protobuf.ByteString getPropertyBytes(); + + /** + * + * + * 
+   * Sets the property to the given server value.
+   *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @return Whether the setToServerValue field is set. + */ + boolean hasSetToServerValue(); + /** + * + * + * 
+   * Sets the property to the given server value.
+   *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @return The enum numeric value on the wire for setToServerValue. + */ + int getSetToServerValueValue(); + /** + * + * + * 
+   * Sets the property to the given server value.
+   *
+ * + * .google.datastore.v1.PropertyTransform.ServerValue set_to_server_value = 2; + * + * @return The setToServerValue. + */ + com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue(); + + /** + * + * + * 
+   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   *
+ * + * .google.datastore.v1.Value increment = 3; + * + * @return Whether the increment field is set. + */ + boolean hasIncrement(); + /** + * + * + * 
+   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   *
+ * + * .google.datastore.v1.Value increment = 3; + * + * @return The increment. + */ + com.google.datastore.v1.Value getIncrement(); + /** + * + * + * 
+   * Adds the given value to the property's current value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If either of the given value or the current property value are doubles,
+   * both values will be interpreted as doubles. Double arithmetic and
+   * representation of double values follows IEEE 754 semantics.
+   * If there is positive/negative integer overflow, the property is resolved
+   * to the largest magnitude positive/negative integer.
+   *
+ * + * .google.datastore.v1.Value increment = 3; + */ + com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder(); + + /** + * + * + * 
+   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value maximum = 4; + * + * @return Whether the maximum field is set. + */ + boolean hasMaximum(); + /** + * + * + * 
+   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value maximum = 4; + * + * @return The maximum. + */ + com.google.datastore.v1.Value getMaximum(); + /** + * + * + * 
+   * Sets the property to the maximum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the given value.
+   * If a maximum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the larger operand. If the operands are
+   * equivalent (e.g. 3 and 3.0), the property does not change.
+   * 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and
+   * zero input value is always the stored value.
+   * The maximum of any numeric value x and NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value maximum = 4; + */ + com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder(); + + /** + * + * + * 
+   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value minimum = 5; + * + * @return Whether the minimum field is set. + */ + boolean hasMinimum(); + /** + * + * + * 
+   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value minimum = 5; + * + * @return The minimum. + */ + com.google.datastore.v1.Value getMinimum(); + /** + * + * + * 
+   * Sets the property to the minimum of its current value and the given
+   * value.
+   *
+   * This must be an integer or a double value.
+   * If the property is not an integer or double, or if the property does not
+   * yet exist, the transformation will set the property to the input value.
+   * If a minimum operation is applied where the property and the input value
+   * are of mixed types (that is - one is an integer and one is a double)
+   * the property takes on the type of the smaller operand. If the operands
+   * are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0,
+   * and -0.0 are all zero. The minimum of a zero stored value and zero input
+   * value is always the stored value. The minimum of any numeric value x and
+   * NaN is NaN.
+   *
+ * + * .google.datastore.v1.Value minimum = 5; + */ + com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder(); + + /** + * + * + * 
+   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + * + * @return Whether the appendMissingElements field is set. + */ + boolean hasAppendMissingElements(); + /** + * + * + * 
+   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + * + * @return The appendMissingElements. + */ + com.google.datastore.v1.ArrayValue getAppendMissingElements(); + /** + * + * + * 
+   * Appends the given elements in order if they are not already present in
+   * the current property value.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is first set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when checking if a value is missing.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * If the input contains multiple equivalent values, only the first will
+   * be considered.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue append_missing_elements = 6; + */ + com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBuilder(); + + /** + * + * + * 
+   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + * + * @return Whether the removeAllFromArray field is set. + */ + boolean hasRemoveAllFromArray(); + /** + * + * + * 
+   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + * + * @return The removeAllFromArray. + */ + com.google.datastore.v1.ArrayValue getRemoveAllFromArray(); + /** + * + * + * 
+   * Removes all of the given elements from the array in the property.
+   * If the property is not an array, or if the property does not yet exist,
+   * it is set to the empty array.
+   *
+   * Equivalent numbers of different types (e.g. 3L and 3.0) are
+   * considered equal when deciding whether an element should be removed.
+   * NaN is equal to NaN, and the null value is equal to the null value.
+   * This will remove all equivalent values if there are duplicates.
+   *
+   * The corresponding transform result will be the null value.
+   *
+ * + * .google.datastore.v1.ArrayValue remove_all_from_array = 7; + */ + com.google.datastore.v1.ArrayValueOrBuilder getRemoveAllFromArrayOrBuilder(); + + com.google.datastore.v1.PropertyTransform.TransformTypeCase getTransformTypeCase(); +} diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto index 9c44501af..c0683b9ba 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto @@ -501,6 +501,18 @@ message ReserveIdsResponse {} // A mutation to apply to an entity. message Mutation { + // The possible ways to resolve a conflict detected in a mutation. + enum ConflictResolutionStrategy { + // Unspecified. Defaults to `SERVER_VALUE`. + STRATEGY_UNSPECIFIED = 0; + + // The server entity is kept. + SERVER_VALUE = 1; + + // The whole commit request fails. + FAIL = 3; + } + // The mutation operation. // // For `insert`, `update`, and `upsert`: @@ -542,6 +554,11 @@ message Mutation { google.protobuf.Timestamp update_time = 11; } + // The strategy to use when a conflict is detected. Defaults to + // `SERVER_VALUE`. + // If this is set, then `conflict_detection_strategy` must also be set. + ConflictResolutionStrategy conflict_resolution_strategy = 10; + // The properties to write in this mutation. // None of the properties in the mask may have a reserved name, except for // `__key__`. @@ -551,6 +568,112 @@ message Mutation { // updated, others are left untouched. // Properties referenced in the mask but not in the entity are deleted. PropertyMask property_mask = 9; + + // Optional. The transforms to perform on the entity. + // + // This field can be set only when the operation is `insert`, `update`, + // or `upsert`. If present, the transforms are be applied to the entity + // regardless of the property mask, in order, after the operation. + repeated PropertyTransform property_transforms = 12 + [(google.api.field_behavior) = OPTIONAL]; +} + +// A transformation of an entity property. +message PropertyTransform { + // A value that is calculated by the server. + enum ServerValue { + // Unspecified. This value must not be used. + SERVER_VALUE_UNSPECIFIED = 0; + + // The time at which the server processed the request, with millisecond + // precision. If used on multiple properties (same or different entities) + // in a transaction, all the properties will get the same server timestamp. + REQUEST_TIME = 1; + } + + // Optional. The name of the property. + // + // Property paths (a list of property names separated by dots (`.`)) may be + // used to refer to properties inside entity values. For example `foo.bar` + // means the property `bar` inside the entity property `foo`. + // + // If a property name contains a dot `.` or a backlslash `\`, then that name + // must be escaped. + string property = 1 [(google.api.field_behavior) = OPTIONAL]; + + // The transformation to apply to the property. + oneof transform_type { + // Sets the property to the given server value. + ServerValue set_to_server_value = 2; + + // Adds the given value to the property's current value. + // + // This must be an integer or a double value. + // If the property is not an integer or double, or if the property does not + // yet exist, the transformation will set the property to the given value. + // If either of the given value or the current property value are doubles, + // both values will be interpreted as doubles. Double arithmetic and + // representation of double values follows IEEE 754 semantics. + // If there is positive/negative integer overflow, the property is resolved + // to the largest magnitude positive/negative integer. + Value increment = 3; + + // Sets the property to the maximum of its current value and the given + // value. + // + // This must be an integer or a double value. + // If the property is not an integer or double, or if the property does not + // yet exist, the transformation will set the property to the given value. + // If a maximum operation is applied where the property and the input value + // are of mixed types (that is - one is an integer and one is a double) + // the property takes on the type of the larger operand. If the operands are + // equivalent (e.g. 3 and 3.0), the property does not change. + // 0, 0.0, and -0.0 are all zero. The maximum of a zero stored value and + // zero input value is always the stored value. + // The maximum of any numeric value x and NaN is NaN. + Value maximum = 4; + + // Sets the property to the minimum of its current value and the given + // value. + // + // This must be an integer or a double value. + // If the property is not an integer or double, or if the property does not + // yet exist, the transformation will set the property to the input value. + // If a minimum operation is applied where the property and the input value + // are of mixed types (that is - one is an integer and one is a double) + // the property takes on the type of the smaller operand. If the operands + // are equivalent (e.g. 3 and 3.0), the property does not change. 0, 0.0, + // and -0.0 are all zero. The minimum of a zero stored value and zero input + // value is always the stored value. The minimum of any numeric value x and + // NaN is NaN. + Value minimum = 5; + + // Appends the given elements in order if they are not already present in + // the current property value. + // If the property is not an array, or if the property does not yet exist, + // it is first set to the empty array. + // + // Equivalent numbers of different types (e.g. 3L and 3.0) are + // considered equal when checking if a value is missing. + // NaN is equal to NaN, and the null value is equal to the null value. + // If the input contains multiple equivalent values, only the first will + // be considered. + // + // The corresponding transform result will be the null value. + ArrayValue append_missing_elements = 6; + + // Removes all of the given elements from the array in the property. + // If the property is not an array, or if the property does not yet exist, + // it is set to the empty array. + // + // Equivalent numbers of different types (e.g. 3L and 3.0) are + // considered equal when deciding whether an element should be removed. + // NaN is equal to NaN, and the null value is equal to the null value. + // This will remove all equivalent values if there are duplicates. + // + // The corresponding transform result will be the null value. + ArrayValue remove_all_from_array = 7; + } } // The result of applying a mutation. @@ -578,6 +701,11 @@ message MutationResult { // Whether a conflict was detected for this mutation. Always false when a // conflict detection strategy field is not set in the mutation. bool conflict_detected = 5; + + // The results of applying each + // [PropertyTransform][google.datastore.v1.PropertyTransform], in the same + // order of the request. + repeated Value transform_results = 8; } // The set of arbitrarily nested property paths used to restrict an operation to @@ -611,16 +739,13 @@ message ReadOptions { EVENTUAL = 2; } - // For Cloud Datastore, if read_consistency is not specified, then lookups and - // ancestor queries default to `read_consistency`=`STRONG`, global queries - // default to `read_consistency`=`EVENTUAL`. - // - // For Cloud Firestore in Datastore mode, if read_consistency is not specified - // then lookups and all queries default to `read_consistency`=`STRONG`. + // For Cloud Firestore in Datastore mode, if you don't specify + // read_consistency then all lookups and queries default to + // `read_consistency`=`STRONG`. Note that, in Cloud Datastore, global queries + // defaulted to `read_consistency`=`EVENTUAL`. // // Explicitly setting `read_consistency`=`EVENTUAL` will result in eventually - // consistent lookups & queries in both Cloud Datastore & Cloud Firestore in - // Datastore mode. + // consistent lookups and queries. oneof consistency_type { // The non-transactional read consistency to use. ReadConsistency read_consistency = 1; diff --git a/renovate.json b/renovate.json index 586208852..b3314f4b2 100644 --- a/renovate.json +++ b/renovate.json @@ -41,6 +41,16 @@ ], "depNameTemplate": "com.google.cloud:sdk-platform-java-config", "datasourceTemplate": "maven" + }, + { + "fileMatch": [ + "^.github/workflows/hermetic_library_generation.yaml$" + ], + "matchStrings": [ + "uses: googleapis/sdk-platform-java/.github/scripts@v(?.+?)\\n" + ], + "depNameTemplate": "com.google.api:gapic-generator-java", + "datasourceTemplate": "maven" } ], "packageRules": [ @@ -101,6 +111,13 @@ "^com.fasterxml.jackson.core" ], "groupName": "jackson dependencies" + }, + { + "matchPackagePatterns": [ + "^com.google.api:gapic-generator-java", + "^com.google.cloud:sdk-platform-java-config" + ], + "groupName": "SDK platform Java dependencies" } ], "semanticCommits": true, From 6eaff23f9de25ae6ad2a4fea67c0b65a243c08fd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 14 Oct 2024 18:57:04 +0200 Subject: [PATCH 096/292] deps: update sdk platform java dependencies (#1617) --- .github/workflows/hermetic_library_generation.yaml | 2 +- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 4caa5567a..9399ebef2 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.46.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.47.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index aabf59292..8e4ccadbd 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.36.1 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.37.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index b39cf017d..5cb66b4fe 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.36.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.37.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index c59887969..11c4b309b 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.36.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.37.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 4c3ab17bb..f76a7993b 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.36.1 + 3.37.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index a90b44f5e..5ba61348b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.36.1 + 3.37.0 From fee3f7c52fdc3b9757c04b8dd6136600771319e1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 12:57:28 -0400 Subject: [PATCH 097/292] chore(main): release 2.22.1-SNAPSHOT (#1606) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 34c4d9475..4c2b1c674 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.22.0 + 2.22.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.22.0 + 2.22.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f76a7993b..7abe27156 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.22.0 + 2.22.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.22.0 + 2.22.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.22.0 + 2.22.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.113.0 + 0.113.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.22.0 + 2.22.1-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 9e91f9ca5..47aa880cc 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.22.0 + 2.22.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.22.0 + 2.22.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 966e0c054..44114db73 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.22.0 + 2.22.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.22.0 + 2.22.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 5ba61348b..e869e58fd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.22.0 + 2.22.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.22.0 + 2.22.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.22.0 + 2.22.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.22.0 + 2.22.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.113.0 + 0.113.1-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.22.0 + 2.22.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 9d3256b3f..560cad9d1 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.22.0 + 2.22.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.22.0 + 2.22.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 2e34da3af..03f4a7eb2 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.113.0 + 0.113.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.22.0 + 2.22.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 973390f5d..ca12a5f14 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.22.0 + 2.22.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 191d0abf1..73e85b1ed 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.22.0:2.22.0 -google-cloud-datastore-bom:2.22.0:2.22.0 -proto-google-cloud-datastore-v1:0.113.0:0.113.0 -datastore-v1-proto-client:2.22.0:2.22.0 -proto-google-cloud-datastore-admin-v1:2.22.0:2.22.0 -grpc-google-cloud-datastore-admin-v1:2.22.0:2.22.0 +google-cloud-datastore:2.22.0:2.22.1-SNAPSHOT +google-cloud-datastore-bom:2.22.0:2.22.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.113.0:0.113.1-SNAPSHOT +datastore-v1-proto-client:2.22.0:2.22.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.22.0:2.22.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.22.0:2.22.1-SNAPSHOT From e15bb0559b40f49fb42b291ddaab347f9049920d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 12:17:20 -0700 Subject: [PATCH 098/292] chore(main): release 2.23.0 (#1622) * chore(main): release 2.23.0 * chore: generate libraries at Mon Oct 14 16:58:14 UTC 2024 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 18 ++++++++++++++++++ README.md | 8 +++----- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- .../filters/IndexingConsiderationQuery.java | 10 +++++----- .../datastore/filters/OrderFieldsQuery.java | 11 +++++------ .../filters/MultiIneqQuerySampleIT.java | 12 +++++++----- versions.txt | 12 ++++++------ 14 files changed, 66 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2670cb02..34aeb6370 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## [2.23.0](https://github.com/googleapis/java-datastore/compare/v2.22.0...v2.23.0) (2024-10-14) + + +### Features + +* Support for field update operators in the Datastore API and resolution strategies when there is a conflict at write time ([b299266](https://github.com/googleapis/java-datastore/commit/b299266e42037b731ee7bbba21dbded73a37323c)) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.46.1 ([678eee2](https://github.com/googleapis/java-datastore/commit/678eee2dfb6d447a852edd436137f8ebfbe50d74)) +* **deps:** Update the Java code generator (gapic-generator-java) to 2.47.0 ([b299266](https://github.com/googleapis/java-datastore/commit/b299266e42037b731ee7bbba21dbded73a37323c)) + + +### Dependencies + +* Update sdk platform java dependencies ([#1617](https://github.com/googleapis/java-datastore/issues/1617)) ([6eaff23](https://github.com/googleapis/java-datastore/commit/6eaff23f9de25ae6ad2a4fea67c0b65a243c08fd)) + ## [2.22.0](https://github.com/googleapis/java-datastore/compare/v2.21.3...v2.22.0) (2024-09-26) diff --git a/README.md b/README.md index d5e61c715..e76f6832b 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,6 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: If you are using Maven without the BOM, add this to your dependencies: - ```xml @@ -57,15 +56,14 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.22.0' +implementation 'com.google.cloud:google-cloud-datastore:2.23.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.22.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.23.0" ``` - ## Authentication @@ -481,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.22.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.23.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 4c2b1c674..723d37a51 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.22.1-SNAPSHOT + 2.23.0 com.google.cloud google-cloud-datastore-parent - 2.22.1-SNAPSHOT + 2.23.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 7abe27156..6cfeb40e2 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.22.1-SNAPSHOT + 2.23.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.22.1-SNAPSHOT + 2.23.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.22.1-SNAPSHOT + 2.23.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.113.1-SNAPSHOT + 0.114.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.22.1-SNAPSHOT + 2.23.0 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 47aa880cc..3c8607887 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.22.1-SNAPSHOT + 2.23.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.22.1-SNAPSHOT + 2.23.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 44114db73..ad06274a9 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.22.1-SNAPSHOT + 2.23.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.22.1-SNAPSHOT + 2.23.0 diff --git a/pom.xml b/pom.xml index e869e58fd..665933af6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.22.1-SNAPSHOT + 2.23.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.22.1-SNAPSHOT + 2.23.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.22.1-SNAPSHOT + 2.23.0 com.google.cloud google-cloud-datastore - 2.22.1-SNAPSHOT + 2.23.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.113.1-SNAPSHOT + 0.114.0 com.google.cloud.datastore datastore-v1-proto-client - 2.22.1-SNAPSHOT + 2.23.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 560cad9d1..4d4da04db 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.22.1-SNAPSHOT + 2.23.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.22.1-SNAPSHOT + 2.23.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 03f4a7eb2..d4bda3ee4 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.113.1-SNAPSHOT + 0.114.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.22.1-SNAPSHOT + 2.23.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ca12a5f14..4da3f232b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.22.1-SNAPSHOT + 2.23.0 diff --git a/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java b/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java index f0c9cd5da..90a94014c 100644 --- a/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java +++ b/samples/snippets/src/main/java/com/example/datastore/filters/IndexingConsiderationQuery.java @@ -29,7 +29,6 @@ import com.google.cloud.datastore.Query; import com.google.cloud.datastore.QueryResults; import com.google.cloud.datastore.StructuredQuery.CompositeFilter; -import com.google.cloud.datastore.StructuredQuery.Filter; import com.google.cloud.datastore.StructuredQuery.OrderBy; import com.google.cloud.datastore.StructuredQuery.PropertyFilter; @@ -40,11 +39,12 @@ public static void invoke() throws Exception { Datastore datastore = DatastoreOptions.getDefaultInstance().getService(); // Build a query with multi inequal filters and optimized index order of index properties. - Query query = Query.newEntityQueryBuilder() + Query query = + Query.newEntityQueryBuilder() .setKind("employees") - .setFilter(CompositeFilter.and( - PropertyFilter.gt("salary", 100000), - PropertyFilter.gt("experience", 0))) + .setFilter( + CompositeFilter.and( + PropertyFilter.gt("salary", 100000), PropertyFilter.gt("experience", 0))) .setOrderBy(OrderBy.asc("salary"), OrderBy.asc("experience")) .build(); diff --git a/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java b/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java index 1739dbade..24fc7901c 100644 --- a/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java +++ b/samples/snippets/src/main/java/com/example/datastore/filters/OrderFieldsQuery.java @@ -28,7 +28,6 @@ import com.google.cloud.datastore.Entity; import com.google.cloud.datastore.Query; import com.google.cloud.datastore.QueryResults; -import com.google.cloud.datastore.StructuredQuery.Filter; import com.google.cloud.datastore.StructuredQuery.OrderBy; import com.google.cloud.datastore.StructuredQuery.PropertyFilter; @@ -40,11 +39,11 @@ public static void invoke() throws Exception { // Build a query with order properties in the decreasing order of query constraint selectivity. Query query = - Query.newEntityQueryBuilder() - .setKind("employees") - .setFilter(PropertyFilter.gt("salary", 100000)) - .setOrderBy(OrderBy.asc("salary")) - .build(); + Query.newEntityQueryBuilder() + .setKind("employees") + .setFilter(PropertyFilter.gt("salary", 100000)) + .setOrderBy(OrderBy.asc("salary")) + .build(); // Get the results back from Datastore QueryResults results = datastore.run(query); diff --git a/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java b/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java index 6fee2a806..8e3fa4c10 100644 --- a/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java +++ b/samples/snippets/src/test/java/com/example/datastore/filters/MultiIneqQuerySampleIT.java @@ -38,27 +38,29 @@ public class MultiIneqQuerySampleIT { private Key employeeKey2; private Key employeeKey3; - @Rule - public final SystemsOutRule systemsOutRule = new SystemsOutRule(); + @Rule public final SystemsOutRule systemsOutRule = new SystemsOutRule(); @Before public void setUp() { employeeKey1 = datastore.newKeyFactory().setKind("employees").newKey("employee1"); - Entity employee1 = Entity.newBuilder(employeeKey1) + Entity employee1 = + Entity.newBuilder(employeeKey1) .set("name", "Alice") .set("salary", 100001) .set("experience", 10) .build(); employeeKey2 = datastore.newKeyFactory().setKind("employees").newKey("employee2"); - Entity employee2 = Entity.newBuilder(employeeKey2) + Entity employee2 = + Entity.newBuilder(employeeKey2) .set("name", "Bob") .set("salary", 90000) .set("experience", 5) .build(); employeeKey3 = datastore.newKeyFactory().setKind("employees").newKey("employee3"); - Entity employee3 = Entity.newBuilder(employeeKey3) + Entity employee3 = + Entity.newBuilder(employeeKey3) .set("name", "Jay") .set("salary", 120000) .set("experience", 15) diff --git a/versions.txt b/versions.txt index 73e85b1ed..666cbda4e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.22.0:2.22.1-SNAPSHOT -google-cloud-datastore-bom:2.22.0:2.22.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.113.0:0.113.1-SNAPSHOT -datastore-v1-proto-client:2.22.0:2.22.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.22.0:2.22.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.22.0:2.22.1-SNAPSHOT +google-cloud-datastore:2.23.0:2.23.0 +google-cloud-datastore-bom:2.23.0:2.23.0 +proto-google-cloud-datastore-v1:0.114.0:0.114.0 +datastore-v1-proto-client:2.23.0:2.23.0 +proto-google-cloud-datastore-admin-v1:2.23.0:2.23.0 +grpc-google-cloud-datastore-admin-v1:2.23.0:2.23.0 From 3512ba2f1bcd358e3c39c36944e05873b3f25f51 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 15 Oct 2024 13:29:28 -0400 Subject: [PATCH 099/292] chore: Update generation configuration at Tue Oct 15 02:24:25 UTC 2024 (#1618) * chore: Update generation configuration at Thu Oct 10 02:23:46 UTC 2024 * chore: Update generation configuration at Fri Oct 11 02:23:15 UTC 2024 * chore: generate libraries at Fri Oct 11 02:23:38 UTC 2024 * chore: Update generation configuration at Sat Oct 12 02:21:27 UTC 2024 * chore: generate libraries at Sat Oct 12 02:21:51 UTC 2024 * chore: Update generation configuration at Sun Oct 13 02:25:36 UTC 2024 * chore: Update generation configuration at Tue Oct 15 02:24:25 UTC 2024 --- generation_config.yaml | 2 +- .../com/google/datastore/v1/FindNearest.java | 2272 +++++++++++++++++ .../datastore/v1/FindNearestOrBuilder.java | 269 ++ .../java/com/google/datastore/v1/Query.java | 359 +++ .../google/datastore/v1/QueryOrBuilder.java | 53 + .../com/google/datastore/v1/QueryProto.java | 181 +- .../proto/google/datastore/v1/query.proto | 80 + 7 files changed, 3140 insertions(+), 76 deletions(-) create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java create mode 100644 proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java diff --git a/generation_config.yaml b/generation_config.yaml index 44eb5d8aa..3e00e550d 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.47.0 -googleapis_commitish: 8692273ae7e0ef95d264e1bb8bcb900fa950674f +googleapis_commitish: f78cd2f7943b9a2eb9734e56a8f3428da75917e2 libraries_bom_version: 26.48.0 libraries: - api_shortname: datastore diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java new file mode 100644 index 000000000..999b5b1f2 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java @@ -0,0 +1,2272 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +// Protobuf Java Version: 3.25.5 +package com.google.datastore.v1; + +/** + * + * + * 
+ * Nearest Neighbors search config. The ordering provided by FindNearest
+ * supersedes the order_by stage. If multiple documents have the same vector
+ * distance, the returned document order is not guaranteed to be stable between
+ * queries.
+ *
+ * + * Protobuf type {@code google.datastore.v1.FindNearest} + */ +public final class FindNearest extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.FindNearest) + FindNearestOrBuilder { + private static final long serialVersionUID = 0L; + // Use FindNearest.newBuilder() to construct. + private FindNearest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + + private FindNearest() { + distanceMeasure_ = 0; + distanceResultProperty_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new FindNearest(); + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_FindNearest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_FindNearest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.FindNearest.class, + com.google.datastore.v1.FindNearest.Builder.class); + } + + /** + * + * + * 
+   * The distance measure to use when comparing vectors.
+   *
+ * + * Protobuf enum {@code google.datastore.v1.FindNearest.DistanceMeasure} + */ + public enum DistanceMeasure implements com.google.protobuf.ProtocolMessageEnum { + /** + * + * + * 
+     * Should not be set.
+     *
+ * + * DISTANCE_MEASURE_UNSPECIFIED = 0; + */ + DISTANCE_MEASURE_UNSPECIFIED(0), + /** + * + * + * 
+     * Measures the EUCLIDEAN distance between the vectors. See
+     * [Euclidean](https://en.wikipedia.org/wiki/Euclidean_distance) to learn
+     * more. The resulting distance decreases the more similar two vectors are.
+     *
+ * + * EUCLIDEAN = 1; + */ + EUCLIDEAN(1), + /** + * + * + * 
+     * COSINE distance compares vectors based on the angle between them, which
+     * allows you to measure similarity that isn't based on the vectors
+     * magnitude. We recommend using DOT_PRODUCT with unit normalized vectors
+     * instead of COSINE distance, which is mathematically equivalent with
+     * better performance. See [Cosine
+     * Similarity](https://en.wikipedia.org/wiki/Cosine_similarity) to learn
+     * more about COSINE similarity and COSINE distance. The resulting COSINE
+     * distance decreases the more similar two vectors are.
+     *
+ * + * COSINE = 2; + */ + COSINE(2), + /** + * + * + * 
+     * Similar to cosine but is affected by the magnitude of the vectors. See
+     * [Dot Product](https://en.wikipedia.org/wiki/Dot_product) to learn more.
+     * The resulting distance increases the more similar two vectors are.
+     *
+ * + * DOT_PRODUCT = 3; + */ + DOT_PRODUCT(3), + UNRECOGNIZED(-1), + ; + + /** + * + * + * 
+     * Should not be set.
+     *
+ * + * DISTANCE_MEASURE_UNSPECIFIED = 0; + */ + public static final int DISTANCE_MEASURE_UNSPECIFIED_VALUE = 0; + /** + * + * + * 
+     * Measures the EUCLIDEAN distance between the vectors. See
+     * [Euclidean](https://en.wikipedia.org/wiki/Euclidean_distance) to learn
+     * more. The resulting distance decreases the more similar two vectors are.
+     *
+ * + * EUCLIDEAN = 1; + */ + public static final int EUCLIDEAN_VALUE = 1; + /** + * + * + * 
+     * COSINE distance compares vectors based on the angle between them, which
+     * allows you to measure similarity that isn't based on the vectors
+     * magnitude. We recommend using DOT_PRODUCT with unit normalized vectors
+     * instead of COSINE distance, which is mathematically equivalent with
+     * better performance. See [Cosine
+     * Similarity](https://en.wikipedia.org/wiki/Cosine_similarity) to learn
+     * more about COSINE similarity and COSINE distance. The resulting COSINE
+     * distance decreases the more similar two vectors are.
+     *
+ * + * COSINE = 2; + */ + public static final int COSINE_VALUE = 2; + /** + * + * + * 
+     * Similar to cosine but is affected by the magnitude of the vectors. See
+     * [Dot Product](https://en.wikipedia.org/wiki/Dot_product) to learn more.
+     * The resulting distance increases the more similar two vectors are.
+     *
+ * + * DOT_PRODUCT = 3; + */ + public static final int DOT_PRODUCT_VALUE = 3; + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static DistanceMeasure valueOf(int value) { + return forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + */ + public static DistanceMeasure forNumber(int value) { + switch (value) { + case 0: + return DISTANCE_MEASURE_UNSPECIFIED; + case 1: + return EUCLIDEAN; + case 2: + return COSINE; + case 3: + return DOT_PRODUCT; + default: + return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { + return internalValueMap; + } + + private static final com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public DistanceMeasure findValueByNumber(int number) { + return DistanceMeasure.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } + return getDescriptor().getValues().get(ordinal()); + } + + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { + return getDescriptor(); + } + + public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { + return com.google.datastore.v1.FindNearest.getDescriptor().getEnumTypes().get(0); + } + + private static final DistanceMeasure[] VALUES = values(); + + public static DistanceMeasure valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private DistanceMeasure(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.datastore.v1.FindNearest.DistanceMeasure) + } + + private int bitField0_; + public static final int VECTOR_PROPERTY_FIELD_NUMBER = 1; + private com.google.datastore.v1.PropertyReference vectorProperty_; + /** + * + * + * 
+   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return Whether the vectorProperty field is set. + */ + @java.lang.Override + public boolean hasVectorProperty() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * + * + * 
+   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The vectorProperty. + */ + @java.lang.Override + public com.google.datastore.v1.PropertyReference getVectorProperty() { + return vectorProperty_ == null + ? com.google.datastore.v1.PropertyReference.getDefaultInstance() + : vectorProperty_; + } + /** + * + * + * 
+   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + */ + @java.lang.Override + public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBuilder() { + return vectorProperty_ == null + ? com.google.datastore.v1.PropertyReference.getDefaultInstance() + : vectorProperty_; + } + + public static final int QUERY_VECTOR_FIELD_NUMBER = 2; + private com.google.datastore.v1.Value queryVector_; + /** + * + * + * 
+   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return Whether the queryVector field is set. + */ + @java.lang.Override + public boolean hasQueryVector() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * + * + * 
+   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The queryVector. + */ + @java.lang.Override + public com.google.datastore.v1.Value getQueryVector() { + return queryVector_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : queryVector_; + } + /** + * + * + * 
+   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + */ + @java.lang.Override + public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() { + return queryVector_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : queryVector_; + } + + public static final int DISTANCE_MEASURE_FIELD_NUMBER = 3; + private int distanceMeasure_ = 0; + /** + * + * + * 
+   * Required. The Distance Measure to use, required.
+   *
+ * + * + * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The enum numeric value on the wire for distanceMeasure. + */ + @java.lang.Override + public int getDistanceMeasureValue() { + return distanceMeasure_; + } + /** + * + * + * 
+   * Required. The Distance Measure to use, required.
+   *
+ * + * + * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The distanceMeasure. + */ + @java.lang.Override + public com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure() { + com.google.datastore.v1.FindNearest.DistanceMeasure result = + com.google.datastore.v1.FindNearest.DistanceMeasure.forNumber(distanceMeasure_); + return result == null + ? com.google.datastore.v1.FindNearest.DistanceMeasure.UNRECOGNIZED + : result; + } + + public static final int LIMIT_FIELD_NUMBER = 4; + private com.google.protobuf.Int32Value limit_; + /** + * + * + * 
+   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + * + * @return Whether the limit field is set. + */ + @java.lang.Override + public boolean hasLimit() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * + * + * 
+   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + * + * @return The limit. + */ + @java.lang.Override + public com.google.protobuf.Int32Value getLimit() { + return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; + } + /** + * + * + * 
+   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + */ + @java.lang.Override + public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { + return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; + } + + public static final int DISTANCE_RESULT_PROPERTY_FIELD_NUMBER = 5; + + @SuppressWarnings("serial") + private volatile java.lang.Object distanceResultProperty_ = ""; + /** + * + * + * 
+   * Optional. Optional name of the field to output the result of the vector
+   * distance calculation. Must conform to [entity
+   * property][google.datastore.v1.Entity.properties] limitations.
+   *
+ * + * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The distanceResultProperty. + */ + @java.lang.Override + public java.lang.String getDistanceResultProperty() { + java.lang.Object ref = distanceResultProperty_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + distanceResultProperty_ = s; + return s; + } + } + /** + * + * + * 
+   * Optional. Optional name of the field to output the result of the vector
+   * distance calculation. Must conform to [entity
+   * property][google.datastore.v1.Entity.properties] limitations.
+   *
+ * + * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for distanceResultProperty. + */ + @java.lang.Override + public com.google.protobuf.ByteString getDistanceResultPropertyBytes() { + java.lang.Object ref = distanceResultProperty_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + distanceResultProperty_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int DISTANCE_THRESHOLD_FIELD_NUMBER = 6; + private com.google.protobuf.DoubleValue distanceThreshold_; + /** + * + * + * 
+   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return Whether the distanceThreshold field is set. + */ + @java.lang.Override + public boolean hasDistanceThreshold() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * + * + * 
+   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The distanceThreshold. + */ + @java.lang.Override + public com.google.protobuf.DoubleValue getDistanceThreshold() { + return distanceThreshold_ == null + ? com.google.protobuf.DoubleValue.getDefaultInstance() + : distanceThreshold_; + } + /** + * + * + * 
+   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public com.google.protobuf.DoubleValueOrBuilder getDistanceThresholdOrBuilder() { + return distanceThreshold_ == null + ? com.google.protobuf.DoubleValue.getDefaultInstance() + : distanceThreshold_; + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(1, getVectorProperty()); + } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeMessage(2, getQueryVector()); + } + if (distanceMeasure_ + != com.google.datastore.v1.FindNearest.DistanceMeasure.DISTANCE_MEASURE_UNSPECIFIED + .getNumber()) { + output.writeEnum(3, distanceMeasure_); + } + if (((bitField0_ & 0x00000004) != 0)) { + output.writeMessage(4, getLimit()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(distanceResultProperty_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, distanceResultProperty_); + } + if (((bitField0_ & 0x00000008) != 0)) { + output.writeMessage(6, getDistanceThreshold()); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getVectorProperty()); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQueryVector()); + } + if (distanceMeasure_ + != com.google.datastore.v1.FindNearest.DistanceMeasure.DISTANCE_MEASURE_UNSPECIFIED + .getNumber()) { + size += com.google.protobuf.CodedOutputStream.computeEnumSize(3, distanceMeasure_); + } + if (((bitField0_ & 0x00000004) != 0)) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getLimit()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(distanceResultProperty_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, distanceResultProperty_); + } + if (((bitField0_ & 0x00000008) != 0)) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getDistanceThreshold()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.FindNearest)) { + return super.equals(obj); + } + com.google.datastore.v1.FindNearest other = (com.google.datastore.v1.FindNearest) obj; + + if (hasVectorProperty() != other.hasVectorProperty()) return false; + if (hasVectorProperty()) { + if (!getVectorProperty().equals(other.getVectorProperty())) return false; + } + if (hasQueryVector() != other.hasQueryVector()) return false; + if (hasQueryVector()) { + if (!getQueryVector().equals(other.getQueryVector())) return false; + } + if (distanceMeasure_ != other.distanceMeasure_) return false; + if (hasLimit() != other.hasLimit()) return false; + if (hasLimit()) { + if (!getLimit().equals(other.getLimit())) return false; + } + if (!getDistanceResultProperty().equals(other.getDistanceResultProperty())) return false; + if (hasDistanceThreshold() != other.hasDistanceThreshold()) return false; + if (hasDistanceThreshold()) { + if (!getDistanceThreshold().equals(other.getDistanceThreshold())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasVectorProperty()) { + hash = (37 * hash) + VECTOR_PROPERTY_FIELD_NUMBER; + hash = (53 * hash) + getVectorProperty().hashCode(); + } + if (hasQueryVector()) { + hash = (37 * hash) + QUERY_VECTOR_FIELD_NUMBER; + hash = (53 * hash) + getQueryVector().hashCode(); + } + hash = (37 * hash) + DISTANCE_MEASURE_FIELD_NUMBER; + hash = (53 * hash) + distanceMeasure_; + if (hasLimit()) { + hash = (37 * hash) + LIMIT_FIELD_NUMBER; + hash = (53 * hash) + getLimit().hashCode(); + } + hash = (37 * hash) + DISTANCE_RESULT_PROPERTY_FIELD_NUMBER; + hash = (53 * hash) + getDistanceResultProperty().hashCode(); + if (hasDistanceThreshold()) { + hash = (37 * hash) + DISTANCE_THRESHOLD_FIELD_NUMBER; + hash = (53 * hash) + getDistanceThreshold().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.FindNearest parseFrom(java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.FindNearest parseFrom( + java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.FindNearest parseFrom(com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.FindNearest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.FindNearest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.FindNearest parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.FindNearest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.FindNearest parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.FindNearest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.FindNearest parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.FindNearest parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.FindNearest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(com.google.datastore.v1.FindNearest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * + * + * 
+   * Nearest Neighbors search config. The ordering provided by FindNearest
+   * supersedes the order_by stage. If multiple documents have the same vector
+   * distance, the returned document order is not guaranteed to be stable between
+   * queries.
+   *
+ * + * Protobuf type {@code google.datastore.v1.FindNearest} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder + implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.FindNearest) + com.google.datastore.v1.FindNearestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_FindNearest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_FindNearest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.FindNearest.class, + com.google.datastore.v1.FindNearest.Builder.class); + } + + // Construct using com.google.datastore.v1.FindNearest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { + getVectorPropertyFieldBuilder(); + getQueryVectorFieldBuilder(); + getLimitFieldBuilder(); + getDistanceThresholdFieldBuilder(); + } + } + + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + vectorProperty_ = null; + if (vectorPropertyBuilder_ != null) { + vectorPropertyBuilder_.dispose(); + vectorPropertyBuilder_ = null; + } + queryVector_ = null; + if (queryVectorBuilder_ != null) { + queryVectorBuilder_.dispose(); + queryVectorBuilder_ = null; + } + distanceMeasure_ = 0; + limit_ = null; + if (limitBuilder_ != null) { + limitBuilder_.dispose(); + limitBuilder_ = null; + } + distanceResultProperty_ = ""; + distanceThreshold_ = null; + if (distanceThresholdBuilder_ != null) { + distanceThresholdBuilder_.dispose(); + distanceThresholdBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_FindNearest_descriptor; + } + + @java.lang.Override + public com.google.datastore.v1.FindNearest getDefaultInstanceForType() { + return com.google.datastore.v1.FindNearest.getDefaultInstance(); + } + + @java.lang.Override + public com.google.datastore.v1.FindNearest build() { + com.google.datastore.v1.FindNearest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.datastore.v1.FindNearest buildPartial() { + com.google.datastore.v1.FindNearest result = new com.google.datastore.v1.FindNearest(this); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartial0(com.google.datastore.v1.FindNearest result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.vectorProperty_ = + vectorPropertyBuilder_ == null ? vectorProperty_ : vectorPropertyBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.queryVector_ = + queryVectorBuilder_ == null ? queryVector_ : queryVectorBuilder_.build(); + to_bitField0_ |= 0x00000002; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.distanceMeasure_ = distanceMeasure_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.limit_ = limitBuilder_ == null ? limit_ : limitBuilder_.build(); + to_bitField0_ |= 0x00000004; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.distanceResultProperty_ = distanceResultProperty_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.distanceThreshold_ = + distanceThresholdBuilder_ == null + ? distanceThreshold_ + : distanceThresholdBuilder_.build(); + to_bitField0_ |= 0x00000008; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + return super.setField(field, value); + } + + @java.lang.Override + public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + + @java.lang.Override + public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + return super.addRepeatedField(field, value); + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.datastore.v1.FindNearest) { + return mergeFrom((com.google.datastore.v1.FindNearest) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.FindNearest other) { + if (other == com.google.datastore.v1.FindNearest.getDefaultInstance()) return this; + if (other.hasVectorProperty()) { + mergeVectorProperty(other.getVectorProperty()); + } + if (other.hasQueryVector()) { + mergeQueryVector(other.getQueryVector()); + } + if (other.distanceMeasure_ != 0) { + setDistanceMeasureValue(other.getDistanceMeasureValue()); + } + if (other.hasLimit()) { + mergeLimit(other.getLimit()); + } + if (!other.getDistanceResultProperty().isEmpty()) { + distanceResultProperty_ = other.distanceResultProperty_; + bitField0_ |= 0x00000010; + onChanged(); + } + if (other.hasDistanceThreshold()) { + mergeDistanceThreshold(other.getDistanceThreshold()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getVectorPropertyFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: + { + input.readMessage(getQueryVectorFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 24: + { + distanceMeasure_ = input.readEnum(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 34: + { + input.readMessage(getLimitFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000008; + break; + } // case 34 + case 42: + { + distanceResultProperty_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000010; + break; + } // case 42 + case 50: + { + input.readMessage( + getDistanceThresholdFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000020; + break; + } // case 50 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private int bitField0_; + + private com.google.datastore.v1.PropertyReference vectorProperty_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, + com.google.datastore.v1.PropertyReference.Builder, + com.google.datastore.v1.PropertyReferenceOrBuilder> + vectorPropertyBuilder_; + /** + * + * + * 
+     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return Whether the vectorProperty field is set. + */ + public boolean hasVectorProperty() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * + * + * 
+     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The vectorProperty. + */ + public com.google.datastore.v1.PropertyReference getVectorProperty() { + if (vectorPropertyBuilder_ == null) { + return vectorProperty_ == null + ? com.google.datastore.v1.PropertyReference.getDefaultInstance() + : vectorProperty_; + } else { + return vectorPropertyBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public Builder setVectorProperty(com.google.datastore.v1.PropertyReference value) { + if (vectorPropertyBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + vectorProperty_ = value; + } else { + vectorPropertyBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public Builder setVectorProperty( + com.google.datastore.v1.PropertyReference.Builder builderForValue) { + if (vectorPropertyBuilder_ == null) { + vectorProperty_ = builderForValue.build(); + } else { + vectorPropertyBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public Builder mergeVectorProperty(com.google.datastore.v1.PropertyReference value) { + if (vectorPropertyBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) + && vectorProperty_ != null + && vectorProperty_ != com.google.datastore.v1.PropertyReference.getDefaultInstance()) { + getVectorPropertyBuilder().mergeFrom(value); + } else { + vectorProperty_ = value; + } + } else { + vectorPropertyBuilder_.mergeFrom(value); + } + if (vectorProperty_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } + return this; + } + /** + * + * + * 
+     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public Builder clearVectorProperty() { + bitField0_ = (bitField0_ & ~0x00000001); + vectorProperty_ = null; + if (vectorPropertyBuilder_ != null) { + vectorPropertyBuilder_.dispose(); + vectorPropertyBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public com.google.datastore.v1.PropertyReference.Builder getVectorPropertyBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getVectorPropertyFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBuilder() { + if (vectorPropertyBuilder_ != null) { + return vectorPropertyBuilder_.getMessageOrBuilder(); + } else { + return vectorProperty_ == null + ? com.google.datastore.v1.PropertyReference.getDefaultInstance() + : vectorProperty_; + } + } + /** + * + * + * 
+     * Required. An indexed vector property to search upon. Only documents which
+     * contain vectors whose dimensionality match the query_vector can be
+     * returned.
+     *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, + com.google.datastore.v1.PropertyReference.Builder, + com.google.datastore.v1.PropertyReferenceOrBuilder> + getVectorPropertyFieldBuilder() { + if (vectorPropertyBuilder_ == null) { + vectorPropertyBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.PropertyReference, + com.google.datastore.v1.PropertyReference.Builder, + com.google.datastore.v1.PropertyReferenceOrBuilder>( + getVectorProperty(), getParentForChildren(), isClean()); + vectorProperty_ = null; + } + return vectorPropertyBuilder_; + } + + private com.google.datastore.v1.Value queryVector_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder> + queryVectorBuilder_; + /** + * + * + * 
+     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return Whether the queryVector field is set. + */ + public boolean hasQueryVector() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * + * + * 
+     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The queryVector. + */ + public com.google.datastore.v1.Value getQueryVector() { + if (queryVectorBuilder_ == null) { + return queryVector_ == null + ? com.google.datastore.v1.Value.getDefaultInstance() + : queryVector_; + } else { + return queryVectorBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public Builder setQueryVector(com.google.datastore.v1.Value value) { + if (queryVectorBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + queryVector_ = value; + } else { + queryVectorBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public Builder setQueryVector(com.google.datastore.v1.Value.Builder builderForValue) { + if (queryVectorBuilder_ == null) { + queryVector_ = builderForValue.build(); + } else { + queryVectorBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public Builder mergeQueryVector(com.google.datastore.v1.Value value) { + if (queryVectorBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0) + && queryVector_ != null + && queryVector_ != com.google.datastore.v1.Value.getDefaultInstance()) { + getQueryVectorBuilder().mergeFrom(value); + } else { + queryVector_ = value; + } + } else { + queryVectorBuilder_.mergeFrom(value); + } + if (queryVector_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } + return this; + } + /** + * + * + * 
+     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public Builder clearQueryVector() { + bitField0_ = (bitField0_ & ~0x00000002); + queryVector_ = null; + if (queryVectorBuilder_ != null) { + queryVectorBuilder_.dispose(); + queryVectorBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public com.google.datastore.v1.Value.Builder getQueryVectorBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getQueryVectorFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + */ + public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() { + if (queryVectorBuilder_ != null) { + return queryVectorBuilder_.getMessageOrBuilder(); + } else { + return queryVector_ == null + ? com.google.datastore.v1.Value.getDefaultInstance() + : queryVector_; + } + } + /** + * + * + * 
+     * Required. The query vector that we are searching on. Must be a vector of no
+     * more than 2048 dimensions.
+     *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder> + getQueryVectorFieldBuilder() { + if (queryVectorBuilder_ == null) { + queryVectorBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Value, + com.google.datastore.v1.Value.Builder, + com.google.datastore.v1.ValueOrBuilder>( + getQueryVector(), getParentForChildren(), isClean()); + queryVector_ = null; + } + return queryVectorBuilder_; + } + + private int distanceMeasure_ = 0; + /** + * + * + * 
+     * Required. The Distance Measure to use, required.
+     *
+ * + * + * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The enum numeric value on the wire for distanceMeasure. + */ + @java.lang.Override + public int getDistanceMeasureValue() { + return distanceMeasure_; + } + /** + * + * + * 
+     * Required. The Distance Measure to use, required.
+     *
+ * + * + * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @param value The enum numeric value on the wire for distanceMeasure to set. + * @return This builder for chaining. + */ + public Builder setDistanceMeasureValue(int value) { + distanceMeasure_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. The Distance Measure to use, required.
+     *
+ * + * + * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The distanceMeasure. + */ + @java.lang.Override + public com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure() { + com.google.datastore.v1.FindNearest.DistanceMeasure result = + com.google.datastore.v1.FindNearest.DistanceMeasure.forNumber(distanceMeasure_); + return result == null + ? com.google.datastore.v1.FindNearest.DistanceMeasure.UNRECOGNIZED + : result; + } + /** + * + * + * 
+     * Required. The Distance Measure to use, required.
+     *
+ * + * + * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @param value The distanceMeasure to set. + * @return This builder for chaining. + */ + public Builder setDistanceMeasure(com.google.datastore.v1.FindNearest.DistanceMeasure value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000004; + distanceMeasure_ = value.getNumber(); + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. The Distance Measure to use, required.
+     *
+ * + * + * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return This builder for chaining. + */ + public Builder clearDistanceMeasure() { + bitField0_ = (bitField0_ & ~0x00000004); + distanceMeasure_ = 0; + onChanged(); + return this; + } + + private com.google.protobuf.Int32Value limit_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Int32Value, + com.google.protobuf.Int32Value.Builder, + com.google.protobuf.Int32ValueOrBuilder> + limitBuilder_; + /** + * + * + * 
+     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + * + * @return Whether the limit field is set. + */ + public boolean hasLimit() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * + * + * 
+     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + * + * @return The limit. + */ + public com.google.protobuf.Int32Value getLimit() { + if (limitBuilder_ == null) { + return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; + } else { + return limitBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + */ + public Builder setLimit(com.google.protobuf.Int32Value value) { + if (limitBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + limit_ = value; + } else { + limitBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + */ + public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue) { + if (limitBuilder_ == null) { + limit_ = builderForValue.build(); + } else { + limitBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + */ + public Builder mergeLimit(com.google.protobuf.Int32Value value) { + if (limitBuilder_ == null) { + if (((bitField0_ & 0x00000008) != 0) + && limit_ != null + && limit_ != com.google.protobuf.Int32Value.getDefaultInstance()) { + getLimitBuilder().mergeFrom(value); + } else { + limit_ = value; + } + } else { + limitBuilder_.mergeFrom(value); + } + if (limit_ != null) { + bitField0_ |= 0x00000008; + onChanged(); + } + return this; + } + /** + * + * + * 
+     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + */ + public Builder clearLimit() { + bitField0_ = (bitField0_ & ~0x00000008); + limit_ = null; + if (limitBuilder_ != null) { + limitBuilder_.dispose(); + limitBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + */ + public com.google.protobuf.Int32Value.Builder getLimitBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getLimitFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + */ + public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { + if (limitBuilder_ != null) { + return limitBuilder_.getMessageOrBuilder(); + } else { + return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; + } + } + /** + * + * + * 
+     * Required. The number of nearest neighbors to return. Must be a positive
+     * integer of no more than 100.
+     *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Int32Value, + com.google.protobuf.Int32Value.Builder, + com.google.protobuf.Int32ValueOrBuilder> + getLimitFieldBuilder() { + if (limitBuilder_ == null) { + limitBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Int32Value, + com.google.protobuf.Int32Value.Builder, + com.google.protobuf.Int32ValueOrBuilder>( + getLimit(), getParentForChildren(), isClean()); + limit_ = null; + } + return limitBuilder_; + } + + private java.lang.Object distanceResultProperty_ = ""; + /** + * + * + * 
+     * Optional. Optional name of the field to output the result of the vector
+     * distance calculation. Must conform to [entity
+     * property][google.datastore.v1.Entity.properties] limitations.
+     *
+ * + * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The distanceResultProperty. + */ + public java.lang.String getDistanceResultProperty() { + java.lang.Object ref = distanceResultProperty_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + distanceResultProperty_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+     * Optional. Optional name of the field to output the result of the vector
+     * distance calculation. Must conform to [entity
+     * property][google.datastore.v1.Entity.properties] limitations.
+     *
+ * + * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for distanceResultProperty. + */ + public com.google.protobuf.ByteString getDistanceResultPropertyBytes() { + java.lang.Object ref = distanceResultProperty_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + distanceResultProperty_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+     * Optional. Optional name of the field to output the result of the vector
+     * distance calculation. Must conform to [entity
+     * property][google.datastore.v1.Entity.properties] limitations.
+     *
+ * + * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL]; + * + * @param value The distanceResultProperty to set. + * @return This builder for chaining. + */ + public Builder setDistanceResultProperty(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + distanceResultProperty_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. Optional name of the field to output the result of the vector
+     * distance calculation. Must conform to [entity
+     * property][google.datastore.v1.Entity.properties] limitations.
+     *
+ * + * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return This builder for chaining. + */ + public Builder clearDistanceResultProperty() { + distanceResultProperty_ = getDefaultInstance().getDistanceResultProperty(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. Optional name of the field to output the result of the vector
+     * distance calculation. Must conform to [entity
+     * property][google.datastore.v1.Entity.properties] limitations.
+     *
+ * + * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL]; + * + * @param value The bytes for distanceResultProperty to set. + * @return This builder for chaining. + */ + public Builder setDistanceResultPropertyBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + distanceResultProperty_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + + private com.google.protobuf.DoubleValue distanceThreshold_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.DoubleValue, + com.google.protobuf.DoubleValue.Builder, + com.google.protobuf.DoubleValueOrBuilder> + distanceThresholdBuilder_; + /** + * + * + * 
+     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return Whether the distanceThreshold field is set. + */ + public boolean hasDistanceThreshold() { + return ((bitField0_ & 0x00000020) != 0); + } + /** + * + * + * 
+     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The distanceThreshold. + */ + public com.google.protobuf.DoubleValue getDistanceThreshold() { + if (distanceThresholdBuilder_ == null) { + return distanceThreshold_ == null + ? com.google.protobuf.DoubleValue.getDefaultInstance() + : distanceThreshold_; + } else { + return distanceThresholdBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder setDistanceThreshold(com.google.protobuf.DoubleValue value) { + if (distanceThresholdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + distanceThreshold_ = value; + } else { + distanceThresholdBuilder_.setMessage(value); + } + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder setDistanceThreshold(com.google.protobuf.DoubleValue.Builder builderForValue) { + if (distanceThresholdBuilder_ == null) { + distanceThreshold_ = builderForValue.build(); + } else { + distanceThresholdBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder mergeDistanceThreshold(com.google.protobuf.DoubleValue value) { + if (distanceThresholdBuilder_ == null) { + if (((bitField0_ & 0x00000020) != 0) + && distanceThreshold_ != null + && distanceThreshold_ != com.google.protobuf.DoubleValue.getDefaultInstance()) { + getDistanceThresholdBuilder().mergeFrom(value); + } else { + distanceThreshold_ = value; + } + } else { + distanceThresholdBuilder_.mergeFrom(value); + } + if (distanceThreshold_ != null) { + bitField0_ |= 0x00000020; + onChanged(); + } + return this; + } + /** + * + * + * 
+     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder clearDistanceThreshold() { + bitField0_ = (bitField0_ & ~0x00000020); + distanceThreshold_ = null; + if (distanceThresholdBuilder_ != null) { + distanceThresholdBuilder_.dispose(); + distanceThresholdBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.protobuf.DoubleValue.Builder getDistanceThresholdBuilder() { + bitField0_ |= 0x00000020; + onChanged(); + return getDistanceThresholdFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.protobuf.DoubleValueOrBuilder getDistanceThresholdOrBuilder() { + if (distanceThresholdBuilder_ != null) { + return distanceThresholdBuilder_.getMessageOrBuilder(); + } else { + return distanceThreshold_ == null + ? com.google.protobuf.DoubleValue.getDefaultInstance() + : distanceThreshold_; + } + } + /** + * + * + * 
+     * Optional. Option to specify a threshold for which no less similar documents
+     * will be returned. The behavior of the specified `distance_measure` will
+     * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+     * increase when the vectors are more similar, the comparison is inverted.
+     *
+     * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+     * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+     *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.DoubleValue, + com.google.protobuf.DoubleValue.Builder, + com.google.protobuf.DoubleValueOrBuilder> + getDistanceThresholdFieldBuilder() { + if (distanceThresholdBuilder_ == null) { + distanceThresholdBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.DoubleValue, + com.google.protobuf.DoubleValue.Builder, + com.google.protobuf.DoubleValueOrBuilder>( + getDistanceThreshold(), getParentForChildren(), isClean()); + distanceThreshold_ = null; + } + return distanceThresholdBuilder_; + } + + @java.lang.Override + public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.FindNearest) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.FindNearest) + private static final com.google.datastore.v1.FindNearest DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.FindNearest(); + } + + public static com.google.datastore.v1.FindNearest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public FindNearest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.datastore.v1.FindNearest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java new file mode 100644 index 000000000..ac7b994a6 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java @@ -0,0 +1,269 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +// Protobuf Java Version: 3.25.5 +package com.google.datastore.v1; + +public interface FindNearestOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.FindNearest) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return Whether the vectorProperty field is set. + */ + boolean hasVectorProperty(); + /** + * + * + * 
+   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The vectorProperty. + */ + com.google.datastore.v1.PropertyReference getVectorProperty(); + /** + * + * + * 
+   * Required. An indexed vector property to search upon. Only documents which
+   * contain vectors whose dimensionality match the query_vector can be
+   * returned.
+   *
+ * + * + * .google.datastore.v1.PropertyReference vector_property = 1 [(.google.api.field_behavior) = REQUIRED]; + * + */ + com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBuilder(); + + /** + * + * + * 
+   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return Whether the queryVector field is set. + */ + boolean hasQueryVector(); + /** + * + * + * 
+   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The queryVector. + */ + com.google.datastore.v1.Value getQueryVector(); + /** + * + * + * 
+   * Required. The query vector that we are searching on. Must be a vector of no
+   * more than 2048 dimensions.
+   *
+ * + * .google.datastore.v1.Value query_vector = 2 [(.google.api.field_behavior) = REQUIRED]; + * + */ + com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder(); + + /** + * + * + * 
+   * Required. The Distance Measure to use, required.
+   *
+ * + * + * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The enum numeric value on the wire for distanceMeasure. + */ + int getDistanceMeasureValue(); + /** + * + * + * 
+   * Required. The Distance Measure to use, required.
+   *
+ * + * + * .google.datastore.v1.FindNearest.DistanceMeasure distance_measure = 3 [(.google.api.field_behavior) = REQUIRED]; + * + * + * @return The distanceMeasure. + */ + com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure(); + + /** + * + * + * 
+   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + * + * @return Whether the limit field is set. + */ + boolean hasLimit(); + /** + * + * + * 
+   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + * + * @return The limit. + */ + com.google.protobuf.Int32Value getLimit(); + /** + * + * + * 
+   * Required. The number of nearest neighbors to return. Must be a positive
+   * integer of no more than 100.
+   *
+ * + * .google.protobuf.Int32Value limit = 4 [(.google.api.field_behavior) = REQUIRED]; + */ + com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder(); + + /** + * + * + * 
+   * Optional. Optional name of the field to output the result of the vector
+   * distance calculation. Must conform to [entity
+   * property][google.datastore.v1.Entity.properties] limitations.
+   *
+ * + * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The distanceResultProperty. + */ + java.lang.String getDistanceResultProperty(); + /** + * + * + * 
+   * Optional. Optional name of the field to output the result of the vector
+   * distance calculation. Must conform to [entity
+   * property][google.datastore.v1.Entity.properties] limitations.
+   *
+ * + * string distance_result_property = 5 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for distanceResultProperty. + */ + com.google.protobuf.ByteString getDistanceResultPropertyBytes(); + + /** + * + * + * 
+   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return Whether the distanceThreshold field is set. + */ + boolean hasDistanceThreshold(); + /** + * + * + * 
+   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The distanceThreshold. + */ + com.google.protobuf.DoubleValue getDistanceThreshold(); + /** + * + * + * 
+   * Optional. Option to specify a threshold for which no less similar documents
+   * will be returned. The behavior of the specified `distance_measure` will
+   * affect the meaning of the distance threshold. Since DOT_PRODUCT distances
+   * increase when the vectors are more similar, the comparison is inverted.
+   *
+   * For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold
+   * For DOT_PRODUCT:       WHERE distance >= distance_threshold
+   *
+ * + * + * .google.protobuf.DoubleValue distance_threshold = 6 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + com.google.protobuf.DoubleValueOrBuilder getDistanceThresholdOrBuilder(); +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java index 2c0c40f79..25fba4c89 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java @@ -24,6 +24,15 @@ * * 
  * A query for entities.
+ *
+ * The query stages are executed in the following order:
+ * 1. kind
+ * 2. filter
+ * 3. projection
+ * 4. order + start_cursor + end_cursor
+ * 5. offset
+ * 6. limit
+ * 7. find_nearest
  *
* * Protobuf type {@code google.datastore.v1.Query} @@ -553,6 +562,74 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; } + public static final int FIND_NEAREST_FIELD_NUMBER = 13; + private com.google.datastore.v1.FindNearest findNearest_; + /** + * + * + * 
+   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return Whether the findNearest field is set. + */ + @java.lang.Override + public boolean hasFindNearest() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * + * + * 
+   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The findNearest. + */ + @java.lang.Override + public com.google.datastore.v1.FindNearest getFindNearest() { + return findNearest_ == null + ? com.google.datastore.v1.FindNearest.getDefaultInstance() + : findNearest_; + } + /** + * + * + * 
+   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public com.google.datastore.v1.FindNearestOrBuilder getFindNearestOrBuilder() { + return findNearest_ == null + ? com.google.datastore.v1.FindNearest.getDefaultInstance() + : findNearest_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -594,6 +671,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000002) != 0)) { output.writeMessage(12, getLimit()); } + if (((bitField0_ & 0x00000004) != 0)) { + output.writeMessage(13, getFindNearest()); + } getUnknownFields().writeTo(output); } @@ -630,6 +710,9 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getLimit()); } + if (((bitField0_ & 0x00000004) != 0)) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(13, getFindNearest()); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -660,6 +743,10 @@ public boolean equals(final java.lang.Object obj) { if (hasLimit()) { if (!getLimit().equals(other.getLimit())) return false; } + if (hasFindNearest() != other.hasFindNearest()) return false; + if (hasFindNearest()) { + if (!getFindNearest().equals(other.getFindNearest())) return false; + } if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -701,6 +788,10 @@ public int hashCode() { hash = (37 * hash) + LIMIT_FIELD_NUMBER; hash = (53 * hash) + getLimit().hashCode(); } + if (hasFindNearest()) { + hash = (37 * hash) + FIND_NEAREST_FIELD_NUMBER; + hash = (53 * hash) + getFindNearest().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -805,6 +896,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * * 
    * A query for entities.
+   *
+   * The query stages are executed in the following order:
+   * 1. kind
+   * 2. filter
+   * 3. projection
+   * 4. order + start_cursor + end_cursor
+   * 5. offset
+   * 6. limit
+   * 7. find_nearest
    *
* * Protobuf type {@code google.datastore.v1.Query} @@ -845,6 +945,7 @@ private void maybeForceBuilderInitialization() { getOrderFieldBuilder(); getDistinctOnFieldBuilder(); getLimitFieldBuilder(); + getFindNearestFieldBuilder(); } } @@ -893,6 +994,11 @@ public Builder clear() { limitBuilder_.dispose(); limitBuilder_ = null; } + findNearest_ = null; + if (findNearestBuilder_ != null) { + findNearestBuilder_.dispose(); + findNearestBuilder_ = null; + } return this; } @@ -986,6 +1092,11 @@ private void buildPartial0(com.google.datastore.v1.Query result) { result.limit_ = limitBuilder_ == null ? limit_ : limitBuilder_.build(); to_bitField0_ |= 0x00000002; } + if (((from_bitField0_ & 0x00000200) != 0)) { + result.findNearest_ = + findNearestBuilder_ == null ? findNearest_ : findNearestBuilder_.build(); + to_bitField0_ |= 0x00000004; + } result.bitField0_ |= to_bitField0_; } @@ -1157,6 +1268,9 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) { if (other.hasLimit()) { mergeLimit(other.getLimit()); } + if (other.hasFindNearest()) { + mergeFindNearest(other.getFindNearest()); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -1265,6 +1379,12 @@ public Builder mergeFrom( bitField0_ |= 0x00000100; break; } // case 98 + case 106: + { + input.readMessage(getFindNearestFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000200; + break; + } // case 106 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -3396,6 +3516,245 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { return limitBuilder_; } + private com.google.datastore.v1.FindNearest findNearest_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.FindNearest, + com.google.datastore.v1.FindNearest.Builder, + com.google.datastore.v1.FindNearestOrBuilder> + findNearestBuilder_; + /** + * + * + * 
+     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return Whether the findNearest field is set. + */ + public boolean hasFindNearest() { + return ((bitField0_ & 0x00000200) != 0); + } + /** + * + * + * 
+     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The findNearest. + */ + public com.google.datastore.v1.FindNearest getFindNearest() { + if (findNearestBuilder_ == null) { + return findNearest_ == null + ? com.google.datastore.v1.FindNearest.getDefaultInstance() + : findNearest_; + } else { + return findNearestBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder setFindNearest(com.google.datastore.v1.FindNearest value) { + if (findNearestBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + findNearest_ = value; + } else { + findNearestBuilder_.setMessage(value); + } + bitField0_ |= 0x00000200; + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder setFindNearest(com.google.datastore.v1.FindNearest.Builder builderForValue) { + if (findNearestBuilder_ == null) { + findNearest_ = builderForValue.build(); + } else { + findNearestBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000200; + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder mergeFindNearest(com.google.datastore.v1.FindNearest value) { + if (findNearestBuilder_ == null) { + if (((bitField0_ & 0x00000200) != 0) + && findNearest_ != null + && findNearest_ != com.google.datastore.v1.FindNearest.getDefaultInstance()) { + getFindNearestBuilder().mergeFrom(value); + } else { + findNearest_ = value; + } + } else { + findNearestBuilder_.mergeFrom(value); + } + if (findNearest_ != null) { + bitField0_ |= 0x00000200; + onChanged(); + } + return this; + } + /** + * + * + * 
+     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder clearFindNearest() { + bitField0_ = (bitField0_ & ~0x00000200); + findNearest_ = null; + if (findNearestBuilder_ != null) { + findNearestBuilder_.dispose(); + findNearestBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.FindNearest.Builder getFindNearestBuilder() { + bitField0_ |= 0x00000200; + onChanged(); + return getFindNearestFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.FindNearestOrBuilder getFindNearestOrBuilder() { + if (findNearestBuilder_ != null) { + return findNearestBuilder_.getMessageOrBuilder(); + } else { + return findNearest_ == null + ? com.google.datastore.v1.FindNearest.getDefaultInstance() + : findNearest_; + } + } + /** + * + * + * 
+     * Optional. A potential Nearest Neighbors Search.
+     *
+     * Applies after all other filters and ordering.
+     *
+     * Finds the closest vector embeddings to the given query vector.
+     *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.FindNearest, + com.google.datastore.v1.FindNearest.Builder, + com.google.datastore.v1.FindNearestOrBuilder> + getFindNearestFieldBuilder() { + if (findNearestBuilder_ == null) { + findNearestBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.FindNearest, + com.google.datastore.v1.FindNearest.Builder, + com.google.datastore.v1.FindNearestOrBuilder>( + getFindNearest(), getParentForChildren(), isClean()); + findNearest_ = null; + } + return findNearestBuilder_; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java index 70533577f..86e6d218f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java @@ -394,4 +394,57 @@ public interface QueryOrBuilder * .google.protobuf.Int32Value limit = 12; */ com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder(); + + /** + * + * + * 
+   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return Whether the findNearest field is set. + */ + boolean hasFindNearest(); + /** + * + * + * 
+   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The findNearest. + */ + com.google.datastore.v1.FindNearest getFindNearest(); + /** + * + * + * 
+   * Optional. A potential Nearest Neighbors Search.
+   *
+   * Applies after all other filters and ordering.
+   *
+   * Finds the closest vector embeddings to the given query vector.
+   *
+ * + * + * .google.datastore.v1.FindNearest find_nearest = 13 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + com.google.datastore.v1.FindNearestOrBuilder getFindNearestOrBuilder(); } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java index 60c35e2e1..489e035ab 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java @@ -84,6 +84,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r internal_static_google_datastore_v1_PropertyFilter_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_FindNearest_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_FindNearest_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_google_datastore_v1_GqlQuery_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable @@ -120,7 +124,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "date_time\030\005 \001(\0132\032.google.protobuf.Timest" + "amp\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RES" + "ULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJ" - + "ECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nproj" + + "ECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\257\003\n\005Query\0223\n\nproj" + "ection\030\002 \003(\0132\037.google.datastore.v1.Proje" + "ction\0221\n\004kind\030\003 \003(\0132#.google.datastore.v" + "1.KindExpression\022+\n\006filter\030\004 \001(\0132\033.googl" @@ -129,77 +133,90 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "inct_on\030\006 \003(\0132&.google.datastore.v1.Prop" + "ertyReference\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\ne" + "nd_cursor\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit" - + "\030\014 \001(\0132\033.google.protobuf.Int32Value\"\344\004\n\020" - + "AggregationQuery\0222\n\014nested_query\030\001 \001(\0132\032" - + ".google.datastore.v1.QueryH\000\022L\n\014aggregat" - + "ions\030\003 \003(\01321.google.datastore.v1.Aggrega" - + "tionQuery.AggregationB\003\340A\001\032\277\003\n\013Aggregati" - + "on\022H\n\005count\030\001 \001(\01327.google.datastore.v1." - + "AggregationQuery.Aggregation.CountH\000\022D\n\003" - + "sum\030\002 \001(\01325.google.datastore.v1.Aggregat" - + "ionQuery.Aggregation.SumH\000\022D\n\003avg\030\003 \001(\0132" - + "5.google.datastore.v1.AggregationQuery.A" - + "ggregation.AvgH\000\022\022\n\005alias\030\007 \001(\tB\003\340A\001\0328\n\005" - + "Count\022/\n\005up_to\030\001 \001(\0132\033.google.protobuf.I" - + "nt64ValueB\003\340A\001\032?\n\003Sum\0228\n\010property\030\001 \001(\0132" - + "&.google.datastore.v1.PropertyReference\032" - + "?\n\003Avg\0228\n\010property\030\001 \001(\0132&.google.datast" - + "ore.v1.PropertyReferenceB\n\n\010operatorB\014\n\n" - + "query_type\"\036\n\016KindExpression\022\014\n\004name\030\001 \001" - + "(\t\"!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n" - + "\nProjection\0228\n\010property\030\001 \001(\0132&.google.d" - + "atastore.v1.PropertyReference\"\321\001\n\rProper" - + "tyOrder\0228\n\010property\030\001 \001(\0132&.google.datas" - + "tore.v1.PropertyReference\022?\n\tdirection\030\002" - + " \001(\0162,.google.datastore.v1.PropertyOrder" - + ".Direction\"E\n\tDirection\022\031\n\025DIRECTION_UNS" - + "PECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020" - + "\002\"\231\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132$" - + ".google.datastore.v1.CompositeFilterH\000\022>" - + "\n\017property_filter\030\002 \001(\0132#.google.datasto" - + "re.v1.PropertyFilterH\000B\r\n\013filter_type\"\261\001" - + "\n\017CompositeFilter\0229\n\002op\030\001 \001(\0162-.google.d" - + "atastore.v1.CompositeFilter.Operator\022,\n\007" - + "filters\030\002 \003(\0132\033.google.datastore.v1.Filt" - + "er\"5\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000" - + "\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352\002\n\016PropertyFilter\0228\n\010" - + "property\030\001 \001(\0132&.google.datastore.v1.Pro" - + "pertyReference\0228\n\002op\030\002 \001(\0162,.google.data" - + "store.v1.PropertyFilter.Operator\022)\n\005valu" - + "e\030\003 \001(\0132\032.google.datastore.v1.Value\"\270\001\n\010" - + "Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000\022\r\n\tLE" - + "SS_THAN\020\001\022\026\n\022LESS_THAN_OR_EQUAL\020\002\022\020\n\014GRE" - + "ATER_THAN\020\003\022\031\n\025GREATER_THAN_OR_EQUAL\020\004\022\t" - + "\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r\n\tNOT_EQUAL\020\t\022\020\n\014HAS_" - + "ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010GqlQuery\022\024\n\014q" - + "uery_string\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001(" - + "\010\022H\n\016named_bindings\030\005 \003(\01320.google.datas" - + "tore.v1.GqlQuery.NamedBindingsEntry\022C\n\023p" - + "ositional_bindings\030\004 \003(\0132&.google.datast" - + "ore.v1.GqlQueryParameter\032\\\n\022NamedBinding" - + "sEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.goo" - + "gle.datastore.v1.GqlQueryParameter:\0028\001\"d" - + "\n\021GqlQueryParameter\022+\n\005value\030\002 \001(\0132\032.goo" - + "gle.datastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014" - + "H\000B\020\n\016parameter_type\"\215\004\n\020QueryResultBatc" - + "h\022\027\n\017skipped_results\030\006 \001(\005\022\026\n\016skipped_cu" - + "rsor\030\003 \001(\014\022H\n\022entity_result_type\030\001 \001(\0162," - + ".google.datastore.v1.EntityResult.Result" - + "Type\0229\n\016entity_results\030\002 \003(\0132!.google.da" - + "tastore.v1.EntityResult\022\022\n\nend_cursor\030\004 " - + "\001(\014\022K\n\014more_results\030\005 \001(\01625.google.datas" - + "tore.v1.QueryResultBatch.MoreResultsType" - + "\022\030\n\020snapshot_version\030\007 \001(\003\022-\n\tread_time\030" - + "\010 \001(\0132\032.google.protobuf.Timestamp\"\230\001\n\017Mo" - + "reResultsType\022!\n\035MORE_RESULTS_TYPE_UNSPE" - + "CIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE_RESUL" - + "TS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS_AFTER_C" - + "URSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\273\001\n\027com.goo" - + "gle.datastore.v1B\nQueryProtoP\001Z;cloud.go" - + "ogle.com/go/datastore/apiv1/datastorepb;" - + "datastorepb\252\002\031Google.Cloud.Datastore.V1\312" - + "\002\031Google\\Cloud\\Datastore\\V1\352\002\034Google::Cl" - + "oud::Datastore::V1b\006proto3" + + "\030\014 \001(\0132\033.google.protobuf.Int32Value\022;\n\014f" + + "ind_nearest\030\r \001(\0132 .google.datastore.v1." + + "FindNearestB\003\340A\001\"\344\004\n\020AggregationQuery\0222\n" + + "\014nested_query\030\001 \001(\0132\032.google.datastore.v" + + "1.QueryH\000\022L\n\014aggregations\030\003 \003(\01321.google" + + ".datastore.v1.AggregationQuery.Aggregati" + + "onB\003\340A\001\032\277\003\n\013Aggregation\022H\n\005count\030\001 \001(\01327" + + ".google.datastore.v1.AggregationQuery.Ag" + + "gregation.CountH\000\022D\n\003sum\030\002 \001(\01325.google." + + "datastore.v1.AggregationQuery.Aggregatio" + + "n.SumH\000\022D\n\003avg\030\003 \001(\01325.google.datastore." + + "v1.AggregationQuery.Aggregation.AvgH\000\022\022\n" + + "\005alias\030\007 \001(\tB\003\340A\001\0328\n\005Count\022/\n\005up_to\030\001 \001(" + + "\0132\033.google.protobuf.Int64ValueB\003\340A\001\032?\n\003S" + + "um\0228\n\010property\030\001 \001(\0132&.google.datastore." + + "v1.PropertyReference\032?\n\003Avg\0228\n\010property\030" + + "\001 \001(\0132&.google.datastore.v1.PropertyRefe" + + "renceB\n\n\010operatorB\014\n\nquery_type\"\036\n\016KindE" + + "xpression\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyRefer" + + "ence\022\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010prop" + + "erty\030\001 \001(\0132&.google.datastore.v1.Propert" + + "yReference\"\321\001\n\rPropertyOrder\0228\n\010property" + + "\030\001 \001(\0132&.google.datastore.v1.PropertyRef" + + "erence\022?\n\tdirection\030\002 \001(\0162,.google.datas" + + "tore.v1.PropertyOrder.Direction\"E\n\tDirec" + + "tion\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCEN" + + "DING\020\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020com" + + "posite_filter\030\001 \001(\0132$.google.datastore.v" + + "1.CompositeFilterH\000\022>\n\017property_filter\030\002" + + " \001(\0132#.google.datastore.v1.PropertyFilte" + + "rH\000B\r\n\013filter_type\"\261\001\n\017CompositeFilter\0229" + + "\n\002op\030\001 \001(\0162-.google.datastore.v1.Composi" + + "teFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.goo" + + "gle.datastore.v1.Filter\"5\n\010Operator\022\030\n\024O" + + "PERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352" + + "\002\n\016PropertyFilter\0228\n\010property\030\001 \001(\0132&.go" + + "ogle.datastore.v1.PropertyReference\0228\n\002o" + + "p\030\002 \001(\0162,.google.datastore.v1.PropertyFi" + + "lter.Operator\022)\n\005value\030\003 \001(\0132\032.google.da" + + "tastore.v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATO" + + "R_UNSPECIFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026\n\022LESS_T" + + "HAN_OR_EQUAL\020\002\022\020\n\014GREATER_THAN\020\003\022\031\n\025GREA" + + "TER_THAN_OR_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r" + + "\n\tNOT_EQUAL\020\t\022\020\n\014HAS_ANCESTOR\020\013\022\n\n\006NOT_I" + + "N\020\r\"\323\003\n\013FindNearest\022D\n\017vector_property\030\001" + + " \001(\0132&.google.datastore.v1.PropertyRefer" + + "enceB\003\340A\002\0225\n\014query_vector\030\002 \001(\0132\032.google" + + ".datastore.v1.ValueB\003\340A\002\022O\n\020distance_mea" + + "sure\030\003 \001(\01620.google.datastore.v1.FindNea" + + "rest.DistanceMeasureB\003\340A\002\022/\n\005limit\030\004 \001(\013" + + "2\033.google.protobuf.Int32ValueB\003\340A\002\022%\n\030di" + + "stance_result_property\030\005 \001(\tB\003\340A\001\022=\n\022dis" + + "tance_threshold\030\006 \001(\0132\034.google.protobuf." + + "DoubleValueB\003\340A\001\"_\n\017DistanceMeasure\022 \n\034D" + + "ISTANCE_MEASURE_UNSPECIFIED\020\000\022\r\n\tEUCLIDE" + + "AN\020\001\022\n\n\006COSINE\020\002\022\017\n\013DOT_PRODUCT\020\003\"\245\002\n\010Gq" + + "lQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allow_li" + + "terals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\01320.g" + + "oogle.datastore.v1.GqlQuery.NamedBinding" + + "sEntry\022C\n\023positional_bindings\030\004 \003(\0132&.go" + + "ogle.datastore.v1.GqlQueryParameter\032\\\n\022N" + + "amedBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030" + + "\002 \001(\0132&.google.datastore.v1.GqlQueryPara" + + "meter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005value\030" + + "\002 \001(\0132\032.google.datastore.v1.ValueH\000\022\020\n\006c" + + "ursor\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020Quer" + + "yResultBatch\022\027\n\017skipped_results\030\006 \001(\005\022\026\n" + + "\016skipped_cursor\030\003 \001(\014\022H\n\022entity_result_t" + + "ype\030\001 \001(\0162,.google.datastore.v1.EntityRe" + + "sult.ResultType\0229\n\016entity_results\030\002 \003(\0132" + + "!.google.datastore.v1.EntityResult\022\022\n\nen" + + "d_cursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625.g" + + "oogle.datastore.v1.QueryResultBatch.More" + + "ResultsType\022\030\n\020snapshot_version\030\007 \001(\003\022-\n" + + "\tread_time\030\010 \001(\0132\032.google.protobuf.Times" + + "tamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RESULTS" + + "_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n" + + "\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESU" + + "LTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B" + + "\273\001\n\027com.google.datastore.v1B\nQueryProtoP" + + "\001Z;cloud.google.com/go/datastore/apiv1/d" + + "atastorepb;datastorepb\252\002\031Google.Cloud.Da" + + "tastore.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002" + + "\034Google::Cloud::Datastore::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -232,6 +249,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "EndCursor", "Offset", "Limit", + "FindNearest", }); internal_static_google_datastore_v1_AggregationQuery_descriptor = getDescriptor().getMessageTypes().get(2); @@ -335,8 +353,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new java.lang.String[] { "Property", "Op", "Value", }); - internal_static_google_datastore_v1_GqlQuery_descriptor = + internal_static_google_datastore_v1_FindNearest_descriptor = getDescriptor().getMessageTypes().get(10); + internal_static_google_datastore_v1_FindNearest_fieldAccessorTable = + new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_google_datastore_v1_FindNearest_descriptor, + new java.lang.String[] { + "VectorProperty", + "QueryVector", + "DistanceMeasure", + "Limit", + "DistanceResultProperty", + "DistanceThreshold", + }); + internal_static_google_datastore_v1_GqlQuery_descriptor = + getDescriptor().getMessageTypes().get(11); internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_datastore_v1_GqlQuery_descriptor, @@ -352,7 +383,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Key", "Value", }); internal_static_google_datastore_v1_GqlQueryParameter_descriptor = - getDescriptor().getMessageTypes().get(11); + getDescriptor().getMessageTypes().get(12); internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_datastore_v1_GqlQueryParameter_descriptor, @@ -360,7 +391,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Value", "Cursor", "ParameterType", }); internal_static_google_datastore_v1_QueryResultBatch_descriptor = - getDescriptor().getMessageTypes().get(12); + getDescriptor().getMessageTypes().get(13); internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_datastore_v1_QueryResultBatch_descriptor, diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto index 5ec0eea61..3c2e8ae66 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto @@ -82,6 +82,15 @@ message EntityResult { } // A query for entities. +// +// The query stages are executed in the following order: +// 1. kind +// 2. filter +// 3. projection +// 4. order + start_cursor + end_cursor +// 5. offset +// 6. limit +// 7. find_nearest message Query { // The projection to return. Defaults to returning all properties. repeated Projection projection = 2; @@ -127,6 +136,13 @@ message Query { // Unspecified is interpreted as no limit. // Must be >= 0 if specified. google.protobuf.Int32Value limit = 12; + + // Optional. A potential Nearest Neighbors Search. + // + // Applies after all other filters and ordering. + // + // Finds the closest vector embeddings to the given query vector. + FindNearest find_nearest = 13 [(google.api.field_behavior) = OPTIONAL]; } // Datastore query for running an aggregation over a @@ -436,6 +452,70 @@ message PropertyFilter { Value value = 3; } +// Nearest Neighbors search config. The ordering provided by FindNearest +// supersedes the order_by stage. If multiple documents have the same vector +// distance, the returned document order is not guaranteed to be stable between +// queries. +message FindNearest { + // The distance measure to use when comparing vectors. + enum DistanceMeasure { + // Should not be set. + DISTANCE_MEASURE_UNSPECIFIED = 0; + + // Measures the EUCLIDEAN distance between the vectors. See + // [Euclidean](https://en.wikipedia.org/wiki/Euclidean_distance) to learn + // more. The resulting distance decreases the more similar two vectors are. + EUCLIDEAN = 1; + + // COSINE distance compares vectors based on the angle between them, which + // allows you to measure similarity that isn't based on the vectors + // magnitude. We recommend using DOT_PRODUCT with unit normalized vectors + // instead of COSINE distance, which is mathematically equivalent with + // better performance. See [Cosine + // Similarity](https://en.wikipedia.org/wiki/Cosine_similarity) to learn + // more about COSINE similarity and COSINE distance. The resulting COSINE + // distance decreases the more similar two vectors are. + COSINE = 2; + + // Similar to cosine but is affected by the magnitude of the vectors. See + // [Dot Product](https://en.wikipedia.org/wiki/Dot_product) to learn more. + // The resulting distance increases the more similar two vectors are. + DOT_PRODUCT = 3; + } + + // Required. An indexed vector property to search upon. Only documents which + // contain vectors whose dimensionality match the query_vector can be + // returned. + PropertyReference vector_property = 1 + [(google.api.field_behavior) = REQUIRED]; + + // Required. The query vector that we are searching on. Must be a vector of no + // more than 2048 dimensions. + Value query_vector = 2 [(google.api.field_behavior) = REQUIRED]; + + // Required. The Distance Measure to use, required. + DistanceMeasure distance_measure = 3 [(google.api.field_behavior) = REQUIRED]; + + // Required. The number of nearest neighbors to return. Must be a positive + // integer of no more than 100. + google.protobuf.Int32Value limit = 4 [(google.api.field_behavior) = REQUIRED]; + + // Optional. Optional name of the field to output the result of the vector + // distance calculation. Must conform to [entity + // property][google.datastore.v1.Entity.properties] limitations. + string distance_result_property = 5 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Option to specify a threshold for which no less similar documents + // will be returned. The behavior of the specified `distance_measure` will + // affect the meaning of the distance threshold. Since DOT_PRODUCT distances + // increase when the vectors are more similar, the comparison is inverted. + // + // For EUCLIDEAN, COSINE: WHERE distance <= distance_threshold + // For DOT_PRODUCT: WHERE distance >= distance_threshold + google.protobuf.DoubleValue distance_threshold = 6 + [(google.api.field_behavior) = OPTIONAL]; +} + // A [GQL // query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference). message GqlQuery { From d13d9c63ef87a0115f70b85a6d6b60ab3ff5a222 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:10:36 -0400 Subject: [PATCH 100/292] chore: Update generation configuration at Fri Oct 18 02:24:22 UTC 2024 (#1625) * chore: Update generation configuration at Wed Oct 16 02:24:55 UTC 2024 * chore: Update generation configuration at Thu Oct 17 02:23:50 UTC 2024 * chore: generate libraries at Thu Oct 17 02:24:19 UTC 2024 * chore: Update generation configuration at Fri Oct 18 02:24:22 UTC 2024 --- README.md | 2 +- generation_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e76f6832b..a6a76d6c5 100644 --- a/README.md +++ b/README.md @@ -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.48.0') +implementation platform('com.google.cloud:libraries-bom:26.49.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index 3e00e550d..570a4341f 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.47.0 -googleapis_commitish: f78cd2f7943b9a2eb9734e56a8f3428da75917e2 -libraries_bom_version: 26.48.0 +googleapis_commitish: 5ebb5c1e3d2953efd05c068b27138098eecc8308 +libraries_bom_version: 26.49.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From e3c413880018e1866c46b08fcd4e2c3110a15264 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:52:30 -0400 Subject: [PATCH 101/292] chore: Update generation configuration at Tue Oct 22 02:24:17 UTC 2024 (#1626) * chore: Update generation configuration at Sat Oct 19 02:22:40 UTC 2024 * chore: Update generation configuration at Tue Oct 22 02:24:17 UTC 2024 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 570a4341f..f8e731ddc 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.47.0 -googleapis_commitish: 5ebb5c1e3d2953efd05c068b27138098eecc8308 +googleapis_commitish: beea48a164c2a8cc8485185c3a4f56c587090e1a libraries_bom_version: 26.49.0 libraries: - api_shortname: datastore From af7de6526786783a3f4173eaa17d25a6aa52d4fa Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 18:58:24 +0000 Subject: [PATCH 102/292] chore(main): release 2.23.1-SNAPSHOT (#1623) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 723d37a51..6e3f7cfc9 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.23.0 + 2.23.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.23.0 + 2.23.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 6cfeb40e2..73f8b5cbe 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.23.0 + 2.23.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.23.0 + 2.23.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.23.0 + 2.23.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.114.0 + 0.114.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.23.0 + 2.23.1-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 3c8607887..11e6620ea 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.23.0 + 2.23.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.23.0 + 2.23.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index ad06274a9..36820f768 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.23.0 + 2.23.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.23.0 + 2.23.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 665933af6..108aca675 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.23.0 + 2.23.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.23.0 + 2.23.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.23.0 + 2.23.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.23.0 + 2.23.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.114.0 + 0.114.1-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.23.0 + 2.23.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 4d4da04db..621327b74 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.23.0 + 2.23.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.23.0 + 2.23.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index d4bda3ee4..c07b7321e 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.114.0 + 0.114.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.23.0 + 2.23.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 4da3f232b..04401d182 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.23.0 + 2.23.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 666cbda4e..1d3d32591 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.23.0:2.23.0 -google-cloud-datastore-bom:2.23.0:2.23.0 -proto-google-cloud-datastore-v1:0.114.0:0.114.0 -datastore-v1-proto-client:2.23.0:2.23.0 -proto-google-cloud-datastore-admin-v1:2.23.0:2.23.0 -grpc-google-cloud-datastore-admin-v1:2.23.0:2.23.0 +google-cloud-datastore:2.23.0:2.23.1-SNAPSHOT +google-cloud-datastore-bom:2.23.0:2.23.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.114.0:0.114.1-SNAPSHOT +datastore-v1-proto-client:2.23.0:2.23.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.23.0:2.23.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.23.0:2.23.1-SNAPSHOT From 67f41ffe47cc1b88c6580702048c08a4a9e2d5f1 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 24 Oct 2024 13:29:57 -0400 Subject: [PATCH 103/292] chore: Update generation configuration at Thu Oct 24 02:23:46 UTC 2024 (#1629) * chore: Update generation configuration at Wed Oct 23 02:23:50 UTC 2024 * chore: Update generation configuration at Thu Oct 24 02:23:46 UTC 2024 * chore: generate libraries at Thu Oct 24 02:24:14 UTC 2024 --- generation_config.yaml | 4 ++-- .../reflect-config.json | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/generation_config.yaml b/generation_config.yaml index f8e731ddc..5efd31c25 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.47.0 -googleapis_commitish: beea48a164c2a8cc8485185c3a4f56c587090e1a +gapic_generator_version: 2.48.0 +googleapis_commitish: 7d0624db6f5b5b7d8f5cf36571b33ded2067c5e1 libraries_bom_version: 26.49.0 libraries: - api_shortname: datastore diff --git a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json index e4ca7ae5f..dfe000730 100644 --- a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json +++ b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.admin.v1/reflect-config.json @@ -395,6 +395,24 @@ "allDeclaredClasses": true, "allPublicClasses": true }, + { + "name": "com.google.api.SelectiveGapicGeneration", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.SelectiveGapicGeneration$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, { "name": "com.google.datastore.admin.v1.CommonMetadata", "queryAllDeclaredConstructors": true, From d3bce79467254b3128a8f16d5754e91d29ece525 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 24 Oct 2024 19:33:03 +0200 Subject: [PATCH 104/292] deps: update googleapis/sdk-platform-java action to v2.48.0 (#1628) --- .github/workflows/hermetic_library_generation.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 9399ebef2..4943e3e93 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.47.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.48.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} From c44f17a7bb93d688367611ee2533c59c940ae61f Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Thu, 24 Oct 2024 13:59:15 -0700 Subject: [PATCH 105/292] fix(sample): change update entity sample to use transaction (#1633) --- .../com/google/datastore/snippets/ConceptsTest.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index 1397728ba..045b16a9a 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -297,8 +297,17 @@ public void testLookup() { public void testUpdate() { datastore.put(testEntity); // [START datastore_update] - Entity task = Entity.newBuilder(datastore.get(taskKey)).set("priority", 5).build(); - datastore.update(task); + Entity task; + Transaction txn = datastore.newTransaction(); + try { + task = Entity.newBuilder(txn.get(taskKey)).set("priority", 5).build(); + txn.put(task); + txn.commit(); + } finally { + if (txn.isActive()) { + txn.rollback(); + } + } // [END datastore_update] assertEquals(task, datastore.get(taskKey)); } From 6453f1e44f370a13434ef68295ae5638612032c8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 25 Oct 2024 00:59:23 +0200 Subject: [PATCH 106/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.38.0 (#1632) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 8e4ccadbd..e53ea6bf9 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.37.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.38.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 5cb66b4fe..49b4cde5f 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.37.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.38.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 11c4b309b..d486f7e50 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.37.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.38.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 73f8b5cbe..b5d0bd919 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.37.0 + 3.38.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 108aca675..2ea152f6c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.37.0 + 3.38.0 From 51b7e35574e4dbf253734b504a877c8a19c2c75b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 09:22:22 -0700 Subject: [PATCH 107/292] chore(main): release 2.24.0 (#1631) * chore(main): release 2.24.0 * chore: generate libraries at Thu Oct 24 23:00:05 UTC 2024 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 18 ++++++++++++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 49 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34aeb6370..cd4b9d6f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## [2.24.0](https://github.com/googleapis/java-datastore/compare/v2.23.0...v2.24.0) (2024-10-24) + + +### Features + +* Add FindNearest API to the stable branch ([3512ba2](https://github.com/googleapis/java-datastore/commit/3512ba2f1bcd358e3c39c36944e05873b3f25f51)) + + +### Bug Fixes + +* **sample:** Change update entity sample to use transaction ([#1633](https://github.com/googleapis/java-datastore/issues/1633)) ([c44f17a](https://github.com/googleapis/java-datastore/commit/c44f17a7bb93d688367611ee2533c59c940ae61f)) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.38.0 ([#1632](https://github.com/googleapis/java-datastore/issues/1632)) ([6453f1e](https://github.com/googleapis/java-datastore/commit/6453f1e44f370a13434ef68295ae5638612032c8)) +* Update googleapis/sdk-platform-java action to v2.48.0 ([#1628](https://github.com/googleapis/java-datastore/issues/1628)) ([d3bce79](https://github.com/googleapis/java-datastore/commit/d3bce79467254b3128a8f16d5754e91d29ece525)) + ## [2.23.0](https://github.com/googleapis/java-datastore/compare/v2.22.0...v2.23.0) (2024-10-14) diff --git a/README.md b/README.md index a6a76d6c5..bd795fe50 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.23.0' +implementation 'com.google.cloud:google-cloud-datastore:2.24.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.23.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.0" ``` ## Authentication @@ -479,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.23.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 6e3f7cfc9..59dfb4979 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.23.1-SNAPSHOT + 2.24.0 com.google.cloud google-cloud-datastore-parent - 2.23.1-SNAPSHOT + 2.24.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index b5d0bd919..8f22264e0 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.23.1-SNAPSHOT + 2.24.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.23.1-SNAPSHOT + 2.24.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.23.1-SNAPSHOT + 2.24.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.114.1-SNAPSHOT + 0.115.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.23.1-SNAPSHOT + 2.24.0 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 11e6620ea..b6a7829a5 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.23.1-SNAPSHOT + 2.24.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.23.1-SNAPSHOT + 2.24.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 36820f768..d0e64f478 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.23.1-SNAPSHOT + 2.24.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.23.1-SNAPSHOT + 2.24.0 diff --git a/pom.xml b/pom.xml index 2ea152f6c..c0e18bc93 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.23.1-SNAPSHOT + 2.24.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.23.1-SNAPSHOT + 2.24.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.23.1-SNAPSHOT + 2.24.0 com.google.cloud google-cloud-datastore - 2.23.1-SNAPSHOT + 2.24.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.114.1-SNAPSHOT + 0.115.0 com.google.cloud.datastore datastore-v1-proto-client - 2.23.1-SNAPSHOT + 2.24.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 621327b74..fe5016f50 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.23.1-SNAPSHOT + 2.24.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.23.1-SNAPSHOT + 2.24.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index c07b7321e..fb92c3d74 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.114.1-SNAPSHOT + 0.115.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.23.1-SNAPSHOT + 2.24.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 04401d182..3c12a1725 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.23.1-SNAPSHOT + 2.24.0 diff --git a/versions.txt b/versions.txt index 1d3d32591..cbf5e4466 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.23.0:2.23.1-SNAPSHOT -google-cloud-datastore-bom:2.23.0:2.23.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.114.0:0.114.1-SNAPSHOT -datastore-v1-proto-client:2.23.0:2.23.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.23.0:2.23.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.23.0:2.23.1-SNAPSHOT +google-cloud-datastore:2.24.0:2.24.0 +google-cloud-datastore-bom:2.24.0:2.24.0 +proto-google-cloud-datastore-v1:0.115.0:0.115.0 +datastore-v1-proto-client:2.24.0:2.24.0 +proto-google-cloud-datastore-admin-v1:2.24.0:2.24.0 +grpc-google-cloud-datastore-admin-v1:2.24.0:2.24.0 From 57598d7d59cd6917f23a653403613e4edc160c64 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 28 Oct 2024 17:34:40 +0100 Subject: [PATCH 108/292] deps: update googleapis/sdk-platform-java action to v2.49.0 (#1638) --- .github/workflows/hermetic_library_generation.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 4943e3e93..46b80edc1 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.48.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.49.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} From bff8540a88e12a60103caa34ddef5e53433dcbbb Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 09:34:58 -0700 Subject: [PATCH 109/292] chore(main): release 2.24.1-SNAPSHOT (#1635) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 59dfb4979..7393d37da 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.24.0 + 2.24.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.24.0 + 2.24.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 8f22264e0..ea57703ec 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.24.0 + 2.24.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.24.0 + 2.24.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.0 + 2.24.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.0 + 0.115.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.0 + 2.24.1-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index b6a7829a5..115c1ec4a 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.24.0 + 2.24.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.24.0 + 2.24.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index d0e64f478..879820cf2 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.0 + 2.24.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.0 + 2.24.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index c0e18bc93..a14bafbe8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.24.0 + 2.24.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.0 + 2.24.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.0 + 2.24.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.24.0 + 2.24.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.0 + 0.115.1-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.24.0 + 2.24.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index fe5016f50..ca0d206f6 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.0 + 2.24.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.0 + 2.24.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index fb92c3d74..ffec1dc62 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.0 + 0.115.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.24.0 + 2.24.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 3c12a1725..cfb3a5b62 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.24.0 + 2.24.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index cbf5e4466..71a58858f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.24.0:2.24.0 -google-cloud-datastore-bom:2.24.0:2.24.0 -proto-google-cloud-datastore-v1:0.115.0:0.115.0 -datastore-v1-proto-client:2.24.0:2.24.0 -proto-google-cloud-datastore-admin-v1:2.24.0:2.24.0 -grpc-google-cloud-datastore-admin-v1:2.24.0:2.24.0 +google-cloud-datastore:2.24.0:2.24.1-SNAPSHOT +google-cloud-datastore-bom:2.24.0:2.24.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.115.0:0.115.1-SNAPSHOT +datastore-v1-proto-client:2.24.0:2.24.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.24.0:2.24.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.24.0:2.24.1-SNAPSHOT From 6bc3f1b5198427195a3394c3770328220090365d Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 28 Oct 2024 12:58:20 -0400 Subject: [PATCH 110/292] chore: Update generation configuration at Sun Oct 27 02:26:19 UTC 2024 (#1634) * chore: Update generation configuration at Fri Oct 25 02:24:17 UTC 2024 * chore: Update generation configuration at Sat Oct 26 02:21:39 UTC 2024 * chore: Update generation configuration at Sun Oct 27 02:26:19 UTC 2024 --- generation_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generation_config.yaml b/generation_config.yaml index 5efd31c25..f2751f7dc 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.48.0 -googleapis_commitish: 7d0624db6f5b5b7d8f5cf36571b33ded2067c5e1 +gapic_generator_version: 2.49.0 +googleapis_commitish: 48d30c4966ef9ea31b897e13f75d8f94070cc8e9 libraries_bom_version: 26.49.0 libraries: - api_shortname: datastore From fe61f6691a5e3c8fbfc974b6fe613a69652241ca Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 28 Oct 2024 18:16:30 +0100 Subject: [PATCH 111/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.39.0 (#1640) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index e53ea6bf9..f1796d286 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.38.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.39.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 49b4cde5f..e8c154f48 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.38.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index d486f7e50..046dc8df4 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.38.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index ea57703ec..15b54408c 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.38.0 + 3.39.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index a14bafbe8..415bbbf63 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.38.0 + 3.39.0 From 5899f7c471792af054954b7e44c2d04cb44b3121 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 11:48:12 -0700 Subject: [PATCH 112/292] chore(main): release 2.24.1 (#1641) * chore(main): release 2.24.1 * chore: generate libraries at Mon Oct 28 17:17:32 UTC 2024 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 8 ++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 39 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd4b9d6f9..b76fbc206 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.24.1](https://github.com/googleapis/java-datastore/compare/v2.24.0...v2.24.1) (2024-10-28) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.39.0 ([#1640](https://github.com/googleapis/java-datastore/issues/1640)) ([fe61f66](https://github.com/googleapis/java-datastore/commit/fe61f6691a5e3c8fbfc974b6fe613a69652241ca)) +* Update googleapis/sdk-platform-java action to v2.49.0 ([#1638](https://github.com/googleapis/java-datastore/issues/1638)) ([57598d7](https://github.com/googleapis/java-datastore/commit/57598d7d59cd6917f23a653403613e4edc160c64)) + ## [2.24.0](https://github.com/googleapis/java-datastore/compare/v2.23.0...v2.24.0) (2024-10-24) diff --git a/README.md b/README.md index bd795fe50..ef03d1261 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.24.0' +implementation 'com.google.cloud:google-cloud-datastore:2.24.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.1" ``` ## Authentication @@ -479,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.1 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 7393d37da..235be990e 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.24.1-SNAPSHOT + 2.24.1 com.google.cloud google-cloud-datastore-parent - 2.24.1-SNAPSHOT + 2.24.1 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 15b54408c..627c32f58 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.24.1-SNAPSHOT + 2.24.1 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.24.1-SNAPSHOT + 2.24.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.1-SNAPSHOT + 2.24.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.1-SNAPSHOT + 0.115.1 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.1-SNAPSHOT + 2.24.1 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 115c1ec4a..6f39d3922 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.24.1-SNAPSHOT + 2.24.1 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.24.1-SNAPSHOT + 2.24.1 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 879820cf2..ebe1b66cd 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.1-SNAPSHOT + 2.24.1 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.1-SNAPSHOT + 2.24.1 diff --git a/pom.xml b/pom.xml index 415bbbf63..b4211aa32 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.24.1-SNAPSHOT + 2.24.1 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.1-SNAPSHOT + 2.24.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.1-SNAPSHOT + 2.24.1 com.google.cloud google-cloud-datastore - 2.24.1-SNAPSHOT + 2.24.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.1-SNAPSHOT + 0.115.1 com.google.cloud.datastore datastore-v1-proto-client - 2.24.1-SNAPSHOT + 2.24.1 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index ca0d206f6..1c19e4ab3 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.1-SNAPSHOT + 2.24.1 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.1-SNAPSHOT + 2.24.1 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index ffec1dc62..f8d1b8c04 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.1-SNAPSHOT + 0.115.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.24.1-SNAPSHOT + 2.24.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index cfb3a5b62..46881f45b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.24.1-SNAPSHOT + 2.24.1 diff --git a/versions.txt b/versions.txt index 71a58858f..6939d61e9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.24.0:2.24.1-SNAPSHOT -google-cloud-datastore-bom:2.24.0:2.24.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.115.0:0.115.1-SNAPSHOT -datastore-v1-proto-client:2.24.0:2.24.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.24.0:2.24.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.24.0:2.24.1-SNAPSHOT +google-cloud-datastore:2.24.1:2.24.1 +google-cloud-datastore-bom:2.24.1:2.24.1 +proto-google-cloud-datastore-v1:0.115.1:0.115.1 +datastore-v1-proto-client:2.24.1:2.24.1 +proto-google-cloud-datastore-admin-v1:2.24.1:2.24.1 +grpc-google-cloud-datastore-admin-v1:2.24.1:2.24.1 From 173a88330cc5693f54504348cf39bf3191db2250 Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Tue, 29 Oct 2024 09:29:03 -0700 Subject: [PATCH 113/292] fix(doc): Add discriptions for TransactionCallable interface (#1644) * fix(doc): Add discriptions for TransactionCallable interface * chore: generate libraries at Mon Oct 28 22:49:19 UTC 2024 --------- Co-authored-by: cloud-java-bot --- .../main/java/com/google/cloud/datastore/Datastore.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java index 5bd8384a3..45cecbf25 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java @@ -51,6 +51,13 @@ public interface Datastore extends Service, DatastoreReaderWri * @param the type of the return value */ interface TransactionCallable { + /** + * Callback's invoke method for the TransactionCallable. + * + * @param readerWriter DatastoreReaderWriter associated with the new transaction + * @return T The transaction result + * @throws Exception upon failure + */ T run(DatastoreReaderWriter readerWriter) throws Exception; } From 11892116f0fb8eacb711a8f48e780e48a232f987 Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Tue, 29 Oct 2024 09:29:18 -0700 Subject: [PATCH 114/292] fix(doc): Fix return types for batch interface (#1645) * fix(doc): Fix return types for batch interface * chore: generate libraries at Tue Oct 29 00:30:42 UTC 2024 --------- Co-authored-by: cloud-java-bot --- .../com/google/cloud/datastore/Batch.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java index eb4abd854..882a4db25 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java @@ -53,9 +53,13 @@ interface Response { /** * {@inheritDoc} * - *

If an entity for {@code entity.getKey()} does not exists, {@code entity} is inserted. + *

If an entity for {@code entity.getKey()} does not exist, {@code entity} is inserted. * Otherwise, {@link #submit()} will throw a {@link DatastoreException} with {@link * DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. + * + * @param entity the entity to be added to the datastore + * @return The entity that was added + * @throws DatastoreException if there was any failure */ @Override Entity add(FullEntity entity); @@ -67,6 +71,10 @@ interface Response { * exists, {@link #submit()} will throw a {@link DatastoreException} with {@link * DatastoreException#getReason()} equal to {@code "ALREADY_EXISTS"}. All entities in {@code * entities} whose key did not exist are inserted. + * + * @param entities entities to be added to the datastore + * @return A list of entities that have been added + * @throws DatastoreException if there was any failure */ @Override List add(FullEntity... entities); @@ -74,10 +82,15 @@ interface Response { /** * Submit the batch to the Datastore. * - * @throws DatastoreException if there was any failure or if batch is not longer active + * @return Response of the batch submit operation. + * @throws DatastoreException if there was any failure or if batch is no longer active */ Response submit(); - /** Returns the batch associated {@link Datastore}. */ + /** + * Returns the batch associated {@link Datastore}. + * + * @return The batch associated datastore + */ Datastore getDatastore(); } From cb6a8fc24dc11b868441fe8d9d6d95598218084e Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:31:07 -0400 Subject: [PATCH 115/292] chore: Update generation configuration at Tue Oct 29 02:24:47 UTC 2024 (#1646) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index f2751f7dc..17098ace7 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.49.0 -googleapis_commitish: 48d30c4966ef9ea31b897e13f75d8f94070cc8e9 +googleapis_commitish: ba8ea80f25d19bde8501cd51f314391f8d39bde8 libraries_bom_version: 26.49.0 libraries: - api_shortname: datastore From 29daac0e23ec9c7fe9beccda4953550e098a3ea5 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 30 Oct 2024 13:15:46 -0400 Subject: [PATCH 116/292] chore: Update generation configuration at Wed Oct 30 02:24:22 UTC 2024 (#1647) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 17098ace7..b94bf11c9 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.49.0 -googleapis_commitish: ba8ea80f25d19bde8501cd51f314391f8d39bde8 +googleapis_commitish: f108d78638893ec91cc0d71222ed3d9a048f7a98 libraries_bom_version: 26.49.0 libraries: - api_shortname: datastore From ef586eaf4b2e0f45e7d8d68841edf92ec77b6ec3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:30:24 +0000 Subject: [PATCH 117/292] chore(main): release 2.24.2-SNAPSHOT (#1643) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 235be990e..139de8788 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.24.1 + 2.24.2-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.24.1 + 2.24.2-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 627c32f58..2106efa7e 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.24.1 + 2.24.2-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.24.1 + 2.24.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.1 + 2.24.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.1 + 0.115.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.1 + 2.24.2-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6f39d3922..259614fdd 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.24.1 + 2.24.2-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.24.1 + 2.24.2-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index ebe1b66cd..044dd0a77 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.1 + 2.24.2-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.1 + 2.24.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index b4211aa32..170cd3609 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.24.1 + 2.24.2-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.1 + 2.24.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.1 + 2.24.2-SNAPSHOT com.google.cloud google-cloud-datastore - 2.24.1 + 2.24.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.1 + 0.115.2-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.24.1 + 2.24.2-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 1c19e4ab3..a592fc191 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.1 + 2.24.2-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.1 + 2.24.2-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index f8d1b8c04..ca0f3b663 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.1 + 0.115.2-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.24.1 + 2.24.2-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 46881f45b..cd9f2fd3c 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.24.1 + 2.24.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index 6939d61e9..3b0af5d9e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.24.1:2.24.1 -google-cloud-datastore-bom:2.24.1:2.24.1 -proto-google-cloud-datastore-v1:0.115.1:0.115.1 -datastore-v1-proto-client:2.24.1:2.24.1 -proto-google-cloud-datastore-admin-v1:2.24.1:2.24.1 -grpc-google-cloud-datastore-admin-v1:2.24.1:2.24.1 +google-cloud-datastore:2.24.1:2.24.2-SNAPSHOT +google-cloud-datastore-bom:2.24.1:2.24.2-SNAPSHOT +proto-google-cloud-datastore-v1:0.115.1:0.115.2-SNAPSHOT +datastore-v1-proto-client:2.24.1:2.24.2-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.24.1:2.24.2-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.24.1:2.24.2-SNAPSHOT From 29f818562fa994dd6dac1743ee21e4292a88bb7d Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:37:27 -0400 Subject: [PATCH 118/292] chore: Update generation configuration at Thu Oct 31 02:24:55 UTC 2024 (#1649) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index b94bf11c9..c74ee03aa 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.49.0 -googleapis_commitish: f108d78638893ec91cc0d71222ed3d9a048f7a98 +googleapis_commitish: 8c534a5c3afe69eeca1b9d4c8415d6d1952aa5ce libraries_bom_version: 26.49.0 libraries: - api_shortname: datastore From adf7a547e0534e7f351d91c69520e5dc5f4e0aa8 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 4 Nov 2024 11:57:46 -0500 Subject: [PATCH 119/292] chore: Update generation configuration at Sat Nov 2 02:22:17 UTC 2024 (#1650) * chore: Update generation configuration at Fri Nov 1 02:27:18 UTC 2024 * chore: Update generation configuration at Sat Nov 2 02:22:17 UTC 2024 * chore: generate libraries at Sat Nov 2 02:22:55 UTC 2024 --- README.md | 2 +- generation_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ef03d1261..78621b205 100644 --- a/README.md +++ b/README.md @@ -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.49.0') +implementation platform('com.google.cloud:libraries-bom:26.50.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index c74ee03aa..a370f1961 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.49.0 -googleapis_commitish: 8c534a5c3afe69eeca1b9d4c8415d6d1952aa5ce -libraries_bom_version: 26.49.0 +googleapis_commitish: 9b94dba2f7f4b601f8232bc3a3f6ef32665279b9 +libraries_bom_version: 26.50.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From 8f32aca4bd779f552c21bf2f7044367214888912 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 4 Nov 2024 18:38:27 +0100 Subject: [PATCH 120/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.50.0 (#1613) --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 677692680..d31d40cb9 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.47.0 + 26.50.0 pom import From 92952c8e033aaeed7f0dcded1226bbaed577e140 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 4 Nov 2024 18:38:39 +0100 Subject: [PATCH 121/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.24.1 (#1624) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index c39bbf20b..30cba8255 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.22.0 + 2.24.1 From 61a1c2b791a4ae01413ca0006d945ffce547a3bc Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:17:20 -0500 Subject: [PATCH 122/292] chore: Update generation configuration at Tue Nov 5 02:22:24 UTC 2024 (#1652) * chore: Update generation configuration at Tue Nov 5 02:22:24 UTC 2024 * chore: generate libraries at Tue Nov 5 02:23:04 UTC 2024 --- README.md | 4 ++-- generation_config.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 78621b205..5618dd688 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.47.0 + 26.50.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.22.0 + 2.24.1 ``` diff --git a/generation_config.yaml b/generation_config.yaml index a370f1961..ec3f32594 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.49.0 -googleapis_commitish: 9b94dba2f7f4b601f8232bc3a3f6ef32665279b9 +googleapis_commitish: 1f2e5aab4f95b9bd38dd1ac8c7486657f93c1975 libraries_bom_version: 26.50.0 libraries: - api_shortname: datastore From d05d1a47bda7de457147d5716bc6b1fa9538f59f Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:12:25 -0500 Subject: [PATCH 123/292] chore: Update generation configuration at Wed Nov 6 02:21:44 UTC 2024 (#1653) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index ec3f32594..87be80054 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.49.0 -googleapis_commitish: 1f2e5aab4f95b9bd38dd1ac8c7486657f93c1975 +googleapis_commitish: 5e306b977beaf42766855a4a26ebe1f2dd133d92 libraries_bom_version: 26.50.0 libraries: - api_shortname: datastore From 73460e064545222739c6ce69ac0b8a99c3fa267a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 12:20:15 -0800 Subject: [PATCH 124/292] chore(main): release 2.24.2 (#1648) * chore(main): release 2.24.2 * chore: generate libraries at Wed Nov 6 21:13:30 UTC 2024 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 8 ++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 39 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b76fbc206..36d4e90cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.24.2](https://github.com/googleapis/java-datastore/compare/v2.24.1...v2.24.2) (2024-11-06) + + +### Bug Fixes + +* **doc:** Add discriptions for TransactionCallable interface ([#1644](https://github.com/googleapis/java-datastore/issues/1644)) ([173a883](https://github.com/googleapis/java-datastore/commit/173a88330cc5693f54504348cf39bf3191db2250)) +* **doc:** Fix return types for batch interface ([#1645](https://github.com/googleapis/java-datastore/issues/1645)) ([1189211](https://github.com/googleapis/java-datastore/commit/11892116f0fb8eacb711a8f48e780e48a232f987)) + ## [2.24.1](https://github.com/googleapis/java-datastore/compare/v2.24.0...v2.24.1) (2024-10-28) diff --git a/README.md b/README.md index 5618dd688..536b57f4c 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.24.1' +implementation 'com.google.cloud:google-cloud-datastore:2.24.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.2" ``` ## Authentication @@ -479,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.2 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 139de8788..31e19645e 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.24.2-SNAPSHOT + 2.24.2 com.google.cloud google-cloud-datastore-parent - 2.24.2-SNAPSHOT + 2.24.2 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 2106efa7e..f9b016415 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.24.2-SNAPSHOT + 2.24.2 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.24.2-SNAPSHOT + 2.24.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.2-SNAPSHOT + 2.24.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.2-SNAPSHOT + 0.115.2 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.2-SNAPSHOT + 2.24.2 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 259614fdd..419bd87ae 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.24.2-SNAPSHOT + 2.24.2 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.24.2-SNAPSHOT + 2.24.2 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 044dd0a77..cfd79c52d 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.2-SNAPSHOT + 2.24.2 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.2-SNAPSHOT + 2.24.2 diff --git a/pom.xml b/pom.xml index 170cd3609..e3c138615 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.24.2-SNAPSHOT + 2.24.2 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.2-SNAPSHOT + 2.24.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.2-SNAPSHOT + 2.24.2 com.google.cloud google-cloud-datastore - 2.24.2-SNAPSHOT + 2.24.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.2-SNAPSHOT + 0.115.2 com.google.cloud.datastore datastore-v1-proto-client - 2.24.2-SNAPSHOT + 2.24.2 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index a592fc191..02befd0a5 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.2-SNAPSHOT + 2.24.2 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.2-SNAPSHOT + 2.24.2 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index ca0f3b663..47bbefce7 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.2-SNAPSHOT + 0.115.2 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.24.2-SNAPSHOT + 2.24.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index cd9f2fd3c..3e017bbe2 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.24.2-SNAPSHOT + 2.24.2 diff --git a/versions.txt b/versions.txt index 3b0af5d9e..5a01f70c6 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.24.1:2.24.2-SNAPSHOT -google-cloud-datastore-bom:2.24.1:2.24.2-SNAPSHOT -proto-google-cloud-datastore-v1:0.115.1:0.115.2-SNAPSHOT -datastore-v1-proto-client:2.24.1:2.24.2-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.24.1:2.24.2-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.24.1:2.24.2-SNAPSHOT +google-cloud-datastore:2.24.2:2.24.2 +google-cloud-datastore-bom:2.24.2:2.24.2 +proto-google-cloud-datastore-v1:0.115.2:0.115.2 +datastore-v1-proto-client:2.24.2:2.24.2 +proto-google-cloud-datastore-admin-v1:2.24.2:2.24.2 +grpc-google-cloud-datastore-admin-v1:2.24.2:2.24.2 From dc9258c6fd5212df1aaaee55665e7955dc5a3ded Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:55:07 -0500 Subject: [PATCH 125/292] chore: Update generation configuration at Tue Nov 12 02:21:13 UTC 2024 (#1654) * chore: Update generation configuration at Thu Nov 7 02:22:45 UTC 2024 * chore: Update generation configuration at Fri Nov 8 02:22:33 UTC 2024 * chore: Update generation configuration at Sat Nov 9 02:19:26 UTC 2024 * chore: Update generation configuration at Tue Nov 12 02:21:13 UTC 2024 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 87be80054..273697bc6 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.49.0 -googleapis_commitish: 5e306b977beaf42766855a4a26ebe1f2dd133d92 +googleapis_commitish: 5257378f52352e70b8995713f0d4484bdab7e71d libraries_bom_version: 26.50.0 libraries: - api_shortname: datastore From 21f1a221b7d0501ca702ea07fc57a3c1f7423a17 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 10:09:00 -0800 Subject: [PATCH 126/292] chore(main): release 2.24.3-SNAPSHOT (#1655) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 31e19645e..34fe59866 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.24.2 + 2.24.3-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.24.2 + 2.24.3-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f9b016415..3c2859643 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.24.2 + 2.24.3-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.24.2 + 2.24.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.2 + 2.24.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.2 + 0.115.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.2 + 2.24.3-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 419bd87ae..2b173dbda 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.24.2 + 2.24.3-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.24.2 + 2.24.3-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index cfd79c52d..618e4a114 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.2 + 2.24.3-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.2 + 2.24.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index e3c138615..9384a3f1c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.24.2 + 2.24.3-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.2 + 2.24.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.2 + 2.24.3-SNAPSHOT com.google.cloud google-cloud-datastore - 2.24.2 + 2.24.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.2 + 0.115.3-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.24.2 + 2.24.3-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 02befd0a5..0e54ae372 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.2 + 2.24.3-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.2 + 2.24.3-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 47bbefce7..7047f6a30 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.2 + 0.115.3-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.24.2 + 2.24.3-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 3e017bbe2..999da4b70 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.24.2 + 2.24.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index 5a01f70c6..eb2d90393 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.24.2:2.24.2 -google-cloud-datastore-bom:2.24.2:2.24.2 -proto-google-cloud-datastore-v1:0.115.2:0.115.2 -datastore-v1-proto-client:2.24.2:2.24.2 -proto-google-cloud-datastore-admin-v1:2.24.2:2.24.2 -grpc-google-cloud-datastore-admin-v1:2.24.2:2.24.2 +google-cloud-datastore:2.24.2:2.24.3-SNAPSHOT +google-cloud-datastore-bom:2.24.2:2.24.3-SNAPSHOT +proto-google-cloud-datastore-v1:0.115.2:0.115.3-SNAPSHOT +datastore-v1-proto-client:2.24.2:2.24.3-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.24.2:2.24.3-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.24.2:2.24.3-SNAPSHOT From b4d3ab9a72bb2a4dff59bf54abcc5d9536b2596b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 18 Nov 2024 19:11:25 +0100 Subject: [PATCH 127/292] deps: update sdk platform java dependencies (#1662) --- .github/workflows/hermetic_library_generation.yaml | 2 +- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 46b80edc1..35aa3b151 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.49.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.50.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index f1796d286..0ee0f5aaa 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.39.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.40.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index e8c154f48..aabe0f1f9 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.39.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.40.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 046dc8df4..4b9610ffc 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.39.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.40.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 3c2859643..62f90d65f 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.39.0 + 3.40.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 9384a3f1c..f8f609aee 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.39.0 + 3.40.0 From 7d247a89be1abc0249ca530c37b526088b7b0bf8 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 18 Nov 2024 13:18:21 -0500 Subject: [PATCH 128/292] chore: Update generation configuration at Mon Nov 18 02:27:15 UTC 2024 (#1657) * chore: Update generation configuration at Wed Nov 13 02:22:54 UTC 2024 * chore: Update generation configuration at Thu Nov 14 02:23:22 UTC 2024 * chore: Update generation configuration at Fri Nov 15 02:26:26 UTC 2024 * chore: Update generation configuration at Sat Nov 16 02:25:10 UTC 2024 * chore: Update generation configuration at Mon Nov 18 02:27:15 UTC 2024 --- generation_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generation_config.yaml b/generation_config.yaml index 273697bc6..029446537 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.49.0 -googleapis_commitish: 5257378f52352e70b8995713f0d4484bdab7e71d +gapic_generator_version: 2.50.0 +googleapis_commitish: 0b5613ee74c9558dd284aa2b01a585ce297c0045 libraries_bom_version: 26.50.0 libraries: - api_shortname: datastore From 5d5f1db4c5d183602badabd90d8e0759bcadb406 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 11:04:10 -0800 Subject: [PATCH 129/292] chore(main): release 2.24.3 (#1665) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 35 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36d4e90cf..07cf43d6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.24.3](https://github.com/googleapis/java-datastore/compare/v2.24.2...v2.24.3) (2024-11-18) + + +### Dependencies + +* Update sdk platform java dependencies ([#1662](https://github.com/googleapis/java-datastore/issues/1662)) ([b4d3ab9](https://github.com/googleapis/java-datastore/commit/b4d3ab9a72bb2a4dff59bf54abcc5d9536b2596b)) + ## [2.24.2](https://github.com/googleapis/java-datastore/compare/v2.24.1...v2.24.2) (2024-11-06) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 34fe59866..81f589e82 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.24.3-SNAPSHOT + 2.24.3 com.google.cloud google-cloud-datastore-parent - 2.24.3-SNAPSHOT + 2.24.3 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 62f90d65f..c44f45040 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.24.3-SNAPSHOT + 2.24.3 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.24.3-SNAPSHOT + 2.24.3 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.3-SNAPSHOT + 2.24.3 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.3-SNAPSHOT + 0.115.3 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.3-SNAPSHOT + 2.24.3 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 2b173dbda..6c8dbf156 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.24.3-SNAPSHOT + 2.24.3 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.24.3-SNAPSHOT + 2.24.3 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 618e4a114..bc6da09a2 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.3-SNAPSHOT + 2.24.3 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.3-SNAPSHOT + 2.24.3 diff --git a/pom.xml b/pom.xml index f8f609aee..010f41c6b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.24.3-SNAPSHOT + 2.24.3 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.3-SNAPSHOT + 2.24.3 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.3-SNAPSHOT + 2.24.3 com.google.cloud google-cloud-datastore - 2.24.3-SNAPSHOT + 2.24.3 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.3-SNAPSHOT + 0.115.3 com.google.cloud.datastore datastore-v1-proto-client - 2.24.3-SNAPSHOT + 2.24.3 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 0e54ae372..e0eb6c902 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.3-SNAPSHOT + 2.24.3 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.3-SNAPSHOT + 2.24.3 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 7047f6a30..49d767dfb 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.3-SNAPSHOT + 0.115.3 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.24.3-SNAPSHOT + 2.24.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 999da4b70..e484c2694 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.24.3-SNAPSHOT + 2.24.3 diff --git a/versions.txt b/versions.txt index eb2d90393..99f46fe19 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.24.2:2.24.3-SNAPSHOT -google-cloud-datastore-bom:2.24.2:2.24.3-SNAPSHOT -proto-google-cloud-datastore-v1:0.115.2:0.115.3-SNAPSHOT -datastore-v1-proto-client:2.24.2:2.24.3-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.24.2:2.24.3-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.24.2:2.24.3-SNAPSHOT +google-cloud-datastore:2.24.3:2.24.3 +google-cloud-datastore-bom:2.24.3:2.24.3 +proto-google-cloud-datastore-v1:0.115.3:0.115.3 +datastore-v1-proto-client:2.24.3:2.24.3 +proto-google-cloud-datastore-admin-v1:2.24.3:2.24.3 +grpc-google-cloud-datastore-admin-v1:2.24.3:2.24.3 From 8244ad258a90e5bbc7e7d8ec384555b2be84ab8f Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:50:00 -0500 Subject: [PATCH 130/292] chore: Update generation configuration at Wed Nov 20 02:25:57 UTC 2024 (#1669) * chore: Update generation configuration at Tue Nov 19 02:26:26 UTC 2024 * chore: generate libraries at Tue Nov 19 02:27:03 UTC 2024 * chore: Update generation configuration at Wed Nov 20 02:25:57 UTC 2024 --- README.md | 6 +- generation_config.yaml | 2 +- .../admin/v1/DatastoreAdminSettings.java | 2 +- .../v1/stub/DatastoreAdminStubSettings.java | 60 +++++++++---------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 536b57f4c..f059e75ed 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.24.2' +implementation 'com.google.cloud:google-cloud-datastore:2.24.3' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.3" ``` ## Authentication @@ -479,7 +479,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.3 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/generation_config.yaml b/generation_config.yaml index 029446537..b9de0b019 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.50.0 -googleapis_commitish: 0b5613ee74c9558dd284aa2b01a585ce297c0045 +googleapis_commitish: a547fc1420eb0a0f3ae32b0a4eb72d3b8b17d136 libraries_bom_version: 26.50.0 libraries: - api_shortname: datastore diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java index cafef310e..4db454e20 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java @@ -117,7 +117,7 @@ * RetrySettings.newBuilder() * .setInitialRetryDelayDuration(Duration.ofMillis(500)) * .setRetryDelayMultiplier(1.5) - * .setMaxRetryDelay(Duration.ofMillis(5000)) + * .setMaxRetryDelayDuration(Duration.ofMillis(5000)) * .setTotalTimeoutDuration(Duration.ofHours(24)) * .build()); * datastoreAdminSettingsBuilder diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java index 82df00c03..aa10d582f 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java @@ -67,9 +67,9 @@ import com.google.longrunning.Operation; import com.google.protobuf.Empty; import java.io.IOException; +import java.time.Duration; import java.util.List; import javax.annotation.Generated; -import org.threeten.bp.Duration; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -138,7 +138,7 @@ * RetrySettings.newBuilder() * .setInitialRetryDelayDuration(Duration.ofMillis(500)) * .setRetryDelayMultiplier(1.5) - * .setMaxRetryDelay(Duration.ofMillis(5000)) + * .setMaxRetryDelayDuration(Duration.ofMillis(5000)) * .setTotalTimeoutDuration(Duration.ofHours(24)) * .build()); * datastoreAdminSettingsBuilder @@ -449,21 +449,21 @@ public static class Builder extends StubSettings.Builder Date: Wed, 20 Nov 2024 13:35:07 -0500 Subject: [PATCH 131/292] chore: make library generation required (#1672) * chore: make library generation required * chore: generate libraries at Tue Nov 19 22:29:32 UTC 2024 --------- Co-authored-by: cloud-java-bot --- .github/sync-repo-settings.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index fce568dc2..bd6908f91 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -18,6 +18,7 @@ branchProtectionRules: - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc + - library_generation - pattern: 1.106.5-sp isAdminEnforced: true requiredApprovingReviewCount: 1 From 593c50c34849c0f967822e05bfd3859eacedd99c Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Wed, 20 Nov 2024 16:21:56 -0800 Subject: [PATCH 132/292] chore: disable V3-experimental branch rules (#1668) * chore:Disable v3-experimental branch rules * chore: generate libraries at Tue Nov 19 00:24:17 UTC 2024 --------- Co-authored-by: cloud-java-bot --- .github/dependabot.yml | 13 +------------ .github/sync-repo-settings.yaml | 16 ---------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3a7c9a454..2afe7bfe7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,15 +17,4 @@ updates: # If a security vulnerability comes in, we will be notified about # it via template in the synthtool repository. ignore: - - dependency-name: "*" - - # rules for the `V3-experimental` branch - - package-ecosystem: maven - directory: "/" - schedule: - interval: daily - commit-message: - # Prefix all commit messages with "deps: " - prefix: "deps" - open-pull-requests-limit: 10 - target-branch: "V3-experimental" + - dependency-name: "*" \ No newline at end of file diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index bd6908f91..ab421dce5 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -108,22 +108,6 @@ branchProtectionRules: - cla/google - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - - pattern: V3-experimental - isAdminEnforced: true - requiredApprovingReviewCount: 1 - requiresCodeOwnerReviews: true - requiresStrictStatusChecks: false - requiredStatusCheckContexts: - - dependencies (17) - - lint - - clirr - - units (8) - - units (11) - - 'Kokoro - Test: Integration' - - cla/google - - 'Kokoro - Test: Java GraalVM Native Image' - - 'Kokoro - Test: Java 17 GraalVM Native Image' - - javadoc - pattern: 2.15.x isAdminEnforced: true requiredApprovingReviewCount: 1 From 5a78a8075867f4b2fc598f0423bd2ab65b559856 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 27 Nov 2024 19:06:20 -0500 Subject: [PATCH 133/292] feat: introduce `java.time` methods and variables (#1671) This PR introduces `java.time` alternatives to existing `org.threeten.bp.*` methods, as well as switching internal variables (if any) to `java.time` The main constraint is to keep the changes backwards compatible, so for each existing threeten method "`method1(org.threeten.bp.Duration)`" we will add an alternative with a _Duration_ (or _Timestamp_ when applicable) suffix: "`method1Duration(java.time.Duration)`". For most cases, the implementation will be held in the `java.time` method and the old threeten method will just delegate the call to it. However, for the case of abstract classes, the implementation will be kept in the threeten method to avoid breaking changes (i.e. users that already overloaded the method in their user code). --- .../datastore/models/ExecutionStats.java | 16 ++++++++++---- .../testing/LocalDatastoreHelper.java | 22 ++++++++++++++----- .../google/cloud/datastore/DatastoreTest.java | 4 ++-- .../cloud/datastore/it/ITDatastoreTest.java | 4 ++-- .../datastore/models/ExecutionStatsTest.java | 4 ++-- .../testing/ITLocalDatastoreHelperTest.java | 6 ++--- .../testing/RemoteDatastoreHelper.java | 12 +++++----- .../datastore/snippets/ConceptsTest.java | 3 +-- 8 files changed, 44 insertions(+), 27 deletions(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java index 52184a01a..6738d84e3 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/models/ExecutionStats.java @@ -15,25 +15,27 @@ */ package com.google.cloud.datastore.models; +import static com.google.api.gax.util.TimeConversionUtils.toThreetenDuration; + import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; +import com.google.api.core.ObsoleteApi; import com.google.cloud.Structs; import com.google.common.base.Objects; import java.util.Map; -import org.threeten.bp.Duration; /** Model class for {@link com.google.datastore.v1.ExecutionStats} */ @BetaApi public class ExecutionStats { private final long resultsReturned; - private final Duration executionDuration; + private final java.time.Duration executionDuration; private final long readOperations; private final Map debugStats; @InternalApi public ExecutionStats(com.google.datastore.v1.ExecutionStats proto) { this.resultsReturned = proto.getResultsReturned(); - this.executionDuration = Duration.ofNanos(proto.getExecutionDuration().getNanos()); + this.executionDuration = java.time.Duration.ofNanos(proto.getExecutionDuration().getNanos()); this.readOperations = proto.getReadOperations(); this.debugStats = Structs.asMap(proto.getDebugStats()); } @@ -51,8 +53,14 @@ public Map getDebugStats() { return debugStats; } + /** This method is obsolete. Use {@link #getExecutionDurationJavaTime()} instead. */ + @ObsoleteApi("Use getExecutionDurationJavaTime() instead") + public org.threeten.bp.Duration getExecutionDuration() { + return toThreetenDuration(getExecutionDurationJavaTime()); + } + /** Returns the total time to execute the query in the backend. */ - public Duration getExecutionDuration() { + public java.time.Duration getExecutionDurationJavaTime() { return executionDuration; } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java index 2723325ee..32bf9611c 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java @@ -16,9 +16,11 @@ package com.google.cloud.datastore.testing; +import static com.google.api.gax.util.TimeConversionUtils.toJavaTimeDuration; import static com.google.common.base.MoreObjects.firstNonNull; import com.google.api.core.InternalApi; +import com.google.api.core.ObsoleteApi; import com.google.cloud.NoCredentials; import com.google.cloud.ServiceOptions; import com.google.cloud.datastore.DatastoreOptions; @@ -38,7 +40,6 @@ import java.util.UUID; import java.util.concurrent.TimeoutException; import java.util.logging.Logger; -import org.threeten.bp.Duration; /** * Utility to start and stop local Google Cloud Datastore emulators. @@ -307,6 +308,14 @@ public void reset() throws IOException { sendPostRequest("/reset"); } + /** This method is obsolete. Use {@link #stopDuration(java.time.Duration)} instead */ + @ObsoleteApi("Use stopDuration(java.time.Duration) instead") + @Override + public void stop(org.threeten.bp.Duration timeout) + throws IOException, InterruptedException, TimeoutException { + stopDuration(toJavaTimeDuration(timeout)); + } + /** * Stops the Datastore emulator. * @@ -319,15 +328,16 @@ public void reset() throws IOException { * this value high to ensure proper shutdown, like 5 seconds or more. */ @Override - public void stop(Duration timeout) throws IOException, InterruptedException, TimeoutException { + public void stopDuration(java.time.Duration timeout) + throws IOException, InterruptedException, TimeoutException { sendPostRequest("/shutdown"); - waitForProcess(timeout); + waitForProcessDuration(timeout); deleteRecursively(gcdPath); } /** - * Stops the Datastore emulator. The same as {@link #stop(Duration)} but with timeout duration of - * 20 seconds. + * Stops the Datastore emulator. The same as {@link #stopDuration(java.time.Duration)} but with + * timeout duration of 20 seconds. * *

It is important to stop the emulator. Since the emulator runs in its own process, not * stopping it might cause it to become orphan. @@ -335,7 +345,7 @@ public void stop(Duration timeout) throws IOException, InterruptedException, Tim *

It is not required to call {@link #reset()} before {@code stop()}. */ public void stop() throws IOException, InterruptedException, TimeoutException { - stop(Duration.ofSeconds(20)); + stopDuration(java.time.Duration.ofSeconds(20)); } static void deleteRecursively(Path path) throws IOException { diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java index d88e1d1ec..459278f25 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java @@ -68,6 +68,7 @@ import com.google.datastore.v1.TransactionOptions; import com.google.protobuf.ByteString; import java.io.IOException; +import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -87,7 +88,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import org.threeten.bp.Duration; @RunWith(JUnit4.class) public class DatastoreTest { @@ -193,7 +193,7 @@ public void setUp() { @AfterClass public static void afterClass() throws IOException, InterruptedException, TimeoutException { - helper.stop(Duration.ofMinutes(1)); + helper.stopDuration(Duration.ofMinutes(1)); } @Test diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java index c012d28c9..bf0c20dce 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java @@ -81,6 +81,7 @@ import com.google.common.truth.Truth; import com.google.datastore.v1.TransactionOptions; import com.google.datastore.v1.TransactionOptions.ReadOnly; +import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -103,7 +104,6 @@ import org.junit.rules.Timeout; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.threeten.bp.Duration; @RunWith(Parameterized.class) public class ITDatastoreTest { @@ -674,7 +674,7 @@ private void assertExecutionStats( Truth.assertThat(debugStats.get("index_entries_scanned")) .isEqualTo(expectedIndexEntriesScanned); - Duration executionDuration = executionStats.getExecutionDuration(); + Duration executionDuration = executionStats.getExecutionDurationJavaTime(); Truth.assertThat(executionDuration).isIn(Range.greaterThan(Duration.ofMillis(0))); long readOperations = executionStats.getReadOperations(); diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java index 4706e3b86..a0e778cee 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/models/ExecutionStatsTest.java @@ -41,8 +41,8 @@ public class ExecutionStatsTest { @Test public void testModel() { Truth.assertThat(executionStats.getDebugStats()).isEqualTo(Structs.asMap(struct)); - Truth.assertThat(executionStats.getExecutionDuration()) - .isEqualTo(org.threeten.bp.Duration.ofNanos(duration.getNanos())); + Truth.assertThat(executionStats.getExecutionDurationJavaTime()) + .isEqualTo(java.time.Duration.ofNanos(duration.getNanos())); Truth.assertThat(executionStats.getReadOperations()).isEqualTo(2); Truth.assertThat(executionStats.getResultsReturned()).isEqualTo(3); } diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java index 3ebd3ef4a..dfa2255a0 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java @@ -32,6 +32,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.time.Duration; import java.util.concurrent.TimeoutException; import org.junit.After; import org.junit.Assert; @@ -39,7 +40,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import org.threeten.bp.Duration; @RunWith(JUnit4.class) public class ITLocalDatastoreHelperTest { @@ -178,7 +178,7 @@ public void testStartStopReset() throws IOException, InterruptedException, Timeo assertNotNull(datastore.get(key)); helper.reset(); assertNull(datastore.get(key)); - helper.stop(Duration.ofMinutes(1)); + helper.stopDuration(Duration.ofMinutes(1)); datastore.get(key); Assert.fail(); } catch (DatastoreException ex) { @@ -198,7 +198,7 @@ public void testStartStopResetWithBuilder() assertNotNull(datastore.get(key)); helper.reset(); assertNull(datastore.get(key)); - helper.stop(Duration.ofMinutes(1)); + helper.stopDuration(Duration.ofMinutes(1)); datastore.get(key); Assert.fail(); } catch (DatastoreException ex) { diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java index 6167cedca..a4b389a1e 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java @@ -27,9 +27,9 @@ import com.google.cloud.datastore.StructuredQuery; import com.google.cloud.http.HttpTransportOptions; import io.opentelemetry.sdk.OpenTelemetrySdk; +import java.time.Duration; import java.util.UUID; import javax.annotation.Nullable; -import org.threeten.bp.Duration; /** * Utility to create a remote datastore configuration for testing. Datastore options can be obtained @@ -110,13 +110,13 @@ public static RemoteDatastoreHelper create(String databaseId) { private static RetrySettings retrySettings() { return RetrySettings.newBuilder() .setMaxAttempts(10) - .setMaxRetryDelay(Duration.ofMillis(30000L)) - .setTotalTimeout(Duration.ofMillis(120000L)) - .setInitialRetryDelay(Duration.ofMillis(250L)) + .setMaxRetryDelayDuration(Duration.ofMillis(30000L)) + .setTotalTimeoutDuration(Duration.ofMillis(120000L)) + .setInitialRetryDelayDuration(Duration.ofMillis(250L)) .setRetryDelayMultiplier(1.0) - .setInitialRpcTimeout(Duration.ofMillis(120000L)) + .setInitialRpcTimeoutDuration(Duration.ofMillis(120000L)) .setRpcTimeoutMultiplier(1.0) - .setMaxRpcTimeout(Duration.ofMillis(120000L)) + .setMaxRpcTimeoutDuration(Duration.ofMillis(120000L)) .build(); } } diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index 045b16a9a..33aa63ab4 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -77,7 +77,6 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import org.threeten.bp.Duration; /** Contains Cloud Datastore snippets demonstrating concepts for documentation. */ @RunWith(JUnit4.class) @@ -147,7 +146,7 @@ public void tearDown() throws Exception { */ @AfterClass public static void afterClass() throws IOException, InterruptedException, TimeoutException { - HELPER.stop(Duration.ofMinutes(1)); + HELPER.stopDuration(java.time.Duration.ofMinutes(1)); } private void assertValidKey(Key taskKey) { From 8146530139e2bdcec0961c252cc2fc1bfff2bd4a Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:37:53 +0000 Subject: [PATCH 134/292] chore: mark the unmanaged dependency check required (#1675) --- .github/sync-repo-settings.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index ab421dce5..203644341 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -19,6 +19,7 @@ branchProtectionRules: - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc - library_generation + - unmanaged_dependency_check - pattern: 1.106.5-sp isAdminEnforced: true requiredApprovingReviewCount: 1 From b3fbfcc9654bc63bf0d8f3025641d8c50a24ef97 Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:17:28 -0800 Subject: [PATCH 135/292] Docs: Update gapic upgrade installation instructions (#1677) * Update user guide * chore: generate libraries at Wed Dec 4 18:25:42 UTC 2024 * Formatting code block * chore: generate libraries at Wed Dec 4 19:22:29 UTC 2024 * Remove client-side metrics suggestions --------- Co-authored-by: cloud-java-bot --- .readme-partials.yaml | 82 +++++++++++++++++++++++++++++++------------ README.md | 82 +++++++++++++++++++++++++++++++------------ 2 files changed, 120 insertions(+), 44 deletions(-) diff --git a/.readme-partials.yaml b/.readme-partials.yaml index ced21e49f..3e8d3a465 100644 --- a/.readme-partials.yaml +++ b/.readme-partials.yaml @@ -110,28 +110,33 @@ custom_content: | ------- In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance. - #### Download Instructions - Instructions: - 1. Clone the grpc-experimental branch from GitHub: - ```python - git clone -b grpc-experimental https://github.com/googleapis/java-datastore.git - ``` - 2. Run the following commands to build the library: - ```python - # Go to the directory the code was downloaded to - cd java-datastore/ - - # Build the library - mvn clean install -DskipTests=true - ``` - 3. Add the following dependency to your project: - ```xml - + #### Installation Instructions + The client can be built from the `grpc-experimental` branch on GitHub. For private preview, you can also download the artifact with the instructions provided below. + + 1. Download the datastore private preview package with dependencies: + ``` + curl -o https://datastore-sdk-feature-release.web.app/google-cloud-datastore-2.20.0-grpc-experimental-1-SNAPSHOT-jar-with-dependencies.jar + ``` + 2. Run the following commands to install JDK locally: + ``` + mvn install:install-file -Dfile= -DgroupId=com.google.cloud -DartifactId=google-cloud-datastore -Dversion=2.20.0-grpc + ``` + 3. Edit your pom.xml to add above package to `` section: + ```xml + com.google.cloud google-cloud-datastore 2.20.0-grpc-experimental-1-SNAPSHOT - - ``` + + ``` + + And if you have not yet, add below to `` section: + ```xml + + local-repo + file://${user.home}/.m2/repository + + ``` #### How to Use To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation. @@ -181,11 +186,44 @@ custom_content: | #### New Features There are new gRPC specific features available to use in this update. - ##### Channel Pooling - To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. + ##### Connection Pool + A connection pool, also known as a channel pool, is a cache of database connections that are shared and reused to improve connection latency and performance. With this update, now you will be able to configure the channel pool to improve application performance. This section guides you in determining the optimal connection pool size and configuring it within the Java datastore client. + To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. + ###### Determine the best connection pool size + The default connection pool size is right for most applications, and in most cases there's no need to change it. + + However sometimes you may want to change your connection pool size due to high throughput or buffered requests. Ideally, to leave room for traffic fluctuations, a connection pool has about twice the number of connections it takes for maximum saturation. Because a connection can handle a maximum of 100 concurrent requests, between 10 and 50 outstanding requests per connection is optimal. The limit of 100 concurrent streams per gRPC connection is enforced in Google's middleware layer, and you are not able to reconfigure this number. + + The following steps help you calculate the optimal number of connections in your channel pool using estimate per-client QPS and average latency numbers. + + To calculate the optimal connections, gather the following information: + + 1. The maximum number of queries per second (QPS) per client when your application is running a typical workload. + 2. The average latency (the response time for a single request) in ms. + 3. Determine the number of requests that you can send serially per second by dividing 1,000 by the average latency value. + 4. Divide the QPS in seconds by the number of serial requests per second. + 5. Divide the result by 50 requests per channel to determine the minimum optimal channel pool size. (If your calculation is less than 2, use at least 2 channels anyway, to ensure redundancy.) + 6. Divide the same result by 10 requests per channel to determine the maximum optimal channel pool size. + + These steps are expressed in the following equations: + ```java + (QPS ÷ (1,000 ÷ latency ms)) ÷ 50 streams = Minimum optimal number of connections + (QPS ÷ (1,000 ÷ latency ms)) ÷ 10 streams = Maximum optimal number of connections + ``` + + ###### Example + Your application typically sends 50,000 requests per second, and the average latency is 10 ms. Divide 1,000 by 10 ms to determine that you can send 100 requests serially per second. + Divide that number into 50,000 to get the parallelism needed to send 50,000 QPS: 500. Each channel can have at most 100 requests out concurrently, and your target channel utilization + is between 10 and 50 concurrent streams. Therefore, to calculate the minimum, divide 500 by 50 to get 10. To find the maximum, divide 500 by 10 to get 50. This means that your channel + pool size for this example should be between 10 and 50 connections. + + It is also important to monitor your traffic after making changes and adjust the number of connections in your pool if necessary. + + ###### Set the pool size + The following code sample demonstrates how to configure the channel pool in the client libraries using `DatastoreOptions`. See [ChannelPoolSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.grpc.ChannelPoolSettings) and [Performance Best Practices](https://grpc.io/docs/guides/performance/) for more information on channel pools and best practices for performance. - Example: + Code Example ```java InstantiatingGrpcChannelProvider channelProvider = DatastoreSettings.defaultGrpcTransportProviderBuilder() diff --git a/README.md b/README.md index f059e75ed..4dc14a97f 100644 --- a/README.md +++ b/README.md @@ -208,28 +208,33 @@ gRPC Java Datastore Client User Guide ------- In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance. -#### Download Instructions -Instructions: -1. Clone the grpc-experimental branch from GitHub: -```python -git clone -b grpc-experimental https://github.com/googleapis/java-datastore.git -``` -2. Run the following commands to build the library: -```python -# Go to the directory the code was downloaded to -cd java-datastore/ - -# Build the library -mvn clean install -DskipTests=true -``` -3. Add the following dependency to your project: -```xml - +#### Installation Instructions +The client can be built from the `grpc-experimental` branch on GitHub. For private preview, you can also download the artifact with the instructions provided below. + +1. Download the datastore private preview package with dependencies: + ``` + curl -o https://datastore-sdk-feature-release.web.app/google-cloud-datastore-2.20.0-grpc-experimental-1-SNAPSHOT-jar-with-dependencies.jar + ``` +2. Run the following commands to install JDK locally: + ``` + mvn install:install-file -Dfile= -DgroupId=com.google.cloud -DartifactId=google-cloud-datastore -Dversion=2.20.0-grpc + ``` +3. Edit your pom.xml to add above package to `` section: + ```xml + com.google.cloud google-cloud-datastore 2.20.0-grpc-experimental-1-SNAPSHOT - -``` + + ``` + +And if you have not yet, add below to `` section: + ```xml + + local-repo + file://${user.home}/.m2/repository + + ``` #### How to Use To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation. @@ -279,11 +284,44 @@ boolean isHTTP = datastore.getOptions().getTransportOptions() instanceof HTTPTra #### New Features There are new gRPC specific features available to use in this update. -##### Channel Pooling -To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. +##### Connection Pool +A connection pool, also known as a channel pool, is a cache of database connections that are shared and reused to improve connection latency and performance. With this update, now you will be able to configure the channel pool to improve application performance. This section guides you in determining the optimal connection pool size and configuring it within the Java datastore client. +To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. +###### Determine the best connection pool size +The default connection pool size is right for most applications, and in most cases there's no need to change it. + +However sometimes you may want to change your connection pool size due to high throughput or buffered requests. Ideally, to leave room for traffic fluctuations, a connection pool has about twice the number of connections it takes for maximum saturation. Because a connection can handle a maximum of 100 concurrent requests, between 10 and 50 outstanding requests per connection is optimal. The limit of 100 concurrent streams per gRPC connection is enforced in Google's middleware layer, and you are not able to reconfigure this number. + +The following steps help you calculate the optimal number of connections in your channel pool using estimate per-client QPS and average latency numbers. + +To calculate the optimal connections, gather the following information: + +1. The maximum number of queries per second (QPS) per client when your application is running a typical workload. +2. The average latency (the response time for a single request) in ms. +3. Determine the number of requests that you can send serially per second by dividing 1,000 by the average latency value. +4. Divide the QPS in seconds by the number of serial requests per second. +5. Divide the result by 50 requests per channel to determine the minimum optimal channel pool size. (If your calculation is less than 2, use at least 2 channels anyway, to ensure redundancy.) +6. Divide the same result by 10 requests per channel to determine the maximum optimal channel pool size. + +These steps are expressed in the following equations: +```java +(QPS ÷ (1,000 ÷ latency ms)) ÷ 50 streams = Minimum optimal number of connections +(QPS ÷ (1,000 ÷ latency ms)) ÷ 10 streams = Maximum optimal number of connections +``` + +###### Example +Your application typically sends 50,000 requests per second, and the average latency is 10 ms. Divide 1,000 by 10 ms to determine that you can send 100 requests serially per second. +Divide that number into 50,000 to get the parallelism needed to send 50,000 QPS: 500. Each channel can have at most 100 requests out concurrently, and your target channel utilization +is between 10 and 50 concurrent streams. Therefore, to calculate the minimum, divide 500 by 50 to get 10. To find the maximum, divide 500 by 10 to get 50. This means that your channel +pool size for this example should be between 10 and 50 connections. + +It is also important to monitor your traffic after making changes and adjust the number of connections in your pool if necessary. + +###### Set the pool size +The following code sample demonstrates how to configure the channel pool in the client libraries using `DatastoreOptions`. See [ChannelPoolSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.grpc.ChannelPoolSettings) and [Performance Best Practices](https://grpc.io/docs/guides/performance/) for more information on channel pools and best practices for performance. -Example: +Code Example ```java InstantiatingGrpcChannelProvider channelProvider = DatastoreSettings.defaultGrpcTransportProviderBuilder() From c308e4c57439460785378be7f46af057bc2d1b72 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 9 Dec 2024 19:04:50 +0100 Subject: [PATCH 136/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.51.0 (#1678) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index d31d40cb9..95c5f4db4 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.50.0 + 26.51.0 pom import From 3de67d55917a4ed97cf5f34e5f1183e865ce6e3a Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:22:07 -0500 Subject: [PATCH 137/292] chore: Update generation configuration at Sat Dec 7 02:27:08 UTC 2024 (#1673) * chore: Update generation configuration at Thu Nov 21 02:25:49 UTC 2024 * chore: Update generation configuration at Fri Nov 22 02:26:29 UTC 2024 * chore: Update generation configuration at Sat Nov 23 02:25:13 UTC 2024 * chore: Update generation configuration at Tue Nov 26 02:26:48 UTC 2024 * chore: Update generation configuration at Wed Nov 27 02:27:31 UTC 2024 * chore: Update generation configuration at Thu Nov 28 02:27:23 UTC 2024 * chore: Update generation configuration at Fri Nov 29 02:27:22 UTC 2024 * chore: Update generation configuration at Tue Dec 3 02:27:53 UTC 2024 * chore: Update generation configuration at Wed Dec 4 02:28:04 UTC 2024 * chore: Update generation configuration at Thu Dec 5 02:28:17 UTC 2024 * chore: Update generation configuration at Fri Dec 6 02:27:42 UTC 2024 * chore: generate libraries at Fri Dec 6 02:28:19 UTC 2024 * chore: Update generation configuration at Sat Dec 7 02:27:08 UTC 2024 --- README.md | 2 +- generation_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4dc14a97f..780b96e75 100644 --- a/README.md +++ b/README.md @@ -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.50.0') +implementation platform('com.google.cloud:libraries-bom:26.51.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index b9de0b019..d7067bcda 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.50.0 -googleapis_commitish: a547fc1420eb0a0f3ae32b0a4eb72d3b8b17d136 -libraries_bom_version: 26.50.0 +googleapis_commitish: 0f3a20ebd29fb1deb2bd1f75c7ba55500d35457d +libraries_bom_version: 26.51.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From 9c992a77fee4b114815acd178dae515d345e2f98 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 17:36:22 +0000 Subject: [PATCH 138/292] chore(main): release 2.24.4-SNAPSHOT (#1667) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- README.md | 2 +- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 780b96e75..321a5e15c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.50.0 + 26.51.0 pom import diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 81f589e82..5bddd489b 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.24.3 + 2.24.4-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.24.3 + 2.24.4-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index c44f45040..e2efd3ff3 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.24.3 + 2.24.4-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.24.3 + 2.24.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.3 + 2.24.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.3 + 0.115.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.3 + 2.24.4-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6c8dbf156..16c16241e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.24.3 + 2.24.4-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.24.3 + 2.24.4-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index bc6da09a2..46a6065ba 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.3 + 2.24.4-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.3 + 2.24.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 010f41c6b..7c0df571c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.24.3 + 2.24.4-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.3 + 2.24.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.3 + 2.24.4-SNAPSHOT com.google.cloud google-cloud-datastore - 2.24.3 + 2.24.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.3 + 0.115.4-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.24.3 + 2.24.4-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index e0eb6c902..1fb4dd265 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.3 + 2.24.4-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.3 + 2.24.4-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 49d767dfb..1e9a5083f 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.3 + 0.115.4-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.24.3 + 2.24.4-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e484c2694..5eefa5993 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.24.3 + 2.24.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 99f46fe19..e40fb3ab7 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.24.3:2.24.3 -google-cloud-datastore-bom:2.24.3:2.24.3 -proto-google-cloud-datastore-v1:0.115.3:0.115.3 -datastore-v1-proto-client:2.24.3:2.24.3 -proto-google-cloud-datastore-admin-v1:2.24.3:2.24.3 -grpc-google-cloud-datastore-admin-v1:2.24.3:2.24.3 +google-cloud-datastore:2.24.3:2.24.4-SNAPSHOT +google-cloud-datastore-bom:2.24.3:2.24.4-SNAPSHOT +proto-google-cloud-datastore-v1:0.115.3:0.115.4-SNAPSHOT +datastore-v1-proto-client:2.24.3:2.24.4-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.24.3:2.24.4-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.24.3:2.24.4-SNAPSHOT From b3042ddc2f76a01ef411f26c1e271f2566108592 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 10 Dec 2024 15:47:50 -0500 Subject: [PATCH 139/292] chore: Update generation configuration at Tue Dec 10 02:28:41 UTC 2024 (#1680) * chore: Update generation configuration at Tue Dec 10 02:28:41 UTC 2024 * chore: generate libraries at Tue Dec 10 02:29:17 UTC 2024 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index d7067bcda..685dceedb 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.50.0 -googleapis_commitish: 0f3a20ebd29fb1deb2bd1f75c7ba55500d35457d +googleapis_commitish: 5d5b1bf126485b0e2c972bac41b376438601e266 libraries_bom_version: 26.51.0 libraries: - api_shortname: datastore From 5c6a67844f7b5d4c7001cccd1bed3d0d56be6e90 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 10 Dec 2024 22:40:28 +0100 Subject: [PATCH 140/292] deps: update dependency com.google.cloud:gapic-libraries-bom to v1.48.0 (#1605) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 16c16241e..a294f039e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -24,7 +24,7 @@ com.google.cloud gapic-libraries-bom - 1.43.0 + 1.48.0 pom import From 456ecaa61007f909922665f8123f96b9e58e0c9d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 10 Dec 2024 22:40:40 +0100 Subject: [PATCH 141/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.24.3 (#1656) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 30cba8255..3b581a093 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.24.1 + 2.24.3 From 1d89e6c0e2eadefed46c100895c4d9c111279f1b Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:57:52 -0500 Subject: [PATCH 142/292] chore: Update generation configuration at Wed Dec 11 02:27:51 UTC 2024 (#1682) * chore: Update generation configuration at Wed Dec 11 02:27:51 UTC 2024 * chore: generate libraries at Wed Dec 11 02:28:26 UTC 2024 --- README.md | 2 +- generation_config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 321a5e15c..f063e2691 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.24.1 + 2.24.3 ``` diff --git a/generation_config.yaml b/generation_config.yaml index 685dceedb..63fce0276 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.50.0 -googleapis_commitish: 5d5b1bf126485b0e2c972bac41b376438601e266 +googleapis_commitish: 798bd23a97e0c6a2582a4b442c09523b1325b533 libraries_bom_version: 26.51.0 libraries: - api_shortname: datastore From f9652d42dc25ca4a8a6ca88e76b1f2e67f553064 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:28:04 -0800 Subject: [PATCH 143/292] chore(main): release 2.25.0 (#1681) * chore(main): release 2.25.0 * chore: generate libraries at Wed Dec 11 18:58:48 UTC 2024 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 17 +++++++++++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 48 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07cf43d6d..072422617 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [2.25.0](https://github.com/googleapis/java-datastore/compare/v2.24.3...v2.25.0) (2024-12-11) + + +### Features + +* Introduce `java.time` methods and variables ([#1671](https://github.com/googleapis/java-datastore/issues/1671)) ([5a78a80](https://github.com/googleapis/java-datastore/commit/5a78a8075867f4b2fc598f0423bd2ab65b559856)) + + +### Dependencies + +* Update dependency com.google.cloud:gapic-libraries-bom to v1.48.0 ([#1605](https://github.com/googleapis/java-datastore/issues/1605)) ([5c6a678](https://github.com/googleapis/java-datastore/commit/5c6a67844f7b5d4c7001cccd1bed3d0d56be6e90)) + + +### Documentation + +* Update gapic upgrade installation instructions ([#1677](https://github.com/googleapis/java-datastore/issues/1677)) ([b3fbfcc](https://github.com/googleapis/java-datastore/commit/b3fbfcc9654bc63bf0d8f3025641d8c50a24ef97)) + ## [2.24.3](https://github.com/googleapis/java-datastore/compare/v2.24.2...v2.24.3) (2024-11-18) diff --git a/README.md b/README.md index f063e2691..bc5bf8abc 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.24.3' +implementation 'com.google.cloud:google-cloud-datastore:2.25.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.24.3" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.0" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.24.3 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 5bddd489b..7cf0fff8a 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.24.4-SNAPSHOT + 2.25.0 com.google.cloud google-cloud-datastore-parent - 2.24.4-SNAPSHOT + 2.25.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index e2efd3ff3..9725aa812 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.24.4-SNAPSHOT + 2.25.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.24.4-SNAPSHOT + 2.25.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.4-SNAPSHOT + 2.25.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.4-SNAPSHOT + 0.116.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.4-SNAPSHOT + 2.25.0 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index a294f039e..6f3838a63 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.24.4-SNAPSHOT + 2.25.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.24.4-SNAPSHOT + 2.25.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 46a6065ba..613e5df1a 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.4-SNAPSHOT + 2.25.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.4-SNAPSHOT + 2.25.0 diff --git a/pom.xml b/pom.xml index 7c0df571c..93f84904a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.24.4-SNAPSHOT + 2.25.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.4-SNAPSHOT + 2.25.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.24.4-SNAPSHOT + 2.25.0 com.google.cloud google-cloud-datastore - 2.24.4-SNAPSHOT + 2.25.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.4-SNAPSHOT + 0.116.0 com.google.cloud.datastore datastore-v1-proto-client - 2.24.4-SNAPSHOT + 2.25.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 1fb4dd265..78a52ca6f 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.24.4-SNAPSHOT + 2.25.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.24.4-SNAPSHOT + 2.25.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 1e9a5083f..ac9bdfc05 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.115.4-SNAPSHOT + 0.116.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.24.4-SNAPSHOT + 2.25.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 5eefa5993..274bd463f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.24.4-SNAPSHOT + 2.25.0 diff --git a/versions.txt b/versions.txt index e40fb3ab7..1e2a77f49 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.24.3:2.24.4-SNAPSHOT -google-cloud-datastore-bom:2.24.3:2.24.4-SNAPSHOT -proto-google-cloud-datastore-v1:0.115.3:0.115.4-SNAPSHOT -datastore-v1-proto-client:2.24.3:2.24.4-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.24.3:2.24.4-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.24.3:2.24.4-SNAPSHOT +google-cloud-datastore:2.25.0:2.25.0 +google-cloud-datastore-bom:2.25.0:2.25.0 +proto-google-cloud-datastore-v1:0.116.0:0.116.0 +datastore-v1-proto-client:2.25.0:2.25.0 +proto-google-cloud-datastore-admin-v1:2.25.0:2.25.0 +grpc-google-cloud-datastore-admin-v1:2.25.0:2.25.0 From 3b52271b13161661f92c04cdd8e8d6bdca28e900 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:57:41 -0500 Subject: [PATCH 144/292] chore(main): release 2.25.1-SNAPSHOT (#1686) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 7cf0fff8a..fc986bac4 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.0 + 2.25.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.25.0 + 2.25.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 9725aa812..b1d7d5940 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.25.0 + 2.25.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.25.0 + 2.25.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.0 + 2.25.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.0 + 0.116.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.0 + 2.25.1-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6f3838a63..6078401f7 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.25.0 + 2.25.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.25.0 + 2.25.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 613e5df1a..ab7770677 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.0 + 2.25.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.0 + 2.25.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 93f84904a..ea6c611c0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.25.0 + 2.25.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.0 + 2.25.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.0 + 2.25.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.25.0 + 2.25.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.0 + 0.116.1-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.25.0 + 2.25.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 78a52ca6f..88b858411 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.0 + 2.25.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.0 + 2.25.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index ac9bdfc05..7968ce4d8 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.0 + 0.116.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.25.0 + 2.25.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 274bd463f..a420fb812 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.25.0 + 2.25.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 1e2a77f49..7b5b11827 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.25.0:2.25.0 -google-cloud-datastore-bom:2.25.0:2.25.0 -proto-google-cloud-datastore-v1:0.116.0:0.116.0 -datastore-v1-proto-client:2.25.0:2.25.0 -proto-google-cloud-datastore-admin-v1:2.25.0:2.25.0 -grpc-google-cloud-datastore-admin-v1:2.25.0:2.25.0 +google-cloud-datastore:2.25.0:2.25.1-SNAPSHOT +google-cloud-datastore-bom:2.25.0:2.25.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.116.0:0.116.1-SNAPSHOT +datastore-v1-proto-client:2.25.0:2.25.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.25.0:2.25.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.25.0:2.25.1-SNAPSHOT From 4372350117ba57903f510512a383339b6a4ea47c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 13 Dec 2024 18:48:34 +0100 Subject: [PATCH 145/292] deps: update sdk platform java dependencies (#1685) --- .github/workflows/hermetic_library_generation.yaml | 2 +- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 35aa3b151..604b674ba 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.50.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.51.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 0ee0f5aaa..87c21c0a0 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.40.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.41.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index aabe0f1f9..6c760a779 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.40.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.41.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 4b9610ffc..2a166877f 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.40.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.41.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index b1d7d5940..793feee87 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.40.0 + 3.41.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index ea6c611c0..de06d3203 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.40.0 + 3.41.0 From 2e85cb75bdd98107cdcb7cda7716510e32f16878 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 13 Dec 2024 19:07:00 +0100 Subject: [PATCH 146/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.25.0 (#1687) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 3b581a093..f60a4bb5a 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.24.3 + 2.25.0 From 106ee4dd7ca4dd9e59a5419f59b8625680e60f15 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:27:10 -0500 Subject: [PATCH 147/292] chore: Update generation configuration at Fri Dec 13 02:28:28 UTC 2024 (#1683) * chore: Update generation configuration at Thu Dec 12 02:27:48 UTC 2024 * chore: Update generation configuration at Fri Dec 13 02:28:28 UTC 2024 * update workflow script * update generation config * chore: generate libraries at Fri Dec 13 18:10:48 UTC 2024 --------- Co-authored-by: Joe Wang --- .github/scripts/update_generation_config.sh | 63 ++++++++++++++++++--- README.md | 2 +- generation_config.yaml | 4 +- renovate.json | 17 ------ 4 files changed, 58 insertions(+), 28 deletions(-) diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh index 561a31304..91434688c 100644 --- a/.github/scripts/update_generation_config.sh +++ b/.github/scripts/update_generation_config.sh @@ -28,11 +28,23 @@ function update_config() { sed -i -e "s/^${key_word}.*$/${key_word}: ${new_value}/" "${file}" } +# Update an action to a new version in GitHub action. +function update_action() { + local key_word=$1 + local new_value=$2 + local file=$3 + echo "Update ${key_word} to ${new_value} in ${file}" + # use a different delimiter because the key_word contains "/". + sed -i -e "s|${key_word}@v.*$|${key_word}@v${new_value}|" "${file}" +} + # The parameters of this script is: # 1. base_branch, the base branch of the result pull request. # 2. repo, organization/repo-name, e.g., googleapis/google-cloud-java # 3. [optional] generation_config, the path to the generation configuration, # the default value is generation_config.yaml in the repository root. +# 4. [optional] workflow, the library generation workflow file, +# the default value is .github/workflows/hermetic_library_generation.yaml. while [[ $# -gt 0 ]]; do key="$1" case "${key}" in @@ -48,6 +60,10 @@ case "${key}" in generation_config="$2" shift ;; + --workflow) + workflow="$2" + shift + ;; *) echo "Invalid option: [$1]" exit 1 @@ -71,21 +87,34 @@ if [ -z "${generation_config}" ]; then echo "Use default generation config: ${generation_config}" fi +if [ -z "${workflow}" ]; then + workflow=".github/workflows/hermetic_library_generation.yaml" + echo "Use default library generation workflow file: ${workflow}" +fi + current_branch="generate-libraries-${base_branch}" title="chore: Update generation configuration at $(date)" -# try to find a open pull request associated with the branch +git checkout "${base_branch}" +# Try to find a open pull request associated with the branch pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number") -# create a branch if there's no open pull request associated with the +# Create a branch if there's no open pull request associated with the # branch; otherwise checkout the pull request. if [ -z "${pr_num}" ]; then git checkout -b "${current_branch}" + # Push the current branch to remote so that we can + # compare the commits later. + git push -u origin "${current_branch}" else gh pr checkout "${pr_num}" fi +# Only allow fast-forward merging; exit with non-zero result if there's merging +# conflict. +git merge -m "chore: merge ${base_branch} into ${current_branch}" "${base_branch}" + mkdir tmp-googleapis -# use partial clone because only commit history is needed. +# Use partial clone because only commit history is needed. git clone --filter=blob:none https://github.com/googleapis/googleapis.git tmp-googleapis pushd tmp-googleapis git pull @@ -94,25 +123,43 @@ popd rm -rf tmp-googleapis update_config "googleapis_commitish" "${latest_commit}" "${generation_config}" -# update gapic-generator-java version to the latest +# Update gapic-generator-java version to the latest latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java") update_config "gapic_generator_version" "${latest_version}" "${generation_config}" -# update libraries-bom version to the latest +# Update composite action version to latest gapic-generator-java version +update_action "googleapis/sdk-platform-java/.github/scripts" \ + "${latest_version}" \ + "${workflow}" + +# Update libraries-bom version to the latest latest_version=$(get_latest_released_version "com.google.cloud" "libraries-bom") update_config "libraries_bom_version" "${latest_version}" "${generation_config}" -git add "${generation_config}" +git add "${generation_config}" "${workflow}" changed_files=$(git diff --cached --name-only) if [[ "${changed_files}" == "" ]]; then echo "The latest generation config is not changed." echo "Skip committing to the pull request." +else + git commit -m "${title}" +fi + +# There are potentially at most two commits: merge commit and change commit. +# We want to exit the script if no commit happens (otherwise this will be an +# infinite loop). +# `git cherry` is a way to find whether the local branch has commits that are +# not in the remote branch. +# If we find any such commit, push them to remote branch. +unpushed_commit=$(git cherry -v "origin/${current_branch}" | wc -l) +if [[ "${unpushed_commit}" -eq 0 ]]; then + echo "No unpushed commits, exit" exit 0 fi -git commit -m "${title}" + if [ -z "${pr_num}" ]; then git remote add remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${repo}.git" - git fetch -q --unshallow remote_repo + git fetch -q remote_repo git push -f remote_repo "${current_branch}" gh pr create --title "${title}" --head "${current_branch}" --body "${title}" --base "${base_branch}" else diff --git a/README.md b/README.md index bc5bf8abc..362f547a7 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.24.3 + 2.25.0 ``` diff --git a/generation_config.yaml b/generation_config.yaml index 63fce0276..13bc526fb 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.50.0 -googleapis_commitish: 798bd23a97e0c6a2582a4b442c09523b1325b533 +gapic_generator_version: 2.51.0 +googleapis_commitish: 7d0c6bee2517d77635beb2a1dd6d6e7d4d943512 libraries_bom_version: 26.51.0 libraries: - api_shortname: datastore diff --git a/renovate.json b/renovate.json index b3314f4b2..586208852 100644 --- a/renovate.json +++ b/renovate.json @@ -41,16 +41,6 @@ ], "depNameTemplate": "com.google.cloud:sdk-platform-java-config", "datasourceTemplate": "maven" - }, - { - "fileMatch": [ - "^.github/workflows/hermetic_library_generation.yaml$" - ], - "matchStrings": [ - "uses: googleapis/sdk-platform-java/.github/scripts@v(?.+?)\\n" - ], - "depNameTemplate": "com.google.api:gapic-generator-java", - "datasourceTemplate": "maven" } ], "packageRules": [ @@ -111,13 +101,6 @@ "^com.fasterxml.jackson.core" ], "groupName": "jackson dependencies" - }, - { - "matchPackagePatterns": [ - "^com.google.api:gapic-generator-java", - "^com.google.cloud:sdk-platform-java-config" - ], - "groupName": "SDK platform Java dependencies" } ], "semanticCommits": true, From 12b8f125baa5a3324e7d5a50a89d427d18f9c2d1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 14:12:10 -0800 Subject: [PATCH 148/292] chore(main): release 2.25.1 (#1688) * chore(main): release 2.25.1 * chore: generate libraries at Fri Dec 13 18:28:02 UTC 2024 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 12 ++++++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 43 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 072422617..adec35297 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.25.1](https://github.com/googleapis/java-datastore/compare/v2.25.0...v2.25.1) (2024-12-13) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.51.0 ([106ee4d](https://github.com/googleapis/java-datastore/commit/106ee4dd7ca4dd9e59a5419f59b8625680e60f15)) + + +### Dependencies + +* Update sdk platform java dependencies ([#1685](https://github.com/googleapis/java-datastore/issues/1685)) ([4372350](https://github.com/googleapis/java-datastore/commit/4372350117ba57903f510512a383339b6a4ea47c)) + ## [2.25.0](https://github.com/googleapis/java-datastore/compare/v2.24.3...v2.25.0) (2024-12-11) diff --git a/README.md b/README.md index 362f547a7..2fa4ffd04 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.25.0' +implementation 'com.google.cloud:google-cloud-datastore:2.25.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.1" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.1 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index fc986bac4..f71e20221 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.1-SNAPSHOT + 2.25.1 com.google.cloud google-cloud-datastore-parent - 2.25.1-SNAPSHOT + 2.25.1 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 793feee87..c9cfd3347 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.25.1-SNAPSHOT + 2.25.1 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.25.1-SNAPSHOT + 2.25.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.1-SNAPSHOT + 2.25.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.1-SNAPSHOT + 0.116.1 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.1-SNAPSHOT + 2.25.1 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6078401f7..6f22c2be2 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.25.1-SNAPSHOT + 2.25.1 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.25.1-SNAPSHOT + 2.25.1 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index ab7770677..74b964682 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.1-SNAPSHOT + 2.25.1 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.1-SNAPSHOT + 2.25.1 diff --git a/pom.xml b/pom.xml index de06d3203..4a8583e61 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.25.1-SNAPSHOT + 2.25.1 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.1-SNAPSHOT + 2.25.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.1-SNAPSHOT + 2.25.1 com.google.cloud google-cloud-datastore - 2.25.1-SNAPSHOT + 2.25.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.1-SNAPSHOT + 0.116.1 com.google.cloud.datastore datastore-v1-proto-client - 2.25.1-SNAPSHOT + 2.25.1 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 88b858411..28ed4b0e7 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.1-SNAPSHOT + 2.25.1 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.1-SNAPSHOT + 2.25.1 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 7968ce4d8..a2fc2f2a8 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.1-SNAPSHOT + 0.116.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.25.1-SNAPSHOT + 2.25.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index a420fb812..174ac036d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.25.1-SNAPSHOT + 2.25.1 diff --git a/versions.txt b/versions.txt index 7b5b11827..783c47b1f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.25.0:2.25.1-SNAPSHOT -google-cloud-datastore-bom:2.25.0:2.25.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.116.0:0.116.1-SNAPSHOT -datastore-v1-proto-client:2.25.0:2.25.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.25.0:2.25.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.25.0:2.25.1-SNAPSHOT +google-cloud-datastore:2.25.1:2.25.1 +google-cloud-datastore-bom:2.25.1:2.25.1 +proto-google-cloud-datastore-v1:0.116.1:0.116.1 +datastore-v1-proto-client:2.25.1:2.25.1 +proto-google-cloud-datastore-admin-v1:2.25.1:2.25.1 +grpc-google-cloud-datastore-admin-v1:2.25.1:2.25.1 From 926c25faac3dab65e0e7f6c3004e03a385b3ea15 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 16 Dec 2024 15:53:01 -0500 Subject: [PATCH 149/292] chore: Update generation configuration at Sat Dec 14 02:26:29 UTC 2024 (#1691) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 13bc526fb..a35232f28 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.51.0 -googleapis_commitish: 7d0c6bee2517d77635beb2a1dd6d6e7d4d943512 +googleapis_commitish: f4eff5440fd07389f820d22d2a55690c6390dc6d libraries_bom_version: 26.51.0 libraries: - api_shortname: datastore From 93e45edf335f06fd707ce64398c8b02d2a433f6f Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:52:51 -0500 Subject: [PATCH 150/292] chore: Update generation configuration at Tue Dec 31 02:22:25 UTC 2024 (#1692) * chore: Update generation configuration at Tue Dec 17 02:27:47 UTC 2024 * chore: Update generation configuration at Wed Dec 18 02:26:15 UTC 2024 * chore: Update generation configuration at Thu Dec 19 02:26:21 UTC 2024 * chore: generate libraries at Thu Dec 19 02:26:53 UTC 2024 * chore: Update generation configuration at Fri Dec 20 02:23:43 UTC 2024 * chore: Update generation configuration at Sat Dec 21 02:21:26 UTC 2024 * chore: Update generation configuration at Tue Dec 24 02:23:27 UTC 2024 * chore: Update generation configuration at Fri Dec 27 02:23:22 UTC 2024 * chore: Update generation configuration at Sat Dec 28 02:20:59 UTC 2024 * chore: Update generation configuration at Tue Dec 31 02:22:25 UTC 2024 --- README.md | 2 +- generation_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2fa4ffd04..160907fc0 100644 --- a/README.md +++ b/README.md @@ -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.51.0') +implementation platform('com.google.cloud:libraries-bom:26.52.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index a35232f28..54ff42158 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.51.0 -googleapis_commitish: f4eff5440fd07389f820d22d2a55690c6390dc6d -libraries_bom_version: 26.51.0 +googleapis_commitish: 52e410823122cf44d265c3beecb86c773db248a2 +libraries_bom_version: 26.52.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From 732ae660d2755ebb88aaabbae2175e013125f03c Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Fri, 3 Jan 2025 19:59:59 -0500 Subject: [PATCH 151/292] chore: Update generation configuration at Fri Jan 3 02:23:25 UTC 2025 (#1696) * chore: Update generation configuration at Fri Jan 3 02:23:25 UTC 2025 * chore: generate libraries at Fri Jan 3 02:23:58 UTC 2025 --- generation_config.yaml | 2 +- .../google/cloud/datastore/admin/v1/DatastoreAdminClient.java | 2 +- .../google/cloud/datastore/admin/v1/DatastoreAdminSettings.java | 2 +- .../java/com/google/cloud/datastore/admin/v1/package-info.java | 2 +- .../cloud/datastore/admin/v1/stub/DatastoreAdminStub.java | 2 +- .../datastore/admin/v1/stub/DatastoreAdminStubSettings.java | 2 +- .../admin/v1/stub/GrpcDatastoreAdminCallableFactory.java | 2 +- .../cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java | 2 +- .../admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java | 2 +- .../datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java | 2 +- .../datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java | 2 +- .../cloud/datastore/admin/v1/DatastoreAdminClientTest.java | 2 +- .../com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java | 2 +- .../google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java | 2 +- .../java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java | 2 +- .../main/java/com/google/datastore/admin/v1/CommonMetadata.java | 2 +- .../com/google/datastore/admin/v1/CommonMetadataOrBuilder.java | 2 +- .../java/com/google/datastore/admin/v1/CreateIndexRequest.java | 2 +- .../google/datastore/admin/v1/CreateIndexRequestOrBuilder.java | 2 +- .../java/com/google/datastore/admin/v1/DatastoreAdminProto.java | 2 +- .../datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java | 2 +- .../admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java | 2 +- .../java/com/google/datastore/admin/v1/DeleteIndexRequest.java | 2 +- .../google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java | 2 +- .../main/java/com/google/datastore/admin/v1/EntityFilter.java | 2 +- .../com/google/datastore/admin/v1/EntityFilterOrBuilder.java | 2 +- .../com/google/datastore/admin/v1/ExportEntitiesMetadata.java | 2 +- .../datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java | 2 +- .../com/google/datastore/admin/v1/ExportEntitiesRequest.java | 2 +- .../datastore/admin/v1/ExportEntitiesRequestOrBuilder.java | 2 +- .../com/google/datastore/admin/v1/ExportEntitiesResponse.java | 2 +- .../datastore/admin/v1/ExportEntitiesResponseOrBuilder.java | 2 +- .../java/com/google/datastore/admin/v1/GetIndexRequest.java | 2 +- .../com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java | 2 +- .../com/google/datastore/admin/v1/ImportEntitiesMetadata.java | 2 +- .../datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java | 2 +- .../com/google/datastore/admin/v1/ImportEntitiesRequest.java | 2 +- .../datastore/admin/v1/ImportEntitiesRequestOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/admin/v1/Index.java | 2 +- .../com/google/datastore/admin/v1/IndexOperationMetadata.java | 2 +- .../datastore/admin/v1/IndexOperationMetadataOrBuilder.java | 2 +- .../main/java/com/google/datastore/admin/v1/IndexOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/admin/v1/IndexProto.java | 2 +- .../java/com/google/datastore/admin/v1/ListIndexesRequest.java | 2 +- .../google/datastore/admin/v1/ListIndexesRequestOrBuilder.java | 2 +- .../java/com/google/datastore/admin/v1/ListIndexesResponse.java | 2 +- .../google/datastore/admin/v1/ListIndexesResponseOrBuilder.java | 2 +- .../com/google/datastore/admin/v1/MigrationProgressEvent.java | 2 +- .../datastore/admin/v1/MigrationProgressEventOrBuilder.java | 2 +- .../main/java/com/google/datastore/admin/v1/MigrationProto.java | 2 +- .../main/java/com/google/datastore/admin/v1/MigrationState.java | 2 +- .../java/com/google/datastore/admin/v1/MigrationStateEvent.java | 2 +- .../google/datastore/admin/v1/MigrationStateEventOrBuilder.java | 2 +- .../main/java/com/google/datastore/admin/v1/MigrationStep.java | 2 +- .../main/java/com/google/datastore/admin/v1/OperationType.java | 2 +- .../src/main/java/com/google/datastore/admin/v1/Progress.java | 2 +- .../java/com/google/datastore/admin/v1/ProgressOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/AggregationQuery.java | 2 +- .../java/com/google/datastore/v1/AggregationQueryOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/AggregationResult.java | 2 +- .../java/com/google/datastore/v1/AggregationResultBatch.java | 2 +- .../google/datastore/v1/AggregationResultBatchOrBuilder.java | 2 +- .../com/google/datastore/v1/AggregationResultOrBuilder.java | 2 +- .../java/com/google/datastore/v1/AggregationResultProto.java | 2 +- .../main/java/com/google/datastore/v1/AllocateIdsRequest.java | 2 +- .../com/google/datastore/v1/AllocateIdsRequestOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/AllocateIdsResponse.java | 2 +- .../com/google/datastore/v1/AllocateIdsResponseOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/ArrayValue.java | 2 +- .../main/java/com/google/datastore/v1/ArrayValueOrBuilder.java | 2 +- .../java/com/google/datastore/v1/BeginTransactionRequest.java | 2 +- .../google/datastore/v1/BeginTransactionRequestOrBuilder.java | 2 +- .../java/com/google/datastore/v1/BeginTransactionResponse.java | 2 +- .../google/datastore/v1/BeginTransactionResponseOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/CommitRequest.java | 2 +- .../java/com/google/datastore/v1/CommitRequestOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/CommitResponse.java | 2 +- .../java/com/google/datastore/v1/CommitResponseOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/CompositeFilter.java | 2 +- .../java/com/google/datastore/v1/CompositeFilterOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/DatastoreProto.java | 2 +- .../src/main/java/com/google/datastore/v1/Entity.java | 2 +- .../src/main/java/com/google/datastore/v1/EntityOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/EntityProto.java | 2 +- .../src/main/java/com/google/datastore/v1/EntityResult.java | 2 +- .../java/com/google/datastore/v1/EntityResultOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/ExecutionStats.java | 2 +- .../java/com/google/datastore/v1/ExecutionStatsOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/ExplainMetrics.java | 2 +- .../java/com/google/datastore/v1/ExplainMetricsOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/ExplainOptions.java | 2 +- .../java/com/google/datastore/v1/ExplainOptionsOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/Filter.java | 2 +- .../src/main/java/com/google/datastore/v1/FilterOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/FindNearest.java | 2 +- .../main/java/com/google/datastore/v1/FindNearestOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/GqlQuery.java | 2 +- .../main/java/com/google/datastore/v1/GqlQueryOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/GqlQueryParameter.java | 2 +- .../com/google/datastore/v1/GqlQueryParameterOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/Key.java | 2 +- .../src/main/java/com/google/datastore/v1/KeyOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/KindExpression.java | 2 +- .../java/com/google/datastore/v1/KindExpressionOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/LookupRequest.java | 2 +- .../java/com/google/datastore/v1/LookupRequestOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/LookupResponse.java | 2 +- .../java/com/google/datastore/v1/LookupResponseOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/Mutation.java | 2 +- .../main/java/com/google/datastore/v1/MutationOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/MutationResult.java | 2 +- .../java/com/google/datastore/v1/MutationResultOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/PartitionId.java | 2 +- .../main/java/com/google/datastore/v1/PartitionIdOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/PlanSummary.java | 2 +- .../main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/Projection.java | 2 +- .../main/java/com/google/datastore/v1/ProjectionOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/PropertyFilter.java | 2 +- .../java/com/google/datastore/v1/PropertyFilterOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/PropertyMask.java | 2 +- .../java/com/google/datastore/v1/PropertyMaskOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/PropertyOrder.java | 2 +- .../java/com/google/datastore/v1/PropertyOrderOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/PropertyReference.java | 2 +- .../com/google/datastore/v1/PropertyReferenceOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/PropertyTransform.java | 2 +- .../com/google/datastore/v1/PropertyTransformOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/Query.java | 2 +- .../src/main/java/com/google/datastore/v1/QueryOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/QueryProfileProto.java | 2 +- .../src/main/java/com/google/datastore/v1/QueryProto.java | 2 +- .../src/main/java/com/google/datastore/v1/QueryResultBatch.java | 2 +- .../java/com/google/datastore/v1/QueryResultBatchOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/ReadOptions.java | 2 +- .../main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/ReserveIdsRequest.java | 2 +- .../com/google/datastore/v1/ReserveIdsRequestOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/ReserveIdsResponse.java | 2 +- .../com/google/datastore/v1/ReserveIdsResponseOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/RollbackRequest.java | 2 +- .../java/com/google/datastore/v1/RollbackRequestOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/RollbackResponse.java | 2 +- .../java/com/google/datastore/v1/RollbackResponseOrBuilder.java | 2 +- .../com/google/datastore/v1/RunAggregationQueryRequest.java | 2 +- .../datastore/v1/RunAggregationQueryRequestOrBuilder.java | 2 +- .../com/google/datastore/v1/RunAggregationQueryResponse.java | 2 +- .../datastore/v1/RunAggregationQueryResponseOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/RunQueryRequest.java | 2 +- .../java/com/google/datastore/v1/RunQueryRequestOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/RunQueryResponse.java | 2 +- .../java/com/google/datastore/v1/RunQueryResponseOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/TransactionOptions.java | 2 +- .../com/google/datastore/v1/TransactionOptionsOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/Value.java | 2 +- .../src/main/java/com/google/datastore/v1/ValueOrBuilder.java | 2 +- 156 files changed, 156 insertions(+), 156 deletions(-) diff --git a/generation_config.yaml b/generation_config.yaml index 54ff42158..fdfb8c1fe 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.51.0 -googleapis_commitish: 52e410823122cf44d265c3beecb86c773db248a2 +googleapis_commitish: c72d7385435589176aa6e44563fcfbc795b9a476 libraries_bom_version: 26.52.0 libraries: - api_shortname: datastore diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java index 2e58d6679..9ef7f1edf 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java index 4db454e20..35f993cc8 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/DatastoreAdminSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java index bf70b678a..73f593170 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java index 90c3c45f9..e5a17cc7d 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java index aa10d582f..77314c4bc 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/DatastoreAdminStubSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java index 9fa4e901b..fa1147044 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminCallableFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java index 0ab662814..1f6e840e0 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/GrpcDatastoreAdminStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java index 0f992e4c2..e56561c69 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminCallableFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java index af095ad28..7c1a53ea3 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java index eff9e6b3a..60e786eb9 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientHttpJsonTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java index 0632151c6..e279f543e 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/DatastoreAdminClientTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java index ab9b5b1fb..ab02d565b 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdmin.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java index cc63d5248..7ac63a381 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/admin/v1/MockDatastoreAdminImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java index 3e36d55f5..fcea8a71f 100644 --- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java +++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java index 3bd274168..8b6c77deb 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java index 3ef2919c4..7532c1b7a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java index 6a14a8152..8a418b846 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java index 0d87e8faa..aafb81d48 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java index 838a55b36..c97248e0a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java index ea0e28ff1..ef2be326b 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java index 2f6c2ae7c..e73f8c737 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java index d4f87d2a8..828c5c1fb 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java index ab53b6df5..9a93b66f2 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java index 3a6b14377..5cbe9bb4d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java index 3f75daeff..d5e1a058f 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java index a6bded093..6acc9b76f 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java index 099f4bb5b..908f32500 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java index 88eeb5b0f..e953f4621 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java index 9ddd587f9..e0b0c0bcb 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java index b4f183c04..4bddab90f 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java index 338f4ff99..8b8568774 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java index 2513a6c2b..cbacd2260 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java index da3d4617d..d1d781b7d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java index 9e8265e49..5fea7cf98 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java index 2ed2c3684..ba30c430a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java index 1ca992dd5..94e8192ce 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java index c1d8424fe..e0d8abbe0 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java index cb5c4b96c..20c0e9c40 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java index c524fb3b2..0eb0440d1 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java index e85b0747a..1ffba87d4 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java index b45823f6a..f47a371a4 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java index e44ad1c73..90627347f 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java index 8472db7dc..258d08cd9 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java index dc18f1b63..3a5d68fc4 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java index abce952f3..956b22417 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java index a305da039..40f2e4ba1 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java index a35cd49ca..7dd512772 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java index 4db619cd0..08bbab7bf 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java index 63e6e1186..4da124461 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java index a5b46ab83..9df1276a8 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java index 203980b3a..0fac9e592 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java index de901f9e3..962e1416e 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java index 46a80ff31..9e2cc7f61 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java index 34316b3be..66e73b4dc 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java index 7e010b15d..139ed5960 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java index cc6b6c27b..0d22c5b2c 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java index fa056f1b1..85ab86988 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java index d71b7a7ec..7f9a0a608 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java index 5566884f0..358672417 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java index d40e87f16..84cfc1a97 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java index 280f19bd4..c75fce0f3 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java index 470d13243..8bdf749c3 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java index 5a3b32a73..8c172f409 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java index 6aeec8c61..ba8b762c5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java index e39eca958..92532d1f7 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java index 25b3b348c..d741665c8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java index 2204290ae..1624266d1 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java index 245cb4b38..64ac1d115 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java index 021a8ba56..d9a3fe96d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java index 79747e7ba..70db08648 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java index 8a8bbadd2..38e18ec75 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java index c9cbae64e..fcca145c2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java index ef98909fd..408896255 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java index baefc371e..27db57172 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java index 137b69963..02dd0e53b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java index e24a08499..1c99dbe42 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java index ac4da4033..14881db57 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java index 10fb06dfd..549b6c60d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java index 3e53e363a..43f56bd57 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java index b186c25f0..2764eb38f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java index 6688af1dc..7217a2bdc 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java index 8359303a8..1ec6d192b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java index 8d131a68a..9bd0e1002 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java index 4fac83ece..58f2b5131 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java index 6d1020451..408813f6b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java index 2e17827a8..fca303323 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java index 237bd2909..67957d774 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java index e6fefcd17..23a8172e5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java index 3b4d3578b..bfcc297a2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java index 0871c6cbb..a7a497c80 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java index 764b080ee..f6c779c19 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java index 55d69597d..c6c71843b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java index 49f3eb708..4d351a272 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java index 999b5b1f2..105ba669e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java index ac7b994a6..504c10bb5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java index 49a298590..766dfa10e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java index 48a1a92de..1ce49ae7a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java index d22732f68..d57a38e85 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java index dfa3547b8..5c3fc53da 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java index 90c1fe1fc..9cd165e42 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java index ca5be689d..dca0ac300 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java index 8d4782909..2440248b2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java index 08dc4b3d2..75f85f5fa 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java index 4a9d52439..c9debbee5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java index e417f3306..645d311f2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java index f624e5d4d..211ecfd32 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java index 9dfacb3d6..540ffdd11 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java index ff6a54f5b..e9d1e8527 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java index 131454c79..f608c8c71 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java index aa05f03da..e2bd44311 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java index e4f8c7561..c948ceffb 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java index 09ea652c9..c5c480230 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java index 7c418fe37..0fd99d809 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java index 365b11d31..25c75ada8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java index 8088a8c24..ace5cbe50 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java index cfd0dc705..440ca2b2c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java index 71920236c..179dddadc 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java index 814bfe7fa..e549f15f9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java index fd74ed8e9..1cd09dd3e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java index 432846ebc..a60894f47 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java index e36a55be5..f34a77f67 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java index c12f8741b..7991da53c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java index 4e4e8b986..a190d59d3 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java index d1ce5477e..56ee78cec 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java index 0d80ea0ea..6e93680de 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java index 520ccb0f2..516aa58ad 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java index 34782a859..169427dd6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java index 25fba4c89..d210c1636 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java index 86e6d218f..4ae6b255d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java index 83e5d1763..9bfe380f7 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java index 489e035ab..bdd8d7682 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java index 49bb3799f..a5f09b7c9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java index 57ae675f6..01f9c75a7 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java index dd545344e..ed5ac6a48 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java index 64500abd9..4c0ac317b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java index d37792b79..bec6a7ae9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java index 74644db43..794b3102f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java index 9cf9adff3..5100f525e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java index 8858bddf2..182dfdc18 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java index 1e3b5e93d..edae24a6c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java index 5c4ac4664..754a19210 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java index a8de2a48b..b7aae8596 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java index 3b89b7ed5..69e9ae346 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java index 85021f6fa..1d262da92 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java index 6137bb693..7f12bcfe2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java index f122b0943..54453de38 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java index cacfa52e8..a8845ed1a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java index 7886ca3c7..0dc924f05 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java index 858455723..7135a9e04 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java index 714256e65..814bd4257 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java index c7fceec74..c4ad0528c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java index 7e73f6826..3da613369 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java index 551969802..6d256b615 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java index 56b6fae30..14ce00607 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java index a375525d9..96773b933 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 9d531957da3f017f0702a126601eaa8afe3113d6 Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Fri, 3 Jan 2025 18:16:21 -0800 Subject: [PATCH 152/292] fix: Fix emulator command arg data-dir (#1695) The current gcloudRunner doesn't take any `--data-dir` flag due to a bug. This PR is to fix the `--data-dir` flag. --- .../cloud/datastore/testing/LocalDatastoreHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java index 32bf9611c..79d10220c 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java @@ -163,15 +163,15 @@ private LocalDatastoreHelper(Builder builder) { if (!builder.storeOnDisk) { gcloudCommand.add("--no-store-on-disk"); } + if (builder.dataDir != null) { + gcloudCommand.add("--data-dir=" + getGcdPath()); + } GcloudEmulatorRunner gcloudRunner = new GcloudEmulatorRunner(gcloudCommand, VERSION_PREFIX, MIN_VERSION); List binCommand = new ArrayList<>(Arrays.asList(binName, "start")); binCommand.add("--testing"); binCommand.add(BIN_CMD_PORT_FLAG + getPort()); binCommand.add(CONSISTENCY_FLAG + getConsistency()); - if (builder.dataDir != null) { - gcloudCommand.add("--data-dir=" + getGcdPath()); - } DownloadableEmulatorRunner downloadRunner = new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM, ACCESS_TOKEN); this.emulatorRunners = ImmutableList.of(gcloudRunner, downloadRunner); From 9b63580c5fac85f783690e1b8b844719c335c3e2 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 6 Jan 2025 12:21:18 -0500 Subject: [PATCH 153/292] chore: Update generation configuration at Sat Jan 4 02:21:14 UTC 2025 (#1697) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index fdfb8c1fe..67a3d1ef5 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.51.0 -googleapis_commitish: c72d7385435589176aa6e44563fcfbc795b9a476 +googleapis_commitish: e1b13abbbbec18998ad0bfe39a32ad2b061d4eda libraries_bom_version: 26.52.0 libraries: - api_shortname: datastore From 978fafe9ab3f3bc6e6b2e764a7f7c7ac7e5a607f Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 8 Jan 2025 16:35:01 -0500 Subject: [PATCH 154/292] chore: Update generation configuration at Wed Jan 8 02:23:09 UTC 2025 (#1699) * chore: Update generation configuration at Tue Jan 7 02:24:02 UTC 2025 * chore: Update generation configuration at Wed Jan 8 02:23:09 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 67a3d1ef5..ca592fd99 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.51.0 -googleapis_commitish: e1b13abbbbec18998ad0bfe39a32ad2b061d4eda +googleapis_commitish: 130b113520c1b3fffd90f67198681b5fe84de464 libraries_bom_version: 26.52.0 libraries: - api_shortname: datastore From b91a2af534eb7568ec86a0b27a80a6bd2943af7b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 8 Jan 2025 22:36:17 +0100 Subject: [PATCH 155/292] deps: update dependency com.google.guava:guava-testlib to v33.4.0-jre (#1694) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6f22c2be2..14dbbfb73 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -151,7 +151,7 @@ com.google.guava guava-testlib - 33.3.1-jre + 33.4.0-jre test From cd258d048811b3d6e09dfee4b044da370ad943a4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 13:36:33 -0800 Subject: [PATCH 156/292] chore(main): release 2.25.2-SNAPSHOT (#1689) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index f71e20221..20383ef09 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.1 + 2.25.2-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.25.1 + 2.25.2-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index c9cfd3347..4d1be0d6f 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.25.1 + 2.25.2-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.25.1 + 2.25.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.1 + 2.25.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.1 + 0.116.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.1 + 2.25.2-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 14dbbfb73..b8157b04d 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.25.1 + 2.25.2-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.25.1 + 2.25.2-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 74b964682..870bd340e 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.1 + 2.25.2-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.1 + 2.25.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4a8583e61..cdfbc9208 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.25.1 + 2.25.2-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.1 + 2.25.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.1 + 2.25.2-SNAPSHOT com.google.cloud google-cloud-datastore - 2.25.1 + 2.25.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.1 + 0.116.2-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.25.1 + 2.25.2-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 28ed4b0e7..e053c1c50 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.1 + 2.25.2-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.1 + 2.25.2-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a2fc2f2a8..de04132d9 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.1 + 0.116.2-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.25.1 + 2.25.2-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 174ac036d..d749b07af 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.25.1 + 2.25.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index 783c47b1f..64fa74fc1 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.25.1:2.25.1 -google-cloud-datastore-bom:2.25.1:2.25.1 -proto-google-cloud-datastore-v1:0.116.1:0.116.1 -datastore-v1-proto-client:2.25.1:2.25.1 -proto-google-cloud-datastore-admin-v1:2.25.1:2.25.1 -grpc-google-cloud-datastore-admin-v1:2.25.1:2.25.1 +google-cloud-datastore:2.25.1:2.25.2-SNAPSHOT +google-cloud-datastore-bom:2.25.1:2.25.2-SNAPSHOT +proto-google-cloud-datastore-v1:0.116.1:0.116.2-SNAPSHOT +datastore-v1-proto-client:2.25.1:2.25.2-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.25.1:2.25.2-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.25.1:2.25.2-SNAPSHOT From 8160c2895e947c118cea24e92d9a31a1fdf4653f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 8 Jan 2025 22:37:57 +0100 Subject: [PATCH 157/292] deps: update dependency com.google.cloud:gapic-libraries-bom to v1.49.0 (#1693) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index b8157b04d..56e61e7fe 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -24,7 +24,7 @@ com.google.cloud gapic-libraries-bom - 1.48.0 + 1.49.0 pom import From f94b5952cc3589ed8970a453ecc6e005a39625f3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 8 Jan 2025 22:58:11 +0100 Subject: [PATCH 158/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.52.0 (#1701) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 95c5f4db4..6f9dca16c 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.51.0 + 26.52.0 pom import From bf9537f81b6e7cc2252ad0183fb87db656b009d7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 8 Jan 2025 22:58:29 +0100 Subject: [PATCH 159/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.41.1 (#1703) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 87c21c0a0..07240c018 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.41.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.41.1 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 6c760a779..82991aa29 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.41.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.41.1" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 2a166877f..9303e1793 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.41.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.41.1" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 4d1be0d6f..01f5831f2 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.41.0 + 3.41.1 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index cdfbc9208..4f085e97b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.41.0 + 3.41.1 From 7f5c379ed1a065179aa77d847a3f7d43905e6da4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 8 Jan 2025 23:55:51 +0100 Subject: [PATCH 160/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.25.1 (#1690) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index f60a4bb5a..72a4cae0c 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.25.0 + 2.25.1 From 90d8b3034d5a583d880a822d1e763035a2120f4a Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 9 Jan 2025 12:46:45 -0500 Subject: [PATCH 161/292] chore: Update generation configuration at Thu Jan 9 02:33:59 UTC 2025 (#1705) * chore: Update generation configuration at Thu Jan 9 02:33:59 UTC 2025 * chore: generate libraries at Thu Jan 9 02:34:46 UTC 2025 --- .github/workflows/hermetic_library_generation.yaml | 2 +- README.md | 4 ++-- generation_config.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 604b674ba..c1be8aca5 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.51.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.51.1 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/README.md b/README.md index 160907fc0..fb097be59 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.51.0 + 26.52.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.25.0 + 2.25.1 ``` diff --git a/generation_config.yaml b/generation_config.yaml index ca592fd99..657b30e8f 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.51.0 -googleapis_commitish: 130b113520c1b3fffd90f67198681b5fe84de464 +gapic_generator_version: 2.51.1 +googleapis_commitish: 00196e2a68b16a864c57db2e870822875a7f1198 libraries_bom_version: 26.52.0 libraries: - api_shortname: datastore From 1beb7a1757babd5057a027747e56648729a94d1e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:10:25 -0800 Subject: [PATCH 162/292] chore(main): release 2.25.2 (#1702) * chore(main): release 2.25.2 * chore: generate libraries at Thu Jan 9 20:16:10 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 15 +++++++++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 46 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adec35297..ac277985c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [2.25.2](https://github.com/googleapis/java-datastore/compare/v2.25.1...v2.25.2) (2025-01-09) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.51.1 ([90d8b30](https://github.com/googleapis/java-datastore/commit/90d8b3034d5a583d880a822d1e763035a2120f4a)) +* Fix emulator command arg data-dir ([#1695](https://github.com/googleapis/java-datastore/issues/1695)) ([9d53195](https://github.com/googleapis/java-datastore/commit/9d531957da3f017f0702a126601eaa8afe3113d6)) + + +### Dependencies + +* Update dependency com.google.cloud:gapic-libraries-bom to v1.49.0 ([#1693](https://github.com/googleapis/java-datastore/issues/1693)) ([8160c28](https://github.com/googleapis/java-datastore/commit/8160c2895e947c118cea24e92d9a31a1fdf4653f)) +* Update dependency com.google.cloud:sdk-platform-java-config to v3.41.1 ([#1703](https://github.com/googleapis/java-datastore/issues/1703)) ([bf9537f](https://github.com/googleapis/java-datastore/commit/bf9537f81b6e7cc2252ad0183fb87db656b009d7)) +* Update dependency com.google.guava:guava-testlib to v33.4.0-jre ([#1694](https://github.com/googleapis/java-datastore/issues/1694)) ([b91a2af](https://github.com/googleapis/java-datastore/commit/b91a2af534eb7568ec86a0b27a80a6bd2943af7b)) + ## [2.25.1](https://github.com/googleapis/java-datastore/compare/v2.25.0...v2.25.1) (2024-12-13) diff --git a/README.md b/README.md index fb097be59..25ff835b0 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.25.1' +implementation 'com.google.cloud:google-cloud-datastore:2.25.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.2" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.2 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 20383ef09..181845869 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.2-SNAPSHOT + 2.25.2 com.google.cloud google-cloud-datastore-parent - 2.25.2-SNAPSHOT + 2.25.2 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 01f5831f2..3ea804a55 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.25.2-SNAPSHOT + 2.25.2 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.25.2-SNAPSHOT + 2.25.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.2-SNAPSHOT + 2.25.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.2-SNAPSHOT + 0.116.2 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.2-SNAPSHOT + 2.25.2 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 56e61e7fe..7ceaa1d4e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.25.2-SNAPSHOT + 2.25.2 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.25.2-SNAPSHOT + 2.25.2 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 870bd340e..5dc40791d 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.2-SNAPSHOT + 2.25.2 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.2-SNAPSHOT + 2.25.2 diff --git a/pom.xml b/pom.xml index 4f085e97b..750c26156 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.25.2-SNAPSHOT + 2.25.2 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.2-SNAPSHOT + 2.25.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.2-SNAPSHOT + 2.25.2 com.google.cloud google-cloud-datastore - 2.25.2-SNAPSHOT + 2.25.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.2-SNAPSHOT + 0.116.2 com.google.cloud.datastore datastore-v1-proto-client - 2.25.2-SNAPSHOT + 2.25.2 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index e053c1c50..f60cac1d7 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.2-SNAPSHOT + 2.25.2 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.2-SNAPSHOT + 2.25.2 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index de04132d9..b33dff30b 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.2-SNAPSHOT + 0.116.2 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.25.2-SNAPSHOT + 2.25.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index d749b07af..92e479703 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.25.2-SNAPSHOT + 2.25.2 diff --git a/versions.txt b/versions.txt index 64fa74fc1..38a509604 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.25.1:2.25.2-SNAPSHOT -google-cloud-datastore-bom:2.25.1:2.25.2-SNAPSHOT -proto-google-cloud-datastore-v1:0.116.1:0.116.2-SNAPSHOT -datastore-v1-proto-client:2.25.1:2.25.2-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.25.1:2.25.2-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.25.1:2.25.2-SNAPSHOT +google-cloud-datastore:2.25.2:2.25.2 +google-cloud-datastore-bom:2.25.2:2.25.2 +proto-google-cloud-datastore-v1:0.116.2:0.116.2 +datastore-v1-proto-client:2.25.2:2.25.2 +proto-google-cloud-datastore-admin-v1:2.25.2:2.25.2 +grpc-google-cloud-datastore-admin-v1:2.25.2:2.25.2 From b78660f3866ce5c1198db4590b5e1f645170ecff Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 13 Jan 2025 19:18:15 +0100 Subject: [PATCH 163/292] deps: update dependency com.google.cloud:gapic-libraries-bom to v1.50.0 (#1708) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 7ceaa1d4e..2bc73cfdd 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -24,7 +24,7 @@ com.google.cloud gapic-libraries-bom - 1.49.0 + 1.50.0 pom import From f336bf7d7a9bd19115801ae369326d37d20f8dcc Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:18:36 -0500 Subject: [PATCH 164/292] chore: Update generation configuration at Mon Jan 13 02:25:37 UTC 2025 (#1707) * chore: Update generation configuration at Fri Jan 10 02:24:46 UTC 2025 * chore: Update generation configuration at Sat Jan 11 02:23:02 UTC 2025 * chore: Update generation configuration at Sun Jan 12 02:26:48 UTC 2025 * chore: Update generation configuration at Mon Jan 13 02:25:37 UTC 2025 --------- Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 657b30e8f..3fd93e0ec 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.51.1 -googleapis_commitish: 00196e2a68b16a864c57db2e870822875a7f1198 +googleapis_commitish: d5cc1cd738a66bb7104162bcb35ebd539c658415 libraries_bom_version: 26.52.0 libraries: - api_shortname: datastore From 124f8b227cbcfa87df3cf593ab9ee9c3c2e7bcda Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 13 Jan 2025 19:55:30 +0100 Subject: [PATCH 165/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.25.2 (#1710) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 72a4cae0c..84f763453 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.25.1 + 2.25.2 From 1573ccaffded52dd0f070a9ce2b7c64d0bc4a341 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:46:23 -0800 Subject: [PATCH 166/292] chore(main): release 2.25.3-SNAPSHOT (#1709) * chore(main): release 2.25.3-SNAPSHOT * chore: generate libraries at Mon Jan 13 18:56:29 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- README.md | 2 +- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 25ff835b0..12e6a2c04 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.25.1 + 2.25.2 ``` diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 181845869..53a4f5751 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.2 + 2.25.3-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.25.2 + 2.25.3-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 3ea804a55..9611a2182 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.25.2 + 2.25.3-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.25.2 + 2.25.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.2 + 2.25.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.2 + 0.116.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.2 + 2.25.3-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 2bc73cfdd..6c210369d 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.25.2 + 2.25.3-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.25.2 + 2.25.3-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 5dc40791d..f207af3c8 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.2 + 2.25.3-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.2 + 2.25.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index 750c26156..170494d2d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.25.2 + 2.25.3-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.2 + 2.25.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.2 + 2.25.3-SNAPSHOT com.google.cloud google-cloud-datastore - 2.25.2 + 2.25.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.2 + 0.116.3-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.25.2 + 2.25.3-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index f60cac1d7..79d146139 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.2 + 2.25.3-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.2 + 2.25.3-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index b33dff30b..3c1b7f545 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.2 + 0.116.3-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.25.2 + 2.25.3-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 92e479703..e636da6ee 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.25.2 + 2.25.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index 38a509604..a0abd7bdb 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.25.2:2.25.2 -google-cloud-datastore-bom:2.25.2:2.25.2 -proto-google-cloud-datastore-v1:0.116.2:0.116.2 -datastore-v1-proto-client:2.25.2:2.25.2 -proto-google-cloud-datastore-admin-v1:2.25.2:2.25.2 -grpc-google-cloud-datastore-admin-v1:2.25.2:2.25.2 +google-cloud-datastore:2.25.2:2.25.3-SNAPSHOT +google-cloud-datastore-bom:2.25.2:2.25.3-SNAPSHOT +proto-google-cloud-datastore-v1:0.116.2:0.116.3-SNAPSHOT +datastore-v1-proto-client:2.25.2:2.25.3-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.25.2:2.25.3-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.25.2:2.25.3-SNAPSHOT From 352b248991529c4be9f26c26fc16c739b4026be3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 12:41:09 -0800 Subject: [PATCH 167/292] chore(main): release 2.25.3 (#1714) * chore(main): release 2.25.3 * chore: generate libraries at Wed Jan 15 19:47:17 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 7 +++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 38 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac277985c..24de017f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.25.3](https://github.com/googleapis/java-datastore/compare/v2.25.2...v2.25.3) (2025-01-15) + + +### Dependencies + +* Update dependency com.google.cloud:gapic-libraries-bom to v1.50.0 ([#1708](https://github.com/googleapis/java-datastore/issues/1708)) ([b78660f](https://github.com/googleapis/java-datastore/commit/b78660f3866ce5c1198db4590b5e1f645170ecff)) + ## [2.25.2](https://github.com/googleapis/java-datastore/compare/v2.25.1...v2.25.2) (2025-01-09) diff --git a/README.md b/README.md index 12e6a2c04..ba1a2143c 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.25.2' +implementation 'com.google.cloud:google-cloud-datastore:2.25.3' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.3" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.3 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 53a4f5751..3acf5b61f 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.3-SNAPSHOT + 2.25.3 com.google.cloud google-cloud-datastore-parent - 2.25.3-SNAPSHOT + 2.25.3 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 9611a2182..1ab3f57c9 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.25.3-SNAPSHOT + 2.25.3 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.25.3-SNAPSHOT + 2.25.3 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.3-SNAPSHOT + 2.25.3 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.3-SNAPSHOT + 0.116.3 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.3-SNAPSHOT + 2.25.3 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6c210369d..78e862752 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.25.3-SNAPSHOT + 2.25.3 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.25.3-SNAPSHOT + 2.25.3 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index f207af3c8..2e240f549 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.3-SNAPSHOT + 2.25.3 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.3-SNAPSHOT + 2.25.3 diff --git a/pom.xml b/pom.xml index 170494d2d..2dc557ecc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.25.3-SNAPSHOT + 2.25.3 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.3-SNAPSHOT + 2.25.3 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.3-SNAPSHOT + 2.25.3 com.google.cloud google-cloud-datastore - 2.25.3-SNAPSHOT + 2.25.3 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.3-SNAPSHOT + 0.116.3 com.google.cloud.datastore datastore-v1-proto-client - 2.25.3-SNAPSHOT + 2.25.3 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 79d146139..e1c7befb2 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.3-SNAPSHOT + 2.25.3 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.3-SNAPSHOT + 2.25.3 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 3c1b7f545..ea9aac37d 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.3-SNAPSHOT + 0.116.3 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.25.3-SNAPSHOT + 2.25.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e636da6ee..7ef6cdcaa 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.25.3-SNAPSHOT + 2.25.3 diff --git a/versions.txt b/versions.txt index a0abd7bdb..e7b449b76 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.25.2:2.25.3-SNAPSHOT -google-cloud-datastore-bom:2.25.2:2.25.3-SNAPSHOT -proto-google-cloud-datastore-v1:0.116.2:0.116.3-SNAPSHOT -datastore-v1-proto-client:2.25.2:2.25.3-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.25.2:2.25.3-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.25.2:2.25.3-SNAPSHOT +google-cloud-datastore:2.25.3:2.25.3 +google-cloud-datastore-bom:2.25.3:2.25.3 +proto-google-cloud-datastore-v1:0.116.3:0.116.3 +datastore-v1-proto-client:2.25.3:2.25.3 +proto-google-cloud-datastore-admin-v1:2.25.3:2.25.3 +grpc-google-cloud-datastore-admin-v1:2.25.3:2.25.3 From 2a7a9a114257ada6b195d2c58467005c23b5d9d1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:04:46 -0500 Subject: [PATCH 168/292] chore(main): release 2.25.4-SNAPSHOT (#1715) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 3acf5b61f..1d720d54f 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.3 + 2.25.4-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.25.3 + 2.25.4-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 1ab3f57c9..2b77ecd5b 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.25.3 + 2.25.4-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.25.3 + 2.25.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.3 + 2.25.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.3 + 0.116.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.3 + 2.25.4-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 78e862752..e37499d33 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.25.3 + 2.25.4-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.25.3 + 2.25.4-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 2e240f549..4b754b8b5 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.3 + 2.25.4-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.3 + 2.25.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2dc557ecc..74c56c801 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.25.3 + 2.25.4-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.3 + 2.25.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.3 + 2.25.4-SNAPSHOT com.google.cloud google-cloud-datastore - 2.25.3 + 2.25.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.3 + 0.116.4-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.25.3 + 2.25.4-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index e1c7befb2..40747b491 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.3 + 2.25.4-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.3 + 2.25.4-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index ea9aac37d..a759958b5 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.3 + 0.116.4-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.25.3 + 2.25.4-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 7ef6cdcaa..d338a8647 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.25.3 + 2.25.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index e7b449b76..29feb608f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.25.3:2.25.3 -google-cloud-datastore-bom:2.25.3:2.25.3 -proto-google-cloud-datastore-v1:0.116.3:0.116.3 -datastore-v1-proto-client:2.25.3:2.25.3 -proto-google-cloud-datastore-admin-v1:2.25.3:2.25.3 -grpc-google-cloud-datastore-admin-v1:2.25.3:2.25.3 +google-cloud-datastore:2.25.3:2.25.4-SNAPSHOT +google-cloud-datastore-bom:2.25.3:2.25.4-SNAPSHOT +proto-google-cloud-datastore-v1:0.116.3:0.116.4-SNAPSHOT +datastore-v1-proto-client:2.25.3:2.25.4-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.25.3:2.25.4-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.25.3:2.25.4-SNAPSHOT From 9d5c8dddf636a0cb2a9aa6c7302d73edef96d152 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 21 Jan 2025 13:56:11 -0500 Subject: [PATCH 169/292] chore: Update generation configuration at Thu Jan 16 02:19:57 UTC 2025 (#1711) * chore: Update generation configuration at Tue Jan 14 02:19:18 UTC 2025 * chore: generate libraries at Tue Jan 14 02:19:54 UTC 2025 * chore: Update generation configuration at Wed Jan 15 02:20:57 UTC 2025 * chore: Update generation configuration at Thu Jan 16 02:19:57 UTC 2025 --------- Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 3fd93e0ec..187bb8c3a 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.51.1 -googleapis_commitish: d5cc1cd738a66bb7104162bcb35ebd539c658415 +googleapis_commitish: 8c9639ac76d6f08df5b3c2c0aa759cab126bbba5 libraries_bom_version: 26.52.0 libraries: - api_shortname: datastore From 0333b0744bab87afe78dad1c17f6811d3dec47e6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 22 Jan 2025 22:31:20 +0100 Subject: [PATCH 170/292] deps: update dependency org.easymock:easymock to v5.5.0 (#1666) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 74c56c801..092ea0577 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,7 @@ org.easymock easymock - 5.4.0 + 5.5.0 test From 2f31c5b3ade3e255dcc0a3f093041317f8c805b6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 22 Jan 2025 22:32:32 +0100 Subject: [PATCH 171/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.53.0 (#1713) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 6f9dca16c..20ba4adb9 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.52.0 + 26.53.0 pom import From fa8cea090e5d41645c64ab0379bd035307c07f0d Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:32:48 -0500 Subject: [PATCH 172/292] chore: Update generation configuration at Wed Jan 22 02:22:09 UTC 2025 (#1717) * chore: Update generation configuration at Wed Jan 22 02:22:09 UTC 2025 * chore: generate libraries at Wed Jan 22 02:22:43 UTC 2025 --- README.md | 2 +- generation_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ba1a2143c..0f4fdf46d 100644 --- a/README.md +++ b/README.md @@ -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.52.0') +implementation platform('com.google.cloud:libraries-bom:26.53.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index 187bb8c3a..69ac415c0 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.51.1 -googleapis_commitish: 8c9639ac76d6f08df5b3c2c0aa759cab126bbba5 -libraries_bom_version: 26.52.0 +googleapis_commitish: e9a4c38a81933108eaa6ac96c7ead31e253c8c64 +libraries_bom_version: 26.53.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From a38a741b8364a7048656c074e8aa42b9c2496990 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 15:20:28 -0800 Subject: [PATCH 173/292] chore(main): release 2.25.4 (#1718) * chore(main): release 2.25.4 * chore: generate libraries at Wed Jan 22 21:33:50 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 7 +++++++ README.md | 8 ++++---- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 39 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24de017f9..78c769d0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.25.4](https://github.com/googleapis/java-datastore/compare/v2.25.3...v2.25.4) (2025-01-22) + + +### Dependencies + +* Update dependency org.easymock:easymock to v5.5.0 ([#1666](https://github.com/googleapis/java-datastore/issues/1666)) ([0333b07](https://github.com/googleapis/java-datastore/commit/0333b0744bab87afe78dad1c17f6811d3dec47e6)) + ## [2.25.3](https://github.com/googleapis/java-datastore/compare/v2.25.2...v2.25.3) (2025-01-15) diff --git a/README.md b/README.md index 0f4fdf46d..1470ac3e7 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.52.0 + 26.53.0 pom import @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.25.3' +implementation 'com.google.cloud:google-cloud-datastore:2.25.4' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.3" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.4" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.3 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.4 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 1d720d54f..c6b52b796 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.4-SNAPSHOT + 2.25.4 com.google.cloud google-cloud-datastore-parent - 2.25.4-SNAPSHOT + 2.25.4 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 2b77ecd5b..f3475c4a9 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.25.4-SNAPSHOT + 2.25.4 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.25.4-SNAPSHOT + 2.25.4 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.4-SNAPSHOT + 2.25.4 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.4-SNAPSHOT + 0.116.4 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.4-SNAPSHOT + 2.25.4 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e37499d33..5b228e916 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.25.4-SNAPSHOT + 2.25.4 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.25.4-SNAPSHOT + 2.25.4 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 4b754b8b5..125807ce5 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.4-SNAPSHOT + 2.25.4 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.4-SNAPSHOT + 2.25.4 diff --git a/pom.xml b/pom.xml index 092ea0577..4579f4aef 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.25.4-SNAPSHOT + 2.25.4 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.4-SNAPSHOT + 2.25.4 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.4-SNAPSHOT + 2.25.4 com.google.cloud google-cloud-datastore - 2.25.4-SNAPSHOT + 2.25.4 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.4-SNAPSHOT + 0.116.4 com.google.cloud.datastore datastore-v1-proto-client - 2.25.4-SNAPSHOT + 2.25.4 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 40747b491..fab8c1c58 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.4-SNAPSHOT + 2.25.4 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.4-SNAPSHOT + 2.25.4 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a759958b5..8ab0b4196 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.4-SNAPSHOT + 0.116.4 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.25.4-SNAPSHOT + 2.25.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index d338a8647..706cbea57 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.25.4-SNAPSHOT + 2.25.4 diff --git a/versions.txt b/versions.txt index 29feb608f..f7fd65578 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.25.3:2.25.4-SNAPSHOT -google-cloud-datastore-bom:2.25.3:2.25.4-SNAPSHOT -proto-google-cloud-datastore-v1:0.116.3:0.116.4-SNAPSHOT -datastore-v1-proto-client:2.25.3:2.25.4-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.25.3:2.25.4-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.25.3:2.25.4-SNAPSHOT +google-cloud-datastore:2.25.4:2.25.4 +google-cloud-datastore-bom:2.25.4:2.25.4 +proto-google-cloud-datastore-v1:0.116.4:0.116.4 +datastore-v1-proto-client:2.25.4:2.25.4 +proto-google-cloud-datastore-admin-v1:2.25.4:2.25.4 +grpc-google-cloud-datastore-admin-v1:2.25.4:2.25.4 From 50f106d4c50884ce471a66c00df322270fe4a91c Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Fri, 24 Jan 2025 01:23:32 -0800 Subject: [PATCH 174/292] feat: Add firestoreInDatastoreMode for datastore emulator (#1698) * feat: Add firestoreInDatastoreMode for datastore emulator * chore: generate libraries at Mon Jan 6 17:28:37 UTC 2025 * update emulator min version * update version to 2.2.2 * update version to 2.3.0 * update version to 2.2.1 * update version to 2.3.1 * chore: generate libraries at Mon Jan 13 23:32:38 UTC 2025 * Fix ci testing environment with java 11 * Add Java 11 enviroment to run tests * Fix java env formatting * set maven env * set maven env * testing java 11 * Add sample test env variable * Add sample test env variable * Add sample test env variable * run with java8 but build with 11 * Add java 11 as java_home sample build * Add java_home for presubmit * Fix SUREFIRE_JVM_OPT for sample build * Fix JAVA_HOME for sample build * Fix JAVA_HOME for sample build * Modify Java env for presubmit integration build * Add setjava to builder script * Add setjava to builder script * Add setjava to builder script * Add debugging info to builder script * Add debugging info to builder script * Add debugging info to builder script * Add debugging info to builder script * formatting * Add debugging * Add debugging * Add debugging * Add debugging * Add debugging * Add debugging * Resolve conflicts * Change sample build to use java11 container * chore: generate libraries at Thu Jan 23 23:20:47 UTC 2025 --------- Co-authored-by: cloud-java-bot --- .cloudbuild/samples_build.yaml | 10 ++--- .github/workflows/ci.yaml | 10 ++++- .kokoro/build.sh | 12 ++++++ .kokoro/common.sh | 2 +- .kokoro/presubmit/integration.cfg | 2 +- .../testing/LocalDatastoreHelper.java | 38 +++++++++++++++++-- .../testing/ITLocalDatastoreHelperTest.java | 24 ++++++++++++ 7 files changed, 87 insertions(+), 11 deletions(-) diff --git a/.cloudbuild/samples_build.yaml b/.cloudbuild/samples_build.yaml index 204a7b254..3dd2ff94c 100644 --- a/.cloudbuild/samples_build.yaml +++ b/.cloudbuild/samples_build.yaml @@ -1,19 +1,19 @@ steps: -- name: gcr.io/cloud-devrel-public-resources/java8 +- name: gcr.io/cloud-devrel-public-resources/java11 entrypoint: ls args: [ '-alt', ] -- name: gcr.io/cloud-devrel-public-resources/java8 +- name: gcr.io/cloud-devrel-public-resources/java11 entrypoint: curl args: [ '--header', 'Metadata-Flavor: Google', 'http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/email' ] -- name: gcr.io/cloud-devrel-public-resources/java8 +- name: gcr.io/cloud-devrel-public-resources/java11 entrypoint: pwd -- name: gcr.io/cloud-devrel-public-resources/java8 +- name: gcr.io/cloud-devrel-public-resources/java11 entrypoint: bash args: [ '.kokoro/build.sh' @@ -22,7 +22,7 @@ steps: - 'JOB_TYPE=samples' - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-sample' - 'KOKORO_GITHUB_PULL_REQUEST_NUMBER=$_PR_NUMBER' -- name: gcr.io/cloud-devrel-public-resources/java8 +- name: gcr.io/cloud-devrel-public-resources/java11 entrypoint: echo args: [ 'Sample job succeeded', diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b91fa381f..941f2f3b4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -59,6 +59,7 @@ jobs: env: JOB_TYPE: test windows: + # Building using Java 11 and run the tests with Java 8 runtime runs-on: windows-latest steps: - name: Support longpaths @@ -66,8 +67,15 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - distribution: temurin java-version: 8 + distribution: temurin + - name: "Set jvm system property environment variable for surefire plugin (unit tests)" + run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}\bin\java" >> $GITHUB_ENV + shell: bash + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 11 - run: java -version - run: .kokoro/build.bat env: diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 8a894939c..c4b65f8b5 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -60,6 +60,18 @@ javadoc) RETURN_CODE=$? ;; integration) + # Kokoro integration tests use both JDK 11 and JDK 8. Integration + # tests require JDK 11 export as JAVA env variable to run cloud datastore + # emulator (https://cloud.google.com/sdk/docs/release-notes#39300_2022-07-12). + # For Java 8 environment, we will still run the tests using Java 8 with + # SUREFIRE_JVM_OPT for Maven surefire plugin: + # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm + if [[ -n "${JAVA11_HOME}" && -n "${JAVA8_HOME}" ]] + then + export JAVA=${JAVA11_HOME}/bin/java + export SUREFIRE_JVM_OPT=-Djvm=${JAVA8_HOME}/bin/java + fi + mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ -Penable-integration-tests \ diff --git a/.kokoro/common.sh b/.kokoro/common.sh index f8f957af1..aeb3568bb 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -52,7 +52,7 @@ function retry_with_backoff { return $exit_code } -## Helper functionss +## Helper functions function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; } function msg() { println "$*" >&2; } function println() { printf '%s\n' "$(now) $*"; } diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg index fd5cd6689..71431d938 100644 --- a/.kokoro/presubmit/integration.cfg +++ b/.kokoro/presubmit/integration.cfg @@ -35,4 +35,4 @@ env_vars: { env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" -} +} \ No newline at end of file diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java index 79d10220c..20321f812 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java @@ -53,12 +53,13 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper { private final double consistency; private final Path gcdPath; private boolean storeOnDisk; + private boolean firestoreInDatastoreMode; // Gcloud emulator settings private static final String GCLOUD_CMD_TEXT = "gcloud beta emulators datastore start"; private static final String GCLOUD_CMD_PORT_FLAG = "--host-port="; private static final String VERSION_PREFIX = "cloud-datastore-emulator "; - private static final String MIN_VERSION = "2.0.2"; + private static final String MIN_VERSION = "2.3.1"; // Downloadable emulator settings private static final String BIN_NAME = "cloud-datastore-emulator/cloud_datastore_emulator"; @@ -74,6 +75,8 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper { private static final String PROJECT_FLAG = "--project="; private static final double DEFAULT_CONSISTENCY = 0.9; private static final String DEFAULT_PROJECT_ID = PROJECT_ID_PREFIX + UUID.randomUUID(); + private static final String FIRESTORE_IN_DATASTORE_MODE_FLAG = + "--use-firestore-in-datastore-mode"; private static final Logger LOGGER = Logger.getLogger(LocalDatastoreHelper.class.getName()); @@ -102,6 +105,7 @@ public static class Builder { private int port; private Path dataDir; private boolean storeOnDisk = true; + private boolean firestoreInDatastoreMode = false; private String projectId; private Builder() {} @@ -110,6 +114,7 @@ private Builder(LocalDatastoreHelper helper) { this.consistency = helper.consistency; this.dataDir = helper.gcdPath; this.storeOnDisk = helper.storeOnDisk; + this.firestoreInDatastoreMode = helper.firestoreInDatastoreMode; } public Builder setConsistency(double consistency) { @@ -137,6 +142,11 @@ public Builder setStoreOnDisk(boolean storeOnDisk) { return this; } + public Builder setFirestoreInDatastoreMode(boolean firestoreInDatastoreMode) { + this.firestoreInDatastoreMode = firestoreInDatastoreMode; + return this; + } + /** Creates a {@code LocalDatastoreHelper} object. */ public LocalDatastoreHelper build() { return new LocalDatastoreHelper(this); @@ -152,14 +162,21 @@ private LocalDatastoreHelper(Builder builder) { this.consistency = builder.consistency > 0 ? builder.consistency : DEFAULT_CONSISTENCY; this.gcdPath = builder.dataDir; this.storeOnDisk = builder.storeOnDisk; + this.firestoreInDatastoreMode = builder.firestoreInDatastoreMode; String binName = BIN_NAME; if (isWindows()) { binName = BIN_NAME.replace("/", "\\"); } List gcloudCommand = new ArrayList<>(Arrays.asList(GCLOUD_CMD_TEXT.split(" "))); gcloudCommand.add(GCLOUD_CMD_PORT_FLAG + "localhost:" + getPort()); - gcloudCommand.add(CONSISTENCY_FLAG + builder.consistency); gcloudCommand.add(PROJECT_FLAG + projectId); + if (builder.firestoreInDatastoreMode) { + gcloudCommand.add(FIRESTORE_IN_DATASTORE_MODE_FLAG); + } else { + // At most one of --consistency | --use-firestore-in-datastore-mode can be specified. + // --consistency will be ignored with --use-firestore-in-datastore-mode. + gcloudCommand.add(CONSISTENCY_FLAG + builder.consistency); + } if (!builder.storeOnDisk) { gcloudCommand.add("--no-store-on-disk"); } @@ -170,8 +187,16 @@ private LocalDatastoreHelper(Builder builder) { new GcloudEmulatorRunner(gcloudCommand, VERSION_PREFIX, MIN_VERSION); List binCommand = new ArrayList<>(Arrays.asList(binName, "start")); binCommand.add("--testing"); + if (builder.firestoreInDatastoreMode) { + // Downloadable emulator runner takes the flag in a different + // format: --firestore_in_datastore_mode + binCommand.add("--firestore_in_datastore_mode"); + } else { + // At most one of --consistency | --firestore_in_datastore_mode can be specified. + // --consistency will be ignored with --firestore_in_datastore_mode. + binCommand.add(CONSISTENCY_FLAG + getConsistency()); + } binCommand.add(BIN_CMD_PORT_FLAG + getPort()); - binCommand.add(CONSISTENCY_FLAG + getConsistency()); DownloadableEmulatorRunner downloadRunner = new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM, ACCESS_TOKEN); this.emulatorRunners = ImmutableList.of(gcloudRunner, downloadRunner); @@ -235,6 +260,13 @@ public boolean isStoreOnDisk() { return storeOnDisk; } + /** + * Returns {@code true} use firestore-in-datastore-mode, otherwise {@code false} use native mode. + */ + public boolean isFirestoreInDatastoreMode() { + return firestoreInDatastoreMode; + } + /** * Creates a local Datastore helper with the specified settings for project ID and consistency. * diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java index dfa2255a0..cad6d4fbe 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java @@ -76,11 +76,13 @@ public void testCreateWithBuilder() { .setConsistency(0.75) .setPort(8081) .setStoreOnDisk(false) + .setFirestoreInDatastoreMode(true) .setDataDir(dataDir) .build(); assertTrue(Math.abs(0.75 - helper.getConsistency()) < TOLERANCE); assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX)); assertFalse(helper.isStoreOnDisk()); + assertTrue(helper.isFirestoreInDatastoreMode()); assertEquals(8081, helper.getPort()); assertEquals(dataDir, helper.getGcdPath()); LocalDatastoreHelper incompleteHelper = LocalDatastoreHelper.newBuilder().build(); @@ -103,11 +105,13 @@ public void testCreateWithToBuilder() throws IOException { .setConsistency(0.75) .setPort(8081) .setStoreOnDisk(false) + .setFirestoreInDatastoreMode(true) .setDataDir(dataDir) .build(); assertTrue(Math.abs(0.75 - helper.getConsistency()) < TOLERANCE); assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX)); assertFalse(helper.isStoreOnDisk()); + assertTrue(helper.isFirestoreInDatastoreMode()); assertEquals(8081, helper.getPort()); assertEquals(dataDir, helper.getGcdPath()); LocalDatastoreHelper actualHelper = helper.toBuilder().build(); @@ -119,10 +123,12 @@ public void testCreateWithToBuilder() throws IOException { .setConsistency(0.85) .setPort(9091) .setStoreOnDisk(true) + .setFirestoreInDatastoreMode(false) .setDataDir(dataDir) .build(); assertTrue(Math.abs(0.85 - actualHelper.getConsistency()) < TOLERANCE); assertTrue(actualHelper.isStoreOnDisk()); + assertFalse(actualHelper.isFirestoreInDatastoreMode()); assertEquals(9091, actualHelper.getPort()); assertEquals(dataDir, actualHelper.getGcdPath()); LocalDatastoreHelper.deleteRecursively(dataDir); @@ -206,10 +212,28 @@ public void testStartStopResetWithBuilder() } } + @Test + public void testCreateWithFirestoreInDatastoreMode() + throws IOException, InterruptedException, TimeoutException { + LocalDatastoreHelper helper = + LocalDatastoreHelper.newBuilder().setFirestoreInDatastoreMode(true).build(); + assertTrue(helper.isFirestoreInDatastoreMode()); + helper.start(); + Datastore datastore = helper.getOptions().getService(); + Key key = datastore.newKeyFactory().setKind("kind").newKey("name"); + Entity expected = Entity.newBuilder(key).build(); + datastore.put(expected); + assertNotNull(datastore.get(key)); + Entity actual = datastore.get(key); + assertEquals(expected, actual); + helper.stop(); + } + public void assertLocalDatastoreHelpersEquivelent( LocalDatastoreHelper expected, LocalDatastoreHelper actual) { assertEquals(expected.getConsistency(), actual.getConsistency(), 0); assertEquals(expected.isStoreOnDisk(), actual.isStoreOnDisk()); + assertEquals(expected.isFirestoreInDatastoreMode(), actual.isFirestoreInDatastoreMode()); assertEquals(expected.getGcdPath(), actual.getGcdPath()); } } From df740b60b0fe9ca9caa9ec5ea86a39e582a5331c Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:48:59 -0500 Subject: [PATCH 175/292] chore: Update generation configuration at Thu Jan 23 02:20:40 UTC 2025 (#1721) * chore: Update generation configuration at Thu Jan 23 02:20:40 UTC 2025 * chore: generate libraries at Thu Jan 23 02:21:21 UTC 2025 --------- Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 69ac415c0..6d2d9bc03 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.51.1 -googleapis_commitish: e9a4c38a81933108eaa6ac96c7ead31e253c8c64 +googleapis_commitish: 1a0e353ac4a372cf7016df4ce0a7d7e609f339b3 libraries_bom_version: 26.53.0 libraries: - api_shortname: datastore From 1cbaf22cf557aec606dce7a5ca5d3ebe620a9339 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 29 Jan 2025 20:09:47 +0100 Subject: [PATCH 176/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.42.0 (#1725) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 07240c018..b0249a7b8 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.41.1 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.42.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 82991aa29..68a18d5c0 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.41.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.42.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 9303e1793..a8f634797 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.41.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.42.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f3475c4a9..68f80a38e 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.41.1 + 3.42.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 4579f4aef..897db9e21 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.41.1 + 3.42.0 From 999d51a4cdc29afbb4ed7cfe931408f211f6032b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:10:25 -0500 Subject: [PATCH 177/292] chore(main): release 2.25.5-SNAPSHOT (#1722) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index c6b52b796..ca4f8caa7 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.4 + 2.25.5-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.25.4 + 2.25.5-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 68f80a38e..df5fe58c2 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.25.4 + 2.25.5-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.25.4 + 2.25.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.4 + 2.25.5-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.4 + 0.116.5-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.4 + 2.25.5-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 5b228e916..83f3761a6 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.25.4 + 2.25.5-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.25.4 + 2.25.5-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 125807ce5..45112775d 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.4 + 2.25.5-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.4 + 2.25.5-SNAPSHOT diff --git a/pom.xml b/pom.xml index 897db9e21..1e980cffe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.25.4 + 2.25.5-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.4 + 2.25.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.4 + 2.25.5-SNAPSHOT com.google.cloud google-cloud-datastore - 2.25.4 + 2.25.5-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.4 + 0.116.5-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.25.4 + 2.25.5-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index fab8c1c58..6c201d81a 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.4 + 2.25.5-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.4 + 2.25.5-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 8ab0b4196..0420e5acd 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.4 + 0.116.5-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.25.4 + 2.25.5-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 706cbea57..63ce5241d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.25.4 + 2.25.5-SNAPSHOT diff --git a/versions.txt b/versions.txt index f7fd65578..6b9232d78 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.25.4:2.25.4 -google-cloud-datastore-bom:2.25.4:2.25.4 -proto-google-cloud-datastore-v1:0.116.4:0.116.4 -datastore-v1-proto-client:2.25.4:2.25.4 -proto-google-cloud-datastore-admin-v1:2.25.4:2.25.4 -grpc-google-cloud-datastore-admin-v1:2.25.4:2.25.4 +google-cloud-datastore:2.25.4:2.25.5-SNAPSHOT +google-cloud-datastore-bom:2.25.4:2.25.5-SNAPSHOT +proto-google-cloud-datastore-v1:0.116.4:0.116.5-SNAPSHOT +datastore-v1-proto-client:2.25.4:2.25.5-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.25.4:2.25.5-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.25.4:2.25.5-SNAPSHOT From bde9254b3c877c3bd3be7fa5a3e2b3e06a610215 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 10:48:44 -0500 Subject: [PATCH 178/292] chore(main): release 2.26.0 (#1727) * chore(main): release 2.26.0 * chore: generate libraries at Wed Jan 29 20:11:20 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 12 ++++++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 43 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78c769d0c..794f60678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.26.0](https://github.com/googleapis/java-datastore/compare/v2.25.4...v2.26.0) (2025-01-29) + + +### Features + +* Add firestoreInDatastoreMode for datastore emulator ([#1698](https://github.com/googleapis/java-datastore/issues/1698)) ([50f106d](https://github.com/googleapis/java-datastore/commit/50f106d4c50884ce471a66c00df322270fe4a91c)) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.42.0 ([#1725](https://github.com/googleapis/java-datastore/issues/1725)) ([1cbaf22](https://github.com/googleapis/java-datastore/commit/1cbaf22cf557aec606dce7a5ca5d3ebe620a9339)) + ## [2.25.4](https://github.com/googleapis/java-datastore/compare/v2.25.3...v2.25.4) (2025-01-22) diff --git a/README.md b/README.md index 1470ac3e7..c2f02f1ce 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.25.4' +implementation 'com.google.cloud:google-cloud-datastore:2.26.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.25.4" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.0" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.25.4 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index ca4f8caa7..d5e7defc8 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.5-SNAPSHOT + 2.26.0 com.google.cloud google-cloud-datastore-parent - 2.25.5-SNAPSHOT + 2.26.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index df5fe58c2..d67c016fb 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.25.5-SNAPSHOT + 2.26.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.25.5-SNAPSHOT + 2.26.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.5-SNAPSHOT + 2.26.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.5-SNAPSHOT + 0.117.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.5-SNAPSHOT + 2.26.0 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 83f3761a6..4059aaa2c 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.25.5-SNAPSHOT + 2.26.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.25.5-SNAPSHOT + 2.26.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 45112775d..d066da0ac 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.5-SNAPSHOT + 2.26.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.5-SNAPSHOT + 2.26.0 diff --git a/pom.xml b/pom.xml index 1e980cffe..91579d9af 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.25.5-SNAPSHOT + 2.26.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.5-SNAPSHOT + 2.26.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.25.5-SNAPSHOT + 2.26.0 com.google.cloud google-cloud-datastore - 2.25.5-SNAPSHOT + 2.26.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.5-SNAPSHOT + 0.117.0 com.google.cloud.datastore datastore-v1-proto-client - 2.25.5-SNAPSHOT + 2.26.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 6c201d81a..6c50068e5 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.25.5-SNAPSHOT + 2.26.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.25.5-SNAPSHOT + 2.26.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 0420e5acd..a41f0ae34 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.116.5-SNAPSHOT + 0.117.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.25.5-SNAPSHOT + 2.26.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 63ce5241d..c923bab29 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.25.5-SNAPSHOT + 2.26.0 diff --git a/versions.txt b/versions.txt index 6b9232d78..7cf291116 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.25.4:2.25.5-SNAPSHOT -google-cloud-datastore-bom:2.25.4:2.25.5-SNAPSHOT -proto-google-cloud-datastore-v1:0.116.4:0.116.5-SNAPSHOT -datastore-v1-proto-client:2.25.4:2.25.5-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.25.4:2.25.5-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.25.4:2.25.5-SNAPSHOT +google-cloud-datastore:2.26.0:2.26.0 +google-cloud-datastore-bom:2.26.0:2.26.0 +proto-google-cloud-datastore-v1:0.117.0:0.117.0 +datastore-v1-proto-client:2.26.0:2.26.0 +proto-google-cloud-datastore-admin-v1:2.26.0:2.26.0 +grpc-google-cloud-datastore-admin-v1:2.26.0:2.26.0 From 95940241de9f324000d52dc80b3106aedefd481e Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 30 Jan 2025 18:10:48 -0500 Subject: [PATCH 179/292] chore: Update generation configuration at Wed Jan 29 02:19:56 UTC 2025 (#1723) * chore: Update generation configuration at Sat Jan 25 02:17:00 UTC 2025 * chore: Update generation configuration at Mon Jan 27 02:21:43 UTC 2025 * chore: Update generation configuration at Tue Jan 28 02:20:23 UTC 2025 * chore: Update generation configuration at Wed Jan 29 02:19:56 UTC 2025 --- .github/workflows/hermetic_library_generation.yaml | 2 +- generation_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index c1be8aca5..f7804e9d0 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.51.1 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.52.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/generation_config.yaml b/generation_config.yaml index 6d2d9bc03..f74abe925 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.51.1 -googleapis_commitish: 1a0e353ac4a372cf7016df4ce0a7d7e609f339b3 +gapic_generator_version: 2.52.0 +googleapis_commitish: 280725e991516d4a0f136268faf5aa6d32d21b54 libraries_bom_version: 26.53.0 libraries: - api_shortname: datastore From ffa05a242d495d46f3a0d0df9aba5bdd0b7808fe Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Sat, 1 Feb 2025 21:48:34 -0500 Subject: [PATCH 180/292] chore: Update generation configuration at Fri Jan 31 02:20:29 UTC 2025 (#1729) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index f74abe925..795d4d486 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.52.0 -googleapis_commitish: 280725e991516d4a0f136268faf5aa6d32d21b54 +googleapis_commitish: dd1210af5bee414c9e606f5637e0eb0fd9d894e8 libraries_bom_version: 26.53.0 libraries: - api_shortname: datastore From a690e53934bb6d4760ce0f695b13c3ad05d91e15 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 08:34:27 -0800 Subject: [PATCH 181/292] chore(main): release 2.26.1-SNAPSHOT (#1728) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index d5e7defc8..3f5e61e8e 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.0 + 2.26.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.26.0 + 2.26.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index d67c016fb..f2d630f34 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.26.0 + 2.26.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.26.0 + 2.26.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.0 + 2.26.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.0 + 0.117.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.0 + 2.26.1-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 4059aaa2c..1843574b1 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.26.0 + 2.26.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.26.0 + 2.26.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index d066da0ac..80efbb229 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.0 + 2.26.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.0 + 2.26.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 91579d9af..9763d9786 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.26.0 + 2.26.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.0 + 2.26.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.0 + 2.26.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.26.0 + 2.26.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.0 + 0.117.1-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.26.0 + 2.26.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 6c50068e5..94bd710a6 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.0 + 2.26.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.0 + 2.26.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a41f0ae34..8153848f2 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.0 + 0.117.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.26.0 + 2.26.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c923bab29..1b9e6dde4 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.26.0 + 2.26.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 7cf291116..008ca948f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.26.0:2.26.0 -google-cloud-datastore-bom:2.26.0:2.26.0 -proto-google-cloud-datastore-v1:0.117.0:0.117.0 -datastore-v1-proto-client:2.26.0:2.26.0 -proto-google-cloud-datastore-admin-v1:2.26.0:2.26.0 -grpc-google-cloud-datastore-admin-v1:2.26.0:2.26.0 +google-cloud-datastore:2.26.0:2.26.1-SNAPSHOT +google-cloud-datastore-bom:2.26.0:2.26.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.117.0:0.117.1-SNAPSHOT +datastore-v1-proto-client:2.26.0:2.26.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.26.0:2.26.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.26.0:2.26.1-SNAPSHOT From 89f31a88d346193c9a5533de3e38c9088db30043 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 3 Feb 2025 17:58:06 +0100 Subject: [PATCH 182/292] deps: update dependency com.google.cloud:gapic-libraries-bom to v1.51.0 (#1726) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 1843574b1..4476e41fc 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -24,7 +24,7 @@ com.google.cloud gapic-libraries-bom - 1.50.0 + 1.51.0 pom import From ebc9bcf8a92b4505c0b232249b5d5f71f052867b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 5 Feb 2025 02:22:12 +0100 Subject: [PATCH 183/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.54.0 (#1732) --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 20ba4adb9..915461c90 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.53.0 + 26.54.0 pom import From 6e62989a598998b69c73e6ac7a7529efbab8aa44 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 4 Feb 2025 20:22:26 -0500 Subject: [PATCH 184/292] chore: Update generation configuration at Mon Feb 3 02:21:17 UTC 2025 (#1730) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 795d4d486..d936e58c9 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.52.0 -googleapis_commitish: dd1210af5bee414c9e606f5637e0eb0fd9d894e8 +googleapis_commitish: 3cf61b2df20eace09e6336c23f9e08859c0d87ae libraries_bom_version: 26.53.0 libraries: - api_shortname: datastore From c4d82a3adf91753ef03a8a588fd18a6974047bbd Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 5 Feb 2025 12:51:53 -0500 Subject: [PATCH 185/292] chore: Update generation configuration at Wed Feb 5 02:21:45 UTC 2025 (#1733) * chore: Update generation configuration at Wed Feb 5 02:21:45 UTC 2025 * chore: generate libraries at Wed Feb 5 02:22:19 UTC 2025 --- README.md | 4 ++-- generation_config.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c2f02f1ce..331d9f7a8 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.53.0 + 26.54.0 pom import @@ -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.53.0') +implementation platform('com.google.cloud:libraries-bom:26.54.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index d936e58c9..940fc05f4 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.52.0 -googleapis_commitish: 3cf61b2df20eace09e6336c23f9e08859c0d87ae -libraries_bom_version: 26.53.0 +googleapis_commitish: a1c746a0304b9d0d913ab013cb248ce605a6871b +libraries_bom_version: 26.54.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From 8b5499438ca45d1b652509173a927c9d075b76db Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 16:18:46 +0000 Subject: [PATCH 186/292] chore(main): release 2.26.1 (#1731) :robot: I have created a release *beep* *boop* --- ## [2.26.1](https://togithub.com/googleapis/java-datastore/compare/v2.26.0...v2.26.1) (2025-02-05) ### Bug Fixes * **deps:** Update the Java code generator (gapic-generator-java) to 2.52.0 ([9594024](https://togithub.com/googleapis/java-datastore/commit/95940241de9f324000d52dc80b3106aedefd481e)) ### Dependencies * Update dependency com.google.cloud:gapic-libraries-bom to v1.51.0 ([#1726](https://togithub.com/googleapis/java-datastore/issues/1726)) ([89f31a8](https://togithub.com/googleapis/java-datastore/commit/89f31a88d346193c9a5533de3e38c9088db30043)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 12 ++++++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 43 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 794f60678..c55341a22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.26.1](https://github.com/googleapis/java-datastore/compare/v2.26.0...v2.26.1) (2025-02-05) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.52.0 ([9594024](https://github.com/googleapis/java-datastore/commit/95940241de9f324000d52dc80b3106aedefd481e)) + + +### Dependencies + +* Update dependency com.google.cloud:gapic-libraries-bom to v1.51.0 ([#1726](https://github.com/googleapis/java-datastore/issues/1726)) ([89f31a8](https://github.com/googleapis/java-datastore/commit/89f31a88d346193c9a5533de3e38c9088db30043)) + ## [2.26.0](https://github.com/googleapis/java-datastore/compare/v2.25.4...v2.26.0) (2025-01-29) diff --git a/README.md b/README.md index 331d9f7a8..a2cd95787 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.26.0' +implementation 'com.google.cloud:google-cloud-datastore:2.26.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.1" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.1 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 3f5e61e8e..51503fcf0 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.1-SNAPSHOT + 2.26.1 com.google.cloud google-cloud-datastore-parent - 2.26.1-SNAPSHOT + 2.26.1 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f2d630f34..1f202fe1b 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.26.1-SNAPSHOT + 2.26.1 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.26.1-SNAPSHOT + 2.26.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.1-SNAPSHOT + 2.26.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.1-SNAPSHOT + 0.117.1 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.1-SNAPSHOT + 2.26.1 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 4476e41fc..805dc6e26 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.26.1-SNAPSHOT + 2.26.1 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.26.1-SNAPSHOT + 2.26.1 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 80efbb229..0a2418591 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.1-SNAPSHOT + 2.26.1 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.1-SNAPSHOT + 2.26.1 diff --git a/pom.xml b/pom.xml index 9763d9786..224ed3a5e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.26.1-SNAPSHOT + 2.26.1 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.1-SNAPSHOT + 2.26.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.1-SNAPSHOT + 2.26.1 com.google.cloud google-cloud-datastore - 2.26.1-SNAPSHOT + 2.26.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.1-SNAPSHOT + 0.117.1 com.google.cloud.datastore datastore-v1-proto-client - 2.26.1-SNAPSHOT + 2.26.1 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 94bd710a6..72a95a754 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.1-SNAPSHOT + 2.26.1 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.1-SNAPSHOT + 2.26.1 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 8153848f2..a373b4131 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.1-SNAPSHOT + 0.117.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.26.1-SNAPSHOT + 2.26.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1b9e6dde4..ff0e02a2f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.26.1-SNAPSHOT + 2.26.1 diff --git a/versions.txt b/versions.txt index 008ca948f..933af631e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.26.0:2.26.1-SNAPSHOT -google-cloud-datastore-bom:2.26.0:2.26.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.117.0:0.117.1-SNAPSHOT -datastore-v1-proto-client:2.26.0:2.26.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.26.0:2.26.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.26.0:2.26.1-SNAPSHOT +google-cloud-datastore:2.26.1:2.26.1 +google-cloud-datastore-bom:2.26.1:2.26.1 +proto-google-cloud-datastore-v1:0.117.1:0.117.1 +datastore-v1-proto-client:2.26.1:2.26.1 +proto-google-cloud-datastore-admin-v1:2.26.1:2.26.1 +grpc-google-cloud-datastore-admin-v1:2.26.1:2.26.1 From bf553dbac498ca4d6f8da95bb3446d73e7c60c82 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 6 Feb 2025 19:46:37 -0500 Subject: [PATCH 187/292] chore: Update generation configuration at Thu Feb 6 02:21:48 UTC 2025 (#1734) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 940fc05f4..b32da6c52 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.52.0 -googleapis_commitish: a1c746a0304b9d0d913ab013cb248ce605a6871b +googleapis_commitish: fed8c2613ed7e9e49ad6a98101f585cf00f6657b libraries_bom_version: 26.54.0 libraries: - api_shortname: datastore From 6ce5039c3da31e9042c3f556466b33bd051c3f73 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 19:06:05 -0800 Subject: [PATCH 188/292] chore(main): release 2.26.2-SNAPSHOT (#1735) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 51503fcf0..ea8b454ec 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.1 + 2.26.2-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.26.1 + 2.26.2-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 1f202fe1b..cae8cb287 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.26.1 + 2.26.2-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.26.1 + 2.26.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.1 + 2.26.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.1 + 0.117.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.1 + 2.26.2-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 805dc6e26..9376d7da6 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.26.1 + 2.26.2-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.26.1 + 2.26.2-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 0a2418591..f76fd16c9 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.1 + 2.26.2-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.1 + 2.26.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 224ed3a5e..648d4faba 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.26.1 + 2.26.2-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.1 + 2.26.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.1 + 2.26.2-SNAPSHOT com.google.cloud google-cloud-datastore - 2.26.1 + 2.26.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.1 + 0.117.2-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.26.1 + 2.26.2-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 72a95a754..b767e4cc6 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.1 + 2.26.2-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.1 + 2.26.2-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a373b4131..d6616eb61 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.1 + 0.117.2-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.26.1 + 2.26.2-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ff0e02a2f..c1ec03877 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.26.1 + 2.26.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index 933af631e..d5764ecee 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.26.1:2.26.1 -google-cloud-datastore-bom:2.26.1:2.26.1 -proto-google-cloud-datastore-v1:0.117.1:0.117.1 -datastore-v1-proto-client:2.26.1:2.26.1 -proto-google-cloud-datastore-admin-v1:2.26.1:2.26.1 -grpc-google-cloud-datastore-admin-v1:2.26.1:2.26.1 +google-cloud-datastore:2.26.1:2.26.2-SNAPSHOT +google-cloud-datastore-bom:2.26.1:2.26.2-SNAPSHOT +proto-google-cloud-datastore-v1:0.117.1:0.117.2-SNAPSHOT +datastore-v1-proto-client:2.26.1:2.26.2-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.26.1:2.26.2-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.26.1:2.26.2-SNAPSHOT From 7a7a2030ce6be77eb0a48f2a101594881d62fde1 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 10 Feb 2025 22:06:25 -0500 Subject: [PATCH 189/292] chore: Update generation configuration at Tue Feb 11 02:22:43 UTC 2025 (#1736) * chore: Update generation configuration at Fri Feb 7 02:22:28 UTC 2025 * chore: Update generation configuration at Sat Feb 8 02:19:21 UTC 2025 * chore: Update generation configuration at Tue Feb 11 02:22:43 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index b32da6c52..5ff323b28 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.52.0 -googleapis_commitish: fed8c2613ed7e9e49ad6a98101f585cf00f6657b +googleapis_commitish: 04132de0b952ee921d91a2583915dbd82d10cd3c libraries_bom_version: 26.54.0 libraries: - api_shortname: datastore From b8a7a5d5d8700ccccb643162843e3043396a9444 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 12 Feb 2025 04:22:59 +0100 Subject: [PATCH 190/292] deps: update googleapis/sdk-platform-java action to v2.53.0 (#1738) --- .github/workflows/hermetic_library_generation.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index f7804e9d0..545f19048 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.52.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.53.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} From 0e1a2d6209d2ccedd5e0e9435e2416a00a517b96 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 12 Feb 2025 04:23:19 +0100 Subject: [PATCH 191/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.25.3 (#1716) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 84f763453..9fc1e0a83 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.25.2 + 2.25.3 From 5b59a62e729072e62b9ed21536db06db63ee9b51 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 12 Feb 2025 05:52:02 +0100 Subject: [PATCH 192/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.26.1 (#1741) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 9fc1e0a83..1f1ea4f1f 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.25.3 + 2.26.1 From be0d0cd960b9254d26404d9331b78dee1104cf0a Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 11 Feb 2025 23:55:13 -0500 Subject: [PATCH 193/292] chore: Update generation configuration at Wed Feb 12 02:21:54 UTC 2025 (#1739) --- generation_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generation_config.yaml b/generation_config.yaml index 5ff323b28..9461e7b40 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.52.0 -googleapis_commitish: 04132de0b952ee921d91a2583915dbd82d10cd3c +gapic_generator_version: 2.53.0 +googleapis_commitish: 9605bff3d36fbdb1227b26bce68258c5f00815e4 libraries_bom_version: 26.54.0 libraries: - api_shortname: datastore From 7272a4197a0d7fb97ee039ccb88ac13a1ec037d1 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 12 Feb 2025 05:55:37 +0100 Subject: [PATCH 194/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.43.0 (#1737) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index b0249a7b8..ea5e4f46b 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.42.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.43.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 68a18d5c0..a9a633716 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.42.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.43.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index a8f634797..327e2ed78 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.42.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.43.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index cae8cb287..59b6a0f0e 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.42.0 + 3.43.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 648d4faba..0118c8b09 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.42.0 + 3.43.0 From 4755aeb2150dbb1ae2cf2769355989ec6f2df791 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 17:40:27 +0000 Subject: [PATCH 195/292] chore(main): release 2.26.2 (#1740) :robot: I have created a release *beep* *boop* --- ## [2.26.2](https://togithub.com/googleapis/java-datastore/compare/v2.26.1...v2.26.2) (2025-02-12) ### Bug Fixes * **deps:** Update the Java code generator (gapic-generator-java) to 2.53.0 ([be0d0cd](https://togithub.com/googleapis/java-datastore/commit/be0d0cd960b9254d26404d9331b78dee1104cf0a)) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.43.0 ([#1737](https://togithub.com/googleapis/java-datastore/issues/1737)) ([7272a41](https://togithub.com/googleapis/java-datastore/commit/7272a4197a0d7fb97ee039ccb88ac13a1ec037d1)) * Update googleapis/sdk-platform-java action to v2.53.0 ([#1738](https://togithub.com/googleapis/java-datastore/issues/1738)) ([b8a7a5d](https://togithub.com/googleapis/java-datastore/commit/b8a7a5d5d8700ccccb643162843e3043396a9444)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 13 +++++++++++++ README.md | 8 ++++---- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 45 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c55341a22..f9e8e7e4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [2.26.2](https://github.com/googleapis/java-datastore/compare/v2.26.1...v2.26.2) (2025-02-12) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.53.0 ([be0d0cd](https://github.com/googleapis/java-datastore/commit/be0d0cd960b9254d26404d9331b78dee1104cf0a)) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.43.0 ([#1737](https://github.com/googleapis/java-datastore/issues/1737)) ([7272a41](https://github.com/googleapis/java-datastore/commit/7272a4197a0d7fb97ee039ccb88ac13a1ec037d1)) +* Update googleapis/sdk-platform-java action to v2.53.0 ([#1738](https://github.com/googleapis/java-datastore/issues/1738)) ([b8a7a5d](https://github.com/googleapis/java-datastore/commit/b8a7a5d5d8700ccccb643162843e3043396a9444)) + ## [2.26.1](https://github.com/googleapis/java-datastore/compare/v2.26.0...v2.26.1) (2025-02-05) diff --git a/README.md b/README.md index a2cd95787..92af750c1 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.25.2 + 2.26.1 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.26.1' +implementation 'com.google.cloud:google-cloud-datastore:2.26.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.2" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.2 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index ea8b454ec..a23fdc021 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.2-SNAPSHOT + 2.26.2 com.google.cloud google-cloud-datastore-parent - 2.26.2-SNAPSHOT + 2.26.2 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 59b6a0f0e..04503d68d 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.26.2-SNAPSHOT + 2.26.2 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.26.2-SNAPSHOT + 2.26.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.2-SNAPSHOT + 2.26.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.2-SNAPSHOT + 0.117.2 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.2-SNAPSHOT + 2.26.2 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 9376d7da6..392cc12b0 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.26.2-SNAPSHOT + 2.26.2 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.26.2-SNAPSHOT + 2.26.2 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index f76fd16c9..3e9d82244 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.2-SNAPSHOT + 2.26.2 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.2-SNAPSHOT + 2.26.2 diff --git a/pom.xml b/pom.xml index 0118c8b09..4c6a3b38e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.26.2-SNAPSHOT + 2.26.2 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.2-SNAPSHOT + 2.26.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.2-SNAPSHOT + 2.26.2 com.google.cloud google-cloud-datastore - 2.26.2-SNAPSHOT + 2.26.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.2-SNAPSHOT + 0.117.2 com.google.cloud.datastore datastore-v1-proto-client - 2.26.2-SNAPSHOT + 2.26.2 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index b767e4cc6..cd0a2a91b 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.2-SNAPSHOT + 2.26.2 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.2-SNAPSHOT + 2.26.2 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index d6616eb61..9d1aa744f 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.2-SNAPSHOT + 0.117.2 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.26.2-SNAPSHOT + 2.26.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c1ec03877..a95b17619 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.26.2-SNAPSHOT + 2.26.2 diff --git a/versions.txt b/versions.txt index d5764ecee..1ada84ac2 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.26.1:2.26.2-SNAPSHOT -google-cloud-datastore-bom:2.26.1:2.26.2-SNAPSHOT -proto-google-cloud-datastore-v1:0.117.1:0.117.2-SNAPSHOT -datastore-v1-proto-client:2.26.1:2.26.2-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.26.1:2.26.2-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.26.1:2.26.2-SNAPSHOT +google-cloud-datastore:2.26.2:2.26.2 +google-cloud-datastore-bom:2.26.2:2.26.2 +proto-google-cloud-datastore-v1:0.117.2:0.117.2 +datastore-v1-proto-client:2.26.2:2.26.2 +proto-google-cloud-datastore-admin-v1:2.26.2:2.26.2 +grpc-google-cloud-datastore-admin-v1:2.26.2:2.26.2 From de24a2c236e33138285be3d7b9bbb787ebf10c9f Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 12 Feb 2025 23:30:56 -0500 Subject: [PATCH 196/292] chore: Update generation configuration at Thu Feb 13 02:22:31 UTC 2025 (#1744) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 9461e7b40..80828c88a 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.53.0 -googleapis_commitish: 9605bff3d36fbdb1227b26bce68258c5f00815e4 +googleapis_commitish: da30f52583f070f676ed886ed9e33d84a646f74c libraries_bom_version: 26.54.0 libraries: - api_shortname: datastore From c4157f8f2c1a20fabfbbf9af05792a6f774979ba Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Mon, 17 Feb 2025 01:34:24 -0800 Subject: [PATCH 197/292] chore: add grpc-experimental branch rules (#1745) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable github branch rules for gapic client branch [grpc-experimental](https://togithub.com/googleapis/java-datastore/tree/grpc-experimental). We need the dependencies to be up-to-date before launching the public preview. Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [x] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) Fixes # ☕️ --- .github/dependabot.yml | 13 ++++++++++++- .github/sync-repo-settings.yaml | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2afe7bfe7..ac8af89e1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,4 +17,15 @@ updates: # If a security vulnerability comes in, we will be notified about # it via template in the synthtool repository. ignore: - - dependency-name: "*" \ No newline at end of file + - dependency-name: "*" + +# rules for the `grpc-experimental` branch + - package-ecosystem: maven + directory: "/" + schedule: + interval: daily + commit-message: + # Prefix all commit messages with "deps: " + prefix: "deps" + open-pull-requests-limit: 10 + target-branch: "grpc-experimental" diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 203644341..1af0c45a3 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -109,6 +109,22 @@ branchProtectionRules: - cla/google - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' + - pattern: grpc-experimental + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image' + - 'Kokoro - Test: Java 17 GraalVM Native Image' + - javadoc - pattern: 2.15.x isAdminEnforced: true requiredApprovingReviewCount: 1 From a42c6df3aecf6c0bd54585ea8d4b9486168b81e8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 20 Feb 2025 03:50:51 +0100 Subject: [PATCH 198/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.26.2 (#1743) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 1f1ea4f1f..4a194ca75 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.26.1 + 2.26.2 From fb2bd58b770cfa1e951b3311bdbc4977f83801ac Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 20 Feb 2025 05:15:42 -0500 Subject: [PATCH 199/292] chore: Update generation configuration at Sat Feb 15 02:21:37 UTC 2025 (#1746) * chore: Update generation configuration at Fri Feb 14 02:22:08 UTC 2025 * chore: Update generation configuration at Sat Feb 15 02:21:37 UTC 2025 * chore: generate libraries at Thu Feb 20 02:51:23 UTC 2025 --------- Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- README.md | 2 +- generation_config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 92af750c1..316ebda7c 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.26.1 + 2.26.2 ``` diff --git a/generation_config.yaml b/generation_config.yaml index 80828c88a..40ecdae6f 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.53.0 -googleapis_commitish: da30f52583f070f676ed886ed9e33d84a646f74c +googleapis_commitish: 58be301346758c9a342de5632c3f9284d05c4b95 libraries_bom_version: 26.54.0 libraries: - api_shortname: datastore From 592072b194706e63a7fd4a6f6230377e8f4b729d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 20 Feb 2025 16:50:31 +0100 Subject: [PATCH 200/292] deps: update dependency com.google.cloud:gapic-libraries-bom to v1.52.0 (#1747) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 392cc12b0..8f7d7dd76 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -24,7 +24,7 @@ com.google.cloud gapic-libraries-bom - 1.51.0 + 1.52.0 pom import From 26c3db044bfd5311baa1de73b24403f590eee6da Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 01:54:22 +0000 Subject: [PATCH 201/292] chore(main): release 2.26.3-SNAPSHOT (#1742) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index a23fdc021..22de0a26b 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.2 + 2.26.3-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.26.2 + 2.26.3-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 04503d68d..1e4e5ded4 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.26.2 + 2.26.3-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.26.2 + 2.26.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.2 + 2.26.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.2 + 0.117.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.2 + 2.26.3-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 8f7d7dd76..2a5b479c6 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.26.2 + 2.26.3-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.26.2 + 2.26.3-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 3e9d82244..d2b0dd980 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.2 + 2.26.3-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.2 + 2.26.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4c6a3b38e..30921603d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.26.2 + 2.26.3-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.2 + 2.26.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.2 + 2.26.3-SNAPSHOT com.google.cloud google-cloud-datastore - 2.26.2 + 2.26.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.2 + 0.117.3-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.26.2 + 2.26.3-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index cd0a2a91b..8232820dc 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.2 + 2.26.3-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.2 + 2.26.3-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 9d1aa744f..2aca97593 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.2 + 0.117.3-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.26.2 + 2.26.3-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index a95b17619..0864d2d30 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.26.2 + 2.26.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index 1ada84ac2..48e1d17c4 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.26.2:2.26.2 -google-cloud-datastore-bom:2.26.2:2.26.2 -proto-google-cloud-datastore-v1:0.117.2:0.117.2 -datastore-v1-proto-client:2.26.2:2.26.2 -proto-google-cloud-datastore-admin-v1:2.26.2:2.26.2 -grpc-google-cloud-datastore-admin-v1:2.26.2:2.26.2 +google-cloud-datastore:2.26.2:2.26.3-SNAPSHOT +google-cloud-datastore-bom:2.26.2:2.26.3-SNAPSHOT +proto-google-cloud-datastore-v1:0.117.2:0.117.3-SNAPSHOT +datastore-v1-proto-client:2.26.2:2.26.3-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.26.2:2.26.3-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.26.2:2.26.3-SNAPSHOT From da5d9e5e4f0a87356d5a0bb02a53787321ec45af Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Sat, 22 Feb 2025 02:18:23 +0000 Subject: [PATCH 202/292] chore(main): release 2.26.3 (#1758) :robot: I have created a release *beep* *boop* --- ## [2.26.3](https://togithub.com/googleapis/java-datastore/compare/v2.26.2...v2.26.3) (2025-02-21) ### Dependencies * Update dependency com.google.cloud:gapic-libraries-bom to v1.52.0 ([#1747](https://togithub.com/googleapis/java-datastore/issues/1747)) ([592072b](https://togithub.com/googleapis/java-datastore/commit/592072b194706e63a7fd4a6f6230377e8f4b729d)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 38 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9e8e7e4f..c820d29ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.26.3](https://github.com/googleapis/java-datastore/compare/v2.26.2...v2.26.3) (2025-02-21) + + +### Dependencies + +* Update dependency com.google.cloud:gapic-libraries-bom to v1.52.0 ([#1747](https://github.com/googleapis/java-datastore/issues/1747)) ([592072b](https://github.com/googleapis/java-datastore/commit/592072b194706e63a7fd4a6f6230377e8f4b729d)) + ## [2.26.2](https://github.com/googleapis/java-datastore/compare/v2.26.1...v2.26.2) (2025-02-12) diff --git a/README.md b/README.md index 316ebda7c..7162f7d5a 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.26.2' +implementation 'com.google.cloud:google-cloud-datastore:2.26.3' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.3" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.3 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 22de0a26b..116fe8c95 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.3-SNAPSHOT + 2.26.3 com.google.cloud google-cloud-datastore-parent - 2.26.3-SNAPSHOT + 2.26.3 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 1e4e5ded4..a33b5ec34 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.26.3-SNAPSHOT + 2.26.3 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.26.3-SNAPSHOT + 2.26.3 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.3-SNAPSHOT + 2.26.3 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.3-SNAPSHOT + 0.117.3 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.3-SNAPSHOT + 2.26.3 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 2a5b479c6..375bccfe4 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.26.3-SNAPSHOT + 2.26.3 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.26.3-SNAPSHOT + 2.26.3 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index d2b0dd980..b0211b72d 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.3-SNAPSHOT + 2.26.3 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.3-SNAPSHOT + 2.26.3 diff --git a/pom.xml b/pom.xml index 30921603d..a804178cb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.26.3-SNAPSHOT + 2.26.3 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.3-SNAPSHOT + 2.26.3 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.3-SNAPSHOT + 2.26.3 com.google.cloud google-cloud-datastore - 2.26.3-SNAPSHOT + 2.26.3 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.3-SNAPSHOT + 0.117.3 com.google.cloud.datastore datastore-v1-proto-client - 2.26.3-SNAPSHOT + 2.26.3 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 8232820dc..73667ed91 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.3-SNAPSHOT + 2.26.3 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.3-SNAPSHOT + 2.26.3 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 2aca97593..f33fe48d5 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.3-SNAPSHOT + 0.117.3 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.26.3-SNAPSHOT + 2.26.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 0864d2d30..1670fd682 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.26.3-SNAPSHOT + 2.26.3 diff --git a/versions.txt b/versions.txt index 48e1d17c4..390cf29e7 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.26.2:2.26.3-SNAPSHOT -google-cloud-datastore-bom:2.26.2:2.26.3-SNAPSHOT -proto-google-cloud-datastore-v1:0.117.2:0.117.3-SNAPSHOT -datastore-v1-proto-client:2.26.2:2.26.3-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.26.2:2.26.3-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.26.2:2.26.3-SNAPSHOT +google-cloud-datastore:2.26.3:2.26.3 +google-cloud-datastore-bom:2.26.3:2.26.3 +proto-google-cloud-datastore-v1:0.117.3:0.117.3 +datastore-v1-proto-client:2.26.3:2.26.3 +proto-google-cloud-datastore-admin-v1:2.26.3:2.26.3 +grpc-google-cloud-datastore-admin-v1:2.26.3:2.26.3 From 63468ae5c5af96d818ea347dbdbad1fd2a9bd77f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 18:02:21 +0000 Subject: [PATCH 203/292] chore(main): release 2.26.4-SNAPSHOT (#1762) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 116fe8c95..2d7e490af 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.3 + 2.26.4-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.26.3 + 2.26.4-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index a33b5ec34..2e1df43a2 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.26.3 + 2.26.4-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.26.3 + 2.26.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.3 + 2.26.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.3 + 0.117.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.3 + 2.26.4-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 375bccfe4..492d517e4 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.26.3 + 2.26.4-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.26.3 + 2.26.4-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index b0211b72d..8f85dd1a0 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.3 + 2.26.4-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.3 + 2.26.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index a804178cb..bcd076c2b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.26.3 + 2.26.4-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.3 + 2.26.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.3 + 2.26.4-SNAPSHOT com.google.cloud google-cloud-datastore - 2.26.3 + 2.26.4-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.3 + 0.117.4-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.26.3 + 2.26.4-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 73667ed91..51cc23096 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.3 + 2.26.4-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.3 + 2.26.4-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index f33fe48d5..21334223e 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.3 + 0.117.4-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.26.3 + 2.26.4-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1670fd682..50bf6cfa5 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.26.3 + 2.26.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 390cf29e7..ffb8d14d6 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.26.3:2.26.3 -google-cloud-datastore-bom:2.26.3:2.26.3 -proto-google-cloud-datastore-v1:0.117.3:0.117.3 -datastore-v1-proto-client:2.26.3:2.26.3 -proto-google-cloud-datastore-admin-v1:2.26.3:2.26.3 -grpc-google-cloud-datastore-admin-v1:2.26.3:2.26.3 +google-cloud-datastore:2.26.3:2.26.4-SNAPSHOT +google-cloud-datastore-bom:2.26.3:2.26.4-SNAPSHOT +proto-google-cloud-datastore-v1:0.117.3:0.117.4-SNAPSHOT +datastore-v1-proto-client:2.26.3:2.26.4-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.26.3:2.26.4-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.26.3:2.26.4-SNAPSHOT From 5144e7af0de6e93650a02b3e43da925adfdc59b0 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 24 Feb 2025 13:09:57 -0500 Subject: [PATCH 204/292] chore: Update generation configuration at Fri Feb 21 02:23:23 UTC 2025 (#1759) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 40ecdae6f..77b25623c 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.53.0 -googleapis_commitish: 58be301346758c9a342de5632c3f9284d05c4b95 +googleapis_commitish: caac3b8802186510a881d9ae26e6a09c5d800936 libraries_bom_version: 26.54.0 libraries: - api_shortname: datastore From 65479a201a5fb8bb291098bbce6bd345fc1ec5aa Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Feb 2025 19:10:09 +0100 Subject: [PATCH 205/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.26.3 (#1763) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 4a194ca75..77da5663d 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.26.2 + 2.26.3 From a573815c81e9108b76da7af0c0ee738d583032df Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Feb 2025 20:55:22 +0100 Subject: [PATCH 206/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.55.0 (#1761) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 915461c90..6bd0da5c9 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.54.0 + 26.55.0 pom import From 6f7d7c126fc8f59d7aa4c8b0c38b8d4c48253e05 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 25 Feb 2025 13:20:04 -0500 Subject: [PATCH 207/292] chore: Update generation configuration at Tue Feb 25 02:24:23 UTC 2025 (#1764) * chore: Update generation configuration at Tue Feb 25 02:24:23 UTC 2025 * chore: generate libraries at Tue Feb 25 02:24:58 UTC 2025 --- README.md | 6 +++--- generation_config.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7162f7d5a..c4dd2f360 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.54.0 + 26.55.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.26.2 + 2.26.3 ``` @@ -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.54.0') +implementation platform('com.google.cloud:libraries-bom:26.55.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index 77b25623c..f1f949c50 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.53.0 -googleapis_commitish: caac3b8802186510a881d9ae26e6a09c5d800936 -libraries_bom_version: 26.54.0 +googleapis_commitish: 6bc8e91bf92cc985da5ed0c227b48f12315cb695 +libraries_bom_version: 26.55.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From 28f5d27ec834b31900401dd0e8ba94e8bc8e756b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 25 Feb 2025 19:23:13 +0100 Subject: [PATCH 208/292] build(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.0 (#1760) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bcd076c2b..e98dd2d4c 100644 --- a/pom.xml +++ b/pom.xml @@ -232,7 +232,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 UTF-8 true From be01b183cb5ec06d236fa587f7237eaffb6e54c0 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 26 Feb 2025 13:37:08 -0500 Subject: [PATCH 209/292] chore: Update generation configuration at Wed Feb 26 02:24:15 UTC 2025 (#1768) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index f1f949c50..89599a2a1 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.53.0 -googleapis_commitish: 6bc8e91bf92cc985da5ed0c227b48f12315cb695 +googleapis_commitish: fbbbf5023815f9a662c85aa8af8f3b72467fcb6f libraries_bom_version: 26.55.0 libraries: - api_shortname: datastore From 7a8650939e652fc3b384053454d6ef5084bb1508 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 26 Feb 2025 20:10:49 +0100 Subject: [PATCH 210/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 (#1769) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index ea5e4f46b..1bc662efe 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.43.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.44.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index a9a633716..65c1a67d8 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.43.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.44.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 327e2ed78..c84b27e7d 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.43.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.44.0" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 2e1df43a2..389890661 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.43.0 + 3.44.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index e98dd2d4c..c14db9cb9 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.43.0 + 3.44.0 From a12b0f3f411d80188c4916c39a7df29d71b3082d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 21:56:22 +0000 Subject: [PATCH 211/292] chore(main): release 2.26.4 (#1772) :robot: I have created a release *beep* *boop* --- ## [2.26.4](https://togithub.com/googleapis/java-datastore/compare/v2.26.3...v2.26.4) (2025-02-26) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 ([#1769](https://togithub.com/googleapis/java-datastore/issues/1769)) ([7a86509](https://togithub.com/googleapis/java-datastore/commit/7a8650939e652fc3b384053454d6ef5084bb1508)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 38 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c820d29ab..437feb9b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.26.4](https://github.com/googleapis/java-datastore/compare/v2.26.3...v2.26.4) (2025-02-26) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 ([#1769](https://github.com/googleapis/java-datastore/issues/1769)) ([7a86509](https://github.com/googleapis/java-datastore/commit/7a8650939e652fc3b384053454d6ef5084bb1508)) + ## [2.26.3](https://github.com/googleapis/java-datastore/compare/v2.26.2...v2.26.3) (2025-02-21) diff --git a/README.md b/README.md index c4dd2f360..7168de6d2 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.26.3' +implementation 'com.google.cloud:google-cloud-datastore:2.26.4' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.3" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.4" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.3 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.4 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 2d7e490af..95b049e1e 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.4-SNAPSHOT + 2.26.4 com.google.cloud google-cloud-datastore-parent - 2.26.4-SNAPSHOT + 2.26.4 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 389890661..06b9c9e44 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.26.4-SNAPSHOT + 2.26.4 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.26.4-SNAPSHOT + 2.26.4 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.4-SNAPSHOT + 2.26.4 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.4-SNAPSHOT + 0.117.4 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.4-SNAPSHOT + 2.26.4 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 492d517e4..8a4842303 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.26.4-SNAPSHOT + 2.26.4 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.26.4-SNAPSHOT + 2.26.4 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 8f85dd1a0..f4bbffff1 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.4-SNAPSHOT + 2.26.4 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.4-SNAPSHOT + 2.26.4 diff --git a/pom.xml b/pom.xml index c14db9cb9..493b54187 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.26.4-SNAPSHOT + 2.26.4 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.4-SNAPSHOT + 2.26.4 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.4-SNAPSHOT + 2.26.4 com.google.cloud google-cloud-datastore - 2.26.4-SNAPSHOT + 2.26.4 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.4-SNAPSHOT + 0.117.4 com.google.cloud.datastore datastore-v1-proto-client - 2.26.4-SNAPSHOT + 2.26.4 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 51cc23096..ec44d1474 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.4-SNAPSHOT + 2.26.4 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.4-SNAPSHOT + 2.26.4 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 21334223e..7fb54a1f3 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.4-SNAPSHOT + 0.117.4 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.26.4-SNAPSHOT + 2.26.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 50bf6cfa5..d1e78ece0 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.26.4-SNAPSHOT + 2.26.4 diff --git a/versions.txt b/versions.txt index ffb8d14d6..347b93916 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.26.3:2.26.4-SNAPSHOT -google-cloud-datastore-bom:2.26.3:2.26.4-SNAPSHOT -proto-google-cloud-datastore-v1:0.117.3:0.117.4-SNAPSHOT -datastore-v1-proto-client:2.26.3:2.26.4-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.26.3:2.26.4-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.26.3:2.26.4-SNAPSHOT +google-cloud-datastore:2.26.4:2.26.4 +google-cloud-datastore-bom:2.26.4:2.26.4 +proto-google-cloud-datastore-v1:0.117.4:0.117.4 +datastore-v1-proto-client:2.26.4:2.26.4 +proto-google-cloud-datastore-admin-v1:2.26.4:2.26.4 +grpc-google-cloud-datastore-admin-v1:2.26.4:2.26.4 From b9b302bb6c8bb1c8d8b175b776b2f65317511987 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 27 Feb 2025 18:15:23 -0500 Subject: [PATCH 212/292] chore: Update generation configuration at Thu Feb 27 02:24:49 UTC 2025 (#1776) --- .github/workflows/hermetic_library_generation.yaml | 2 +- generation_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 545f19048..5ad2a254b 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.53.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.54.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/generation_config.yaml b/generation_config.yaml index 89599a2a1..4f2ace2f0 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.53.0 -googleapis_commitish: fbbbf5023815f9a662c85aa8af8f3b72467fcb6f +gapic_generator_version: 2.54.0 +googleapis_commitish: 554575ee8d01d277344ec704e0561e9abc7f57f3 libraries_bom_version: 26.55.0 libraries: - api_shortname: datastore From d29f47cbef9998acdc8b7b0f42d93574dab3cc7f Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 18:11:32 +0000 Subject: [PATCH 213/292] feat: next release from main branch is 2.27.0 (#1781) * feat: next release from main branch is 2.27.0 * revert formatting fix --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index cbb5be49c..3fd939966 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -34,3 +34,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 2.19.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.26.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 1af0c45a3..09c9c67d7 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -188,6 +188,24 @@ branchProtectionRules: - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc + - pattern: 2.26.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image' + - 'Kokoro - Test: Java 17 GraalVM Native Image' + - javadoc + - library_generation + - unmanaged_dependency_check permissionRules: - team: yoshi-admins permission: admin From a278ce03541a94af92ef9cace8c9a3317c2b58f5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 18:56:22 +0000 Subject: [PATCH 214/292] chore(main): release 2.26.5-SNAPSHOT (#1774) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 95b049e1e..db359ce2b 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.4 + 2.26.5-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.26.4 + 2.26.5-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 06b9c9e44..51d708154 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.26.4 + 2.26.5-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.26.4 + 2.26.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.4 + 2.26.5-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.4 + 0.117.5-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.4 + 2.26.5-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 8a4842303..280b54902 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.26.4 + 2.26.5-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.26.4 + 2.26.5-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index f4bbffff1..1beb11696 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.4 + 2.26.5-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.4 + 2.26.5-SNAPSHOT diff --git a/pom.xml b/pom.xml index 493b54187..dd78d6d9f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.26.4 + 2.26.5-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.4 + 2.26.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.4 + 2.26.5-SNAPSHOT com.google.cloud google-cloud-datastore - 2.26.4 + 2.26.5-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.4 + 0.117.5-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.26.4 + 2.26.5-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index ec44d1474..0cb9a3a4e 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.4 + 2.26.5-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.4 + 2.26.5-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 7fb54a1f3..4831e38a5 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.4 + 0.117.5-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.26.4 + 2.26.5-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index d1e78ece0..d21d97aae 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.26.4 + 2.26.5-SNAPSHOT diff --git a/versions.txt b/versions.txt index 347b93916..62073db0a 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.26.4:2.26.4 -google-cloud-datastore-bom:2.26.4:2.26.4 -proto-google-cloud-datastore-v1:0.117.4:0.117.4 -datastore-v1-proto-client:2.26.4:2.26.4 -proto-google-cloud-datastore-admin-v1:2.26.4:2.26.4 -grpc-google-cloud-datastore-admin-v1:2.26.4:2.26.4 +google-cloud-datastore:2.26.4:2.26.5-SNAPSHOT +google-cloud-datastore-bom:2.26.4:2.26.5-SNAPSHOT +proto-google-cloud-datastore-v1:0.117.4:0.117.5-SNAPSHOT +datastore-v1-proto-client:2.26.4:2.26.5-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.26.4:2.26.5-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.26.4:2.26.5-SNAPSHOT From d5e4e8437aa0d67fc358e5c9b9d2aadea708d9a2 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 4 Mar 2025 13:01:15 -0500 Subject: [PATCH 215/292] chore: Update generation configuration at Fri Feb 28 02:25:01 UTC 2025 (#1780) * chore: Update generation configuration at Fri Feb 28 02:25:01 UTC 2025 * chore: generate libraries at Fri Feb 28 02:25:31 UTC 2025 --- generation_config.yaml | 2 +- .../main/proto/google/datastore/admin/v1/datastore_admin.proto | 2 +- .../src/main/proto/google/datastore/admin/v1/index.proto | 2 +- .../src/main/proto/google/datastore/admin/v1/migration.proto | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generation_config.yaml b/generation_config.yaml index 4f2ace2f0..3be066208 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.54.0 -googleapis_commitish: 554575ee8d01d277344ec704e0561e9abc7f57f3 +googleapis_commitish: 68b6376ca75f03094a65ec5bbbc868bd9f058ee3 libraries_bom_version: 26.55.0 libraries: - api_shortname: datastore diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto index a8b3f9986..50c4d0cc8 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto +++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto index 6a1d12227..c90766056 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto +++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto index 813de87dd..67ac1ab71 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto +++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From eda6bf8c9b195fe7362170d2903a5460be3f6d67 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 5 Mar 2025 13:19:51 -0500 Subject: [PATCH 216/292] chore: Update generation configuration at Wed Mar 5 02:25:11 UTC 2025 (#1785) * chore: Update generation configuration at Wed Mar 5 02:25:11 UTC 2025 * chore: generate libraries at Wed Mar 5 02:25:47 UTC 2025 --- README.md | 2 +- generation_config.yaml | 4 ++-- .../main/proto/google/datastore/v1/aggregation_result.proto | 2 +- .../src/main/proto/google/datastore/v1/datastore.proto | 2 +- .../src/main/proto/google/datastore/v1/entity.proto | 2 +- .../src/main/proto/google/datastore/v1/query.proto | 2 +- .../src/main/proto/google/datastore/v1/query_profile.proto | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7168de6d2..0851bfb86 100644 --- a/README.md +++ b/README.md @@ -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.55.0') +implementation platform('com.google.cloud:libraries-bom:26.56.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index 3be066208..ea58b9f51 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.54.0 -googleapis_commitish: 68b6376ca75f03094a65ec5bbbc868bd9f058ee3 -libraries_bom_version: 26.55.0 +googleapis_commitish: f4f8efb9e05e589abf94f8086fb6d0492f3551b8 +libraries_bom_version: 26.56.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto index e31052c0d..cd51f660c 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto index c0683b9ba..c0a281b18 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto index d9742d68d..fdf0a32cb 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto index 3c2e8ae66..2e36f958b 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto index e00a28e3c..71a4eb599 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 126f9199e7f5f8d801a24025a380aa7eb82573c2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 5 Mar 2025 19:32:22 +0100 Subject: [PATCH 217/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.56.0 (#1784) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.55.0` -> `26.56.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.56.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.56.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.55.0/26.56.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.55.0/26.56.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes

googleapis/java-cloud-bom (com.google.cloud:libraries-bom) ### [`v26.56.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26560-2025-03-03) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.55.0...v26.56.0) ##### Dependencies - update bigtable bom ([#​6974](https://redirect.github.com/googleapis/java-cloud-bom/issues/6974)) ([ca61d7d](https://redirect.github.com/googleapis/java-cloud-bom/commit/ca61d7dc19a96efd50c41934c3692a69ff5a923f)) - update dependency com.google.cloud:first-party-dependencies to v3.44.0 ([#​6957](https://redirect.github.com/googleapis/java-cloud-bom/issues/6957)) ([5eba4d7](https://redirect.github.com/googleapis/java-cloud-bom/commit/5eba4d7fb7119709a12e3c6c92589ddcc37d8505)) - update dependency com.google.cloud:gapic-libraries-bom to v1.53.0 ([#​6970](https://redirect.github.com/googleapis/java-cloud-bom/issues/6970)) ([599bec2](https://redirect.github.com/googleapis/java-cloud-bom/commit/599bec2783ed9b91ec69b659f0755ff87a93afeb)) - update dependency com.google.cloud:google-cloud-bigquery to v2.48.1 ([#​6965](https://redirect.github.com/googleapis/java-cloud-bom/issues/6965)) ([d810cc6](https://redirect.github.com/googleapis/java-cloud-bom/commit/d810cc64b2db14781795429911f9e8ee7dd5baa6)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.11.4 ([#​6958](https://redirect.github.com/googleapis/java-cloud-bom/issues/6958)) ([211ca26](https://redirect.github.com/googleapis/java-cloud-bom/commit/211ca269a66b6c19a25447066bab80cdd7c1c392)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.53.0 ([#​6973](https://redirect.github.com/googleapis/java-cloud-bom/issues/6973)) ([4c5e805](https://redirect.github.com/googleapis/java-cloud-bom/commit/4c5e805b726ef439816411bf816c10fa32f556ba)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.26.4 ([#​6956](https://redirect.github.com/googleapis/java-cloud-bom/issues/6956)) ([0174952](https://redirect.github.com/googleapis/java-cloud-bom/commit/017495217b721dcaf9f69f302b37a27b43b54505)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.30.9 ([#​6959](https://redirect.github.com/googleapis/java-cloud-bom/issues/6959)) ([56ee88e](https://redirect.github.com/googleapis/java-cloud-bom/commit/56ee88e776534a672f430325a7d797eda17fbfae)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.21.4 ([#​6961](https://redirect.github.com/googleapis/java-cloud-bom/issues/6961)) ([6d6ab90](https://redirect.github.com/googleapis/java-cloud-bom/commit/6d6ab90151e852ba253531b8152d97d740b18858)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.132.4-alpha ([#​6962](https://redirect.github.com/googleapis/java-cloud-bom/issues/6962)) ([274a6e7](https://redirect.github.com/googleapis/java-cloud-bom/commit/274a6e7bf48ada55308e325445e188a7c2e79f15)) - update dependency com.google.cloud:google-cloud-nio to v0.127.32 ([#​6966](https://redirect.github.com/googleapis/java-cloud-bom/issues/6966)) ([130b2be](https://redirect.github.com/googleapis/java-cloud-bom/commit/130b2be341d33363e9bdd0d3b699e9993e819bf7)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.137.1 ([#​6964](https://redirect.github.com/googleapis/java-cloud-bom/issues/6964)) ([39d6c74](https://redirect.github.com/googleapis/java-cloud-bom/commit/39d6c74593518680b6418af384cf51a49323b2d4)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.15.4 ([#​6967](https://redirect.github.com/googleapis/java-cloud-bom/issues/6967)) ([c452159](https://redirect.github.com/googleapis/java-cloud-bom/commit/c4521591104469c6f27376046dc118948356e56d)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.88.0 ([#​6971](https://redirect.github.com/googleapis/java-cloud-bom/issues/6971)) ([e56bfb4](https://redirect.github.com/googleapis/java-cloud-bom/commit/e56bfb4d7e0c92a356dbfbf357568ff81fdd45cd)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.27.1 ([#​6972](https://redirect.github.com/googleapis/java-cloud-bom/issues/6972)) ([6e2c575](https://redirect.github.com/googleapis/java-cloud-bom/commit/6e2c57515648ff58440a37d16232547a697229ca)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.49.0 ([#​6969](https://redirect.github.com/googleapis/java-cloud-bom/issues/6969)) ([1c9287f](https://redirect.github.com/googleapis/java-cloud-bom/commit/1c9287f413ead9f288c8897f0317b51002e5879b))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 6bd0da5c9..8dc991353 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.55.0 + 26.56.0 pom import From 0fea1bb793ebbe4409d7cc8b1bf915e4fb161cd8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 5 Mar 2025 19:38:25 +0100 Subject: [PATCH 218/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.26.4 (#1777) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.26.3` -> `2.26.4` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.26.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.26.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.26.3/2.26.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.26.3/2.26.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.26.4`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2264-2025-02-26) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.26.3...v2.26.4) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 ([#​1769](https://redirect.github.com/googleapis/java-datastore/issues/1769)) ([7a86509](https://redirect.github.com/googleapis/java-datastore/commit/7a8650939e652fc3b384053454d6ef5084bb1508))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 77da5663d..2f00439b6 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.26.3 + 2.26.4 From 8369118994e9a18b888a7779376fea7e22b219ed Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 6 Mar 2025 00:01:30 +0100 Subject: [PATCH 219/292] deps: update dependency com.google.cloud:gapic-libraries-bom to v1.53.0 (#1779) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 280b54902..a62c34acd 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -24,7 +24,7 @@ com.google.cloud gapic-libraries-bom - 1.52.0 + 1.53.0 pom import From e763727f520a5c451b71c914aa30a0eb03edac88 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 6 Mar 2025 00:01:40 +0100 Subject: [PATCH 220/292] build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.4 (#1775) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/pom.xml b/samples/pom.xml index 56fd2ae2c..41074b395 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -38,7 +38,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.3 + 3.1.4 true From 08f282692e64a8d6ac8837de0c572ce6bac4ae2b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 7 Mar 2025 10:34:22 -0800 Subject: [PATCH 221/292] chore(main): release 2.27.0 (#1783) * chore(main): release 2.27.0 * chore: generate libraries at Wed Mar 5 23:02:15 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 17 +++++++++++++++++ README.md | 10 +++++----- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 50 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 437feb9b2..5679ce48d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [2.27.0](https://github.com/googleapis/java-datastore/compare/v2.26.4...v2.27.0) (2025-03-05) + + +### Features + +* Next release from main branch is 2.27.0 ([#1781](https://github.com/googleapis/java-datastore/issues/1781)) ([d29f47c](https://github.com/googleapis/java-datastore/commit/d29f47cbef9998acdc8b7b0f42d93574dab3cc7f)) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.54.0 ([b9b302b](https://github.com/googleapis/java-datastore/commit/b9b302bb6c8bb1c8d8b175b776b2f65317511987)) + + +### Dependencies + +* Update dependency com.google.cloud:gapic-libraries-bom to v1.53.0 ([#1779](https://github.com/googleapis/java-datastore/issues/1779)) ([8369118](https://github.com/googleapis/java-datastore/commit/8369118994e9a18b888a7779376fea7e22b219ed)) + ## [2.26.4](https://github.com/googleapis/java-datastore/compare/v2.26.3...v2.26.4) (2025-02-26) diff --git a/README.md b/README.md index 0851bfb86..b5a4bfb8a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.55.0 + 26.56.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.26.3 + 2.26.4 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.26.4' +implementation 'com.google.cloud:google-cloud-datastore:2.27.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.26.4" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.0" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.26.4 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index db359ce2b..7d5af2012 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.5-SNAPSHOT + 2.27.0 com.google.cloud google-cloud-datastore-parent - 2.26.5-SNAPSHOT + 2.27.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 51d708154..3450c5fd9 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.26.5-SNAPSHOT + 2.27.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.26.5-SNAPSHOT + 2.27.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.5-SNAPSHOT + 2.27.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.5-SNAPSHOT + 0.118.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.5-SNAPSHOT + 2.27.0 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index a62c34acd..2185e66d2 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.26.5-SNAPSHOT + 2.27.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.26.5-SNAPSHOT + 2.27.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 1beb11696..7c8809069 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.5-SNAPSHOT + 2.27.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.5-SNAPSHOT + 2.27.0 diff --git a/pom.xml b/pom.xml index dd78d6d9f..72ff139a8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.26.5-SNAPSHOT + 2.27.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.5-SNAPSHOT + 2.27.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.26.5-SNAPSHOT + 2.27.0 com.google.cloud google-cloud-datastore - 2.26.5-SNAPSHOT + 2.27.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.5-SNAPSHOT + 0.118.0 com.google.cloud.datastore datastore-v1-proto-client - 2.26.5-SNAPSHOT + 2.27.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 0cb9a3a4e..cadc1e790 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.26.5-SNAPSHOT + 2.27.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.26.5-SNAPSHOT + 2.27.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 4831e38a5..4e0ef15b8 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.117.5-SNAPSHOT + 0.118.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.26.5-SNAPSHOT + 2.27.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index d21d97aae..c26d5eecd 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.26.5-SNAPSHOT + 2.27.0 diff --git a/versions.txt b/versions.txt index 62073db0a..606a8e55c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.26.4:2.26.5-SNAPSHOT -google-cloud-datastore-bom:2.26.4:2.26.5-SNAPSHOT -proto-google-cloud-datastore-v1:0.117.4:0.117.5-SNAPSHOT -datastore-v1-proto-client:2.26.4:2.26.5-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.26.4:2.26.5-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.26.4:2.26.5-SNAPSHOT +google-cloud-datastore:2.27.0:2.27.0 +google-cloud-datastore-bom:2.27.0:2.27.0 +proto-google-cloud-datastore-v1:0.118.0:0.118.0 +datastore-v1-proto-client:2.27.0:2.27.0 +proto-google-cloud-datastore-admin-v1:2.27.0:2.27.0 +grpc-google-cloud-datastore-admin-v1:2.27.0:2.27.0 From b8aa8daef024780ba3917cb1590e4bbe75d5a3be Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 18:24:36 +0000 Subject: [PATCH 222/292] chore(main): release 2.27.1-SNAPSHOT (#1787) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 7d5af2012..f3adaac3a 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.27.0 + 2.27.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.27.0 + 2.27.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 3450c5fd9..64927148c 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.27.0 + 2.27.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.27.0 + 2.27.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.0 + 2.27.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.0 + 0.118.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.0 + 2.27.1-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 2185e66d2..22ca9d73f 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.27.0 + 2.27.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.27.0 + 2.27.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 7c8809069..47b2f69e7 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.0 + 2.27.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.0 + 2.27.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 72ff139a8..a380ba686 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.27.0 + 2.27.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.0 + 2.27.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.0 + 2.27.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.27.0 + 2.27.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.0 + 0.118.1-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.27.0 + 2.27.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index cadc1e790..0c119df39 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.0 + 2.27.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.0 + 2.27.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 4e0ef15b8..6000a76b6 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.0 + 0.118.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.27.0 + 2.27.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c26d5eecd..b59251598 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.27.0 + 2.27.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 606a8e55c..2b23ec786 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.27.0:2.27.0 -google-cloud-datastore-bom:2.27.0:2.27.0 -proto-google-cloud-datastore-v1:0.118.0:0.118.0 -datastore-v1-proto-client:2.27.0:2.27.0 -proto-google-cloud-datastore-admin-v1:2.27.0:2.27.0 -grpc-google-cloud-datastore-admin-v1:2.27.0:2.27.0 +google-cloud-datastore:2.27.0:2.27.1-SNAPSHOT +google-cloud-datastore-bom:2.27.0:2.27.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.118.0:0.118.1-SNAPSHOT +datastore-v1-proto-client:2.27.0:2.27.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.27.0:2.27.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.27.0:2.27.1-SNAPSHOT From 18333497dad2f70c8bb5e4354b0c4d7083a503b3 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 11 Mar 2025 14:12:52 -0400 Subject: [PATCH 223/292] chore: Update generation configuration at Fri Mar 7 02:25:44 UTC 2025 (#1786) chore: Update generation configuration at Fri Mar 7 02:25:44 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index ea58b9f51..33a785daa 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.54.0 -googleapis_commitish: f4f8efb9e05e589abf94f8086fb6d0492f3551b8 +googleapis_commitish: 9513189365a4cd150cbd62024ea23b0a4d3265c4 libraries_bom_version: 26.56.0 libraries: - api_shortname: datastore From ba1ad98cce4c0feae13a370ea0581d15674dd43c Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:51:23 -0400 Subject: [PATCH 224/292] chore: Update generation configuration at Mon Mar 17 02:27:09 UTC 2025 (#1789) * chore: Update generation configuration at Wed Mar 12 02:25:18 UTC 2025 * chore: Update generation configuration at Thu Mar 13 02:26:22 UTC 2025 * chore: Update generation configuration at Fri Mar 14 02:25:18 UTC 2025 * chore: Update generation configuration at Sat Mar 15 02:24:25 UTC 2025 * chore: Update generation configuration at Mon Mar 17 02:27:09 UTC 2025 --- .github/workflows/hermetic_library_generation.yaml | 2 +- generation_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 5ad2a254b..ca1baea12 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.54.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/generation_config.yaml b/generation_config.yaml index 33a785daa..838148d64 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.54.0 -googleapis_commitish: 9513189365a4cd150cbd62024ea23b0a4d3265c4 +gapic_generator_version: 2.55.1 +googleapis_commitish: bc7f715d7f58afe381fbc244a8bcde7f0afa11ed libraries_bom_version: 26.56.0 libraries: - api_shortname: datastore From ab5ac8e6407541520fabb4504fcce0d675347f63 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 18 Mar 2025 15:39:26 +0100 Subject: [PATCH 225/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.45.1 (#1791) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 1bc662efe..1ecabfe27 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.44.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.45.1 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 65c1a67d8..842dadd7f 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -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.44.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index c84b27e7d..745c5c961 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -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.44.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1" } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 64927148c..f682a3443 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.44.0 + 3.45.1 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index a380ba686..edc3e8848 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.44.0 + 3.45.1 From cbf58a5ffbf643b45fa1330f7b22bceb92ff2ee8 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 20 Mar 2025 13:48:21 -0400 Subject: [PATCH 226/292] chore: Update generation configuration at Tue Mar 18 02:26:52 UTC 2025 (#1795) chore: Update generation configuration at Tue Mar 18 02:26:52 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 838148d64..0141d0185 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.55.1 -googleapis_commitish: bc7f715d7f58afe381fbc244a8bcde7f0afa11ed +googleapis_commitish: 6155d42e99f45ebf53100d492852be1561916137 libraries_bom_version: 26.56.0 libraries: - api_shortname: datastore From 2a82de0de194b56538c77c5adfb58abb32dbbfa8 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 20 Mar 2025 13:48:35 -0400 Subject: [PATCH 227/292] chore(main): release 2.27.1 (#1794) * chore(main): release 2.27.1 * chore: generate libraries at Tue Mar 18 14:40:24 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 12 ++++++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 43 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5679ce48d..788ff76c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.27.1](https://github.com/googleapis/java-datastore/compare/v2.27.0...v2.27.1) (2025-03-18) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.55.1 ([ba1ad98](https://github.com/googleapis/java-datastore/commit/ba1ad98cce4c0feae13a370ea0581d15674dd43c)) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.45.1 ([#1791](https://github.com/googleapis/java-datastore/issues/1791)) ([ab5ac8e](https://github.com/googleapis/java-datastore/commit/ab5ac8e6407541520fabb4504fcce0d675347f63)) + ## [2.27.0](https://github.com/googleapis/java-datastore/compare/v2.26.4...v2.27.0) (2025-03-05) diff --git a/README.md b/README.md index b5a4bfb8a..6618f6a49 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.27.0' +implementation 'com.google.cloud:google-cloud-datastore:2.27.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.1" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.1 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index f3adaac3a..c8cff4f30 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.27.1-SNAPSHOT + 2.27.1 com.google.cloud google-cloud-datastore-parent - 2.27.1-SNAPSHOT + 2.27.1 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f682a3443..7be68ff13 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.27.1-SNAPSHOT + 2.27.1 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.27.1-SNAPSHOT + 2.27.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.1-SNAPSHOT + 2.27.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.1-SNAPSHOT + 0.118.1 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.1-SNAPSHOT + 2.27.1 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 22ca9d73f..ea9a95380 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.27.1-SNAPSHOT + 2.27.1 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.27.1-SNAPSHOT + 2.27.1 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 47b2f69e7..f605d4b05 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.1-SNAPSHOT + 2.27.1 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.1-SNAPSHOT + 2.27.1 diff --git a/pom.xml b/pom.xml index edc3e8848..7c1ec3708 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.27.1-SNAPSHOT + 2.27.1 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.1-SNAPSHOT + 2.27.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.1-SNAPSHOT + 2.27.1 com.google.cloud google-cloud-datastore - 2.27.1-SNAPSHOT + 2.27.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.1-SNAPSHOT + 0.118.1 com.google.cloud.datastore datastore-v1-proto-client - 2.27.1-SNAPSHOT + 2.27.1 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 0c119df39..cf2a885c3 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.1-SNAPSHOT + 2.27.1 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.1-SNAPSHOT + 2.27.1 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 6000a76b6..305c81593 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.1-SNAPSHOT + 0.118.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.27.1-SNAPSHOT + 2.27.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b59251598..6e226db48 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.27.1-SNAPSHOT + 2.27.1 diff --git a/versions.txt b/versions.txt index 2b23ec786..e2dae47ae 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.27.0:2.27.1-SNAPSHOT -google-cloud-datastore-bom:2.27.0:2.27.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.118.0:0.118.1-SNAPSHOT -datastore-v1-proto-client:2.27.0:2.27.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.27.0:2.27.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.27.0:2.27.1-SNAPSHOT +google-cloud-datastore:2.27.1:2.27.1 +google-cloud-datastore-bom:2.27.1:2.27.1 +proto-google-cloud-datastore-v1:0.118.1:0.118.1 +datastore-v1-proto-client:2.27.1:2.27.1 +proto-google-cloud-datastore-admin-v1:2.27.1:2.27.1 +grpc-google-cloud-datastore-admin-v1:2.27.1:2.27.1 From 8ceb62b5182e30b4f771d6c1b586a22fb084c9ac Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 27 Mar 2025 16:16:36 -0400 Subject: [PATCH 228/292] chore: Update generation configuration at Thu Mar 27 02:26:48 UTC 2025 (#1805) * chore: Update generation configuration at Fri Mar 21 02:26:50 UTC 2025 * chore: Update generation configuration at Sat Mar 22 02:25:21 UTC 2025 * chore: generate libraries at Sat Mar 22 02:25:54 UTC 2025 * chore: Update generation configuration at Tue Mar 25 02:27:03 UTC 2025 * chore: Update generation configuration at Wed Mar 26 02:26:49 UTC 2025 * chore: Update generation configuration at Thu Mar 27 02:26:48 UTC 2025 --- README.md | 2 +- generation_config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6618f6a49..def36c0cd 100644 --- a/README.md +++ b/README.md @@ -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.56.0') +implementation platform('com.google.cloud:libraries-bom:26.57.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index 0141d0185..920e4077d 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.55.1 -googleapis_commitish: 6155d42e99f45ebf53100d492852be1561916137 -libraries_bom_version: 26.56.0 +googleapis_commitish: 00716e8ec21866b5744ffbe967f3467cf3246e88 +libraries_bom_version: 26.57.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore From b8f7a486722407fc575b7823ee9257fb453f036a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 21 Apr 2025 11:25:03 -0700 Subject: [PATCH 229/292] chore(main): release 2.27.2-SNAPSHOT (#1804) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index c8cff4f30..4178bfa25 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.27.1 + 2.27.2-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.27.1 + 2.27.2-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 7be68ff13..f02b30d9e 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.27.1 + 2.27.2-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.27.1 + 2.27.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.1 + 2.27.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.1 + 0.118.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.1 + 2.27.2-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index ea9a95380..fb581a186 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.27.1 + 2.27.2-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.27.1 + 2.27.2-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index f605d4b05..a0cf3a469 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.1 + 2.27.2-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.1 + 2.27.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7c1ec3708..9fedd55b4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.27.1 + 2.27.2-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.1 + 2.27.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.1 + 2.27.2-SNAPSHOT com.google.cloud google-cloud-datastore - 2.27.1 + 2.27.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.1 + 0.118.2-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.27.1 + 2.27.2-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index cf2a885c3..a8f1bb464 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.1 + 2.27.2-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.1 + 2.27.2-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 305c81593..1cc404ce6 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.1 + 0.118.2-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.27.1 + 2.27.2-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6e226db48..4273064f8 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.27.1 + 2.27.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index e2dae47ae..f3fa92479 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.27.1:2.27.1 -google-cloud-datastore-bom:2.27.1:2.27.1 -proto-google-cloud-datastore-v1:0.118.1:0.118.1 -datastore-v1-proto-client:2.27.1:2.27.1 -proto-google-cloud-datastore-admin-v1:2.27.1:2.27.1 -grpc-google-cloud-datastore-admin-v1:2.27.1:2.27.1 +google-cloud-datastore:2.27.1:2.27.2-SNAPSHOT +google-cloud-datastore-bom:2.27.1:2.27.2-SNAPSHOT +proto-google-cloud-datastore-v1:0.118.1:0.118.2-SNAPSHOT +datastore-v1-proto-client:2.27.1:2.27.2-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.27.1:2.27.2-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.27.1:2.27.2-SNAPSHOT From 1e2433400fdde200f13e735b87d6ccdd469a48cd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 22 Apr 2025 18:28:44 +0100 Subject: [PATCH 230/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.27.0 (#1788) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 2f00439b6..8f6d763fe 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.26.4 + 2.27.0 From 5c736faabcb02661677f6b3c24d878c86a02e0e9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 22 Apr 2025 18:42:24 +0100 Subject: [PATCH 231/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.59.0 (#1807) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.56.0` -> `26.59.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.59.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.59.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.56.0/26.59.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.56.0/26.59.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-cloud-bom (com.google.cloud:libraries-bom) ### [`v26.59.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26590-2025-03-31) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.58.0...v26.59.0) ##### Dependencies - update dependency com.google.cloud:gapic-libraries-bom to v1.54.2 ([#​7011](https://redirect.github.com/googleapis/java-cloud-bom/issues/7011)) ([cb41fcf](https://redirect.github.com/googleapis/java-cloud-bom/commit/cb41fcf9d6dd0d052831b547131b56269a73251d)) ### [`v26.58.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26580-2025-03-28) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.57.0...v26.58.0) ##### Bug Fixes - add error handling to script ([#​7001](https://redirect.github.com/googleapis/java-cloud-bom/issues/7001)) ([cfc7ea2](https://redirect.github.com/googleapis/java-cloud-bom/commit/cfc7ea2630bd9fbce38057f8114a1e3c85dc01f4)) ##### Dependencies - update dependency com.google.cloud:gapic-libraries-bom to v1.54.1 ([#​7006](https://redirect.github.com/googleapis/java-cloud-bom/issues/7006)) ([37fcbe5](https://redirect.github.com/googleapis/java-cloud-bom/commit/37fcbe526eb959c425c02ac0ae2d7300e4f90dab)) ### [`v26.57.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26570-2025-03-21) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.56.0...v26.57.0) ##### Dependencies - Protobuf 4.29.4 in Libraries BOM ([#​6986](https://redirect.github.com/googleapis/java-cloud-bom/issues/6986)) ([b2fdf41](https://redirect.github.com/googleapis/java-cloud-bom/commit/b2fdf41eab274d95285699560fc6c9fcf9bfc2fe)) - update dependency com.google.cloud:first-party-dependencies to v3.45.1 ([#​6980](https://redirect.github.com/googleapis/java-cloud-bom/issues/6980)) ([1b9a203](https://redirect.github.com/googleapis/java-cloud-bom/commit/1b9a2038de423a41005327961434a7a1b7bfdcce)) - update dependency com.google.cloud:gapic-libraries-bom to v1.54.0 ([#​6989](https://redirect.github.com/googleapis/java-cloud-bom/issues/6989)) ([9e27d1e](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e27d1e6b6a209aec9e65f796fa411c1fe00b2b2)) - update dependency com.google.cloud:google-cloud-bigquery to v2.49.0 ([#​6990](https://redirect.github.com/googleapis/java-cloud-bom/issues/6990)) ([d293b75](https://redirect.github.com/googleapis/java-cloud-bom/commit/d293b7534ffeec88fe7cd7ca4c9b6ec417b460e1)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.12.0 ([#​6991](https://redirect.github.com/googleapis/java-cloud-bom/issues/6991)) ([90c6772](https://redirect.github.com/googleapis/java-cloud-bom/commit/90c677281bc2624cbcf541d8ca0e9d06199e91a0)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.27.1 ([#​6977](https://redirect.github.com/googleapis/java-cloud-bom/issues/6977)) ([c1ee194](https://redirect.github.com/googleapis/java-cloud-bom/commit/c1ee194cacbbcb6b11e7c21c7a7c2afe1db153d4)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.30.11 ([#​6976](https://redirect.github.com/googleapis/java-cloud-bom/issues/6976)) ([57028d5](https://redirect.github.com/googleapis/java-cloud-bom/commit/57028d5fae0d97bf2421de1a99c2be9e7e220faa)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.22.0 ([#​6992](https://redirect.github.com/googleapis/java-cloud-bom/issues/6992)) ([8142494](https://redirect.github.com/googleapis/java-cloud-bom/commit/81424944ddce2f16a1fc7d7fb707878123d31f1d)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.132.5-alpha ([#​6985](https://redirect.github.com/googleapis/java-cloud-bom/issues/6985)) ([87ea53f](https://redirect.github.com/googleapis/java-cloud-bom/commit/87ea53fbeb55dd7a1f55a86dcdd328abff127714)) - update dependency com.google.cloud:google-cloud-nio to v0.127.33 ([#​6987](https://redirect.github.com/googleapis/java-cloud-bom/issues/6987)) ([bcf4e3c](https://redirect.github.com/googleapis/java-cloud-bom/commit/bcf4e3c655c2b4d749cdefe91ff9ceb8255dcc96)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.138.0 ([#​6993](https://redirect.github.com/googleapis/java-cloud-bom/issues/6993)) ([27f63d7](https://redirect.github.com/googleapis/java-cloud-bom/commit/27f63d7150b7fff0495c0e2aafab4f3eef7cc843)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.15.5 ([#​6988](https://redirect.github.com/googleapis/java-cloud-bom/issues/6988)) ([51f57f2](https://redirect.github.com/googleapis/java-cloud-bom/commit/51f57f2a11e343bd935a75c946fe7461fdba36fd)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.89.0 ([#​6994](https://redirect.github.com/googleapis/java-cloud-bom/issues/6994)) ([3081df5](https://redirect.github.com/googleapis/java-cloud-bom/commit/3081df53c75b5905f30472765a295d9579a55ff4)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.28.0 ([#​6996](https://redirect.github.com/googleapis/java-cloud-bom/issues/6996)) ([8773613](https://redirect.github.com/googleapis/java-cloud-bom/commit/877361356fe26987246a1a7d99039407f0709f86)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.50.0 ([#​6995](https://redirect.github.com/googleapis/java-cloud-bom/issues/6995)) ([8eec8b6](https://redirect.github.com/googleapis/java-cloud-bom/commit/8eec8b687b8e91b08251137ff6e107fd88154247)) - update dependency node to v22 ([#​6979](https://redirect.github.com/googleapis/java-cloud-bom/issues/6979)) ([27cd056](https://redirect.github.com/googleapis/java-cloud-bom/commit/27cd0567e7e545992148a669d1b8f5729e5bc2df)) - updated dependency of google-cloud-bigtable-bom ([#​6981](https://redirect.github.com/googleapis/java-cloud-bom/issues/6981)) ([ea69ffc](https://redirect.github.com/googleapis/java-cloud-bom/commit/ea69ffcffb7a864bfa9e8eb5059e27f85c8e2e57))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 8dc991353..88e93a110 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.56.0 + 26.59.0 pom import From 1210f32662e7aafd2e170643bedbb851f40f3646 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Fri, 25 Apr 2025 10:55:12 -0400 Subject: [PATCH 232/292] chore: Update generation configuration at Fri Apr 25 02:28:52 UTC 2025 (#1822) * chore: Update generation configuration at Wed Apr 23 17:17:24 UTC 2025 * chore: generate libraries at Wed Apr 23 17:17:54 UTC 2025 * chore: Update generation configuration at Thu Apr 24 02:28:55 UTC 2025 * chore: manually update generation configuration * chore: generate libraries at Thu Apr 24 14:55:47 UTC 2025 * chore: remove old graalvm jobs * chore: Update generation configuration at Fri Apr 25 02:28:52 UTC 2025 * chore: restore custom files --------- Co-authored-by: Diego Marquez --- .github/generated-files-bot.yml | 1 + .github/scripts/update_generation_config.sh | 11 +- .github/sync-repo-settings.yaml | 5 +- .github/workflows/ci.yaml | 2 +- .../hermetic_library_generation.yaml | 2 +- .github/workflows/renovate_config_check.yaml | 4 +- .github/workflows/samples.yaml | 2 +- .../workflows/update_generation_config.yaml | 6 +- .kokoro/build.sh | 24 +- ...raalvm-native.cfg => graalvm-native-a.cfg} | 6 +- ...lvm-native-17.cfg => graalvm-native-b.cfg} | 8 +- .kokoro/presubmit/graalvm-native-c.cfg | 38 ++ CONTRIBUTING.md | 2 +- README.md | 6 +- .../v1/client/DatastoreEmulator.java | 1 + .../v1/client/DatastoreException.java | 8 +- .../datastore/v1/client/DatastoreHelper.java | 4 +- .../v1/client/EndToEndChecksumHandler.java | 1 + .../v1/client/QuerySplitterTest.java | 39 +- generation_config.yaml | 6 +- .../google/cloud/datastore/DatastoreImpl.java | 4 +- .../aggregation/CountAggregation.java | 4 +- .../google/cloud/datastore/DatastoreTest.java | 3 +- .../cloud/datastore/it/ITE2ETracingTest.java | 12 +- .../testing/ITLocalDatastoreHelperTest.java | 3 +- .../testing/RemoteDatastoreHelper.java | 2 +- .../admin/v1/DatastoreAdminGrpc.java | 180 +++++++++ owlbot.py | 4 +- .../datastore/admin/v1/CommonMetadata.java | 61 +++ .../admin/v1/CommonMetadataOrBuilder.java | 11 + .../admin/v1/CreateIndexRequest.java | 21 ++ .../admin/v1/CreateIndexRequestOrBuilder.java | 3 + .../admin/v1/DatastoreAdminProto.java | 219 ++++++----- .../DatastoreFirestoreMigrationMetadata.java | 16 + ...reFirestoreMigrationMetadataOrBuilder.java | 2 + .../admin/v1/DeleteIndexRequest.java | 16 + .../admin/v1/DeleteIndexRequestOrBuilder.java | 2 + .../datastore/admin/v1/EntityFilter.java | 28 ++ .../admin/v1/EntityFilterOrBuilder.java | 6 + .../admin/v1/ExportEntitiesMetadata.java | 57 +++ .../v1/ExportEntitiesMetadataOrBuilder.java | 9 + .../admin/v1/ExportEntitiesRequest.java | 42 +++ .../v1/ExportEntitiesRequestOrBuilder.java | 9 + .../admin/v1/ExportEntitiesResponse.java | 9 + .../v1/ExportEntitiesResponseOrBuilder.java | 1 + .../datastore/admin/v1/GetIndexRequest.java | 16 + .../admin/v1/GetIndexRequestOrBuilder.java | 2 + .../admin/v1/ImportEntitiesMetadata.java | 57 +++ .../v1/ImportEntitiesMetadataOrBuilder.java | 9 + .../admin/v1/ImportEntitiesRequest.java | 42 +++ .../v1/ImportEntitiesRequestOrBuilder.java | 9 + .../com/google/datastore/admin/v1/Index.java | 86 +++++ .../admin/v1/IndexOperationMetadata.java | 33 ++ .../v1/IndexOperationMetadataOrBuilder.java | 5 + .../datastore/admin/v1/IndexOrBuilder.java | 9 + .../google/datastore/admin/v1/IndexProto.java | 56 +-- .../admin/v1/ListIndexesRequest.java | 27 ++ .../admin/v1/ListIndexesRequestOrBuilder.java | 3 + .../admin/v1/ListIndexesResponse.java | 31 ++ .../v1/ListIndexesResponseOrBuilder.java | 5 + .../admin/v1/MigrationProgressEvent.java | 59 +++ .../v1/MigrationProgressEventOrBuilder.java | 5 + .../datastore/admin/v1/MigrationState.java | 3 + .../admin/v1/MigrationStateEvent.java | 9 + .../v1/MigrationStateEventOrBuilder.java | 1 + .../datastore/admin/v1/MigrationStep.java | 7 + .../datastore/admin/v1/OperationType.java | 4 + .../google/datastore/admin/v1/Progress.java | 10 + .../google/datastore/v1/AggregationQuery.java | 142 +++++++ .../v1/AggregationQueryOrBuilder.java | 6 + .../datastore/v1/AggregationResult.java | 20 +- .../datastore/v1/AggregationResultBatch.java | 43 +++ .../v1/AggregationResultBatchOrBuilder.java | 7 + .../v1/AggregationResultOrBuilder.java | 5 + .../datastore/v1/AllocateIdsRequest.java | 38 ++ .../v1/AllocateIdsRequestOrBuilder.java | 6 + .../datastore/v1/AllocateIdsResponse.java | 24 ++ .../v1/AllocateIdsResponseOrBuilder.java | 4 + .../com/google/datastore/v1/ArrayValue.java | 24 ++ .../datastore/v1/ArrayValueOrBuilder.java | 4 + .../datastore/v1/BeginTransactionRequest.java | 28 ++ .../v1/BeginTransactionRequestOrBuilder.java | 4 + .../v1/BeginTransactionResponse.java | 6 + .../google/datastore/v1/CommitRequest.java | 65 ++++ .../datastore/v1/CommitRequestOrBuilder.java | 10 + .../google/datastore/v1/CommitResponse.java | 40 ++ .../datastore/v1/CommitResponseOrBuilder.java | 6 + .../google/datastore/v1/CompositeFilter.java | 33 ++ .../v1/CompositeFilterOrBuilder.java | 5 + .../google/datastore/v1/DatastoreProto.java | 356 ++++++++++-------- .../java/com/google/datastore/v1/Entity.java | 32 +- .../google/datastore/v1/EntityOrBuilder.java | 7 + .../com/google/datastore/v1/EntityProto.java | 70 ++-- .../com/google/datastore/v1/EntityResult.java | 49 +++ .../datastore/v1/EntityResultOrBuilder.java | 6 + .../google/datastore/v1/ExecutionStats.java | 34 ++ .../datastore/v1/ExecutionStatsOrBuilder.java | 4 + .../google/datastore/v1/ExplainMetrics.java | 26 ++ .../datastore/v1/ExplainMetricsOrBuilder.java | 4 + .../google/datastore/v1/ExplainOptions.java | 6 + .../java/com/google/datastore/v1/Filter.java | 27 ++ .../google/datastore/v1/FilterOrBuilder.java | 4 + .../com/google/datastore/v1/FindNearest.java | 67 ++++ .../datastore/v1/FindNearestOrBuilder.java | 10 + .../com/google/datastore/v1/GqlQuery.java | 53 ++- .../datastore/v1/GqlQueryOrBuilder.java | 10 + .../datastore/v1/GqlQueryParameter.java | 20 + .../v1/GqlQueryParameterOrBuilder.java | 3 + .../java/com/google/datastore/v1/Key.java | 64 ++++ .../com/google/datastore/v1/KeyOrBuilder.java | 6 + .../google/datastore/v1/KindExpression.java | 9 + .../datastore/v1/KindExpressionOrBuilder.java | 1 + .../google/datastore/v1/LookupRequest.java | 62 +++ .../datastore/v1/LookupRequestOrBuilder.java | 10 + .../google/datastore/v1/LookupResponse.java | 84 +++++ .../datastore/v1/LookupResponseOrBuilder.java | 14 + .../com/google/datastore/v1/Mutation.java | 112 ++++++ .../datastore/v1/MutationOrBuilder.java | 18 + .../google/datastore/v1/MutationResult.java | 68 ++++ .../datastore/v1/MutationResultOrBuilder.java | 10 + .../com/google/datastore/v1/PartitionId.java | 23 ++ .../datastore/v1/PartitionIdOrBuilder.java | 3 + .../com/google/datastore/v1/PlanSummary.java | 24 ++ .../datastore/v1/PlanSummaryOrBuilder.java | 4 + .../com/google/datastore/v1/Projection.java | 14 + .../datastore/v1/ProjectionOrBuilder.java | 2 + .../google/datastore/v1/PropertyFilter.java | 42 +++ .../datastore/v1/PropertyFilterOrBuilder.java | 5 + .../com/google/datastore/v1/PropertyMask.java | 15 + .../datastore/v1/PropertyMaskOrBuilder.java | 3 + .../google/datastore/v1/PropertyOrder.java | 23 ++ .../datastore/v1/PropertyOrderOrBuilder.java | 3 + .../datastore/v1/PropertyReference.java | 9 + .../v1/PropertyReferenceOrBuilder.java | 1 + .../datastore/v1/PropertyTransform.java | 79 ++++ .../v1/PropertyTransformOrBuilder.java | 13 + .../java/com/google/datastore/v1/Query.java | 138 +++++++ .../google/datastore/v1/QueryOrBuilder.java | 22 ++ .../com/google/datastore/v1/QueryProto.java | 240 +++++++----- .../google/datastore/v1/QueryResultBatch.java | 70 ++++ .../v1/QueryResultBatchOrBuilder.java | 8 + .../com/google/datastore/v1/ReadOptions.java | 42 +++ .../datastore/v1/ReadOptionsOrBuilder.java | 7 + .../datastore/v1/ReserveIdsRequest.java | 38 ++ .../v1/ReserveIdsRequestOrBuilder.java | 6 + .../datastore/v1/ReserveIdsResponse.java | 2 + .../google/datastore/v1/RollbackRequest.java | 20 + .../v1/RollbackRequestOrBuilder.java | 2 + .../google/datastore/v1/RollbackResponse.java | 2 + .../v1/RunAggregationQueryRequest.java | 77 ++++ .../RunAggregationQueryRequestOrBuilder.java | 12 + .../v1/RunAggregationQueryResponse.java | 42 +++ .../RunAggregationQueryResponseOrBuilder.java | 6 + .../google/datastore/v1/RunQueryRequest.java | 89 +++++ .../v1/RunQueryRequestOrBuilder.java | 14 + .../google/datastore/v1/RunQueryResponse.java | 42 +++ .../v1/RunQueryResponseOrBuilder.java | 6 + .../datastore/v1/TransactionOptions.java | 51 +++ .../v1/TransactionOptionsOrBuilder.java | 4 + .../java/com/google/datastore/v1/Value.java | 107 ++++++ .../google/datastore/v1/ValueOrBuilder.java | 18 + renovate.json | 1 - .../google/datastore/snippets/TaskList.java | 5 + .../datastore/snippets/ConceptsTest.java | 1 + 164 files changed, 3987 insertions(+), 502 deletions(-) rename .kokoro/presubmit/{graalvm-native.cfg => graalvm-native-a.cfg} (78%) rename .kokoro/presubmit/{graalvm-native-17.cfg => graalvm-native-b.cfg} (76%) create mode 100644 .kokoro/presubmit/graalvm-native-c.cfg diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml index c644a24e1..e58cdcbad 100644 --- a/.github/generated-files-bot.yml +++ b/.github/generated-files-bot.yml @@ -6,6 +6,7 @@ externalManifests: file: '.github/readme/synth.metadata/synth.metadata' jsonpath: '$.generatedFiles[*]' ignoreAuthors: +- 'cloud-java-bot' - 'renovate-bot' - 'yoshi-automation' - 'release-please[bot]' diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh index 91434688c..fff56bf5d 100644 --- a/.github/scripts/update_generation_config.sh +++ b/.github/scripts/update_generation_config.sh @@ -15,8 +15,15 @@ set -e function get_latest_released_version() { local group_id=$1 local artifact_id=$2 - latest=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json" | jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' | sort -V | tail -n 1) - echo "${latest}" + json_content=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json") + latest=$(jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' <<< "${json_content}" | sort -V | tail -n 1) + if [[ -z "${latest}" ]]; then + echo "The latest version of ${group_id}:${artifact_id} is empty." + echo "The returned json from maven.org is invalid: ${json_content}" + exit 1 + else + echo "${latest}" + fi } # Update a key to a new value in the generation config. diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 09c9c67d7..6fdb2fb2e 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -15,8 +15,9 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google - - 'Kokoro - Test: Java GraalVM Native Image' - - 'Kokoro - Test: Java 17 GraalVM Native Image' + - 'Kokoro - Test: Java GraalVM Native Image A' + - 'Kokoro - Test: Java GraalVM Native Image B' + - 'Kokoro - Test: Java GraalVM Native Image C' - javadoc - library_generation - unmanaged_dependency_check diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 941f2f3b4..2192f032d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -112,7 +112,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 + java-version: 17 - run: java -version - run: .kokoro/build.sh env: diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index ca1baea12..6b856abde 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.56.2 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml index 7c5ec7865..47b9e87c9 100644 --- a/.github/workflows/renovate_config_check.yaml +++ b/.github/workflows/renovate_config_check.yaml @@ -7,7 +7,7 @@ on: jobs: renovate_bot_config_validation: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout code @@ -16,7 +16,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: '20' + node-version: '22' - name: Install Renovate and Config Validator run: | diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index 03b293956..186fd8bcf 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 17 - name: Run checkstyle run: mvn -P lint --quiet --batch-mode checkstyle:check working-directory: samples/snippets diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml index 3cf773992..cd2d5fd5a 100644 --- a/.github/workflows/update_generation_config.yaml +++ b/.github/workflows/update_generation_config.yaml @@ -21,13 +21,14 @@ on: jobs: update-generation-config: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: # the branch into which the pull request is merged base_branch: main steps: - uses: actions/checkout@v4 with: + fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - name: Update params in generation config to latest shell: bash @@ -36,7 +37,8 @@ jobs: [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com" [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot" bash .github/scripts/update_generation_config.sh \ - --base_branch "${base_branch}"\ + --base_branch "${base_branch}" \ --repo ${{ github.repository }} env: GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} + diff --git a/.kokoro/build.sh b/.kokoro/build.sh index c4b65f8b5..f77424b4f 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -1,11 +1,11 @@ #!/bin/bash -# Copyright 2019 Google LLC +# Copyright 2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -42,21 +42,22 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi + RETURN_CODE=0 set +e case ${JOB_TYPE} in test) echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}" - mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT} + mvn test -B -ntp -Dfmt.skip=true -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT} RETURN_CODE=$? ;; lint) - mvn com.coveo:fmt-maven-plugin:check -B -ntp + mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp RETURN_CODE=$? ;; javadoc) - mvn javadoc:javadoc javadoc:test-javadoc -B -ntp + mvn javadoc:javadoc javadoc:test-javadoc -B -ntp -Dfmt.skip=true RETURN_CODE=$? ;; integration) @@ -78,18 +79,16 @@ integration) -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ + -Dcheckstyle.skip=true \ + -DskipUnitTests=true \ + -Dfmt.skip=true \ -fae \ verify RETURN_CODE=$? ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test - RETURN_CODE=$? - ;; -graalvm17) - # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true RETURN_CODE=$? ;; samples) @@ -113,6 +112,7 @@ samples) -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ + -Dfmt.skip=true \ -fae \ verify RETURN_CODE=$? @@ -122,7 +122,7 @@ samples) fi ;; clirr) - mvn -B -ntp -Denforcer.skip=true clirr:check + mvn -B -ntp -Dfmt.skip=true -Denforcer.skip=true clirr:check RETURN_CODE=$? ;; *) diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native-a.cfg similarity index 78% rename from .kokoro/presubmit/graalvm-native.cfg rename to .kokoro/presubmit/graalvm-native-a.cfg index 745c5c961..d0c295213 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -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.45.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { @@ -33,6 +33,6 @@ env_vars: { } env_vars: { - key: "DATASTORE_PROJECT_ID" - value: "gcloud-devel" + key: "IT_SERVICE_ACCOUNT_EMAIL" + value: "it-service-account@gcloud-devel.iam.gserviceaccount.com" } \ No newline at end of file diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-b.cfg similarity index 76% rename from .kokoro/presubmit/graalvm-native-17.cfg rename to .kokoro/presubmit/graalvm-native-b.cfg index 842dadd7f..962c305ff 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -3,12 +3,12 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { key: "JOB_TYPE" - value: "graalvm17" + value: "graalvm" } # TODO: remove this after we've migrated all tests and scripts @@ -33,6 +33,6 @@ env_vars: { } env_vars: { - key: "DATASTORE_PROJECT_ID" - value: "gcloud-devel" + key: "IT_SERVICE_ACCOUNT_EMAIL" + value: "it-service-account@gcloud-devel.iam.gserviceaccount.com" } \ No newline at end of file diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg new file mode 100644 index 000000000..87b5dff65 --- /dev/null +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -0,0 +1,38 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} + +env_vars: { + key: "IT_SERVICE_ACCOUNT_EMAIL" + value: "it-service-account@gcloud-devel.iam.gserviceaccount.com" +} \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b65dd279c..ff092b68e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,7 +84,7 @@ Code in this repo is formatted with [google-java-format](https://github.com/google/google-java-format). To run formatting on your project, you can run: ``` -mvn com.coveo:fmt-maven-plugin:format +mvn com.spotify.fmt:fmt-maven-plugin:format ``` [1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account diff --git a/README.md b/README.md index def36c0cd..8027f49c1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.56.0 + 26.59.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.26.4 + 2.27.0 ``` @@ -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.57.0') +implementation platform('com.google.cloud:libraries-bom:26.59.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java index 2fb11ebe8..dcca102a1 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java @@ -262,6 +262,7 @@ public synchronized File getProjectDirectory() { static class StartupMonitor extends Thread { private final InputStream inputStream; private volatile boolean success = false; + /** This latch will reach 0 once server startup has completed. */ private final CountDownLatch startupCompleteLatch = new CountDownLatch(1); diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java index 400e63308..b283603fb 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java @@ -28,12 +28,16 @@ public DatastoreException(String methodName, Code code, String message, Throwabl this.code = code; } - /** @return the canonical error code */ + /** + * @return the canonical error code + */ public Code getCode() { return code; } - /** @return the datastore method name */ + /** + * @return the datastore method name + */ public String getMethodName() { return methodName; } diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java index 23ac315b5..239673061 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java @@ -336,7 +336,9 @@ private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options) return; } - /** @see #getOptionsFromEnv() */ + /** + * @see #getOptionsFromEnv() + */ public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException { return DatastoreFactory.get().create(getOptionsFromEnv().build()); } diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java index 3f840a8ba..339fe4878 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java @@ -24,6 +24,7 @@ class EndToEndChecksumHandler { /** The checksum http header on http requests */ static final String HTTP_REQUEST_CHECKSUM_HEADER = "x-request-checksum-348659783"; + /** The checksum http header on http responses */ static final String HTTP_RESPONSE_CHECKSUM_HEADER = "x-response-checksum-348659783"; diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java index b064e137a..0802a62aa 100644 --- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java +++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java @@ -101,8 +101,7 @@ public void disallowsSortOrder() { public void disallowsMultipleKinds() { Datastore datastore = factory.create(options.build()); Query queryWithMultipleKinds = - query - .toBuilder() + query.toBuilder() .addKind(KindExpression.newBuilder().setName("another-kind").build()) .build(); IllegalArgumentException exception = @@ -129,8 +128,7 @@ public void disallowsKindlessQuery() { public void disallowsInequalityFilter() { Datastore datastore = factory.create(options.build()); Query queryWithInequality = - query - .toBuilder() + query.toBuilder() .setFilter(makeFilter("foo", Operator.GREATER_THAN, makeValue("value"))) .build(); IllegalArgumentException exception = @@ -177,16 +175,13 @@ public void getSplits() throws Exception { assertThat(splittedQueries) .containsExactly( - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1)) .build(), - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3)) .build(), - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null)) .build()); @@ -229,16 +224,13 @@ public void getSplitsWithDatabaseId() throws Exception { assertThat(splitQueries) .containsExactly( - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1)) .build(), - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3)) .build(), - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null)) .build()); @@ -277,12 +269,10 @@ public void notEnoughSplits() throws Exception { assertThat(splittedQueries) .containsExactly( - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey0)) .build(), - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey0, null)) .build()); @@ -325,16 +315,13 @@ public void getSplits_withReadTime() throws Exception { assertThat(splittedQueries) .containsExactly( - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1)) .build(), - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3)) .build(), - query - .toBuilder() + query.toBuilder() .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null)) .build()); diff --git a/generation_config.yaml b/generation_config.yaml index 920e4077d..5e7d6072a 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ -gapic_generator_version: 2.55.1 -googleapis_commitish: 00716e8ec21866b5744ffbe967f3467cf3246e88 -libraries_bom_version: 26.57.0 +gapic_generator_version: 2.56.2 +googleapis_commitish: 2e5f8ba097342c6ef4efeba5c07677b3d35571d4 +libraries_bom_version: 26.59.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java index 2bf8389fd..42bc1a093 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java @@ -240,8 +240,8 @@ public T runInTransaction(final TransactionCallable callable) { Callable transactionCallable = (getOptions().getOpenTelemetryOptions().isEnabled() ? new TracedReadWriteTransactionCallable( - this, callable, /*transactionOptions=*/ null, span) - : new ReadWriteTransactionCallable(this, callable, /*transactionOptions=*/ null)); + this, callable, /* transactionOptions= */ null, span) + : new ReadWriteTransactionCallable(this, callable, /* transactionOptions= */ null)); try (Scope ignored = span.makeCurrent()) { return RetryHelper.runWithRetries( transactionCallable, diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java index 632b6633d..af2f23788 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java @@ -23,7 +23,9 @@ /** Represents an {@link Aggregation} which returns count. */ public class CountAggregation extends Aggregation { - /** @param alias Alias to used when running this aggregation. */ + /** + * @param alias Alias to used when running this aggregation. + */ public CountAggregation(String alias) { super(alias); } diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java index 459278f25..ca84ab35a 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java @@ -179,8 +179,7 @@ public void setUp() { DatastoreOpenTelemetryOptions.Builder otelOptionsBuilder = DatastoreOpenTelemetryOptions.newBuilder(); rpcMockOptions = - options - .toBuilder() + options.toBuilder() .setRetrySettings(ServiceOptions.getDefaultRetrySettings()) .setServiceRpcFactory(rpcFactoryMock) .build(); diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java index bee54a1f0..d0631f51a 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java @@ -201,7 +201,7 @@ private boolean dfsContainsCallStack(long spanId, List expectedCallStack if (dfsContainsCallStack( childSpan, expectedCallStack.subList( - /*fromIndexInclusive=*/ 1, /*toIndexExclusive*/ callStackListSize))) { + /* fromIndexInclusive= */ 1, /*toIndexExclusive*/ callStackListSize))) { return true; } } @@ -808,7 +808,7 @@ public void newTransactionReadTest() throws Exception { fetchAndValidateTrace( customSpanContext.getTraceId(), - /*numExpectedSpans=*/ 3, + /* numExpectedSpans= */ 3, Arrays.asList( Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION), Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP), @@ -848,7 +848,7 @@ public void newTransactionQueryTest() throws Exception { fetchAndValidateTrace( customSpanContext.getTraceId(), - /*numExpectedSpans=*/ 3, + /* numExpectedSpans= */ 3, Arrays.asList( Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION), Collections.singletonList(SPAN_NAME_TRANSACTION_RUN_QUERY), @@ -903,7 +903,7 @@ public void newTransactionReadWriteTraceTest() throws Exception { fetchAndValidateTrace( customSpanContext.getTraceId(), - /*numExpectedSpans=*/ 3, + /* numExpectedSpans= */ 3, Arrays.asList( Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION), Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP), @@ -958,7 +958,7 @@ public void newTransactionRollbackTest() throws Exception { fetchAndValidateTrace( customSpanContext.getTraceId(), - /*numExpectedSpans=*/ 3, + /* numExpectedSpans= */ 3, Arrays.asList( Collections.singletonList(SPAN_NAME_BEGIN_TRANSACTION), Collections.singletonList(SPAN_NAME_TRANSACTION_LOOKUP), @@ -1000,7 +1000,7 @@ public void runInTransactionQueryTest() throws Exception { fetchAndValidateTrace( customSpanContext.getTraceId(), - /*numExpectedSpans=*/ 4, + /* numExpectedSpans= */ 4, Arrays.asList( Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_BEGIN_TRANSACTION), Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_RUN_QUERY), diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java index cad6d4fbe..d5be6b9e6 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java @@ -118,8 +118,7 @@ public void testCreateWithToBuilder() throws IOException { assertLocalDatastoreHelpersEquivelent(helper, actualHelper); Path dataDir = Files.createTempDirectory("gcd_data_dir"); actualHelper = - helper - .toBuilder() + helper.toBuilder() .setConsistency(0.85) .setPort(9091) .setStoreOnDisk(true) diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java index a4b389a1e..cc30ace71 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java @@ -104,7 +104,7 @@ public static RemoteDatastoreHelper create( } public static RemoteDatastoreHelper create(String databaseId) { - return create(databaseId, /*openTelemetrySdk=*/ null); + return create(databaseId, /* openTelemetrySdk= */ null); } private static RetrySettings retrySettings() { diff --git a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java index fcea8a71f..f331aba0e 100644 --- a/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java +++ b/grpc-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminGrpc.java @@ -344,6 +344,19 @@ public DatastoreAdminStub newStub( return DatastoreAdminStub.newStub(factory, channel); } + /** Creates a new blocking-style stub that supports all types of calls on the service */ + public static DatastoreAdminBlockingV2Stub newBlockingV2Stub(io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public DatastoreAdminBlockingV2Stub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DatastoreAdminBlockingV2Stub(channel, callOptions); + } + }; + return DatastoreAdminBlockingV2Stub.newStub(factory, channel); + } + /** * Creates a new blocking-style stub that supports unary and streaming output calls on the service */ @@ -813,6 +826,173 @@ public void listIndexes( * service google.longrunning.Operations. * */ + public static final class DatastoreAdminBlockingV2Stub + extends io.grpc.stub.AbstractBlockingStub { + private DatastoreAdminBlockingV2Stub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @java.lang.Override + protected DatastoreAdminBlockingV2Stub build( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DatastoreAdminBlockingV2Stub(channel, callOptions); + } + + /** + * + * + * 
+     * Exports a copy of all or a subset of entities from Google Cloud Datastore
+     * to another storage system, such as Google Cloud Storage. Recent updates to
+     * entities may not be reflected in the export. The export occurs in the
+     * background and its progress can be monitored and managed via the
+     * Operation resource that is created. The output of an export may only be
+     * used once the associated operation is done. If an export operation is
+     * cancelled before completion it may leave partial data behind in Google
+     * Cloud Storage.
+     *
+ */ + public com.google.longrunning.Operation exportEntities( + com.google.datastore.admin.v1.ExportEntitiesRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getExportEntitiesMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Imports entities into Google Cloud Datastore. Existing entities with the
+     * same key are overwritten. The import occurs in the background and its
+     * progress can be monitored and managed via the Operation resource that is
+     * created. If an ImportEntities operation is cancelled, it is possible
+     * that a subset of the data has already been imported to Cloud Datastore.
+     *
+ */ + public com.google.longrunning.Operation importEntities( + com.google.datastore.admin.v1.ImportEntitiesRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getImportEntitiesMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Creates the specified index.
+     * A newly created index's initial state is `CREATING`. On completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * state will be `READY`. If the index already exists, the call will return an
+     * `ALREADY_EXISTS` status.
+     * During index creation, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, removing the index with
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex], then
+     * re-creating the index with [create]
+     * [google.datastore.admin.v1.DatastoreAdmin.CreateIndex].
+     * Indexes with a single property cannot be created.
+     *
+ */ + public com.google.longrunning.Operation createIndex( + com.google.datastore.admin.v1.CreateIndexRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getCreateIndexMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Deletes an existing index.
+     * An index can only be deleted if it is in a `READY` or `ERROR` state. On
+     * successful execution of the request, the index will be in a `DELETING`
+     * [state][google.datastore.admin.v1.Index.State]. And on completion of the
+     * returned [google.longrunning.Operation][google.longrunning.Operation], the
+     * index will be removed.
+     * During index deletion, the process could result in an error, in which
+     * case the index will move to the `ERROR` state. The process can be recovered
+     * by fixing the data that caused the error, followed by calling
+     * [delete][google.datastore.admin.v1.DatastoreAdmin.DeleteIndex] again.
+     *
+ */ + public com.google.longrunning.Operation deleteIndex( + com.google.datastore.admin.v1.DeleteIndexRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getDeleteIndexMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Gets an index.
+     *
+ */ + public com.google.datastore.admin.v1.Index getIndex( + com.google.datastore.admin.v1.GetIndexRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getGetIndexMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Lists the indexes that match the specified filters.  Datastore uses an
+     * eventually consistent query to fetch the list of indexes and may
+     * occasionally return stale results.
+     *
+ */ + public com.google.datastore.admin.v1.ListIndexesResponse listIndexes( + com.google.datastore.admin.v1.ListIndexesRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getListIndexesMethod(), getCallOptions(), request); + } + } + + /** + * A stub to allow clients to do limited synchronous rpc calls to service DatastoreAdmin. + * + * 
+   * Google Cloud Datastore Admin API
+   * The Datastore Admin API provides several admin services for Cloud Datastore.
+   * Concepts: Project, namespace, kind, and entity as defined in the Google Cloud
+   * Datastore API.
+   * Operation: An Operation represents work being performed in the background.
+   * EntityFilter: Allows specifying a subset of entities in a project. This is
+   * specified as a combination of kinds and namespaces (either or both of which
+   * may be all).
+   * Export/Import Service:
+   * - The Export/Import service provides the ability to copy all or a subset of
+   * entities to/from Google Cloud Storage.
+   * - Exported data may be imported into Cloud Datastore for any Google Cloud
+   * Platform project. It is not restricted to the export source project. It is
+   * possible to export from one project and then import into another.
+   * - Exported data can also be loaded into Google BigQuery for analysis.
+   * - Exports and imports are performed asynchronously. An Operation resource is
+   * created for each export/import. The state (including any errors encountered)
+   * of the export/import may be queried via the Operation resource.
+   * Index Service:
+   * - The index service manages Cloud Datastore composite indexes.
+   * - Index creation and deletion are performed asynchronously.
+   * An Operation resource is created for each such asynchronous operation.
+   * The state of the operation (including any errors encountered)
+   * may be queried via the Operation resource.
+   * Operation Service:
+   * - The Operations collection provides a record of actions performed for the
+   * specified project (including any operations in progress). Operations are not
+   * created directly but through calls on other collections or resources.
+   * - An operation that is not yet done may be cancelled. The request to cancel
+   * is asynchronous and the operation may continue to run for some time after the
+   * request to cancel is made.
+   * - An operation that is done may be deleted so that it is no longer listed as
+   * part of the Operation collection.
+   * - ListOperations returns all pending operations, but not completed
+   * operations.
+   * - Operations are created by service DatastoreAdmin, but are accessed via
+   * service google.longrunning.Operations.
+   *
+ */ public static final class DatastoreAdminBlockingStub extends io.grpc.stub.AbstractBlockingStub { private DatastoreAdminBlockingStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { diff --git a/owlbot.py b/owlbot.py index aa74153f9..a858b7366 100644 --- a/owlbot.py +++ b/owlbot.py @@ -46,6 +46,7 @@ s.remove_staging_dirs() java.common_templates(excludes=[ + '.kokoro/build.sh', '.kokoro/presubmit/integration.cfg', '.kokoro/presubmit/graalvm-native.cfg', '.kokoro/presubmit/graalvm-native-17.cfg', @@ -53,5 +54,6 @@ '.kokoro/nightly/java11-integration.cfg', '.kokoro/requirements.in', '.kokoro/requirements.txt', - '.github/dependabot.yml' + '.github/dependabot.yml', + '.github/workflows/ci.yaml' ]) diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java index 8b6c77deb..d7c5167a1 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java @@ -33,6 +33,7 @@ public final class CommonMetadata extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.CommonMetadata) CommonMetadataOrBuilder { private static final long serialVersionUID = 0L; + // Use CommonMetadata.newBuilder() to construct. private CommonMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -181,6 +182,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * STATE_UNSPECIFIED = 0; */ public static final int STATE_UNSPECIFIED_VALUE = 0; + /** * * @@ -191,6 +193,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * INITIALIZING = 1; */ public static final int INITIALIZING_VALUE = 1; + /** * * @@ -201,6 +204,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * PROCESSING = 2; */ public static final int PROCESSING_VALUE = 2; + /** * * @@ -212,6 +216,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * CANCELLING = 3; */ public static final int CANCELLING_VALUE = 3; + /** * * @@ -222,6 +227,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * FINALIZING = 4; */ public static final int FINALIZING_VALUE = 4; + /** * * @@ -232,6 +238,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * SUCCESSFUL = 5; */ public static final int SUCCESSFUL_VALUE = 5; + /** * * @@ -242,6 +249,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * FAILED = 6; */ public static final int FAILED_VALUE = 6; + /** * * @@ -350,6 +358,7 @@ private State(int value) { private int bitField0_; public static final int START_TIME_FIELD_NUMBER = 1; private com.google.protobuf.Timestamp startTime_; + /** * * @@ -365,6 +374,7 @@ private State(int value) { public boolean hasStartTime() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -380,6 +390,7 @@ public boolean hasStartTime() { public com.google.protobuf.Timestamp getStartTime() { return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } + /** * * @@ -396,6 +407,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { public static final int END_TIME_FIELD_NUMBER = 2; private com.google.protobuf.Timestamp endTime_; + /** * * @@ -411,6 +423,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { public boolean hasEndTime() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -426,6 +439,7 @@ public boolean hasEndTime() { public com.google.protobuf.Timestamp getEndTime() { return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } + /** * * @@ -442,6 +456,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { public static final int OPERATION_TYPE_FIELD_NUMBER = 3; private int operationType_ = 0; + /** * * @@ -458,6 +473,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { public int getOperationTypeValue() { return operationType_; } + /** * * @@ -503,6 +519,7 @@ private com.google.protobuf.MapField interna public int getLabelsCount() { return internalGetLabels().getMap().size(); } + /** * * @@ -520,12 +537,14 @@ public boolean containsLabels(java.lang.String key) { } return internalGetLabels().getMap().containsKey(key); } + /** Use {@link #getLabelsMap()} instead. */ @java.lang.Override @java.lang.Deprecated public java.util.Map getLabels() { return getLabelsMap(); } + /** * * @@ -540,6 +559,7 @@ public java.util.Map getLabels() { public java.util.Map getLabelsMap() { return internalGetLabels().getMap(); } + /** * * @@ -561,6 +581,7 @@ public java.util.Map getLabelsMap() { java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } + /** * * @@ -585,6 +606,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { public static final int STATE_FIELD_NUMBER = 5; private int state_ = 0; + /** * * @@ -600,6 +622,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { public int getStateValue() { return state_; } + /** * * @@ -837,6 +860,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1125,6 +1149,7 @@ public Builder mergeFrom( com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> startTimeBuilder_; + /** * * @@ -1139,6 +1164,7 @@ public Builder mergeFrom( public boolean hasStartTime() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -1157,6 +1183,7 @@ public com.google.protobuf.Timestamp getStartTime() { return startTimeBuilder_.getMessage(); } } + /** * * @@ -1179,6 +1206,7 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -1198,6 +1226,7 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu onChanged(); return this; } + /** * * @@ -1225,6 +1254,7 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -1244,6 +1274,7 @@ public Builder clearStartTime() { onChanged(); return this; } + /** * * @@ -1258,6 +1289,7 @@ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() { onChanged(); return getStartTimeFieldBuilder().getBuilder(); } + /** * * @@ -1274,6 +1306,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } } + /** * * @@ -1306,6 +1339,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> endTimeBuilder_; + /** * * @@ -1320,6 +1354,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { public boolean hasEndTime() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -1338,6 +1373,7 @@ public com.google.protobuf.Timestamp getEndTime() { return endTimeBuilder_.getMessage(); } } + /** * * @@ -1360,6 +1396,7 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -1379,6 +1416,7 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) onChanged(); return this; } + /** * * @@ -1406,6 +1444,7 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -1425,6 +1464,7 @@ public Builder clearEndTime() { onChanged(); return this; } + /** * * @@ -1439,6 +1479,7 @@ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { onChanged(); return getEndTimeFieldBuilder().getBuilder(); } + /** * * @@ -1455,6 +1496,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } } + /** * * @@ -1482,6 +1524,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { } private int operationType_ = 0; + /** * * @@ -1498,6 +1541,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { public int getOperationTypeValue() { return operationType_; } + /** * * @@ -1517,6 +1561,7 @@ public Builder setOperationTypeValue(int value) { onChanged(); return this; } + /** * * @@ -1535,6 +1580,7 @@ public com.google.datastore.admin.v1.OperationType getOperationType() { com.google.datastore.admin.v1.OperationType.forNumber(operationType_); return result == null ? com.google.datastore.admin.v1.OperationType.UNRECOGNIZED : result; } + /** * * @@ -1557,6 +1603,7 @@ public Builder setOperationType(com.google.datastore.admin.v1.OperationType valu onChanged(); return this; } + /** * * @@ -1601,6 +1648,7 @@ private com.google.protobuf.MapField interna public int getLabelsCount() { return internalGetLabels().getMap().size(); } + /** * * @@ -1618,12 +1666,14 @@ public boolean containsLabels(java.lang.String key) { } return internalGetLabels().getMap().containsKey(key); } + /** Use {@link #getLabelsMap()} instead. */ @java.lang.Override @java.lang.Deprecated public java.util.Map getLabels() { return getLabelsMap(); } + /** * * @@ -1638,6 +1688,7 @@ public java.util.Map getLabels() { public java.util.Map getLabelsMap() { return internalGetLabels().getMap(); } + /** * * @@ -1659,6 +1710,7 @@ public java.util.Map getLabelsMap() { java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } + /** * * @@ -1686,6 +1738,7 @@ public Builder clearLabels() { internalGetMutableLabels().getMutableMap().clear(); return this; } + /** * * @@ -1703,12 +1756,14 @@ public Builder removeLabels(java.lang.String key) { internalGetMutableLabels().getMutableMap().remove(key); return this; } + /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableLabels() { bitField0_ |= 0x00000008; return internalGetMutableLabels().getMutableMap(); } + /** * * @@ -1730,6 +1785,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { bitField0_ |= 0x00000008; return this; } + /** * * @@ -1747,6 +1803,7 @@ public Builder putAllLabels(java.util.Map va } private int state_ = 0; + /** * * @@ -1762,6 +1819,7 @@ public Builder putAllLabels(java.util.Map va public int getStateValue() { return state_; } + /** * * @@ -1780,6 +1838,7 @@ public Builder setStateValue(int value) { onChanged(); return this; } + /** * * @@ -1799,6 +1858,7 @@ public com.google.datastore.admin.v1.CommonMetadata.State getState() { ? com.google.datastore.admin.v1.CommonMetadata.State.UNRECOGNIZED : result; } + /** * * @@ -1820,6 +1880,7 @@ public Builder setState(com.google.datastore.admin.v1.CommonMetadata.State value onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java index 7532c1b7a..29e4383cb 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java @@ -36,6 +36,7 @@ public interface CommonMetadataOrBuilder * @return Whether the startTime field is set. */ boolean hasStartTime(); + /** * * @@ -48,6 +49,7 @@ public interface CommonMetadataOrBuilder * @return The startTime. */ com.google.protobuf.Timestamp getStartTime(); + /** * * @@ -71,6 +73,7 @@ public interface CommonMetadataOrBuilder * @return Whether the endTime field is set. */ boolean hasEndTime(); + /** * * @@ -83,6 +86,7 @@ public interface CommonMetadataOrBuilder * @return The endTime. */ com.google.protobuf.Timestamp getEndTime(); + /** * * @@ -107,6 +111,7 @@ public interface CommonMetadataOrBuilder * @return The enum numeric value on the wire for operationType. */ int getOperationTypeValue(); + /** * * @@ -132,6 +137,7 @@ public interface CommonMetadataOrBuilder * map<string, string> labels = 4; */ int getLabelsCount(); + /** * * @@ -143,9 +149,11 @@ public interface CommonMetadataOrBuilder * map<string, string> labels = 4; */ boolean containsLabels(java.lang.String key); + /** Use {@link #getLabelsMap()} instead. */ @java.lang.Deprecated java.util.Map getLabels(); + /** * * @@ -157,6 +165,7 @@ public interface CommonMetadataOrBuilder * map<string, string> labels = 4; */ java.util.Map getLabelsMap(); + /** * * @@ -172,6 +181,7 @@ java.lang.String getLabelsOrDefault( java.lang.String key, /* nullable */ java.lang.String defaultValue); + /** * * @@ -196,6 +206,7 @@ java.lang.String getLabelsOrDefault( * @return The enum numeric value on the wire for state. */ int getStateValue(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java index 8a418b846..bff6b84a3 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java @@ -34,6 +34,7 @@ public final class CreateIndexRequest extends com.google.protobuf.GeneratedMessa // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.CreateIndexRequest) CreateIndexRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use CreateIndexRequest.newBuilder() to construct. private CreateIndexRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -92,6 +94,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -118,6 +121,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { public static final int INDEX_FIELD_NUMBER = 3; private com.google.datastore.admin.v1.Index index_; + /** * * @@ -134,6 +138,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { public boolean hasIndex() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -150,6 +155,7 @@ public boolean hasIndex() { public com.google.datastore.admin.v1.Index getIndex() { return index_ == null ? com.google.datastore.admin.v1.Index.getDefaultInstance() : index_; } + /** * * @@ -338,6 +344,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -552,6 +559,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -574,6 +582,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -596,6 +605,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -617,6 +627,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -634,6 +645,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -663,6 +675,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { com.google.datastore.admin.v1.Index.Builder, com.google.datastore.admin.v1.IndexOrBuilder> indexBuilder_; + /** * * @@ -678,6 +691,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { public boolean hasIndex() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -697,6 +711,7 @@ public com.google.datastore.admin.v1.Index getIndex() { return indexBuilder_.getMessage(); } } + /** * * @@ -720,6 +735,7 @@ public Builder setIndex(com.google.datastore.admin.v1.Index value) { onChanged(); return this; } + /** * * @@ -740,6 +756,7 @@ public Builder setIndex(com.google.datastore.admin.v1.Index.Builder builderForVa onChanged(); return this; } + /** * * @@ -768,6 +785,7 @@ public Builder mergeIndex(com.google.datastore.admin.v1.Index value) { } return this; } + /** * * @@ -788,6 +806,7 @@ public Builder clearIndex() { onChanged(); return this; } + /** * * @@ -803,6 +822,7 @@ public com.google.datastore.admin.v1.Index.Builder getIndexBuilder() { onChanged(); return getIndexFieldBuilder().getBuilder(); } + /** * * @@ -820,6 +840,7 @@ public com.google.datastore.admin.v1.IndexOrBuilder getIndexOrBuilder() { return index_ == null ? com.google.datastore.admin.v1.Index.getDefaultInstance() : index_; } } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java index aafb81d48..a3de2d745 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface CreateIndexRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -62,6 +63,7 @@ public interface CreateIndexRequestOrBuilder * @return Whether the index field is set. */ boolean hasIndex(); + /** * * @@ -75,6 +77,7 @@ public interface CreateIndexRequestOrBuilder * @return The index. */ com.google.datastore.admin.v1.Index getIndex(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java index c97248e0a..cf104bfb7 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java @@ -109,119 +109,134 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { - "\n/google/datastore/admin/v1/datastore_ad" + "\n" + + "/google/datastore/admin/v1/datastore_ad" + "min.proto\022\031google.datastore.admin.v1\032\034go" + "ogle/api/annotations.proto\032\027google/api/c" + "lient.proto\032\037google/api/field_behavior.p" - + "roto\032%google/datastore/admin/v1/index.pr" - + "oto\032)google/datastore/admin/v1/migration" - + ".proto\032#google/longrunning/operations.pr" - + "oto\032\037google/protobuf/timestamp.proto\"\364\003\n" - + "\016CommonMetadata\022.\n\nstart_time\030\001 \001(\0132\032.go" - + "ogle.protobuf.Timestamp\022,\n\010end_time\030\002 \001(" - + "\0132\032.google.protobuf.Timestamp\022@\n\016operati" - + "on_type\030\003 \001(\0162(.google.datastore.admin.v" - + "1.OperationType\022E\n\006labels\030\004 \003(\01325.google" - + ".datastore.admin.v1.CommonMetadata.Label" - + "sEntry\022>\n\005state\030\005 \001(\0162/.google.datastore" - + ".admin.v1.CommonMetadata.State\032-\n\013Labels" - + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\213\001" - + "\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\020\n\014INITIA" - + "LIZING\020\001\022\016\n\nPROCESSING\020\002\022\016\n\nCANCELLING\020\003" - + "\022\016\n\nFINALIZING\020\004\022\016\n\nSUCCESSFUL\020\005\022\n\n\006FAIL" - + "ED\020\006\022\r\n\tCANCELLED\020\007\":\n\010Progress\022\026\n\016work_" - + "completed\030\001 \001(\003\022\026\n\016work_estimated\030\002 \001(\003\"" - + "\215\002\n\025ExportEntitiesRequest\022\027\n\nproject_id\030" - + "\001 \001(\tB\003\340A\002\022L\n\006labels\030\002 \003(\0132<.google.data" - + "store.admin.v1.ExportEntitiesRequest.Lab" - + "elsEntry\022>\n\rentity_filter\030\003 \001(\0132\'.google" - + ".datastore.admin.v1.EntityFilter\022\036\n\021outp" - + "ut_url_prefix\030\004 \001(\tB\003\340A\002\032-\n\013LabelsEntry\022" - + "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\205\002\n\025Impo" - + "rtEntitiesRequest\022\027\n\nproject_id\030\001 \001(\tB\003\340" - + "A\002\022L\n\006labels\030\002 \003(\0132<.google.datastore.ad" - + "min.v1.ImportEntitiesRequest.LabelsEntry" - + "\022\026\n\tinput_url\030\003 \001(\tB\003\340A\002\022>\n\rentity_filte" - + "r\030\004 \001(\0132\'.google.datastore.admin.v1.Enti" - + "tyFilter\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" - + "value\030\002 \001(\t:\0028\001\",\n\026ExportEntitiesRespons" - + "e\022\022\n\noutput_url\030\001 \001(\t\"\253\002\n\026ExportEntities" - + "Metadata\0229\n\006common\030\001 \001(\0132).google.datast" - + "ore.admin.v1.CommonMetadata\022>\n\021progress_" - + "entities\030\002 \001(\0132#.google.datastore.admin." - + "v1.Progress\022;\n\016progress_bytes\030\003 \001(\0132#.go" - + "ogle.datastore.admin.v1.Progress\022>\n\renti" - + "ty_filter\030\004 \001(\0132\'.google.datastore.admin" - + ".v1.EntityFilter\022\031\n\021output_url_prefix\030\005 " - + "\001(\t\"\243\002\n\026ImportEntitiesMetadata\0229\n\006common" - + "\030\001 \001(\0132).google.datastore.admin.v1.Commo" - + "nMetadata\022>\n\021progress_entities\030\002 \001(\0132#.g" - + "oogle.datastore.admin.v1.Progress\022;\n\016pro" - + "gress_bytes\030\003 \001(\0132#.google.datastore.adm" - + "in.v1.Progress\022>\n\rentity_filter\030\004 \001(\0132\'." - + "google.datastore.admin.v1.EntityFilter\022\021" - + "\n\tinput_url\030\005 \001(\t\"4\n\014EntityFilter\022\r\n\005kin" - + "ds\030\001 \003(\t\022\025\n\rnamespace_ids\030\002 \003(\t\"Y\n\022Creat" - + "eIndexRequest\022\022\n\nproject_id\030\001 \001(\t\022/\n\005ind" - + "ex\030\003 \001(\0132 .google.datastore.admin.v1.Ind" - + "ex\":\n\022DeleteIndexRequest\022\022\n\nproject_id\030\001" - + " \001(\t\022\020\n\010index_id\030\003 \001(\t\"7\n\017GetIndexReques" - + "t\022\022\n\nproject_id\030\001 \001(\t\022\020\n\010index_id\030\003 \001(\t\"" - + "_\n\022ListIndexesRequest\022\022\n\nproject_id\030\001 \001(" - + "\t\022\016\n\006filter\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005\022\022\n\n" - + "page_token\030\005 \001(\t\"a\n\023ListIndexesResponse\022" - + "1\n\007indexes\030\001 \003(\0132 .google.datastore.admi" - + "n.v1.Index\022\027\n\017next_page_token\030\002 \001(\t\"\245\001\n\026" - + "IndexOperationMetadata\0229\n\006common\030\001 \001(\0132)" - + ".google.datastore.admin.v1.CommonMetadat" - + "a\022>\n\021progress_entities\030\002 \001(\0132#.google.da" - + "tastore.admin.v1.Progress\022\020\n\010index_id\030\003 " - + "\001(\t\"\253\001\n#DatastoreFirestoreMigrationMetad" - + "ata\022B\n\017migration_state\030\001 \001(\0162).google.da" - + "tastore.admin.v1.MigrationState\022@\n\016migra" - + "tion_step\030\002 \001(\0162(.google.datastore.admin" - + ".v1.MigrationStep*}\n\rOperationType\022\036\n\032OP" - + "ERATION_TYPE_UNSPECIFIED\020\000\022\023\n\017EXPORT_ENT" - + "ITIES\020\001\022\023\n\017IMPORT_ENTITIES\020\002\022\020\n\014CREATE_I" - + "NDEX\020\003\022\020\n\014DELETE_INDEX\020\0042\204\n\n\016DatastoreAd" - + "min\022\366\001\n\016ExportEntities\0220.google.datastor" - + "e.admin.v1.ExportEntitiesRequest\032\035.googl" - + "e.longrunning.Operation\"\222\001\312A0\n\026ExportEnt" - + "itiesResponse\022\026ExportEntitiesMetadata\332A1" - + "project_id,labels,entity_filter,output_u" - + "rl_prefix\202\323\344\223\002%\" /v1/projects/{project_i" - + "d}:export:\001*\022\355\001\n\016ImportEntities\0220.google" - + ".datastore.admin.v1.ImportEntitiesReques" - + "t\032\035.google.longrunning.Operation\"\211\001\312A/\n\025" - + "google.protobuf.Empty\022\026ImportEntitiesMet" - + "adata\332A)project_id,labels,input_url,enti" - + "ty_filter\202\323\344\223\002%\" /v1/projects/{project_i" - + "d}:import:\001*\022\257\001\n\013CreateIndex\022-.google.da" - + "tastore.admin.v1.CreateIndexRequest\032\035.go" - + "ogle.longrunning.Operation\"R\312A\037\n\005Index\022\026" - + "IndexOperationMetadata\202\323\344\223\002*\"!/v1/projec" - + "ts/{project_id}/indexes:\005index\022\263\001\n\013Delet" - + "eIndex\022-.google.datastore.admin.v1.Delet" - + "eIndexRequest\032\035.google.longrunning.Opera" - + "tion\"V\312A\037\n\005Index\022\026IndexOperationMetadata" - + "\202\323\344\223\002.*,/v1/projects/{project_id}/indexe" - + "s/{index_id}\022\216\001\n\010GetIndex\022*.google.datas" - + "tore.admin.v1.GetIndexRequest\032 .google.d" + + "roto\032%google/datastore/admin/v1/index.proto\032)google/datastore/admin/v1/migration" + + ".proto\032#google/longrunning/operations.proto\032\037google/protobuf/timestamp.proto\"\364\003\n" + + "\016CommonMetadata\022.\n\n" + + "start_time\030\001 \001(\0132\032.google.protobuf.Timestamp\022,\n" + + "\010end_time\030\002 \001(\0132\032.google.protobuf.Timestamp\022@\n" + + "\016operation_type\030\003 \001(\0162(.google.datastore.admin.v1.OperationType\022E\n" + + "\006labels\030\004 \003(\01325.google" + + ".datastore.admin.v1.CommonMetadata.LabelsEntry\022>\n" + + "\005state\030\005 \001(\0162/.google.datastore.admin.v1.CommonMetadata.State\032-\n" + + "\013LabelsEntry\022\013\n" + + "\003key\030\001 \001(\t\022\r\n" + + "\005value\030\002 \001(\t:\0028\001\"\213\001\n" + + "\005State\022\025\n" + + "\021STATE_UNSPECIFIED\020\000\022\020\n" + + "\014INITIALIZING\020\001\022\016\n\n" + + "PROCESSING\020\002\022\016\n\n" + + "CANCELLING\020\003\022\016\n\n" + + "FINALIZING\020\004\022\016\n\n" + + "SUCCESSFUL\020\005\022\n\n" + + "\006FAILED\020\006\022\r\n" + + "\tCANCELLED\020\007\":\n" + + "\010Progress\022\026\n" + + "\016work_completed\030\001 \001(\003\022\026\n" + + "\016work_estimated\030\002 \001(\003\"\215\002\n" + + "\025ExportEntitiesRequest\022\027\n\n" + + "project_id\030\001 \001(\tB\003\340A\002\022L\n" + + "\006labels\030\002 \003(\0132<.google.data" + + "store.admin.v1.ExportEntitiesRequest.LabelsEntry\022>\n\r" + + "entity_filter\030\003 \001(\0132\'.google.datastore.admin.v1.EntityFilter\022\036\n" + + "\021output_url_prefix\030\004 \001(\tB\003\340A\002\032-\n" + + "\013LabelsEntry\022\013\n" + + "\003key\030\001 \001(\t\022\r\n" + + "\005value\030\002 \001(\t:\0028\001\"\205\002\n" + + "\025ImportEntitiesRequest\022\027\n\n" + + "project_id\030\001 \001(\tB\003\340A\002\022L\n" + + "\006labels\030\002 \003(\0132<.google.datastore.ad" + + "min.v1.ImportEntitiesRequest.LabelsEntry\022\026\n" + + "\tinput_url\030\003 \001(\tB\003\340A\002\022>\n\r" + + "entity_filter\030\004 \001(\0132\'.google.datastore.admin.v1.EntityFilter\032-\n" + + "\013LabelsEntry\022\013\n" + + "\003key\030\001 \001(\t\022\r\n" + + "\005value\030\002 \001(\t:\0028\001\",\n" + + "\026ExportEntitiesResponse\022\022\n\n" + + "output_url\030\001 \001(\t\"\253\002\n" + + "\026ExportEntitiesMetadata\0229\n" + + "\006common\030\001 \001(\0132).google.datastore.admin.v1.CommonMetadata\022>\n" + + "\021progress_entities\030\002 \001(\0132#.google.datastore.admin.v1.Progress\022;\n" + + "\016progress_bytes\030\003 \001(\0132#.google.datastore.admin.v1.Progress\022>\n\r" + + "entity_filter\030\004 \001(\0132\'.google.datastore.admin.v1.EntityFilter\022\031\n" + + "\021output_url_prefix\030\005 \001(\t\"\243\002\n" + + "\026ImportEntitiesMetadata\0229\n" + + "\006common\030\001 \001(\0132).google.datastore.admin.v1.CommonMetadata\022>\n" + + "\021progress_entities\030\002 \001(\0132#.google.datastore.admin.v1.Progress\022;\n" + + "\016progress_bytes\030\003 \001(\0132#.google.datastore.admin.v1.Progress\022>\n\r" + + "entity_filter\030\004 \001(\0132\'.google.datastore.admin.v1.EntityFilter\022\021\n" + + "\tinput_url\030\005 \001(\t\"4\n" + + "\014EntityFilter\022\r\n" + + "\005kinds\030\001 \003(\t\022\025\n\r" + + "namespace_ids\030\002 \003(\t\"Y\n" + + "\022CreateIndexRequest\022\022\n\n" + + "project_id\030\001 \001(\t\022/\n" + + "\005index\030\003 \001(\0132 .google.datastore.admin.v1.Index\":\n" + + "\022DeleteIndexRequest\022\022\n\n" + + "project_id\030\001 \001(\t\022\020\n" + + "\010index_id\030\003 \001(\t\"7\n" + + "\017GetIndexRequest\022\022\n\n" + + "project_id\030\001 \001(\t\022\020\n" + + "\010index_id\030\003 \001(\t\"_\n" + + "\022ListIndexesRequest\022\022\n\n" + + "project_id\030\001 \001(\t\022\016\n" + + "\006filter\030\003 \001(\t\022\021\n" + + "\tpage_size\030\004 \001(\005\022\022\n\n" + + "page_token\030\005 \001(\t\"a\n" + + "\023ListIndexesResponse\0221\n" + + "\007indexes\030\001 \003(\0132 .google.datastore.admin.v1.Index\022\027\n" + + "\017next_page_token\030\002 \001(\t\"\245\001\n" + + "\026IndexOperationMetadata\0229\n" + + "\006common\030\001 \001(\0132).google.datastore.admin.v1.CommonMetadata\022>\n" + + "\021progress_entities\030\002 \001(\0132#.google.datastore.admin.v1.Progress\022\020\n" + + "\010index_id\030\003 \001(\t\"\253\001\n" + + "#DatastoreFirestoreMigrationMetadata\022B\n" + + "\017migration_state\030\001" + + " \001(\0162).google.datastore.admin.v1.MigrationState\022@\n" + + "\016migration_step\030\002 \001(\0162(.google.datastore.admin.v1.MigrationStep*}\n\r" + + "OperationType\022\036\n" + + "\032OPERATION_TYPE_UNSPECIFIED\020\000\022\023\n" + + "\017EXPORT_ENTITIES\020\001\022\023\n" + + "\017IMPORT_ENTITIES\020\002\022\020\n" + + "\014CREATE_INDEX\020\003\022\020\n" + + "\014DELETE_INDEX\020\0042\204\n\n" + + "\016DatastoreAdmin\022\366\001\n" + + "\016ExportEntities\0220.google.datastor" + + "e.admin.v1.ExportEntitiesRequest\032\035.google.longrunning.Operation\"\222\001\312A0\n" + + "\026ExportEntitiesResponse\022\026ExportEntitiesMetadata\332A1" + + "project_id,labels,entity_filter,output_url_prefix\202\323\344\223\002%\"" + + " /v1/projects/{project_id}:export:\001*\022\355\001\n" + + "\016ImportEntities\0220.google" + + ".datastore.admin.v1.ImportEntitiesRequest\032\035.google.longrunning.Operation\"\211\001\312A/\n" + + "\025google.protobuf.Empty\022\026ImportEntitiesMet" + + "adata\332A)project_id,labels,input_url,entity_filter\202\323\344\223\002%\"" + + " /v1/projects/{project_id}:import:\001*\022\257\001\n" + + "\013CreateIndex\022-.google.da" + + "tastore.admin.v1.CreateIndexRequest\032\035.google.longrunning.Operation\"R\312A\037\n" + + "\005Index\022\026" + + "IndexOperationMetadata\202\323\344\223\002*\"!/v1/projects/{project_id}/indexes:\005index\022\263\001\n" + + "\013DeleteIndex\022-.google.datastore.admin.v1.Delet" + + "eIndexRequest\032\035.google.longrunning.Operation\"V\312A\037\n" + + "\005Index\022\026IndexOperationMetadata" + + "\202\323\344\223\002.*,/v1/projects/{project_id}/indexes/{index_id}\022\216\001\n" + + "\010GetIndex\022*.google.datastore.admin.v1.GetIndexRequest\032 .google.d" + "atastore.admin.v1.Index\"4\202\323\344\223\002.\022,/v1/pro" - + "jects/{project_id}/indexes/{index_id}\022\227\001" - + "\n\013ListIndexes\022-.google.datastore.admin.v" + + "jects/{project_id}/indexes/{index_id}\022\227\001\n" + + "\013ListIndexes\022-.google.datastore.admin.v" + "1.ListIndexesRequest\032..google.datastore." + "admin.v1.ListIndexesResponse\")\202\323\344\223\002#\022!/v" + "1/projects/{project_id}/indexes\032v\312A\030data" + "store.googleapis.com\322AXhttps://www.googl" - + "eapis.com/auth/cloud-platform,https://ww" - + "w.googleapis.com/auth/datastoreB\333\001\n\035com." - + "google.datastore.admin.v1B\023DatastoreAdmi" + + "eapis.com/auth/cloud-platform,https://www.googleapis.com/auth/datastoreB\333\001\n" + + "\035com.google.datastore.admin.v1B\023DatastoreAdmi" + "nProtoP\001Z9cloud.google.com/go/datastore/" + "admin/apiv1/adminpb;adminpb\252\002\037Google.Clo" + "ud.Datastore.Admin.V1\312\002\037Google\\Cloud\\Dat" - + "astore\\Admin\\V1\352\002#Google::Cloud::Datasto" - + "re::Admin::V1b\006proto3" + + "astore\\Admin\\V1\352\002#Google::Cloud::Datastore::Admin::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java index ef2be326b..fe3a7cf43 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java @@ -41,6 +41,7 @@ public final class DatastoreFirestoreMigrationMetadata // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata) DatastoreFirestoreMigrationMetadataOrBuilder { private static final long serialVersionUID = 0L; + // Use DatastoreFirestoreMigrationMetadata.newBuilder() to construct. private DatastoreFirestoreMigrationMetadata( com.google.protobuf.GeneratedMessageV3.Builder builder) { @@ -75,6 +76,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public static final int MIGRATION_STATE_FIELD_NUMBER = 1; private int migrationState_ = 0; + /** * * @@ -91,6 +93,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public int getMigrationStateValue() { return migrationState_; } + /** * * @@ -112,6 +115,7 @@ public com.google.datastore.admin.v1.MigrationState getMigrationState() { public static final int MIGRATION_STEP_FIELD_NUMBER = 2; private int migrationStep_ = 0; + /** * * @@ -128,6 +132,7 @@ public com.google.datastore.admin.v1.MigrationState getMigrationState() { public int getMigrationStepValue() { return migrationStep_; } + /** * * @@ -321,6 +326,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -528,6 +534,7 @@ public Builder mergeFrom( private int bitField0_; private int migrationState_ = 0; + /** * * @@ -544,6 +551,7 @@ public Builder mergeFrom( public int getMigrationStateValue() { return migrationState_; } + /** * * @@ -563,6 +571,7 @@ public Builder setMigrationStateValue(int value) { onChanged(); return this; } + /** * * @@ -581,6 +590,7 @@ public com.google.datastore.admin.v1.MigrationState getMigrationState() { com.google.datastore.admin.v1.MigrationState.forNumber(migrationState_); return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result; } + /** * * @@ -603,6 +613,7 @@ public Builder setMigrationState(com.google.datastore.admin.v1.MigrationState va onChanged(); return this; } + /** * * @@ -623,6 +634,7 @@ public Builder clearMigrationState() { } private int migrationStep_ = 0; + /** * * @@ -639,6 +651,7 @@ public Builder clearMigrationState() { public int getMigrationStepValue() { return migrationStep_; } + /** * * @@ -658,6 +671,7 @@ public Builder setMigrationStepValue(int value) { onChanged(); return this; } + /** * * @@ -676,6 +690,7 @@ public com.google.datastore.admin.v1.MigrationStep getMigrationStep() { com.google.datastore.admin.v1.MigrationStep.forNumber(migrationStep_); return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result; } + /** * * @@ -698,6 +713,7 @@ public Builder setMigrationStep(com.google.datastore.admin.v1.MigrationStep valu onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java index e73f8c737..dd1e0884d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java @@ -37,6 +37,7 @@ public interface DatastoreFirestoreMigrationMetadataOrBuilder * @return The enum numeric value on the wire for migrationState. */ int getMigrationStateValue(); + /** * * @@ -64,6 +65,7 @@ public interface DatastoreFirestoreMigrationMetadataOrBuilder * @return The enum numeric value on the wire for migrationStep. */ int getMigrationStepValue(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java index 828c5c1fb..e2e7ae6de 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java @@ -34,6 +34,7 @@ public final class DeleteIndexRequest extends com.google.protobuf.GeneratedMessa // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.DeleteIndexRequest) DeleteIndexRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use DeleteIndexRequest.newBuilder() to construct. private DeleteIndexRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -92,6 +94,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -120,6 +123,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object indexId_ = ""; + /** * * @@ -143,6 +147,7 @@ public java.lang.String getIndexId() { return s; } } + /** * * @@ -335,6 +340,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -535,6 +541,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -557,6 +564,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -579,6 +587,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -600,6 +609,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -617,6 +627,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -641,6 +652,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object indexId_ = ""; + /** * * @@ -663,6 +675,7 @@ public java.lang.String getIndexId() { return (java.lang.String) ref; } } + /** * * @@ -685,6 +698,7 @@ public com.google.protobuf.ByteString getIndexIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -706,6 +720,7 @@ public Builder setIndexId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -723,6 +738,7 @@ public Builder clearIndexId() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java index 9a93b66f2..860bbcc27 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface DeleteIndexRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -61,6 +62,7 @@ public interface DeleteIndexRequestOrBuilder * @return The indexId. */ java.lang.String getIndexId(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java index 5cbe9bb4d..35db5e1f2 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java @@ -51,6 +51,7 @@ public final class EntityFilter extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.EntityFilter) EntityFilterOrBuilder { private static final long serialVersionUID = 0L; + // Use EntityFilter.newBuilder() to construct. private EntityFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -87,6 +88,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private com.google.protobuf.LazyStringArrayList kinds_ = com.google.protobuf.LazyStringArrayList.emptyList(); + /** * * @@ -101,6 +103,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public com.google.protobuf.ProtocolStringList getKindsList() { return kinds_; } + /** * * @@ -115,6 +118,7 @@ public com.google.protobuf.ProtocolStringList getKindsList() { public int getKindsCount() { return kinds_.size(); } + /** * * @@ -130,6 +134,7 @@ public int getKindsCount() { public java.lang.String getKinds(int index) { return kinds_.get(index); } + /** * * @@ -151,6 +156,7 @@ public com.google.protobuf.ByteString getKindsBytes(int index) { @SuppressWarnings("serial") private com.google.protobuf.LazyStringArrayList namespaceIds_ = com.google.protobuf.LazyStringArrayList.emptyList(); + /** * * @@ -171,6 +177,7 @@ public com.google.protobuf.ByteString getKindsBytes(int index) { public com.google.protobuf.ProtocolStringList getNamespaceIdsList() { return namespaceIds_; } + /** * * @@ -191,6 +198,7 @@ public com.google.protobuf.ProtocolStringList getNamespaceIdsList() { public int getNamespaceIdsCount() { return namespaceIds_.size(); } + /** * * @@ -212,6 +220,7 @@ public int getNamespaceIdsCount() { public java.lang.String getNamespaceIds(int index) { return namespaceIds_.get(index); } + /** * * @@ -416,6 +425,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -654,6 +664,7 @@ private void ensureKindsIsMutable() { } bitField0_ |= 0x00000001; } + /** * * @@ -669,6 +680,7 @@ public com.google.protobuf.ProtocolStringList getKindsList() { kinds_.makeImmutable(); return kinds_; } + /** * * @@ -683,6 +695,7 @@ public com.google.protobuf.ProtocolStringList getKindsList() { public int getKindsCount() { return kinds_.size(); } + /** * * @@ -698,6 +711,7 @@ public int getKindsCount() { public java.lang.String getKinds(int index) { return kinds_.get(index); } + /** * * @@ -713,6 +727,7 @@ public java.lang.String getKinds(int index) { public com.google.protobuf.ByteString getKindsBytes(int index) { return kinds_.getByteString(index); } + /** * * @@ -736,6 +751,7 @@ public Builder setKinds(int index, java.lang.String value) { onChanged(); return this; } + /** * * @@ -758,6 +774,7 @@ public Builder addKinds(java.lang.String value) { onChanged(); return this; } + /** * * @@ -777,6 +794,7 @@ public Builder addAllKinds(java.lang.Iterable values) { onChanged(); return this; } + /** * * @@ -795,6 +813,7 @@ public Builder clearKinds() { onChanged(); return this; } + /** * * @@ -828,6 +847,7 @@ private void ensureNamespaceIdsIsMutable() { } bitField0_ |= 0x00000002; } + /** * * @@ -849,6 +869,7 @@ public com.google.protobuf.ProtocolStringList getNamespaceIdsList() { namespaceIds_.makeImmutable(); return namespaceIds_; } + /** * * @@ -869,6 +890,7 @@ public com.google.protobuf.ProtocolStringList getNamespaceIdsList() { public int getNamespaceIdsCount() { return namespaceIds_.size(); } + /** * * @@ -890,6 +912,7 @@ public int getNamespaceIdsCount() { public java.lang.String getNamespaceIds(int index) { return namespaceIds_.get(index); } + /** * * @@ -911,6 +934,7 @@ public java.lang.String getNamespaceIds(int index) { public com.google.protobuf.ByteString getNamespaceIdsBytes(int index) { return namespaceIds_.getByteString(index); } + /** * * @@ -940,6 +964,7 @@ public Builder setNamespaceIds(int index, java.lang.String value) { onChanged(); return this; } + /** * * @@ -968,6 +993,7 @@ public Builder addNamespaceIds(java.lang.String value) { onChanged(); return this; } + /** * * @@ -993,6 +1019,7 @@ public Builder addAllNamespaceIds(java.lang.Iterable values) { onChanged(); return this; } + /** * * @@ -1017,6 +1044,7 @@ public Builder clearNamespaceIds() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java index d5e1a058f..381e1e38d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java @@ -36,6 +36,7 @@ public interface EntityFilterOrBuilder * @return A list containing the kinds. */ java.util.List getKindsList(); + /** * * @@ -48,6 +49,7 @@ public interface EntityFilterOrBuilder * @return The count of kinds. */ int getKindsCount(); + /** * * @@ -61,6 +63,7 @@ public interface EntityFilterOrBuilder * @return The kinds at the given index. */ java.lang.String getKinds(int index); + /** * * @@ -93,6 +96,7 @@ public interface EntityFilterOrBuilder * @return A list containing the namespaceIds. */ java.util.List getNamespaceIdsList(); + /** * * @@ -111,6 +115,7 @@ public interface EntityFilterOrBuilder * @return The count of namespaceIds. */ int getNamespaceIdsCount(); + /** * * @@ -130,6 +135,7 @@ public interface EntityFilterOrBuilder * @return The namespaceIds at the given index. */ java.lang.String getNamespaceIds(int index); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java index 6acc9b76f..946dd9d6b 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java @@ -33,6 +33,7 @@ public final class ExportEntitiesMetadata extends com.google.protobuf.GeneratedM // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ExportEntitiesMetadata) ExportEntitiesMetadataOrBuilder { private static final long serialVersionUID = 0L; + // Use ExportEntitiesMetadata.newBuilder() to construct. private ExportEntitiesMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -66,6 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int COMMON_FIELD_NUMBER = 1; private com.google.datastore.admin.v1.CommonMetadata common_; + /** * * @@ -81,6 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasCommon() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -98,6 +101,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() { ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance() : common_; } + /** * * @@ -116,6 +120,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2; private com.google.datastore.admin.v1.Progress progressEntities_; + /** * * @@ -131,6 +136,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( public boolean hasProgressEntities() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -148,6 +154,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() { ? com.google.datastore.admin.v1.Progress.getDefaultInstance() : progressEntities_; } + /** * * @@ -166,6 +173,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil public static final int PROGRESS_BYTES_FIELD_NUMBER = 3; private com.google.datastore.admin.v1.Progress progressBytes_; + /** * * @@ -181,6 +189,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil public boolean hasProgressBytes() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -198,6 +207,7 @@ public com.google.datastore.admin.v1.Progress getProgressBytes() { ? com.google.datastore.admin.v1.Progress.getDefaultInstance() : progressBytes_; } + /** * * @@ -216,6 +226,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder public static final int ENTITY_FILTER_FIELD_NUMBER = 4; private com.google.datastore.admin.v1.EntityFilter entityFilter_; + /** * * @@ -231,6 +242,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder public boolean hasEntityFilter() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -248,6 +260,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() { ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance() : entityFilter_; } + /** * * @@ -268,6 +281,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil @SuppressWarnings("serial") private volatile java.lang.Object outputUrlPrefix_ = ""; + /** * * @@ -295,6 +309,7 @@ public java.lang.String getOutputUrlPrefix() { return s; } } + /** * * @@ -538,6 +553,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -817,6 +833,7 @@ public Builder mergeFrom( com.google.datastore.admin.v1.CommonMetadata.Builder, com.google.datastore.admin.v1.CommonMetadataOrBuilder> commonBuilder_; + /** * * @@ -831,6 +848,7 @@ public Builder mergeFrom( public boolean hasCommon() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -851,6 +869,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() { return commonBuilder_.getMessage(); } } + /** * * @@ -873,6 +892,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) { onChanged(); return this; } + /** * * @@ -892,6 +912,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder bu onChanged(); return this; } + /** * * @@ -919,6 +940,7 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) { } return this; } + /** * * @@ -938,6 +960,7 @@ public Builder clearCommon() { onChanged(); return this; } + /** * * @@ -952,6 +975,7 @@ public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() { onChanged(); return getCommonFieldBuilder().getBuilder(); } + /** * * @@ -970,6 +994,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( : common_; } } + /** * * @@ -1002,6 +1027,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( com.google.datastore.admin.v1.Progress.Builder, com.google.datastore.admin.v1.ProgressOrBuilder> progressEntitiesBuilder_; + /** * * @@ -1016,6 +1042,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( public boolean hasProgressEntities() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -1036,6 +1063,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() { return progressEntitiesBuilder_.getMessage(); } } + /** * * @@ -1058,6 +1086,7 @@ public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value) onChanged(); return this; } + /** * * @@ -1078,6 +1107,7 @@ public Builder setProgressEntities( onChanged(); return this; } + /** * * @@ -1105,6 +1135,7 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu } return this; } + /** * * @@ -1124,6 +1155,7 @@ public Builder clearProgressEntities() { onChanged(); return this; } + /** * * @@ -1138,6 +1170,7 @@ public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder onChanged(); return getProgressEntitiesFieldBuilder().getBuilder(); } + /** * * @@ -1156,6 +1189,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil : progressEntities_; } } + /** * * @@ -1188,6 +1222,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil com.google.datastore.admin.v1.Progress.Builder, com.google.datastore.admin.v1.ProgressOrBuilder> progressBytesBuilder_; + /** * * @@ -1202,6 +1237,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil public boolean hasProgressBytes() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1222,6 +1258,7 @@ public com.google.datastore.admin.v1.Progress getProgressBytes() { return progressBytesBuilder_.getMessage(); } } + /** * * @@ -1244,6 +1281,7 @@ public Builder setProgressBytes(com.google.datastore.admin.v1.Progress value) { onChanged(); return this; } + /** * * @@ -1264,6 +1302,7 @@ public Builder setProgressBytes( onChanged(); return this; } + /** * * @@ -1291,6 +1330,7 @@ public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value) } return this; } + /** * * @@ -1310,6 +1350,7 @@ public Builder clearProgressBytes() { onChanged(); return this; } + /** * * @@ -1324,6 +1365,7 @@ public com.google.datastore.admin.v1.Progress.Builder getProgressBytesBuilder() onChanged(); return getProgressBytesFieldBuilder().getBuilder(); } + /** * * @@ -1342,6 +1384,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder : progressBytes_; } } + /** * * @@ -1374,6 +1417,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder com.google.datastore.admin.v1.EntityFilter.Builder, com.google.datastore.admin.v1.EntityFilterOrBuilder> entityFilterBuilder_; + /** * * @@ -1388,6 +1432,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder public boolean hasEntityFilter() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1408,6 +1453,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() { return entityFilterBuilder_.getMessage(); } } + /** * * @@ -1430,6 +1476,7 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value) onChanged(); return this; } + /** * * @@ -1450,6 +1497,7 @@ public Builder setEntityFilter( onChanged(); return this; } + /** * * @@ -1477,6 +1525,7 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu } return this; } + /** * * @@ -1496,6 +1545,7 @@ public Builder clearEntityFilter() { onChanged(); return this; } + /** * * @@ -1510,6 +1560,7 @@ public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder onChanged(); return getEntityFilterFieldBuilder().getBuilder(); } + /** * * @@ -1528,6 +1579,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil : entityFilter_; } } + /** * * @@ -1555,6 +1607,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil } private java.lang.Object outputUrlPrefix_ = ""; + /** * * @@ -1581,6 +1634,7 @@ public java.lang.String getOutputUrlPrefix() { return (java.lang.String) ref; } } + /** * * @@ -1607,6 +1661,7 @@ public com.google.protobuf.ByteString getOutputUrlPrefixBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1632,6 +1687,7 @@ public Builder setOutputUrlPrefix(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1653,6 +1709,7 @@ public Builder clearOutputUrlPrefix() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java index 908f32500..d6e626eea 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java @@ -36,6 +36,7 @@ public interface ExportEntitiesMetadataOrBuilder * @return Whether the common field is set. */ boolean hasCommon(); + /** * * @@ -48,6 +49,7 @@ public interface ExportEntitiesMetadataOrBuilder * @return The common. */ com.google.datastore.admin.v1.CommonMetadata getCommon(); + /** * * @@ -71,6 +73,7 @@ public interface ExportEntitiesMetadataOrBuilder * @return Whether the progressEntities field is set. */ boolean hasProgressEntities(); + /** * * @@ -83,6 +86,7 @@ public interface ExportEntitiesMetadataOrBuilder * @return The progressEntities. */ com.google.datastore.admin.v1.Progress getProgressEntities(); + /** * * @@ -106,6 +110,7 @@ public interface ExportEntitiesMetadataOrBuilder * @return Whether the progressBytes field is set. */ boolean hasProgressBytes(); + /** * * @@ -118,6 +123,7 @@ public interface ExportEntitiesMetadataOrBuilder * @return The progressBytes. */ com.google.datastore.admin.v1.Progress getProgressBytes(); + /** * * @@ -141,6 +147,7 @@ public interface ExportEntitiesMetadataOrBuilder * @return Whether the entityFilter field is set. */ boolean hasEntityFilter(); + /** * * @@ -153,6 +160,7 @@ public interface ExportEntitiesMetadataOrBuilder * @return The entityFilter. */ com.google.datastore.admin.v1.EntityFilter getEntityFilter(); + /** * * @@ -180,6 +188,7 @@ public interface ExportEntitiesMetadataOrBuilder * @return The outputUrlPrefix. */ java.lang.String getOutputUrlPrefix(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java index e953f4621..ae1047177 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java @@ -34,6 +34,7 @@ public final class ExportEntitiesRequest extends com.google.protobuf.GeneratedMe // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ExportEntitiesRequest) ExportEntitiesRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use ExportEntitiesRequest.newBuilder() to construct. private ExportEntitiesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -82,6 +83,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -105,6 +107,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -155,6 +158,7 @@ private com.google.protobuf.MapField interna public int getLabelsCount() { return internalGetLabels().getMap().size(); } + /** * * @@ -171,12 +175,14 @@ public boolean containsLabels(java.lang.String key) { } return internalGetLabels().getMap().containsKey(key); } + /** Use {@link #getLabelsMap()} instead. */ @java.lang.Override @java.lang.Deprecated public java.util.Map getLabels() { return getLabelsMap(); } + /** * * @@ -190,6 +196,7 @@ public java.util.Map getLabels() { public java.util.Map getLabelsMap() { return internalGetLabels().getMap(); } + /** * * @@ -210,6 +217,7 @@ public java.util.Map getLabelsMap() { java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } + /** * * @@ -233,6 +241,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { public static final int ENTITY_FILTER_FIELD_NUMBER = 3; private com.google.datastore.admin.v1.EntityFilter entityFilter_; + /** * * @@ -248,6 +257,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { public boolean hasEntityFilter() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -265,6 +275,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() { ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance() : entityFilter_; } + /** * * @@ -285,6 +296,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil @SuppressWarnings("serial") private volatile java.lang.Object outputUrlPrefix_ = ""; + /** * * @@ -325,6 +337,7 @@ public java.lang.String getOutputUrlPrefix() { return s; } } + /** * * @@ -565,6 +578,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -836,6 +850,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -858,6 +873,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -880,6 +896,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -901,6 +918,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -918,6 +936,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -966,6 +985,7 @@ private com.google.protobuf.MapField interna public int getLabelsCount() { return internalGetLabels().getMap().size(); } + /** * * @@ -982,12 +1002,14 @@ public boolean containsLabels(java.lang.String key) { } return internalGetLabels().getMap().containsKey(key); } + /** Use {@link #getLabelsMap()} instead. */ @java.lang.Override @java.lang.Deprecated public java.util.Map getLabels() { return getLabelsMap(); } + /** * * @@ -1001,6 +1023,7 @@ public java.util.Map getLabels() { public java.util.Map getLabelsMap() { return internalGetLabels().getMap(); } + /** * * @@ -1021,6 +1044,7 @@ public java.util.Map getLabelsMap() { java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } + /** * * @@ -1047,6 +1071,7 @@ public Builder clearLabels() { internalGetMutableLabels().getMutableMap().clear(); return this; } + /** * * @@ -1063,12 +1088,14 @@ public Builder removeLabels(java.lang.String key) { internalGetMutableLabels().getMutableMap().remove(key); return this; } + /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableLabels() { bitField0_ |= 0x00000002; return internalGetMutableLabels().getMutableMap(); } + /** * * @@ -1089,6 +1116,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { bitField0_ |= 0x00000002; return this; } + /** * * @@ -1110,6 +1138,7 @@ public Builder putAllLabels(java.util.Map va com.google.datastore.admin.v1.EntityFilter.Builder, com.google.datastore.admin.v1.EntityFilterOrBuilder> entityFilterBuilder_; + /** * * @@ -1124,6 +1153,7 @@ public Builder putAllLabels(java.util.Map va public boolean hasEntityFilter() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1144,6 +1174,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() { return entityFilterBuilder_.getMessage(); } } + /** * * @@ -1166,6 +1197,7 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value) onChanged(); return this; } + /** * * @@ -1186,6 +1218,7 @@ public Builder setEntityFilter( onChanged(); return this; } + /** * * @@ -1213,6 +1246,7 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu } return this; } + /** * * @@ -1232,6 +1266,7 @@ public Builder clearEntityFilter() { onChanged(); return this; } + /** * * @@ -1246,6 +1281,7 @@ public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder onChanged(); return getEntityFilterFieldBuilder().getBuilder(); } + /** * * @@ -1264,6 +1300,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil : entityFilter_; } } + /** * * @@ -1291,6 +1328,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil } private java.lang.Object outputUrlPrefix_ = ""; + /** * * @@ -1330,6 +1368,7 @@ public java.lang.String getOutputUrlPrefix() { return (java.lang.String) ref; } } + /** * * @@ -1369,6 +1408,7 @@ public com.google.protobuf.ByteString getOutputUrlPrefixBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1407,6 +1447,7 @@ public Builder setOutputUrlPrefix(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1441,6 +1482,7 @@ public Builder clearOutputUrlPrefix() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java index e0b0c0bcb..0b9dae2e6 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface ExportEntitiesRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -59,6 +60,7 @@ public interface ExportEntitiesRequestOrBuilder * map<string, string> labels = 2; */ int getLabelsCount(); + /** * * @@ -69,9 +71,11 @@ public interface ExportEntitiesRequestOrBuilder * map<string, string> labels = 2; */ boolean containsLabels(java.lang.String key); + /** Use {@link #getLabelsMap()} instead. */ @java.lang.Deprecated java.util.Map getLabels(); + /** * * @@ -82,6 +86,7 @@ public interface ExportEntitiesRequestOrBuilder * map<string, string> labels = 2; */ java.util.Map getLabelsMap(); + /** * * @@ -96,6 +101,7 @@ java.lang.String getLabelsOrDefault( java.lang.String key, /* nullable */ java.lang.String defaultValue); + /** * * @@ -119,6 +125,7 @@ java.lang.String getLabelsOrDefault( * @return Whether the entityFilter field is set. */ boolean hasEntityFilter(); + /** * * @@ -131,6 +138,7 @@ java.lang.String getLabelsOrDefault( * @return The entityFilter. */ com.google.datastore.admin.v1.EntityFilter getEntityFilter(); + /** * * @@ -171,6 +179,7 @@ java.lang.String getLabelsOrDefault( * @return The outputUrlPrefix. */ java.lang.String getOutputUrlPrefix(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java index 4bddab90f..8916b5572 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java @@ -34,6 +34,7 @@ public final class ExportEntitiesResponse extends com.google.protobuf.GeneratedM // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ExportEntitiesResponse) ExportEntitiesResponseOrBuilder { private static final long serialVersionUID = 0L; + // Use ExportEntitiesResponse.newBuilder() to construct. private ExportEntitiesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -68,6 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object outputUrl_ = ""; + /** * * @@ -94,6 +96,7 @@ public java.lang.String getOutputUrl() { return s; } } + /** * * @@ -280,6 +283,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -465,6 +469,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object outputUrl_ = ""; + /** * * @@ -490,6 +495,7 @@ public java.lang.String getOutputUrl() { return (java.lang.String) ref; } } + /** * * @@ -515,6 +521,7 @@ public com.google.protobuf.ByteString getOutputUrlBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -539,6 +546,7 @@ public Builder setOutputUrl(java.lang.String value) { onChanged(); return this; } + /** * * @@ -559,6 +567,7 @@ public Builder clearOutputUrl() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java index 8b8568774..9d515855d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java @@ -39,6 +39,7 @@ public interface ExportEntitiesResponseOrBuilder * @return The outputUrl. */ java.lang.String getOutputUrl(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java index cbacd2260..4d7406fd1 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java @@ -34,6 +34,7 @@ public final class GetIndexRequest extends com.google.protobuf.GeneratedMessageV // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.GetIndexRequest) GetIndexRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use GetIndexRequest.newBuilder() to construct. private GetIndexRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -92,6 +94,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -120,6 +123,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object indexId_ = ""; + /** * * @@ -143,6 +147,7 @@ public java.lang.String getIndexId() { return s; } } + /** * * @@ -335,6 +340,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -534,6 +540,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -556,6 +563,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -578,6 +586,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -599,6 +608,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -616,6 +626,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -640,6 +651,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object indexId_ = ""; + /** * * @@ -662,6 +674,7 @@ public java.lang.String getIndexId() { return (java.lang.String) ref; } } + /** * * @@ -684,6 +697,7 @@ public com.google.protobuf.ByteString getIndexIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -705,6 +719,7 @@ public Builder setIndexId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -722,6 +737,7 @@ public Builder clearIndexId() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java index d1d781b7d..2b49cfd61 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface GetIndexRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -61,6 +62,7 @@ public interface GetIndexRequestOrBuilder * @return The indexId. */ java.lang.String getIndexId(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java index 5fea7cf98..da2ab3e73 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java @@ -33,6 +33,7 @@ public final class ImportEntitiesMetadata extends com.google.protobuf.GeneratedM // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ImportEntitiesMetadata) ImportEntitiesMetadataOrBuilder { private static final long serialVersionUID = 0L; + // Use ImportEntitiesMetadata.newBuilder() to construct. private ImportEntitiesMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -66,6 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int COMMON_FIELD_NUMBER = 1; private com.google.datastore.admin.v1.CommonMetadata common_; + /** * * @@ -81,6 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasCommon() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -98,6 +101,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() { ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance() : common_; } + /** * * @@ -116,6 +120,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2; private com.google.datastore.admin.v1.Progress progressEntities_; + /** * * @@ -131,6 +136,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( public boolean hasProgressEntities() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -148,6 +154,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() { ? com.google.datastore.admin.v1.Progress.getDefaultInstance() : progressEntities_; } + /** * * @@ -166,6 +173,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil public static final int PROGRESS_BYTES_FIELD_NUMBER = 3; private com.google.datastore.admin.v1.Progress progressBytes_; + /** * * @@ -181,6 +189,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil public boolean hasProgressBytes() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -198,6 +207,7 @@ public com.google.datastore.admin.v1.Progress getProgressBytes() { ? com.google.datastore.admin.v1.Progress.getDefaultInstance() : progressBytes_; } + /** * * @@ -216,6 +226,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder public static final int ENTITY_FILTER_FIELD_NUMBER = 4; private com.google.datastore.admin.v1.EntityFilter entityFilter_; + /** * * @@ -231,6 +242,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder public boolean hasEntityFilter() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -248,6 +260,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() { ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance() : entityFilter_; } + /** * * @@ -268,6 +281,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil @SuppressWarnings("serial") private volatile java.lang.Object inputUrl_ = ""; + /** * * @@ -294,6 +308,7 @@ public java.lang.String getInputUrl() { return s; } } + /** * * @@ -536,6 +551,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -815,6 +831,7 @@ public Builder mergeFrom( com.google.datastore.admin.v1.CommonMetadata.Builder, com.google.datastore.admin.v1.CommonMetadataOrBuilder> commonBuilder_; + /** * * @@ -829,6 +846,7 @@ public Builder mergeFrom( public boolean hasCommon() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -849,6 +867,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() { return commonBuilder_.getMessage(); } } + /** * * @@ -871,6 +890,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) { onChanged(); return this; } + /** * * @@ -890,6 +910,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder bu onChanged(); return this; } + /** * * @@ -917,6 +938,7 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) { } return this; } + /** * * @@ -936,6 +958,7 @@ public Builder clearCommon() { onChanged(); return this; } + /** * * @@ -950,6 +973,7 @@ public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() { onChanged(); return getCommonFieldBuilder().getBuilder(); } + /** * * @@ -968,6 +992,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( : common_; } } + /** * * @@ -1000,6 +1025,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( com.google.datastore.admin.v1.Progress.Builder, com.google.datastore.admin.v1.ProgressOrBuilder> progressEntitiesBuilder_; + /** * * @@ -1014,6 +1040,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( public boolean hasProgressEntities() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -1034,6 +1061,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() { return progressEntitiesBuilder_.getMessage(); } } + /** * * @@ -1056,6 +1084,7 @@ public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value) onChanged(); return this; } + /** * * @@ -1076,6 +1105,7 @@ public Builder setProgressEntities( onChanged(); return this; } + /** * * @@ -1103,6 +1133,7 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu } return this; } + /** * * @@ -1122,6 +1153,7 @@ public Builder clearProgressEntities() { onChanged(); return this; } + /** * * @@ -1136,6 +1168,7 @@ public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder onChanged(); return getProgressEntitiesFieldBuilder().getBuilder(); } + /** * * @@ -1154,6 +1187,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil : progressEntities_; } } + /** * * @@ -1186,6 +1220,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil com.google.datastore.admin.v1.Progress.Builder, com.google.datastore.admin.v1.ProgressOrBuilder> progressBytesBuilder_; + /** * * @@ -1200,6 +1235,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil public boolean hasProgressBytes() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1220,6 +1256,7 @@ public com.google.datastore.admin.v1.Progress getProgressBytes() { return progressBytesBuilder_.getMessage(); } } + /** * * @@ -1242,6 +1279,7 @@ public Builder setProgressBytes(com.google.datastore.admin.v1.Progress value) { onChanged(); return this; } + /** * * @@ -1262,6 +1300,7 @@ public Builder setProgressBytes( onChanged(); return this; } + /** * * @@ -1289,6 +1328,7 @@ public Builder mergeProgressBytes(com.google.datastore.admin.v1.Progress value) } return this; } + /** * * @@ -1308,6 +1348,7 @@ public Builder clearProgressBytes() { onChanged(); return this; } + /** * * @@ -1322,6 +1363,7 @@ public com.google.datastore.admin.v1.Progress.Builder getProgressBytesBuilder() onChanged(); return getProgressBytesFieldBuilder().getBuilder(); } + /** * * @@ -1340,6 +1382,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder : progressBytes_; } } + /** * * @@ -1372,6 +1415,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder com.google.datastore.admin.v1.EntityFilter.Builder, com.google.datastore.admin.v1.EntityFilterOrBuilder> entityFilterBuilder_; + /** * * @@ -1386,6 +1430,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder public boolean hasEntityFilter() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1406,6 +1451,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() { return entityFilterBuilder_.getMessage(); } } + /** * * @@ -1428,6 +1474,7 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value) onChanged(); return this; } + /** * * @@ -1448,6 +1495,7 @@ public Builder setEntityFilter( onChanged(); return this; } + /** * * @@ -1475,6 +1523,7 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu } return this; } + /** * * @@ -1494,6 +1543,7 @@ public Builder clearEntityFilter() { onChanged(); return this; } + /** * * @@ -1508,6 +1558,7 @@ public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder onChanged(); return getEntityFilterFieldBuilder().getBuilder(); } + /** * * @@ -1526,6 +1577,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil : entityFilter_; } } + /** * * @@ -1553,6 +1605,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil } private java.lang.Object inputUrl_ = ""; + /** * * @@ -1578,6 +1631,7 @@ public java.lang.String getInputUrl() { return (java.lang.String) ref; } } + /** * * @@ -1603,6 +1657,7 @@ public com.google.protobuf.ByteString getInputUrlBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1627,6 +1682,7 @@ public Builder setInputUrl(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1647,6 +1703,7 @@ public Builder clearInputUrl() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java index ba30c430a..f814d500e 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java @@ -36,6 +36,7 @@ public interface ImportEntitiesMetadataOrBuilder * @return Whether the common field is set. */ boolean hasCommon(); + /** * * @@ -48,6 +49,7 @@ public interface ImportEntitiesMetadataOrBuilder * @return The common. */ com.google.datastore.admin.v1.CommonMetadata getCommon(); + /** * * @@ -71,6 +73,7 @@ public interface ImportEntitiesMetadataOrBuilder * @return Whether the progressEntities field is set. */ boolean hasProgressEntities(); + /** * * @@ -83,6 +86,7 @@ public interface ImportEntitiesMetadataOrBuilder * @return The progressEntities. */ com.google.datastore.admin.v1.Progress getProgressEntities(); + /** * * @@ -106,6 +110,7 @@ public interface ImportEntitiesMetadataOrBuilder * @return Whether the progressBytes field is set. */ boolean hasProgressBytes(); + /** * * @@ -118,6 +123,7 @@ public interface ImportEntitiesMetadataOrBuilder * @return The progressBytes. */ com.google.datastore.admin.v1.Progress getProgressBytes(); + /** * * @@ -141,6 +147,7 @@ public interface ImportEntitiesMetadataOrBuilder * @return Whether the entityFilter field is set. */ boolean hasEntityFilter(); + /** * * @@ -153,6 +160,7 @@ public interface ImportEntitiesMetadataOrBuilder * @return The entityFilter. */ com.google.datastore.admin.v1.EntityFilter getEntityFilter(); + /** * * @@ -179,6 +187,7 @@ public interface ImportEntitiesMetadataOrBuilder * @return The inputUrl. */ java.lang.String getInputUrl(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java index 94e8192ce..66d1fdb0b 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java @@ -34,6 +34,7 @@ public final class ImportEntitiesRequest extends com.google.protobuf.GeneratedMe // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ImportEntitiesRequest) ImportEntitiesRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use ImportEntitiesRequest.newBuilder() to construct. private ImportEntitiesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -82,6 +83,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -105,6 +107,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -155,6 +158,7 @@ private com.google.protobuf.MapField interna public int getLabelsCount() { return internalGetLabels().getMap().size(); } + /** * * @@ -171,12 +175,14 @@ public boolean containsLabels(java.lang.String key) { } return internalGetLabels().getMap().containsKey(key); } + /** Use {@link #getLabelsMap()} instead. */ @java.lang.Override @java.lang.Deprecated public java.util.Map getLabels() { return getLabelsMap(); } + /** * * @@ -190,6 +196,7 @@ public java.util.Map getLabels() { public java.util.Map getLabelsMap() { return internalGetLabels().getMap(); } + /** * * @@ -210,6 +217,7 @@ public java.util.Map getLabelsMap() { java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } + /** * * @@ -235,6 +243,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { @SuppressWarnings("serial") private volatile java.lang.Object inputUrl_ = ""; + /** * * @@ -271,6 +280,7 @@ public java.lang.String getInputUrl() { return s; } } + /** * * @@ -310,6 +320,7 @@ public com.google.protobuf.ByteString getInputUrlBytes() { public static final int ENTITY_FILTER_FIELD_NUMBER = 4; private com.google.datastore.admin.v1.EntityFilter entityFilter_; + /** * * @@ -328,6 +339,7 @@ public com.google.protobuf.ByteString getInputUrlBytes() { public boolean hasEntityFilter() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -348,6 +360,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() { ? com.google.datastore.admin.v1.EntityFilter.getDefaultInstance() : entityFilter_; } + /** * * @@ -566,6 +579,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -837,6 +851,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -859,6 +874,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -881,6 +897,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -902,6 +919,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -919,6 +937,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -967,6 +986,7 @@ private com.google.protobuf.MapField interna public int getLabelsCount() { return internalGetLabels().getMap().size(); } + /** * * @@ -983,12 +1003,14 @@ public boolean containsLabels(java.lang.String key) { } return internalGetLabels().getMap().containsKey(key); } + /** Use {@link #getLabelsMap()} instead. */ @java.lang.Override @java.lang.Deprecated public java.util.Map getLabels() { return getLabelsMap(); } + /** * * @@ -1002,6 +1024,7 @@ public java.util.Map getLabels() { public java.util.Map getLabelsMap() { return internalGetLabels().getMap(); } + /** * * @@ -1022,6 +1045,7 @@ public java.util.Map getLabelsMap() { java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } + /** * * @@ -1048,6 +1072,7 @@ public Builder clearLabels() { internalGetMutableLabels().getMutableMap().clear(); return this; } + /** * * @@ -1064,12 +1089,14 @@ public Builder removeLabels(java.lang.String key) { internalGetMutableLabels().getMutableMap().remove(key); return this; } + /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableLabels() { bitField0_ |= 0x00000002; return internalGetMutableLabels().getMutableMap(); } + /** * * @@ -1090,6 +1117,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { bitField0_ |= 0x00000002; return this; } + /** * * @@ -1106,6 +1134,7 @@ public Builder putAllLabels(java.util.Map va } private java.lang.Object inputUrl_ = ""; + /** * * @@ -1141,6 +1170,7 @@ public java.lang.String getInputUrl() { return (java.lang.String) ref; } } + /** * * @@ -1176,6 +1206,7 @@ public com.google.protobuf.ByteString getInputUrlBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1210,6 +1241,7 @@ public Builder setInputUrl(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1240,6 +1272,7 @@ public Builder clearInputUrl() { onChanged(); return this; } + /** * * @@ -1282,6 +1315,7 @@ public Builder setInputUrlBytes(com.google.protobuf.ByteString value) { com.google.datastore.admin.v1.EntityFilter.Builder, com.google.datastore.admin.v1.EntityFilterOrBuilder> entityFilterBuilder_; + /** * * @@ -1299,6 +1333,7 @@ public Builder setInputUrlBytes(com.google.protobuf.ByteString value) { public boolean hasEntityFilter() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1322,6 +1357,7 @@ public com.google.datastore.admin.v1.EntityFilter getEntityFilter() { return entityFilterBuilder_.getMessage(); } } + /** * * @@ -1347,6 +1383,7 @@ public Builder setEntityFilter(com.google.datastore.admin.v1.EntityFilter value) onChanged(); return this; } + /** * * @@ -1370,6 +1407,7 @@ public Builder setEntityFilter( onChanged(); return this; } + /** * * @@ -1400,6 +1438,7 @@ public Builder mergeEntityFilter(com.google.datastore.admin.v1.EntityFilter valu } return this; } + /** * * @@ -1422,6 +1461,7 @@ public Builder clearEntityFilter() { onChanged(); return this; } + /** * * @@ -1439,6 +1479,7 @@ public com.google.datastore.admin.v1.EntityFilter.Builder getEntityFilterBuilder onChanged(); return getEntityFilterFieldBuilder().getBuilder(); } + /** * * @@ -1460,6 +1501,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil : entityFilter_; } } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java index e0d8abbe0..6bde8cc3c 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface ImportEntitiesRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -59,6 +60,7 @@ public interface ImportEntitiesRequestOrBuilder * map<string, string> labels = 2; */ int getLabelsCount(); + /** * * @@ -69,9 +71,11 @@ public interface ImportEntitiesRequestOrBuilder * map<string, string> labels = 2; */ boolean containsLabels(java.lang.String key); + /** Use {@link #getLabelsMap()} instead. */ @java.lang.Deprecated java.util.Map getLabels(); + /** * * @@ -82,6 +86,7 @@ public interface ImportEntitiesRequestOrBuilder * map<string, string> labels = 2; */ java.util.Map getLabelsMap(); + /** * * @@ -96,6 +101,7 @@ java.lang.String getLabelsOrDefault( java.lang.String key, /* nullable */ java.lang.String defaultValue); + /** * * @@ -132,6 +138,7 @@ java.lang.String getLabelsOrDefault( * @return The inputUrl. */ java.lang.String getInputUrl(); + /** * * @@ -173,6 +180,7 @@ java.lang.String getLabelsOrDefault( * @return Whether the entityFilter field is set. */ boolean hasEntityFilter(); + /** * * @@ -188,6 +196,7 @@ java.lang.String getLabelsOrDefault( * @return The entityFilter. */ com.google.datastore.admin.v1.EntityFilter getEntityFilter(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java index 20c0e9c40..0f2721672 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java @@ -33,6 +33,7 @@ public final class Index extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.Index) IndexOrBuilder { private static final long serialVersionUID = 0L; + // Use Index.newBuilder() to construct. private Index(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -122,6 +123,7 @@ public enum AncestorMode implements com.google.protobuf.ProtocolMessageEnum { * ANCESTOR_MODE_UNSPECIFIED = 0; */ public static final int ANCESTOR_MODE_UNSPECIFIED_VALUE = 0; + /** * * @@ -132,6 +134,7 @@ public enum AncestorMode implements com.google.protobuf.ProtocolMessageEnum { * NONE = 1; */ public static final int NONE_VALUE = 1; + /** * * @@ -281,6 +284,7 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum { * DIRECTION_UNSPECIFIED = 0; */ public static final int DIRECTION_UNSPECIFIED_VALUE = 0; + /** * * @@ -292,6 +296,7 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum { * ASCENDING = 1; */ public static final int ASCENDING_VALUE = 1; + /** * * @@ -473,6 +478,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * STATE_UNSPECIFIED = 0; */ public static final int STATE_UNSPECIFIED_VALUE = 0; + /** * * @@ -486,6 +492,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * CREATING = 1; */ public static final int CREATING_VALUE = 1; + /** * * @@ -498,6 +505,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * READY = 2; */ public static final int READY_VALUE = 2; + /** * * @@ -511,6 +519,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum { * DELETING = 3; */ public static final int DELETING_VALUE = 3; + /** * * @@ -631,6 +640,7 @@ public interface IndexedPropertyOrBuilder * @return The name. */ java.lang.String getName(); + /** * * @@ -659,6 +669,7 @@ public interface IndexedPropertyOrBuilder * @return The enum numeric value on the wire for direction. */ int getDirectionValue(); + /** * * @@ -675,6 +686,7 @@ public interface IndexedPropertyOrBuilder */ com.google.datastore.admin.v1.Index.Direction getDirection(); } + /** * * @@ -689,6 +701,7 @@ public static final class IndexedProperty extends com.google.protobuf.GeneratedM // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.Index.IndexedProperty) IndexedPropertyOrBuilder { private static final long serialVersionUID = 0L; + // Use IndexedProperty.newBuilder() to construct. private IndexedProperty(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -724,6 +737,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object name_ = ""; + /** * * @@ -747,6 +761,7 @@ public java.lang.String getName() { return s; } } + /** * * @@ -773,6 +788,7 @@ public com.google.protobuf.ByteString getNameBytes() { public static final int DIRECTION_FIELD_NUMBER = 2; private int direction_ = 0; + /** * * @@ -791,6 +807,7 @@ public com.google.protobuf.ByteString getNameBytes() { public int getDirectionValue() { return direction_; } + /** * * @@ -984,6 +1001,7 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } + /** * * @@ -1184,6 +1202,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object name_ = ""; + /** * * @@ -1206,6 +1225,7 @@ public java.lang.String getName() { return (java.lang.String) ref; } } + /** * * @@ -1228,6 +1248,7 @@ public com.google.protobuf.ByteString getNameBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1249,6 +1270,7 @@ public Builder setName(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1266,6 +1288,7 @@ public Builder clearName() { onChanged(); return this; } + /** * * @@ -1290,6 +1313,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { } private int direction_ = 0; + /** * * @@ -1308,6 +1332,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { public int getDirectionValue() { return direction_; } + /** * * @@ -1329,6 +1354,7 @@ public Builder setDirectionValue(int value) { onChanged(); return this; } + /** * * @@ -1349,6 +1375,7 @@ public com.google.datastore.admin.v1.Index.Direction getDirection() { com.google.datastore.admin.v1.Index.Direction.forNumber(direction_); return result == null ? com.google.datastore.admin.v1.Index.Direction.UNRECOGNIZED : result; } + /** * * @@ -1373,6 +1400,7 @@ public Builder setDirection(com.google.datastore.admin.v1.Index.Direction value) onChanged(); return this; } + /** * * @@ -1462,6 +1490,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty getDefaultInstanceFor @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -1485,6 +1514,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -1513,6 +1543,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object indexId_ = ""; + /** * * @@ -1536,6 +1567,7 @@ public java.lang.String getIndexId() { return s; } } + /** * * @@ -1564,6 +1596,7 @@ public com.google.protobuf.ByteString getIndexIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object kind_ = ""; + /** * * @@ -1587,6 +1620,7 @@ public java.lang.String getKind() { return s; } } + /** * * @@ -1613,6 +1647,7 @@ public com.google.protobuf.ByteString getKindBytes() { public static final int ANCESTOR_FIELD_NUMBER = 5; private int ancestor_ = 0; + /** * * @@ -1631,6 +1666,7 @@ public com.google.protobuf.ByteString getKindBytes() { public int getAncestorValue() { return ancestor_; } + /** * * @@ -1656,6 +1692,7 @@ public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() { @SuppressWarnings("serial") private java.util.List properties_; + /** * * @@ -1675,6 +1712,7 @@ public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() { public java.util.List getPropertiesList() { return properties_; } + /** * * @@ -1695,6 +1733,7 @@ public java.util.List getPr getPropertiesOrBuilderList() { return properties_; } + /** * * @@ -1714,6 +1753,7 @@ public java.util.List getPr public int getPropertiesCount() { return properties_.size(); } + /** * * @@ -1733,6 +1773,7 @@ public int getPropertiesCount() { public com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int index) { return properties_.get(index); } + /** * * @@ -1756,6 +1797,7 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie public static final int STATE_FIELD_NUMBER = 7; private int state_ = 0; + /** * * @@ -1773,6 +1815,7 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie public int getStateValue() { return state_; } + /** * * @@ -1999,6 +2042,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -2298,6 +2342,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -2320,6 +2365,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -2342,6 +2388,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -2363,6 +2410,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -2380,6 +2428,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -2404,6 +2453,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object indexId_ = ""; + /** * * @@ -2426,6 +2476,7 @@ public java.lang.String getIndexId() { return (java.lang.String) ref; } } + /** * * @@ -2448,6 +2499,7 @@ public com.google.protobuf.ByteString getIndexIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -2469,6 +2521,7 @@ public Builder setIndexId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -2486,6 +2539,7 @@ public Builder clearIndexId() { onChanged(); return this; } + /** * * @@ -2510,6 +2564,7 @@ public Builder setIndexIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object kind_ = ""; + /** * * @@ -2532,6 +2587,7 @@ public java.lang.String getKind() { return (java.lang.String) ref; } } + /** * * @@ -2554,6 +2610,7 @@ public com.google.protobuf.ByteString getKindBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -2575,6 +2632,7 @@ public Builder setKind(java.lang.String value) { onChanged(); return this; } + /** * * @@ -2592,6 +2650,7 @@ public Builder clearKind() { onChanged(); return this; } + /** * * @@ -2616,6 +2675,7 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) { } private int ancestor_ = 0; + /** * * @@ -2634,6 +2694,7 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) { public int getAncestorValue() { return ancestor_; } + /** * * @@ -2655,6 +2716,7 @@ public Builder setAncestorValue(int value) { onChanged(); return this; } + /** * * @@ -2677,6 +2739,7 @@ public com.google.datastore.admin.v1.Index.AncestorMode getAncestor() { ? com.google.datastore.admin.v1.Index.AncestorMode.UNRECOGNIZED : result; } + /** * * @@ -2701,6 +2764,7 @@ public Builder setAncestor(com.google.datastore.admin.v1.Index.AncestorMode valu onChanged(); return this; } + /** * * @@ -2762,6 +2826,7 @@ public java.util.List getPr return propertiesBuilder_.getMessageList(); } } + /** * * @@ -2784,6 +2849,7 @@ public int getPropertiesCount() { return propertiesBuilder_.getCount(); } } + /** * * @@ -2806,6 +2872,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int ind return propertiesBuilder_.getMessage(index); } } + /** * * @@ -2835,6 +2902,7 @@ public Builder setProperties( } return this; } + /** * * @@ -2861,6 +2929,7 @@ public Builder setProperties( } return this; } + /** * * @@ -2889,6 +2958,7 @@ public Builder addProperties(com.google.datastore.admin.v1.Index.IndexedProperty } return this; } + /** * * @@ -2918,6 +2988,7 @@ public Builder addProperties( } return this; } + /** * * @@ -2944,6 +3015,7 @@ public Builder addProperties( } return this; } + /** * * @@ -2970,6 +3042,7 @@ public Builder addProperties( } return this; } + /** * * @@ -2996,6 +3069,7 @@ public Builder addAllProperties( } return this; } + /** * * @@ -3021,6 +3095,7 @@ public Builder clearProperties() { } return this; } + /** * * @@ -3046,6 +3121,7 @@ public Builder removeProperties(int index) { } return this; } + /** * * @@ -3065,6 +3141,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder getProperties int index) { return getPropertiesFieldBuilder().getBuilder(index); } + /** * * @@ -3088,6 +3165,7 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie return propertiesBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -3111,6 +3189,7 @@ public com.google.datastore.admin.v1.Index.IndexedPropertyOrBuilder getPropertie return java.util.Collections.unmodifiableList(properties_); } } + /** * * @@ -3130,6 +3209,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties return getPropertiesFieldBuilder() .addBuilder(com.google.datastore.admin.v1.Index.IndexedProperty.getDefaultInstance()); } + /** * * @@ -3151,6 +3231,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties .addBuilder( index, com.google.datastore.admin.v1.Index.IndexedProperty.getDefaultInstance()); } + /** * * @@ -3189,6 +3270,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties } private int state_ = 0; + /** * * @@ -3206,6 +3288,7 @@ public com.google.datastore.admin.v1.Index.IndexedProperty.Builder addProperties public int getStateValue() { return state_; } + /** * * @@ -3226,6 +3309,7 @@ public Builder setStateValue(int value) { onChanged(); return this; } + /** * * @@ -3245,6 +3329,7 @@ public com.google.datastore.admin.v1.Index.State getState() { com.google.datastore.admin.v1.Index.State.forNumber(state_); return result == null ? com.google.datastore.admin.v1.Index.State.UNRECOGNIZED : result; } + /** * * @@ -3268,6 +3353,7 @@ public Builder setState(com.google.datastore.admin.v1.Index.State value) { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java index 0eb0440d1..c66aa37d4 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java @@ -33,6 +33,7 @@ public final class IndexOperationMetadata extends com.google.protobuf.GeneratedM // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.IndexOperationMetadata) IndexOperationMetadataOrBuilder { private static final long serialVersionUID = 0L; + // Use IndexOperationMetadata.newBuilder() to construct. private IndexOperationMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -66,6 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int COMMON_FIELD_NUMBER = 1; private com.google.datastore.admin.v1.CommonMetadata common_; + /** * * @@ -81,6 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasCommon() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -98,6 +101,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() { ? com.google.datastore.admin.v1.CommonMetadata.getDefaultInstance() : common_; } + /** * * @@ -116,6 +120,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( public static final int PROGRESS_ENTITIES_FIELD_NUMBER = 2; private com.google.datastore.admin.v1.Progress progressEntities_; + /** * * @@ -131,6 +136,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( public boolean hasProgressEntities() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -148,6 +154,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() { ? com.google.datastore.admin.v1.Progress.getDefaultInstance() : progressEntities_; } + /** * * @@ -168,6 +175,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil @SuppressWarnings("serial") private volatile java.lang.Object indexId_ = ""; + /** * * @@ -191,6 +199,7 @@ public java.lang.String getIndexId() { return s; } } + /** * * @@ -402,6 +411,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -641,6 +651,7 @@ public Builder mergeFrom( com.google.datastore.admin.v1.CommonMetadata.Builder, com.google.datastore.admin.v1.CommonMetadataOrBuilder> commonBuilder_; + /** * * @@ -655,6 +666,7 @@ public Builder mergeFrom( public boolean hasCommon() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -675,6 +687,7 @@ public com.google.datastore.admin.v1.CommonMetadata getCommon() { return commonBuilder_.getMessage(); } } + /** * * @@ -697,6 +710,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata value) { onChanged(); return this; } + /** * * @@ -716,6 +730,7 @@ public Builder setCommon(com.google.datastore.admin.v1.CommonMetadata.Builder bu onChanged(); return this; } + /** * * @@ -743,6 +758,7 @@ public Builder mergeCommon(com.google.datastore.admin.v1.CommonMetadata value) { } return this; } + /** * * @@ -762,6 +778,7 @@ public Builder clearCommon() { onChanged(); return this; } + /** * * @@ -776,6 +793,7 @@ public com.google.datastore.admin.v1.CommonMetadata.Builder getCommonBuilder() { onChanged(); return getCommonFieldBuilder().getBuilder(); } + /** * * @@ -794,6 +812,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( : common_; } } + /** * * @@ -826,6 +845,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( com.google.datastore.admin.v1.Progress.Builder, com.google.datastore.admin.v1.ProgressOrBuilder> progressEntitiesBuilder_; + /** * * @@ -840,6 +860,7 @@ public com.google.datastore.admin.v1.CommonMetadataOrBuilder getCommonOrBuilder( public boolean hasProgressEntities() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -860,6 +881,7 @@ public com.google.datastore.admin.v1.Progress getProgressEntities() { return progressEntitiesBuilder_.getMessage(); } } + /** * * @@ -882,6 +904,7 @@ public Builder setProgressEntities(com.google.datastore.admin.v1.Progress value) onChanged(); return this; } + /** * * @@ -902,6 +925,7 @@ public Builder setProgressEntities( onChanged(); return this; } + /** * * @@ -929,6 +953,7 @@ public Builder mergeProgressEntities(com.google.datastore.admin.v1.Progress valu } return this; } + /** * * @@ -948,6 +973,7 @@ public Builder clearProgressEntities() { onChanged(); return this; } + /** * * @@ -962,6 +988,7 @@ public com.google.datastore.admin.v1.Progress.Builder getProgressEntitiesBuilder onChanged(); return getProgressEntitiesFieldBuilder().getBuilder(); } + /** * * @@ -980,6 +1007,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil : progressEntities_; } } + /** * * @@ -1007,6 +1035,7 @@ public com.google.datastore.admin.v1.ProgressOrBuilder getProgressEntitiesOrBuil } private java.lang.Object indexId_ = ""; + /** * * @@ -1029,6 +1058,7 @@ public java.lang.String getIndexId() { return (java.lang.String) ref; } } + /** * * @@ -1051,6 +1081,7 @@ public com.google.protobuf.ByteString getIndexIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1072,6 +1103,7 @@ public Builder setIndexId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1089,6 +1121,7 @@ public Builder clearIndexId() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java index 1ffba87d4..ba34cbf02 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java @@ -36,6 +36,7 @@ public interface IndexOperationMetadataOrBuilder * @return Whether the common field is set. */ boolean hasCommon(); + /** * * @@ -48,6 +49,7 @@ public interface IndexOperationMetadataOrBuilder * @return The common. */ com.google.datastore.admin.v1.CommonMetadata getCommon(); + /** * * @@ -71,6 +73,7 @@ public interface IndexOperationMetadataOrBuilder * @return Whether the progressEntities field is set. */ boolean hasProgressEntities(); + /** * * @@ -83,6 +86,7 @@ public interface IndexOperationMetadataOrBuilder * @return The progressEntities. */ com.google.datastore.admin.v1.Progress getProgressEntities(); + /** * * @@ -106,6 +110,7 @@ public interface IndexOperationMetadataOrBuilder * @return The indexId. */ java.lang.String getIndexId(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java index f47a371a4..a786ec0c3 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java @@ -36,6 +36,7 @@ public interface IndexOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -61,6 +62,7 @@ public interface IndexOrBuilder * @return The indexId. */ java.lang.String getIndexId(); + /** * * @@ -86,6 +88,7 @@ public interface IndexOrBuilder * @return The kind. */ java.lang.String getKind(); + /** * * @@ -114,6 +117,7 @@ public interface IndexOrBuilder * @return The enum numeric value on the wire for ancestor. */ int getAncestorValue(); + /** * * @@ -146,6 +150,7 @@ public interface IndexOrBuilder * */ java.util.List getPropertiesList(); + /** * * @@ -162,6 +167,7 @@ public interface IndexOrBuilder * */ com.google.datastore.admin.v1.Index.IndexedProperty getProperties(int index); + /** * * @@ -178,6 +184,7 @@ public interface IndexOrBuilder * */ int getPropertiesCount(); + /** * * @@ -195,6 +202,7 @@ public interface IndexOrBuilder */ java.util.List getPropertiesOrBuilderList(); + /** * * @@ -226,6 +234,7 @@ public interface IndexOrBuilder * @return The enum numeric value on the wire for state. */ int getStateValue(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java index 90627347f..e66e42843 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java @@ -45,30 +45,42 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { - "\n%google/datastore/admin/v1/index.proto\022" - + "\031google.datastore.admin.v1\032\037google/api/f" - + "ield_behavior.proto\"\346\004\n\005Index\022\027\n\nproject" - + "_id\030\001 \001(\tB\003\340A\003\022\025\n\010index_id\030\003 \001(\tB\003\340A\003\022\021\n" - + "\004kind\030\004 \001(\tB\003\340A\002\022D\n\010ancestor\030\005 \001(\0162-.goo" - + "gle.datastore.admin.v1.Index.AncestorMod" - + "eB\003\340A\002\022I\n\nproperties\030\006 \003(\01320.google.data" - + "store.admin.v1.Index.IndexedPropertyB\003\340A" - + "\002\022:\n\005state\030\007 \001(\0162&.google.datastore.admi" - + "n.v1.Index.StateB\003\340A\003\032h\n\017IndexedProperty" - + "\022\021\n\004name\030\001 \001(\tB\003\340A\002\022B\n\tdirection\030\002 \001(\0162*" - + ".google.datastore.admin.v1.Index.Directi" - + "onB\003\340A\002\"J\n\014AncestorMode\022\035\n\031ANCESTOR_MODE" - + "_UNSPECIFIED\020\000\022\010\n\004NONE\020\001\022\021\n\rALL_ANCESTOR" - + "S\020\002\"E\n\tDirection\022\031\n\025DIRECTION_UNSPECIFIE" - + "D\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020\002\"P\n\005St" - + "ate\022\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010CREATING\020\001" - + "\022\t\n\005READY\020\002\022\014\n\010DELETING\020\003\022\t\n\005ERROR\020\004B\322\001\n" - + "\035com.google.datastore.admin.v1B\nIndexPro" - + "toP\001Z9cloud.google.com/go/datastore/admi" + "\n" + + "%google/datastore/admin/v1/index.proto\022" + + "\031google.datastore.admin.v1\032\037google/api/field_behavior.proto\"\346\004\n" + + "\005Index\022\027\n\n" + + "project_id\030\001 \001(\tB\003\340A\003\022\025\n" + + "\010index_id\030\003 \001(\tB\003\340A\003\022\021\n" + + "\004kind\030\004 \001(\tB\003\340A\002\022D\n" + + "\010ancestor\030\005 \001(\0162-.goo" + + "gle.datastore.admin.v1.Index.AncestorModeB\003\340A\002\022I\n\n" + + "properties\030\006 \003(\01320.google.data" + + "store.admin.v1.Index.IndexedPropertyB\003\340A\002\022:\n" + + "\005state\030\007" + + " \001(\0162&.google.datastore.admin.v1.Index.StateB\003\340A\003\032h\n" + + "\017IndexedProperty\022\021\n" + + "\004name\030\001 \001(\tB\003\340A\002\022B\n" + + "\tdirection\030\002 \001(\0162*" + + ".google.datastore.admin.v1.Index.DirectionB\003\340A\002\"J\n" + + "\014AncestorMode\022\035\n" + + "\031ANCESTOR_MODE_UNSPECIFIED\020\000\022\010\n" + + "\004NONE\020\001\022\021\n\r" + + "ALL_ANCESTORS\020\002\"E\n" + + "\tDirection\022\031\n" + + "\025DIRECTION_UNSPECIFIED\020\000\022\r\n" + + "\tASCENDING\020\001\022\016\n\n" + + "DESCENDING\020\002\"P\n" + + "\005State\022\025\n" + + "\021STATE_UNSPECIFIED\020\000\022\014\n" + + "\010CREATING\020\001\022\t\n" + + "\005READY\020\002\022\014\n" + + "\010DELETING\020\003\022\t\n" + + "\005ERROR\020\004B\322\001\n" + + "\035com.google.datastore.admin.v1B\n" + + "IndexProtoP\001Z9cloud.google.com/go/datastore/admi" + "n/apiv1/adminpb;adminpb\252\002\037Google.Cloud.D" + "atastore.Admin.V1\312\002\037Google\\Cloud\\Datasto" - + "re\\Admin\\V1\352\002#Google::Cloud::Datastore::" - + "Admin::V1b\006proto3" + + "re\\Admin\\V1\352\002#Google::Cloud::Datastore::Admin::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java index 258d08cd9..ca32a0fa3 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java @@ -34,6 +34,7 @@ public final class ListIndexesRequest extends com.google.protobuf.GeneratedMessa // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ListIndexesRequest) ListIndexesRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use ListIndexesRequest.newBuilder() to construct. private ListIndexesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -70,6 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -93,6 +95,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -121,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object filter_ = ""; + /** * string filter = 3; * @@ -138,6 +142,7 @@ public java.lang.String getFilter() { return s; } } + /** * string filter = 3; * @@ -158,6 +163,7 @@ public com.google.protobuf.ByteString getFilterBytes() { public static final int PAGE_SIZE_FIELD_NUMBER = 4; private int pageSize_ = 0; + /** * * @@ -179,6 +185,7 @@ public int getPageSize() { @SuppressWarnings("serial") private volatile java.lang.Object pageToken_ = ""; + /** * * @@ -202,6 +209,7 @@ public java.lang.String getPageToken() { return s; } } + /** * * @@ -412,6 +420,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -640,6 +649,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -662,6 +672,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -684,6 +695,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -705,6 +717,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -722,6 +735,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -746,6 +760,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object filter_ = ""; + /** * string filter = 3; * @@ -762,6 +777,7 @@ public java.lang.String getFilter() { return (java.lang.String) ref; } } + /** * string filter = 3; * @@ -778,6 +794,7 @@ public com.google.protobuf.ByteString getFilterBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * string filter = 3; * @@ -793,6 +810,7 @@ public Builder setFilter(java.lang.String value) { onChanged(); return this; } + /** * string filter = 3; * @@ -804,6 +822,7 @@ public Builder clearFilter() { onChanged(); return this; } + /** * string filter = 3; * @@ -822,6 +841,7 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { } private int pageSize_; + /** * * @@ -838,6 +858,7 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { public int getPageSize() { return pageSize_; } + /** * * @@ -858,6 +879,7 @@ public Builder setPageSize(int value) { onChanged(); return this; } + /** * * @@ -878,6 +900,7 @@ public Builder clearPageSize() { } private java.lang.Object pageToken_ = ""; + /** * * @@ -900,6 +923,7 @@ public java.lang.String getPageToken() { return (java.lang.String) ref; } } + /** * * @@ -922,6 +946,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -943,6 +968,7 @@ public Builder setPageToken(java.lang.String value) { onChanged(); return this; } + /** * * @@ -960,6 +986,7 @@ public Builder clearPageToken() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java index 3a5d68fc4..1c4c70c35 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface ListIndexesRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -55,6 +56,7 @@ public interface ListIndexesRequestOrBuilder * @return The filter. */ java.lang.String getFilter(); + /** * string filter = 3; * @@ -88,6 +90,7 @@ public interface ListIndexesRequestOrBuilder * @return The pageToken. */ java.lang.String getPageToken(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java index 956b22417..3aae0bc18 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java @@ -34,6 +34,7 @@ public final class ListIndexesResponse extends com.google.protobuf.GeneratedMess // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.ListIndexesResponse) ListIndexesResponseOrBuilder { private static final long serialVersionUID = 0L; + // Use ListIndexesResponse.newBuilder() to construct. private ListIndexesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private java.util.List indexes_; + /** * * @@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public java.util.List getIndexesList() { return indexes_; } + /** * * @@ -96,6 +99,7 @@ public java.util.List getIndexesList() { getIndexesOrBuilderList() { return indexes_; } + /** * * @@ -109,6 +113,7 @@ public java.util.List getIndexesList() { public int getIndexesCount() { return indexes_.size(); } + /** * * @@ -122,6 +127,7 @@ public int getIndexesCount() { public com.google.datastore.admin.v1.Index getIndexes(int index) { return indexes_.get(index); } + /** * * @@ -140,6 +146,7 @@ public com.google.datastore.admin.v1.IndexOrBuilder getIndexesOrBuilder(int inde @SuppressWarnings("serial") private volatile java.lang.Object nextPageToken_ = ""; + /** * * @@ -163,6 +170,7 @@ public java.lang.String getNextPageToken() { return s; } } + /** * * @@ -357,6 +365,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -634,6 +643,7 @@ public java.util.List getIndexesList() { return indexesBuilder_.getMessageList(); } } + /** * * @@ -650,6 +660,7 @@ public int getIndexesCount() { return indexesBuilder_.getCount(); } } + /** * * @@ -666,6 +677,7 @@ public com.google.datastore.admin.v1.Index getIndexes(int index) { return indexesBuilder_.getMessage(index); } } + /** * * @@ -688,6 +700,7 @@ public Builder setIndexes(int index, com.google.datastore.admin.v1.Index value) } return this; } + /** * * @@ -708,6 +721,7 @@ public Builder setIndexes( } return this; } + /** * * @@ -730,6 +744,7 @@ public Builder addIndexes(com.google.datastore.admin.v1.Index value) { } return this; } + /** * * @@ -752,6 +767,7 @@ public Builder addIndexes(int index, com.google.datastore.admin.v1.Index value) } return this; } + /** * * @@ -771,6 +787,7 @@ public Builder addIndexes(com.google.datastore.admin.v1.Index.Builder builderFor } return this; } + /** * * @@ -791,6 +808,7 @@ public Builder addIndexes( } return this; } + /** * * @@ -811,6 +829,7 @@ public Builder addAllIndexes( } return this; } + /** * * @@ -830,6 +849,7 @@ public Builder clearIndexes() { } return this; } + /** * * @@ -849,6 +869,7 @@ public Builder removeIndexes(int index) { } return this; } + /** * * @@ -861,6 +882,7 @@ public Builder removeIndexes(int index) { public com.google.datastore.admin.v1.Index.Builder getIndexesBuilder(int index) { return getIndexesFieldBuilder().getBuilder(index); } + /** * * @@ -877,6 +899,7 @@ public com.google.datastore.admin.v1.IndexOrBuilder getIndexesOrBuilder(int inde return indexesBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -894,6 +917,7 @@ public com.google.datastore.admin.v1.IndexOrBuilder getIndexesOrBuilder(int inde return java.util.Collections.unmodifiableList(indexes_); } } + /** * * @@ -907,6 +931,7 @@ public com.google.datastore.admin.v1.Index.Builder addIndexesBuilder() { return getIndexesFieldBuilder() .addBuilder(com.google.datastore.admin.v1.Index.getDefaultInstance()); } + /** * * @@ -920,6 +945,7 @@ public com.google.datastore.admin.v1.Index.Builder addIndexesBuilder(int index) return getIndexesFieldBuilder() .addBuilder(index, com.google.datastore.admin.v1.Index.getDefaultInstance()); } + /** * * @@ -951,6 +977,7 @@ public java.util.List getIndexesBui } private java.lang.Object nextPageToken_ = ""; + /** * * @@ -973,6 +1000,7 @@ public java.lang.String getNextPageToken() { return (java.lang.String) ref; } } + /** * * @@ -995,6 +1023,7 @@ public com.google.protobuf.ByteString getNextPageTokenBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1016,6 +1045,7 @@ public Builder setNextPageToken(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1033,6 +1063,7 @@ public Builder clearNextPageToken() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java index 40f2e4ba1..c89b116ed 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java @@ -34,6 +34,7 @@ public interface ListIndexesResponseOrBuilder * repeated .google.datastore.admin.v1.Index indexes = 1; */ java.util.List getIndexesList(); + /** * * @@ -44,6 +45,7 @@ public interface ListIndexesResponseOrBuilder * repeated .google.datastore.admin.v1.Index indexes = 1; */ com.google.datastore.admin.v1.Index getIndexes(int index); + /** * * @@ -54,6 +56,7 @@ public interface ListIndexesResponseOrBuilder * repeated .google.datastore.admin.v1.Index indexes = 1; */ int getIndexesCount(); + /** * * @@ -64,6 +67,7 @@ public interface ListIndexesResponseOrBuilder * repeated .google.datastore.admin.v1.Index indexes = 1; */ java.util.List getIndexesOrBuilderList(); + /** * * @@ -87,6 +91,7 @@ public interface ListIndexesResponseOrBuilder * @return The nextPageToken. */ java.lang.String getNextPageToken(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java index 7dd512772..7833fb2a2 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java @@ -35,6 +35,7 @@ public final class MigrationProgressEvent extends com.google.protobuf.GeneratedM // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationProgressEvent) MigrationProgressEventOrBuilder { private static final long serialVersionUID = 0L; + // Use MigrationProgressEvent.newBuilder() to construct. private MigrationProgressEvent(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -128,6 +129,7 @@ public enum ConcurrencyMode implements com.google.protobuf.ProtocolMessageEnum { * CONCURRENCY_MODE_UNSPECIFIED = 0; */ public static final int CONCURRENCY_MODE_UNSPECIFIED_VALUE = 0; + /** * * @@ -138,6 +140,7 @@ public enum ConcurrencyMode implements com.google.protobuf.ProtocolMessageEnum { * PESSIMISTIC = 1; */ public static final int PESSIMISTIC_VALUE = 1; + /** * * @@ -148,6 +151,7 @@ public enum ConcurrencyMode implements com.google.protobuf.ProtocolMessageEnum { * OPTIMISTIC = 2; */ public static final int OPTIMISTIC_VALUE = 2; + /** * * @@ -267,6 +271,7 @@ public interface PrepareStepDetailsOrBuilder * @return The enum numeric value on the wire for concurrencyMode. */ int getConcurrencyModeValue(); + /** * * @@ -282,6 +287,7 @@ public interface PrepareStepDetailsOrBuilder */ com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode getConcurrencyMode(); } + /** * * @@ -296,6 +302,7 @@ public static final class PrepareStepDetails extends com.google.protobuf.Generat // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) PrepareStepDetailsOrBuilder { private static final long serialVersionUID = 0L; + // Use PrepareStepDetails.newBuilder() to construct. private PrepareStepDetails(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -329,6 +336,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public static final int CONCURRENCY_MODE_FIELD_NUMBER = 1; private int concurrencyMode_ = 0; + /** * * @@ -346,6 +354,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public int getConcurrencyModeValue() { return concurrencyMode_; } + /** * * @@ -539,6 +548,7 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } + /** * * @@ -735,6 +745,7 @@ public Builder mergeFrom( private int bitField0_; private int concurrencyMode_ = 0; + /** * * @@ -753,6 +764,7 @@ public Builder mergeFrom( public int getConcurrencyModeValue() { return concurrencyMode_; } + /** * * @@ -774,6 +786,7 @@ public Builder setConcurrencyModeValue(int value) { onChanged(); return this; } + /** * * @@ -798,6 +811,7 @@ public Builder setConcurrencyModeValue(int value) { ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED : result; } + /** * * @@ -823,6 +837,7 @@ public Builder setConcurrencyMode( onChanged(); return this; } + /** * * @@ -930,6 +945,7 @@ public interface RedirectWritesStepDetailsOrBuilder * @return The enum numeric value on the wire for concurrencyMode. */ int getConcurrencyModeValue(); + /** * * @@ -944,6 +960,7 @@ public interface RedirectWritesStepDetailsOrBuilder */ com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode getConcurrencyMode(); } + /** * * @@ -959,6 +976,7 @@ public static final class RedirectWritesStepDetails extends com.google.protobuf. // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails) RedirectWritesStepDetailsOrBuilder { private static final long serialVersionUID = 0L; + // Use RedirectWritesStepDetails.newBuilder() to construct. private RedirectWritesStepDetails(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -992,6 +1010,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public static final int CONCURRENCY_MODE_FIELD_NUMBER = 1; private int concurrencyMode_ = 0; + /** * * @@ -1008,6 +1027,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public int getConcurrencyModeValue() { return concurrencyMode_; } + /** * * @@ -1206,6 +1226,7 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } + /** * * @@ -1408,6 +1429,7 @@ public Builder mergeFrom( private int bitField0_; private int concurrencyMode_ = 0; + /** * * @@ -1425,6 +1447,7 @@ public Builder mergeFrom( public int getConcurrencyModeValue() { return concurrencyMode_; } + /** * * @@ -1445,6 +1468,7 @@ public Builder setConcurrencyModeValue(int value) { onChanged(); return this; } + /** * * @@ -1468,6 +1492,7 @@ public Builder setConcurrencyModeValue(int value) { ? com.google.datastore.admin.v1.MigrationProgressEvent.ConcurrencyMode.UNRECOGNIZED : result; } + /** * * @@ -1492,6 +1517,7 @@ public Builder setConcurrencyMode( onChanged(); return this; } + /** * * @@ -1598,6 +1624,7 @@ public enum StepDetailsCase private StepDetailsCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -1632,6 +1659,7 @@ public StepDetailsCase getStepDetailsCase() { public static final int STEP_FIELD_NUMBER = 1; private int step_ = 0; + /** * * @@ -1650,6 +1678,7 @@ public StepDetailsCase getStepDetailsCase() { public int getStepValue() { return step_; } + /** * * @@ -1672,6 +1701,7 @@ public com.google.datastore.admin.v1.MigrationStep getStep() { } public static final int PREPARE_STEP_DETAILS_FIELD_NUMBER = 2; + /** * * @@ -1689,6 +1719,7 @@ public com.google.datastore.admin.v1.MigrationStep getStep() { public boolean hasPrepareStepDetails() { return stepDetailsCase_ == 2; } + /** * * @@ -1711,6 +1742,7 @@ public boolean hasPrepareStepDetails() { return com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails .getDefaultInstance(); } + /** * * @@ -1733,6 +1765,7 @@ public boolean hasPrepareStepDetails() { } public static final int REDIRECT_WRITES_STEP_DETAILS_FIELD_NUMBER = 3; + /** * * @@ -1750,6 +1783,7 @@ public boolean hasPrepareStepDetails() { public boolean hasRedirectWritesStepDetails() { return stepDetailsCase_ == 3; } + /** * * @@ -1773,6 +1807,7 @@ public boolean hasRedirectWritesStepDetails() { return com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails .getDefaultInstance(); } + /** * * @@ -2005,6 +2040,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -2253,6 +2289,7 @@ public Builder clearStepDetails() { private int bitField0_; private int step_ = 0; + /** * * @@ -2271,6 +2308,7 @@ public Builder clearStepDetails() { public int getStepValue() { return step_; } + /** * * @@ -2292,6 +2330,7 @@ public Builder setStepValue(int value) { onChanged(); return this; } + /** * * @@ -2312,6 +2351,7 @@ public com.google.datastore.admin.v1.MigrationStep getStep() { com.google.datastore.admin.v1.MigrationStep.forNumber(step_); return result == null ? com.google.datastore.admin.v1.MigrationStep.UNRECOGNIZED : result; } + /** * * @@ -2336,6 +2376,7 @@ public Builder setStep(com.google.datastore.admin.v1.MigrationStep value) { onChanged(); return this; } + /** * * @@ -2362,6 +2403,7 @@ public Builder clearStep() { com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder, com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetailsOrBuilder> prepareStepDetailsBuilder_; + /** * * @@ -2379,6 +2421,7 @@ public Builder clearStep() { public boolean hasPrepareStepDetails() { return stepDetailsCase_ == 2; } + /** * * @@ -2410,6 +2453,7 @@ public boolean hasPrepareStepDetails() { .getDefaultInstance(); } } + /** * * @@ -2435,6 +2479,7 @@ public Builder setPrepareStepDetails( stepDetailsCase_ = 2; return this; } + /** * * @@ -2458,6 +2503,7 @@ public Builder setPrepareStepDetails( stepDetailsCase_ = 2; return this; } + /** * * @@ -2496,6 +2542,7 @@ public Builder mergePrepareStepDetails( stepDetailsCase_ = 2; return this; } + /** * * @@ -2523,6 +2570,7 @@ public Builder clearPrepareStepDetails() { } return this; } + /** * * @@ -2538,6 +2586,7 @@ public Builder clearPrepareStepDetails() { getPrepareStepDetailsBuilder() { return getPrepareStepDetailsFieldBuilder().getBuilder(); } + /** * * @@ -2563,6 +2612,7 @@ public Builder clearPrepareStepDetails() { .getDefaultInstance(); } } + /** * * @@ -2606,6 +2656,7 @@ public Builder clearPrepareStepDetails() { com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.Builder, com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetailsOrBuilder> redirectWritesStepDetailsBuilder_; + /** * * @@ -2623,6 +2674,7 @@ public Builder clearPrepareStepDetails() { public boolean hasRedirectWritesStepDetails() { return stepDetailsCase_ == 3; } + /** * * @@ -2654,6 +2706,7 @@ public boolean hasRedirectWritesStepDetails() { .getDefaultInstance(); } } + /** * * @@ -2679,6 +2732,7 @@ public Builder setRedirectWritesStepDetails( stepDetailsCase_ = 3; return this; } + /** * * @@ -2702,6 +2756,7 @@ public Builder setRedirectWritesStepDetails( stepDetailsCase_ = 3; return this; } + /** * * @@ -2742,6 +2797,7 @@ public Builder mergeRedirectWritesStepDetails( stepDetailsCase_ = 3; return this; } + /** * * @@ -2769,6 +2825,7 @@ public Builder clearRedirectWritesStepDetails() { } return this; } + /** * * @@ -2784,6 +2841,7 @@ public Builder clearRedirectWritesStepDetails() { getRedirectWritesStepDetailsBuilder() { return getRedirectWritesStepDetailsFieldBuilder().getBuilder(); } + /** * * @@ -2809,6 +2867,7 @@ public Builder clearRedirectWritesStepDetails() { .getDefaultInstance(); } } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java index 08bbab7bf..c23e32fbb 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java @@ -39,6 +39,7 @@ public interface MigrationProgressEventOrBuilder * @return The enum numeric value on the wire for step. */ int getStepValue(); + /** * * @@ -69,6 +70,7 @@ public interface MigrationProgressEventOrBuilder * @return Whether the prepareStepDetails field is set. */ boolean hasPrepareStepDetails(); + /** * * @@ -83,6 +85,7 @@ public interface MigrationProgressEventOrBuilder * @return The prepareStepDetails. */ com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails getPrepareStepDetails(); + /** * * @@ -111,6 +114,7 @@ public interface MigrationProgressEventOrBuilder * @return Whether the redirectWritesStepDetails field is set. */ boolean hasRedirectWritesStepDetails(); + /** * * @@ -126,6 +130,7 @@ public interface MigrationProgressEventOrBuilder */ com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails getRedirectWritesStepDetails(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java index 9df1276a8..5434e3eae 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java @@ -82,6 +82,7 @@ public enum MigrationState implements com.google.protobuf.ProtocolMessageEnum { * MIGRATION_STATE_UNSPECIFIED = 0; */ public static final int MIGRATION_STATE_UNSPECIFIED_VALUE = 0; + /** * * @@ -92,6 +93,7 @@ public enum MigrationState implements com.google.protobuf.ProtocolMessageEnum { * RUNNING = 1; */ public static final int RUNNING_VALUE = 1; + /** * * @@ -102,6 +104,7 @@ public enum MigrationState implements com.google.protobuf.ProtocolMessageEnum { * PAUSED = 2; */ public static final int PAUSED_VALUE = 2; + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java index 0fac9e592..1e06a1c49 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java @@ -35,6 +35,7 @@ public final class MigrationStateEvent extends com.google.protobuf.GeneratedMess // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.MigrationStateEvent) MigrationStateEventOrBuilder { private static final long serialVersionUID = 0L; + // Use MigrationStateEvent.newBuilder() to construct. private MigrationStateEvent(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public static final int STATE_FIELD_NUMBER = 1; private int state_ = 0; + /** * * @@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public int getStateValue() { return state_; } + /** * * @@ -261,6 +264,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -445,6 +449,7 @@ public Builder mergeFrom( private int bitField0_; private int state_ = 0; + /** * * @@ -460,6 +465,7 @@ public Builder mergeFrom( public int getStateValue() { return state_; } + /** * * @@ -478,6 +484,7 @@ public Builder setStateValue(int value) { onChanged(); return this; } + /** * * @@ -495,6 +502,7 @@ public com.google.datastore.admin.v1.MigrationState getState() { com.google.datastore.admin.v1.MigrationState.forNumber(state_); return result == null ? com.google.datastore.admin.v1.MigrationState.UNRECOGNIZED : result; } + /** * * @@ -516,6 +524,7 @@ public Builder setState(com.google.datastore.admin.v1.MigrationState value) { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java index 962e1416e..758d5fe00 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java @@ -36,6 +36,7 @@ public interface MigrationStateEventOrBuilder * @return The enum numeric value on the wire for state. */ int getStateValue(); + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java index 9e2cc7f61..44f3c4c5e 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java @@ -123,6 +123,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum { * MIGRATION_STEP_UNSPECIFIED = 0; */ public static final int MIGRATION_STEP_UNSPECIFIED_VALUE = 0; + /** * * @@ -133,6 +134,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum { * PREPARE = 6; */ public static final int PREPARE_VALUE = 6; + /** * * @@ -143,6 +145,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum { * START = 1; */ public static final int START_VALUE = 1; + /** * * @@ -153,6 +156,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum { * APPLY_WRITES_SYNCHRONOUSLY = 7; */ public static final int APPLY_WRITES_SYNCHRONOUSLY_VALUE = 7; + /** * * @@ -164,6 +168,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum { * COPY_AND_VERIFY = 2; */ public static final int COPY_AND_VERIFY_VALUE = 2; + /** * * @@ -174,6 +179,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum { * REDIRECT_EVENTUALLY_CONSISTENT_READS = 3; */ public static final int REDIRECT_EVENTUALLY_CONSISTENT_READS_VALUE = 3; + /** * * @@ -184,6 +190,7 @@ public enum MigrationStep implements com.google.protobuf.ProtocolMessageEnum { * REDIRECT_STRONGLY_CONSISTENT_READS = 4; */ public static final int REDIRECT_STRONGLY_CONSISTENT_READS_VALUE = 4; + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java index 66e73b4dc..db31a688d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java @@ -92,6 +92,7 @@ public enum OperationType implements com.google.protobuf.ProtocolMessageEnum { * OPERATION_TYPE_UNSPECIFIED = 0; */ public static final int OPERATION_TYPE_UNSPECIFIED_VALUE = 0; + /** * * @@ -102,6 +103,7 @@ public enum OperationType implements com.google.protobuf.ProtocolMessageEnum { * EXPORT_ENTITIES = 1; */ public static final int EXPORT_ENTITIES_VALUE = 1; + /** * * @@ -112,6 +114,7 @@ public enum OperationType implements com.google.protobuf.ProtocolMessageEnum { * IMPORT_ENTITIES = 2; */ public static final int IMPORT_ENTITIES_VALUE = 2; + /** * * @@ -122,6 +125,7 @@ public enum OperationType implements com.google.protobuf.ProtocolMessageEnum { * CREATE_INDEX = 3; */ public static final int CREATE_INDEX_VALUE = 3; + /** * * diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java index 139ed5960..48580643e 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java @@ -33,6 +33,7 @@ public final class Progress extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.admin.v1.Progress) ProgressOrBuilder { private static final long serialVersionUID = 0L; + // Use Progress.newBuilder() to construct. private Progress(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public static final int WORK_COMPLETED_FIELD_NUMBER = 1; private long workCompleted_ = 0L; + /** * * @@ -82,6 +84,7 @@ public long getWorkCompleted() { public static final int WORK_ESTIMATED_FIELD_NUMBER = 2; private long workEstimated_ = 0L; + /** * * @@ -266,6 +269,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -460,6 +464,7 @@ public Builder mergeFrom( private int bitField0_; private long workCompleted_; + /** * * @@ -476,6 +481,7 @@ public Builder mergeFrom( public long getWorkCompleted() { return workCompleted_; } + /** * * @@ -496,6 +502,7 @@ public Builder setWorkCompleted(long value) { onChanged(); return this; } + /** * * @@ -516,6 +523,7 @@ public Builder clearWorkCompleted() { } private long workEstimated_; + /** * * @@ -532,6 +540,7 @@ public Builder clearWorkCompleted() { public long getWorkEstimated() { return workEstimated_; } + /** * * @@ -552,6 +561,7 @@ public Builder setWorkEstimated(long value) { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java index 85ab86988..700120ceb 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java @@ -34,6 +34,7 @@ public final class AggregationQuery extends com.google.protobuf.GeneratedMessage // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery) AggregationQueryOrBuilder { private static final long serialVersionUID = 0L; + // Use AggregationQuery.newBuilder() to construct. private AggregationQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -81,6 +82,7 @@ public interface AggregationOrBuilder * @return Whether the count field is set. */ boolean hasCount(); + /** * * @@ -93,6 +95,7 @@ public interface AggregationOrBuilder * @return The count. */ com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount(); + /** * * @@ -116,6 +119,7 @@ public interface AggregationOrBuilder * @return Whether the sum field is set. */ boolean hasSum(); + /** * * @@ -128,6 +132,7 @@ public interface AggregationOrBuilder * @return The sum. */ com.google.datastore.v1.AggregationQuery.Aggregation.Sum getSum(); + /** * * @@ -151,6 +156,7 @@ public interface AggregationOrBuilder * @return Whether the avg field is set. */ boolean hasAvg(); + /** * * @@ -163,6 +169,7 @@ public interface AggregationOrBuilder * @return The avg. */ com.google.datastore.v1.AggregationQuery.Aggregation.Avg getAvg(); + /** * * @@ -220,6 +227,7 @@ public interface AggregationOrBuilder * @return The alias. */ java.lang.String getAlias(); + /** * * @@ -269,6 +277,7 @@ public interface AggregationOrBuilder com.google.datastore.v1.AggregationQuery.Aggregation.OperatorCase getOperatorCase(); } + /** * * @@ -283,6 +292,7 @@ public static final class Aggregation extends com.google.protobuf.GeneratedMessa // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation) AggregationOrBuilder { private static final long serialVersionUID = 0L; + // Use Aggregation.newBuilder() to construct. private Aggregation(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -350,6 +360,7 @@ public interface CountOrBuilder * @return Whether the upTo field is set. */ boolean hasUpTo(); + /** * * @@ -382,6 +393,7 @@ public interface CountOrBuilder * @return The upTo. */ com.google.protobuf.Int64Value getUpTo(); + /** * * @@ -413,6 +425,7 @@ public interface CountOrBuilder */ com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder(); } + /** * * @@ -430,6 +443,7 @@ public static final class Count extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation.Count) CountOrBuilder { private static final long serialVersionUID = 0L; + // Use Count.newBuilder() to construct. private Count(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -461,6 +475,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int UP_TO_FIELD_NUMBER = 1; private com.google.protobuf.Int64Value upTo_; + /** * * @@ -496,6 +511,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasUpTo() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -531,6 +547,7 @@ public boolean hasUpTo() { public com.google.protobuf.Int64Value getUpTo() { return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_; } + /** * * @@ -731,6 +748,7 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } + /** * * @@ -943,6 +961,7 @@ public Builder mergeFrom( com.google.protobuf.Int64Value.Builder, com.google.protobuf.Int64ValueOrBuilder> upToBuilder_; + /** * * @@ -977,6 +996,7 @@ public Builder mergeFrom( public boolean hasUpTo() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -1015,6 +1035,7 @@ public com.google.protobuf.Int64Value getUpTo() { return upToBuilder_.getMessage(); } } + /** * * @@ -1057,6 +1078,7 @@ public Builder setUpTo(com.google.protobuf.Int64Value value) { onChanged(); return this; } + /** * * @@ -1096,6 +1118,7 @@ public Builder setUpTo(com.google.protobuf.Int64Value.Builder builderForValue) { onChanged(); return this; } + /** * * @@ -1143,6 +1166,7 @@ public Builder mergeUpTo(com.google.protobuf.Int64Value value) { } return this; } + /** * * @@ -1182,6 +1206,7 @@ public Builder clearUpTo() { onChanged(); return this; } + /** * * @@ -1216,6 +1241,7 @@ public com.google.protobuf.Int64Value.Builder getUpToBuilder() { onChanged(); return getUpToFieldBuilder().getBuilder(); } + /** * * @@ -1252,6 +1278,7 @@ public com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder() { return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_; } } + /** * * @@ -1382,6 +1409,7 @@ public interface SumOrBuilder * @return Whether the property field is set. */ boolean hasProperty(); + /** * * @@ -1394,6 +1422,7 @@ public interface SumOrBuilder * @return The property. */ com.google.datastore.v1.PropertyReference getProperty(); + /** * * @@ -1405,6 +1434,7 @@ public interface SumOrBuilder */ com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder(); } + /** * * @@ -1439,6 +1469,7 @@ public static final class Sum extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation.Sum) SumOrBuilder { private static final long serialVersionUID = 0L; + // Use Sum.newBuilder() to construct. private Sum(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -1470,6 +1501,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int PROPERTY_FIELD_NUMBER = 1; private com.google.datastore.v1.PropertyReference property_; + /** * * @@ -1485,6 +1517,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -1502,6 +1535,7 @@ public com.google.datastore.v1.PropertyReference getProperty() { ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; } + /** * * @@ -1684,6 +1718,7 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } + /** * * @@ -1913,6 +1948,7 @@ public Builder mergeFrom( com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_; + /** * * @@ -1927,6 +1963,7 @@ public Builder mergeFrom( public boolean hasProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -1947,6 +1984,7 @@ public com.google.datastore.v1.PropertyReference getProperty() { return propertyBuilder_.getMessage(); } } + /** * * @@ -1969,6 +2007,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) { onChanged(); return this; } + /** * * @@ -1989,6 +2028,7 @@ public Builder setProperty( onChanged(); return this; } + /** * * @@ -2016,6 +2056,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) { } return this; } + /** * * @@ -2035,6 +2076,7 @@ public Builder clearProperty() { onChanged(); return this; } + /** * * @@ -2049,6 +2091,7 @@ public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() { onChanged(); return getPropertyFieldBuilder().getBuilder(); } + /** * * @@ -2067,6 +2110,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() : property_; } } + /** * * @@ -2175,6 +2219,7 @@ public interface AvgOrBuilder * @return Whether the property field is set. */ boolean hasProperty(); + /** * * @@ -2187,6 +2232,7 @@ public interface AvgOrBuilder * @return The property. */ com.google.datastore.v1.PropertyReference getProperty(); + /** * * @@ -2198,6 +2244,7 @@ public interface AvgOrBuilder */ com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder(); } + /** * * @@ -2222,6 +2269,7 @@ public static final class Avg extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation.Avg) AvgOrBuilder { private static final long serialVersionUID = 0L; + // Use Avg.newBuilder() to construct. private Avg(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -2253,6 +2301,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int PROPERTY_FIELD_NUMBER = 1; private com.google.datastore.v1.PropertyReference property_; + /** * * @@ -2268,6 +2317,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -2285,6 +2335,7 @@ public com.google.datastore.v1.PropertyReference getProperty() { ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; } + /** * * @@ -2467,6 +2518,7 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } + /** * * @@ -2686,6 +2738,7 @@ public Builder mergeFrom( com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_; + /** * * @@ -2700,6 +2753,7 @@ public Builder mergeFrom( public boolean hasProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -2720,6 +2774,7 @@ public com.google.datastore.v1.PropertyReference getProperty() { return propertyBuilder_.getMessage(); } } + /** * * @@ -2742,6 +2797,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) { onChanged(); return this; } + /** * * @@ -2762,6 +2818,7 @@ public Builder setProperty( onChanged(); return this; } + /** * * @@ -2789,6 +2846,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) { } return this; } + /** * * @@ -2808,6 +2866,7 @@ public Builder clearProperty() { onChanged(); return this; } + /** * * @@ -2822,6 +2881,7 @@ public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() { onChanged(); return getPropertyFieldBuilder().getBuilder(); } + /** * * @@ -2840,6 +2900,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() : property_; } } + /** * * @@ -2949,6 +3010,7 @@ public enum OperatorCase private OperatorCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -2984,6 +3046,7 @@ public OperatorCase getOperatorCase() { } public static final int COUNT_FIELD_NUMBER = 1; + /** * * @@ -2999,6 +3062,7 @@ public OperatorCase getOperatorCase() { public boolean hasCount() { return operatorCase_ == 1; } + /** * * @@ -3017,6 +3081,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() { } return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance(); } + /** * * @@ -3035,6 +3100,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo } public static final int SUM_FIELD_NUMBER = 2; + /** * * @@ -3050,6 +3116,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo public boolean hasSum() { return operatorCase_ == 2; } + /** * * @@ -3068,6 +3135,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Sum getSum() { } return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance(); } + /** * * @@ -3086,6 +3154,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumO } public static final int AVG_FIELD_NUMBER = 3; + /** * * @@ -3101,6 +3170,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumO public boolean hasAvg() { return operatorCase_ == 3; } + /** * * @@ -3119,6 +3189,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Avg getAvg() { } return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance(); } + /** * * @@ -3140,6 +3211,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder getAvgO @SuppressWarnings("serial") private volatile java.lang.Object alias_ = ""; + /** * * @@ -3197,6 +3269,7 @@ public java.lang.String getAlias() { return s; } } + /** * * @@ -3473,6 +3546,7 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } + /** * * @@ -3743,6 +3817,7 @@ public Builder clearOperator() { com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder, com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder> countBuilder_; + /** * * @@ -3758,6 +3833,7 @@ public Builder clearOperator() { public boolean hasCount() { return operatorCase_ == 1; } + /** * * @@ -3783,6 +3859,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() { return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance(); } } + /** * * @@ -3805,6 +3882,7 @@ public Builder setCount(com.google.datastore.v1.AggregationQuery.Aggregation.Cou operatorCase_ = 1; return this; } + /** * * @@ -3825,6 +3903,7 @@ public Builder setCount( operatorCase_ = 1; return this; } + /** * * @@ -3859,6 +3938,7 @@ public Builder mergeCount(com.google.datastore.v1.AggregationQuery.Aggregation.C operatorCase_ = 1; return this; } + /** * * @@ -3884,6 +3964,7 @@ public Builder clearCount() { } return this; } + /** * * @@ -3896,6 +3977,7 @@ public Builder clearCount() { public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCountBuilder() { return getCountFieldBuilder().getBuilder(); } + /** * * @@ -3917,6 +3999,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance(); } } + /** * * @@ -3956,6 +4039,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder, com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder> sumBuilder_; + /** * * @@ -3971,6 +4055,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou public boolean hasSum() { return operatorCase_ == 2; } + /** * * @@ -3996,6 +4081,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Sum getSum() { return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance(); } } + /** * * @@ -4018,6 +4104,7 @@ public Builder setSum(com.google.datastore.v1.AggregationQuery.Aggregation.Sum v operatorCase_ = 2; return this; } + /** * * @@ -4038,6 +4125,7 @@ public Builder setSum( operatorCase_ = 2; return this; } + /** * * @@ -4072,6 +4160,7 @@ public Builder mergeSum(com.google.datastore.v1.AggregationQuery.Aggregation.Sum operatorCase_ = 2; return this; } + /** * * @@ -4097,6 +4186,7 @@ public Builder clearSum() { } return this; } + /** * * @@ -4109,6 +4199,7 @@ public Builder clearSum() { public com.google.datastore.v1.AggregationQuery.Aggregation.Sum.Builder getSumBuilder() { return getSumFieldBuilder().getBuilder(); } + /** * * @@ -4129,6 +4220,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumO return com.google.datastore.v1.AggregationQuery.Aggregation.Sum.getDefaultInstance(); } } + /** * * @@ -4168,6 +4260,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumO com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder, com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder> avgBuilder_; + /** * * @@ -4183,6 +4276,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.SumOrBuilder getSumO public boolean hasAvg() { return operatorCase_ == 3; } + /** * * @@ -4208,6 +4302,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Avg getAvg() { return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance(); } } + /** * * @@ -4230,6 +4325,7 @@ public Builder setAvg(com.google.datastore.v1.AggregationQuery.Aggregation.Avg v operatorCase_ = 3; return this; } + /** * * @@ -4250,6 +4346,7 @@ public Builder setAvg( operatorCase_ = 3; return this; } + /** * * @@ -4284,6 +4381,7 @@ public Builder mergeAvg(com.google.datastore.v1.AggregationQuery.Aggregation.Avg operatorCase_ = 3; return this; } + /** * * @@ -4309,6 +4407,7 @@ public Builder clearAvg() { } return this; } + /** * * @@ -4321,6 +4420,7 @@ public Builder clearAvg() { public com.google.datastore.v1.AggregationQuery.Aggregation.Avg.Builder getAvgBuilder() { return getAvgFieldBuilder().getBuilder(); } + /** * * @@ -4341,6 +4441,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder getAvgO return com.google.datastore.v1.AggregationQuery.Aggregation.Avg.getDefaultInstance(); } } + /** * * @@ -4376,6 +4477,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.AvgOrBuilder getAvgO } private java.lang.Object alias_ = ""; + /** * * @@ -4432,6 +4534,7 @@ public java.lang.String getAlias() { return (java.lang.String) ref; } } + /** * * @@ -4488,6 +4591,7 @@ public com.google.protobuf.ByteString getAliasBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -4543,6 +4647,7 @@ public Builder setAlias(java.lang.String value) { onChanged(); return this; } + /** * * @@ -4594,6 +4699,7 @@ public Builder clearAlias() { onChanged(); return this; } + /** * * @@ -4731,6 +4837,7 @@ public enum QueryTypeCase private QueryTypeCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -4762,6 +4869,7 @@ public QueryTypeCase getQueryTypeCase() { } public static final int NESTED_QUERY_FIELD_NUMBER = 1; + /** * * @@ -4777,6 +4885,7 @@ public QueryTypeCase getQueryTypeCase() { public boolean hasNestedQuery() { return queryTypeCase_ == 1; } + /** * * @@ -4795,6 +4904,7 @@ public com.google.datastore.v1.Query getNestedQuery() { } return com.google.datastore.v1.Query.getDefaultInstance(); } + /** * * @@ -4816,6 +4926,7 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() { @SuppressWarnings("serial") private java.util.List aggregations_; + /** * * @@ -4837,6 +4948,7 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() { getAggregationsList() { return aggregations_; } + /** * * @@ -4858,6 +4970,7 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() { getAggregationsOrBuilderList() { return aggregations_; } + /** * * @@ -4878,6 +4991,7 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() { public int getAggregationsCount() { return aggregations_.size(); } + /** * * @@ -4898,6 +5012,7 @@ public int getAggregationsCount() { public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int index) { return aggregations_.get(index); } + /** * * @@ -5104,6 +5219,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -5383,6 +5499,7 @@ public Builder clearQueryType() { com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> nestedQueryBuilder_; + /** * * @@ -5398,6 +5515,7 @@ public Builder clearQueryType() { public boolean hasNestedQuery() { return queryTypeCase_ == 1; } + /** * * @@ -5423,6 +5541,7 @@ public com.google.datastore.v1.Query getNestedQuery() { return com.google.datastore.v1.Query.getDefaultInstance(); } } + /** * * @@ -5445,6 +5564,7 @@ public Builder setNestedQuery(com.google.datastore.v1.Query value) { queryTypeCase_ = 1; return this; } + /** * * @@ -5464,6 +5584,7 @@ public Builder setNestedQuery(com.google.datastore.v1.Query.Builder builderForVa queryTypeCase_ = 1; return this; } + /** * * @@ -5495,6 +5616,7 @@ public Builder mergeNestedQuery(com.google.datastore.v1.Query value) { queryTypeCase_ = 1; return this; } + /** * * @@ -5520,6 +5642,7 @@ public Builder clearNestedQuery() { } return this; } + /** * * @@ -5532,6 +5655,7 @@ public Builder clearNestedQuery() { public com.google.datastore.v1.Query.Builder getNestedQueryBuilder() { return getNestedQueryFieldBuilder().getBuilder(); } + /** * * @@ -5552,6 +5676,7 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() { return com.google.datastore.v1.Query.getDefaultInstance(); } } + /** * * @@ -5625,6 +5750,7 @@ private void ensureAggregationsIsMutable() { return aggregationsBuilder_.getMessageList(); } } + /** * * @@ -5648,6 +5774,7 @@ public int getAggregationsCount() { return aggregationsBuilder_.getCount(); } } + /** * * @@ -5671,6 +5798,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int return aggregationsBuilder_.getMessage(index); } } + /** * * @@ -5701,6 +5829,7 @@ public Builder setAggregations( } return this; } + /** * * @@ -5728,6 +5857,7 @@ public Builder setAggregations( } return this; } + /** * * @@ -5757,6 +5887,7 @@ public Builder addAggregations(com.google.datastore.v1.AggregationQuery.Aggregat } return this; } + /** * * @@ -5787,6 +5918,7 @@ public Builder addAggregations( } return this; } + /** * * @@ -5814,6 +5946,7 @@ public Builder addAggregations( } return this; } + /** * * @@ -5841,6 +5974,7 @@ public Builder addAggregations( } return this; } + /** * * @@ -5868,6 +6002,7 @@ public Builder addAllAggregations( } return this; } + /** * * @@ -5894,6 +6029,7 @@ public Builder clearAggregations() { } return this; } + /** * * @@ -5920,6 +6056,7 @@ public Builder removeAggregations(int index) { } return this; } + /** * * @@ -5940,6 +6077,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder getAggregati int index) { return getAggregationsFieldBuilder().getBuilder(index); } + /** * * @@ -5964,6 +6102,7 @@ public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregat return aggregationsBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -5988,6 +6127,7 @@ public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregat return java.util.Collections.unmodifiableList(aggregations_); } } + /** * * @@ -6008,6 +6148,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregati return getAggregationsFieldBuilder() .addBuilder(com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance()); } + /** * * @@ -6030,6 +6171,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregati .addBuilder( index, com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java index 7f9a0a608..1bced478b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java @@ -36,6 +36,7 @@ public interface AggregationQueryOrBuilder * @return Whether the nestedQuery field is set. */ boolean hasNestedQuery(); + /** * * @@ -48,6 +49,7 @@ public interface AggregationQueryOrBuilder * @return The nestedQuery. */ com.google.datastore.v1.Query getNestedQuery(); + /** * * @@ -76,6 +78,7 @@ public interface AggregationQueryOrBuilder * */ java.util.List getAggregationsList(); + /** * * @@ -93,6 +96,7 @@ public interface AggregationQueryOrBuilder * */ com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int index); + /** * * @@ -110,6 +114,7 @@ public interface AggregationQueryOrBuilder * */ int getAggregationsCount(); + /** * * @@ -128,6 +133,7 @@ public interface AggregationQueryOrBuilder */ java.util.List getAggregationsOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java index 358672417..a8af25d74 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java @@ -37,6 +37,7 @@ public final class AggregationResult extends com.google.protobuf.GeneratedMessag // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationResult) AggregationResultOrBuilder { private static final long serialVersionUID = 0L; + // Use AggregationResult.newBuilder() to construct. private AggregationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -108,6 +109,7 @@ private static final class AggregatePropertiesDefaultEntryHolder { public int getAggregatePropertiesCount() { return internalGetAggregateProperties().getMap().size(); } + /** * * @@ -129,12 +131,14 @@ public boolean containsAggregateProperties(java.lang.String key) { } return internalGetAggregateProperties().getMap().containsKey(key); } + /** Use {@link #getAggregatePropertiesMap()} instead. */ @java.lang.Override @java.lang.Deprecated public java.util.Map getAggregateProperties() { return getAggregatePropertiesMap(); } + /** * * @@ -154,6 +158,7 @@ public java.util.Map getAggrega getAggregatePropertiesMap() { return internalGetAggregateProperties().getMap(); } + /** * * @@ -180,6 +185,7 @@ public java.util.Map getAggrega internalGetAggregateProperties().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } + /** * * @@ -379,6 +385,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -611,7 +618,8 @@ public com.google.datastore.v1.Value build(com.google.datastore.v1.ValueOrBuilde defaultEntry() { return AggregatePropertiesDefaultEntryHolder.defaultEntry; } - }; + } + ; private static final AggregatePropertiesConverter aggregatePropertiesConverter = new AggregatePropertiesConverter(); @@ -653,6 +661,7 @@ public com.google.datastore.v1.Value build(com.google.datastore.v1.ValueOrBuilde public int getAggregatePropertiesCount() { return internalGetAggregateProperties().ensureBuilderMap().size(); } + /** * * @@ -674,12 +683,14 @@ public boolean containsAggregateProperties(java.lang.String key) { } return internalGetAggregateProperties().ensureBuilderMap().containsKey(key); } + /** Use {@link #getAggregatePropertiesMap()} instead. */ @java.lang.Override @java.lang.Deprecated public java.util.Map getAggregateProperties() { return getAggregatePropertiesMap(); } + /** * * @@ -699,6 +710,7 @@ public java.util.Map getAggrega getAggregatePropertiesMap() { return internalGetAggregateProperties().getImmutableMap(); } + /** * * @@ -725,6 +737,7 @@ public java.util.Map getAggrega internalGetMutableAggregateProperties().ensureBuilderMap(); return map.containsKey(key) ? aggregatePropertiesConverter.build(map.get(key)) : defaultValue; } + /** * * @@ -757,6 +770,7 @@ public Builder clearAggregateProperties() { internalGetMutableAggregateProperties().clear(); return this; } + /** * * @@ -778,6 +792,7 @@ public Builder removeAggregateProperties(java.lang.String key) { internalGetMutableAggregateProperties().ensureBuilderMap().remove(key); return this; } + /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map @@ -785,6 +800,7 @@ public Builder removeAggregateProperties(java.lang.String key) { bitField0_ |= 0x00000001; return internalGetMutableAggregateProperties().ensureMessageMap(); } + /** * * @@ -811,6 +827,7 @@ public Builder putAggregateProperties( bitField0_ |= 0x00000001; return this; } + /** * * @@ -837,6 +854,7 @@ public Builder putAllAggregateProperties( bitField0_ |= 0x00000001; return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java index 84cfc1a97..2db8614e5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java @@ -33,6 +33,7 @@ public final class AggregationResultBatch extends com.google.protobuf.GeneratedM // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationResultBatch) AggregationResultBatchOrBuilder { private static final long serialVersionUID = 0L; + // Use AggregationResultBatch.newBuilder() to construct. private AggregationResultBatch(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private java.util.List aggregationResults_; + /** * * @@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public java.util.List getAggregationResultsList() { return aggregationResults_; } + /** * * @@ -96,6 +99,7 @@ public java.util.List getAggregationR getAggregationResultsOrBuilderList() { return aggregationResults_; } + /** * * @@ -109,6 +113,7 @@ public java.util.List getAggregationR public int getAggregationResultsCount() { return aggregationResults_.size(); } + /** * * @@ -122,6 +127,7 @@ public int getAggregationResultsCount() { public com.google.datastore.v1.AggregationResult getAggregationResults(int index) { return aggregationResults_.get(index); } + /** * * @@ -139,6 +145,7 @@ public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsO public static final int MORE_RESULTS_FIELD_NUMBER = 2; private int moreResults_ = 0; + /** * * @@ -156,6 +163,7 @@ public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsO public int getMoreResultsValue() { return moreResults_; } + /** * * @@ -180,6 +188,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() public static final int READ_TIME_FIELD_NUMBER = 3; private com.google.protobuf.Timestamp readTime_; + /** * * @@ -199,6 +208,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() public boolean hasReadTime() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -218,6 +228,7 @@ public boolean hasReadTime() { public com.google.protobuf.Timestamp getReadTime() { return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; } + /** * * @@ -425,6 +436,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -728,6 +740,7 @@ public java.util.List getAggregationR return aggregationResultsBuilder_.getMessageList(); } } + /** * * @@ -744,6 +757,7 @@ public int getAggregationResultsCount() { return aggregationResultsBuilder_.getCount(); } } + /** * * @@ -760,6 +774,7 @@ public com.google.datastore.v1.AggregationResult getAggregationResults(int index return aggregationResultsBuilder_.getMessage(index); } } + /** * * @@ -783,6 +798,7 @@ public Builder setAggregationResults( } return this; } + /** * * @@ -803,6 +819,7 @@ public Builder setAggregationResults( } return this; } + /** * * @@ -825,6 +842,7 @@ public Builder addAggregationResults(com.google.datastore.v1.AggregationResult v } return this; } + /** * * @@ -848,6 +866,7 @@ public Builder addAggregationResults( } return this; } + /** * * @@ -868,6 +887,7 @@ public Builder addAggregationResults( } return this; } + /** * * @@ -888,6 +908,7 @@ public Builder addAggregationResults( } return this; } + /** * * @@ -908,6 +929,7 @@ public Builder addAllAggregationResults( } return this; } + /** * * @@ -927,6 +949,7 @@ public Builder clearAggregationResults() { } return this; } + /** * * @@ -946,6 +969,7 @@ public Builder removeAggregationResults(int index) { } return this; } + /** * * @@ -959,6 +983,7 @@ public com.google.datastore.v1.AggregationResult.Builder getAggregationResultsBu int index) { return getAggregationResultsFieldBuilder().getBuilder(index); } + /** * * @@ -976,6 +1001,7 @@ public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsO return aggregationResultsBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -993,6 +1019,7 @@ public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsO return java.util.Collections.unmodifiableList(aggregationResults_); } } + /** * * @@ -1006,6 +1033,7 @@ public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBu return getAggregationResultsFieldBuilder() .addBuilder(com.google.datastore.v1.AggregationResult.getDefaultInstance()); } + /** * * @@ -1020,6 +1048,7 @@ public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBu return getAggregationResultsFieldBuilder() .addBuilder(index, com.google.datastore.v1.AggregationResult.getDefaultInstance()); } + /** * * @@ -1055,6 +1084,7 @@ public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBu } private int moreResults_ = 0; + /** * * @@ -1072,6 +1102,7 @@ public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBu public int getMoreResultsValue() { return moreResults_; } + /** * * @@ -1092,6 +1123,7 @@ public Builder setMoreResultsValue(int value) { onChanged(); return this; } + /** * * @@ -1113,6 +1145,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result; } + /** * * @@ -1136,6 +1169,7 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul onChanged(); return this; } + /** * * @@ -1162,6 +1196,7 @@ public Builder clearMoreResults() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> readTimeBuilder_; + /** * * @@ -1180,6 +1215,7 @@ public Builder clearMoreResults() { public boolean hasReadTime() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1202,6 +1238,7 @@ public com.google.protobuf.Timestamp getReadTime() { return readTimeBuilder_.getMessage(); } } + /** * * @@ -1228,6 +1265,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -1251,6 +1289,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue onChanged(); return this; } + /** * * @@ -1282,6 +1321,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -1305,6 +1345,7 @@ public Builder clearReadTime() { onChanged(); return this; } + /** * * @@ -1323,6 +1364,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() { onChanged(); return getReadTimeFieldBuilder().getBuilder(); } + /** * * @@ -1343,6 +1385,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java index c75fce0f3..0c8ebc3fd 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java @@ -34,6 +34,7 @@ public interface AggregationResultBatchOrBuilder * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; */ java.util.List getAggregationResultsList(); + /** * * @@ -44,6 +45,7 @@ public interface AggregationResultBatchOrBuilder * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; */ com.google.datastore.v1.AggregationResult getAggregationResults(int index); + /** * * @@ -54,6 +56,7 @@ public interface AggregationResultBatchOrBuilder * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; */ int getAggregationResultsCount(); + /** * * @@ -65,6 +68,7 @@ public interface AggregationResultBatchOrBuilder */ java.util.List getAggregationResultsOrBuilderList(); + /** * * @@ -90,6 +94,7 @@ public interface AggregationResultBatchOrBuilder * @return The enum numeric value on the wire for moreResults. */ int getMoreResultsValue(); + /** * * @@ -121,6 +126,7 @@ public interface AggregationResultBatchOrBuilder * @return Whether the readTime field is set. */ boolean hasReadTime(); + /** * * @@ -137,6 +143,7 @@ public interface AggregationResultBatchOrBuilder * @return The readTime. */ com.google.protobuf.Timestamp getReadTime(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java index 8bdf749c3..94e573e78 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java @@ -39,6 +39,7 @@ public interface AggregationResultOrBuilder * map<string, .google.datastore.v1.Value> aggregate_properties = 2; */ int getAggregatePropertiesCount(); + /** * * @@ -54,9 +55,11 @@ public interface AggregationResultOrBuilder * map<string, .google.datastore.v1.Value> aggregate_properties = 2; */ boolean containsAggregateProperties(java.lang.String key); + /** Use {@link #getAggregatePropertiesMap()} instead. */ @java.lang.Deprecated java.util.Map getAggregateProperties(); + /** * * @@ -72,6 +75,7 @@ public interface AggregationResultOrBuilder * map<string, .google.datastore.v1.Value> aggregate_properties = 2; */ java.util.Map getAggregatePropertiesMap(); + /** * * @@ -91,6 +95,7 @@ com.google.datastore.v1.Value getAggregatePropertiesOrDefault( java.lang.String key, /* nullable */ com.google.datastore.v1.Value defaultValue); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java index ba8b762c5..b3bd50bd5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java @@ -34,6 +34,7 @@ public final class AllocateIdsRequest extends com.google.protobuf.GeneratedMessa // @@protoc_insertion_point(message_implements:google.datastore.v1.AllocateIdsRequest) AllocateIdsRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use AllocateIdsRequest.newBuilder() to construct. private AllocateIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -70,6 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -93,6 +95,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -121,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object databaseId_ = ""; + /** * * @@ -147,6 +151,7 @@ public java.lang.String getDatabaseId() { return s; } } + /** * * @@ -178,6 +183,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { @SuppressWarnings("serial") private java.util.List keys_; + /** * * @@ -193,6 +199,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public java.util.List getKeysList() { return keys_; } + /** * * @@ -208,6 +215,7 @@ public java.util.List getKeysList() { public java.util.List getKeysOrBuilderList() { return keys_; } + /** * * @@ -223,6 +231,7 @@ public java.util.List getKeysOrB public int getKeysCount() { return keys_.size(); } + /** * * @@ -238,6 +247,7 @@ public int getKeysCount() { public com.google.datastore.v1.Key getKeys(int index) { return keys_.get(index); } + /** * * @@ -433,6 +443,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -691,6 +702,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -713,6 +725,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -735,6 +748,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -756,6 +770,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -773,6 +788,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -797,6 +813,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object databaseId_ = ""; + /** * * @@ -822,6 +839,7 @@ public java.lang.String getDatabaseId() { return (java.lang.String) ref; } } + /** * * @@ -847,6 +865,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -871,6 +890,7 @@ public Builder setDatabaseId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -891,6 +911,7 @@ public Builder clearDatabaseId() { onChanged(); return this; } + /** * * @@ -950,6 +971,7 @@ public java.util.List getKeysList() { return keysBuilder_.getMessageList(); } } + /** * * @@ -968,6 +990,7 @@ public int getKeysCount() { return keysBuilder_.getCount(); } } + /** * * @@ -986,6 +1009,7 @@ public com.google.datastore.v1.Key getKeys(int index) { return keysBuilder_.getMessage(index); } } + /** * * @@ -1010,6 +1034,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1031,6 +1056,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor } return this; } + /** * * @@ -1055,6 +1081,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1079,6 +1106,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1100,6 +1128,7 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) { } return this; } + /** * * @@ -1121,6 +1150,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor } return this; } + /** * * @@ -1142,6 +1172,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysOrB return java.util.Collections.unmodifiableList(keys_); } } + /** * * @@ -1248,6 +1284,7 @@ public java.util.List getKeysOrB public com.google.datastore.v1.Key.Builder addKeysBuilder() { return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance()); } + /** * * @@ -1263,6 +1300,7 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) { return getKeysFieldBuilder() .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java index 92532d1f7..13d3009e7 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface AllocateIdsRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -64,6 +65,7 @@ public interface AllocateIdsRequestOrBuilder * @return The databaseId. */ java.lang.String getDatabaseId(); + /** * * @@ -92,6 +94,7 @@ public interface AllocateIdsRequestOrBuilder * */ java.util.List getKeysList(); + /** * * @@ -104,6 +107,7 @@ public interface AllocateIdsRequestOrBuilder * */ com.google.datastore.v1.Key getKeys(int index); + /** * * @@ -116,6 +120,7 @@ public interface AllocateIdsRequestOrBuilder * */ int getKeysCount(); + /** * * @@ -128,6 +133,7 @@ public interface AllocateIdsRequestOrBuilder * */ java.util.List getKeysOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java index d741665c8..b7e67dcc0 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java @@ -34,6 +34,7 @@ public final class AllocateIdsResponse extends com.google.protobuf.GeneratedMess // @@protoc_insertion_point(message_implements:google.datastore.v1.AllocateIdsResponse) AllocateIdsResponseOrBuilder { private static final long serialVersionUID = 0L; + // Use AllocateIdsResponse.newBuilder() to construct. private AllocateIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -68,6 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private java.util.List keys_; + /** * * @@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public java.util.List getKeysList() { return keys_; } + /** * * @@ -96,6 +99,7 @@ public java.util.List getKeysList() { public java.util.List getKeysOrBuilderList() { return keys_; } + /** * * @@ -110,6 +114,7 @@ public java.util.List getKeysOrB public int getKeysCount() { return keys_.size(); } + /** * * @@ -124,6 +129,7 @@ public int getKeysCount() { public com.google.datastore.v1.Key getKeys(int index) { return keys_.get(index); } + /** * * @@ -300,6 +306,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -559,6 +566,7 @@ public java.util.List getKeysList() { return keysBuilder_.getMessageList(); } } + /** * * @@ -576,6 +584,7 @@ public int getKeysCount() { return keysBuilder_.getCount(); } } + /** * * @@ -593,6 +602,7 @@ public com.google.datastore.v1.Key getKeys(int index) { return keysBuilder_.getMessage(index); } } + /** * * @@ -616,6 +626,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -636,6 +647,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor } return this; } + /** * * @@ -659,6 +671,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -682,6 +695,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -702,6 +716,7 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) { } return this; } + /** * * @@ -722,6 +737,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor } return this; } + /** * * @@ -742,6 +758,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysOrB return java.util.Collections.unmodifiableList(keys_); } } + /** * * @@ -842,6 +864,7 @@ public java.util.List getKeysOrB public com.google.datastore.v1.Key.Builder addKeysBuilder() { return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance()); } + /** * * @@ -856,6 +879,7 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) { return getKeysFieldBuilder() .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java index 1624266d1..6dbcd866d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java @@ -35,6 +35,7 @@ public interface AllocateIdsResponseOrBuilder * repeated .google.datastore.v1.Key keys = 1; */ java.util.List getKeysList(); + /** * * @@ -46,6 +47,7 @@ public interface AllocateIdsResponseOrBuilder * repeated .google.datastore.v1.Key keys = 1; */ com.google.datastore.v1.Key getKeys(int index); + /** * * @@ -57,6 +59,7 @@ public interface AllocateIdsResponseOrBuilder * repeated .google.datastore.v1.Key keys = 1; */ int getKeysCount(); + /** * * @@ -68,6 +71,7 @@ public interface AllocateIdsResponseOrBuilder * repeated .google.datastore.v1.Key keys = 1; */ java.util.List getKeysOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java index 64ac1d115..0d73c1fa7 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java @@ -33,6 +33,7 @@ public final class ArrayValue extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.ArrayValue) ArrayValueOrBuilder { private static final long serialVersionUID = 0L; + // Use ArrayValue.newBuilder() to construct. private ArrayValue(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private java.util.List values_; + /** * * @@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public java.util.List getValuesList() { return values_; } + /** * * @@ -97,6 +100,7 @@ public java.util.List getValuesList() { public java.util.List getValuesOrBuilderList() { return values_; } + /** * * @@ -112,6 +116,7 @@ public java.util.List getValue public int getValuesCount() { return values_.size(); } + /** * * @@ -127,6 +132,7 @@ public int getValuesCount() { public com.google.datastore.v1.Value getValues(int index) { return values_.get(index); } + /** * * @@ -302,6 +308,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -561,6 +568,7 @@ public java.util.List getValuesList() { return valuesBuilder_.getMessageList(); } } + /** * * @@ -579,6 +587,7 @@ public int getValuesCount() { return valuesBuilder_.getCount(); } } + /** * * @@ -597,6 +606,7 @@ public com.google.datastore.v1.Value getValues(int index) { return valuesBuilder_.getMessage(index); } } + /** * * @@ -621,6 +631,7 @@ public Builder setValues(int index, com.google.datastore.v1.Value value) { } return this; } + /** * * @@ -642,6 +653,7 @@ public Builder setValues(int index, com.google.datastore.v1.Value.Builder builde } return this; } + /** * * @@ -666,6 +678,7 @@ public Builder addValues(com.google.datastore.v1.Value value) { } return this; } + /** * * @@ -690,6 +703,7 @@ public Builder addValues(int index, com.google.datastore.v1.Value value) { } return this; } + /** * * @@ -711,6 +725,7 @@ public Builder addValues(com.google.datastore.v1.Value.Builder builderForValue) } return this; } + /** * * @@ -732,6 +747,7 @@ public Builder addValues(int index, com.google.datastore.v1.Value.Builder builde } return this; } + /** * * @@ -754,6 +770,7 @@ public Builder addAllValues( } return this; } + /** * * @@ -775,6 +792,7 @@ public Builder clearValues() { } return this; } + /** * * @@ -796,6 +814,7 @@ public Builder removeValues(int index) { } return this; } + /** * * @@ -810,6 +829,7 @@ public Builder removeValues(int index) { public com.google.datastore.v1.Value.Builder getValuesBuilder(int index) { return getValuesFieldBuilder().getBuilder(index); } + /** * * @@ -828,6 +848,7 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) { return valuesBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -847,6 +868,7 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) { return java.util.Collections.unmodifiableList(values_); } } + /** * * @@ -861,6 +883,7 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) { public com.google.datastore.v1.Value.Builder addValuesBuilder() { return getValuesFieldBuilder().addBuilder(com.google.datastore.v1.Value.getDefaultInstance()); } + /** * * @@ -876,6 +899,7 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder(int index) { return getValuesFieldBuilder() .addBuilder(index, com.google.datastore.v1.Value.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java index d9a3fe96d..c6d447186 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java @@ -36,6 +36,7 @@ public interface ArrayValueOrBuilder * repeated .google.datastore.v1.Value values = 1; */ java.util.List getValuesList(); + /** * * @@ -48,6 +49,7 @@ public interface ArrayValueOrBuilder * repeated .google.datastore.v1.Value values = 1; */ com.google.datastore.v1.Value getValues(int index); + /** * * @@ -60,6 +62,7 @@ public interface ArrayValueOrBuilder * repeated .google.datastore.v1.Value values = 1; */ int getValuesCount(); + /** * * @@ -72,6 +75,7 @@ public interface ArrayValueOrBuilder * repeated .google.datastore.v1.Value values = 1; */ java.util.List getValuesOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java index 70db08648..6fdef6176 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java @@ -34,6 +34,7 @@ public final class BeginTransactionRequest extends com.google.protobuf.Generated // @@protoc_insertion_point(message_implements:google.datastore.v1.BeginTransactionRequest) BeginTransactionRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use BeginTransactionRequest.newBuilder() to construct. private BeginTransactionRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -70,6 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -93,6 +95,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -121,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object databaseId_ = ""; + /** * * @@ -147,6 +151,7 @@ public java.lang.String getDatabaseId() { return s; } } + /** * * @@ -176,6 +181,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public static final int TRANSACTION_OPTIONS_FIELD_NUMBER = 10; private com.google.datastore.v1.TransactionOptions transactionOptions_; + /** * * @@ -191,6 +197,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public boolean hasTransactionOptions() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -208,6 +215,7 @@ public com.google.datastore.v1.TransactionOptions getTransactionOptions() { ? com.google.datastore.v1.TransactionOptions.getDefaultInstance() : transactionOptions_; } + /** * * @@ -406,6 +414,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -639,6 +648,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -661,6 +671,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -683,6 +694,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -704,6 +716,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -721,6 +734,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -745,6 +759,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object databaseId_ = ""; + /** * * @@ -770,6 +785,7 @@ public java.lang.String getDatabaseId() { return (java.lang.String) ref; } } + /** * * @@ -795,6 +811,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -819,6 +836,7 @@ public Builder setDatabaseId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -839,6 +857,7 @@ public Builder clearDatabaseId() { onChanged(); return this; } + /** * * @@ -871,6 +890,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder> transactionOptionsBuilder_; + /** * * @@ -885,6 +905,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { public boolean hasTransactionOptions() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -905,6 +926,7 @@ public com.google.datastore.v1.TransactionOptions getTransactionOptions() { return transactionOptionsBuilder_.getMessage(); } } + /** * * @@ -927,6 +949,7 @@ public Builder setTransactionOptions(com.google.datastore.v1.TransactionOptions onChanged(); return this; } + /** * * @@ -947,6 +970,7 @@ public Builder setTransactionOptions( onChanged(); return this; } + /** * * @@ -975,6 +999,7 @@ public Builder mergeTransactionOptions(com.google.datastore.v1.TransactionOption } return this; } + /** * * @@ -994,6 +1019,7 @@ public Builder clearTransactionOptions() { onChanged(); return this; } + /** * * @@ -1008,6 +1034,7 @@ public com.google.datastore.v1.TransactionOptions.Builder getTransactionOptionsB onChanged(); return getTransactionOptionsFieldBuilder().getBuilder(); } + /** * * @@ -1026,6 +1053,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions : transactionOptions_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java index 38e18ec75..9441e577d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface BeginTransactionRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -64,6 +65,7 @@ public interface BeginTransactionRequestOrBuilder * @return The databaseId. */ java.lang.String getDatabaseId(); + /** * * @@ -92,6 +94,7 @@ public interface BeginTransactionRequestOrBuilder * @return Whether the transactionOptions field is set. */ boolean hasTransactionOptions(); + /** * * @@ -104,6 +107,7 @@ public interface BeginTransactionRequestOrBuilder * @return The transactionOptions. */ com.google.datastore.v1.TransactionOptions getTransactionOptions(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java index fcca145c2..839dab467 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java @@ -34,6 +34,7 @@ public final class BeginTransactionResponse extends com.google.protobuf.Generate // @@protoc_insertion_point(message_implements:google.datastore.v1.BeginTransactionResponse) BeginTransactionResponseOrBuilder { private static final long serialVersionUID = 0L; + // Use BeginTransactionResponse.newBuilder() to construct. private BeginTransactionResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -66,6 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public static final int TRANSACTION_FIELD_NUMBER = 1; private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -241,6 +243,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -424,6 +427,7 @@ public Builder mergeFrom( private int bitField0_; private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -439,6 +443,7 @@ public Builder mergeFrom( public com.google.protobuf.ByteString getTransaction() { return transaction_; } + /** * * @@ -460,6 +465,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java index 27db57172..3189b3fa6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java @@ -33,6 +33,7 @@ public final class CommitRequest extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.CommitRequest) CommitRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use CommitRequest.newBuilder() to construct. private CommitRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -121,6 +122,7 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum { * MODE_UNSPECIFIED = 0; */ public static final int MODE_UNSPECIFIED_VALUE = 0; + /** * * @@ -133,6 +135,7 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum { * TRANSACTIONAL = 1; */ public static final int TRANSACTIONAL_VALUE = 1; + /** * * @@ -244,6 +247,7 @@ public enum TransactionSelectorCase private TransactionSelectorCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -280,6 +284,7 @@ public TransactionSelectorCase getTransactionSelectorCase() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -303,6 +308,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -331,6 +337,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object databaseId_ = ""; + /** * * @@ -357,6 +364,7 @@ public java.lang.String getDatabaseId() { return s; } } + /** * * @@ -386,6 +394,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public static final int MODE_FIELD_NUMBER = 5; private int mode_ = 0; + /** * * @@ -401,6 +410,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public int getModeValue() { return mode_; } + /** * * @@ -420,6 +430,7 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() { } public static final int TRANSACTION_FIELD_NUMBER = 1; + /** * * @@ -437,6 +448,7 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() { public boolean hasTransaction() { return transactionSelectorCase_ == 1; } + /** * * @@ -459,6 +471,7 @@ public com.google.protobuf.ByteString getTransaction() { } public static final int SINGLE_USE_TRANSACTION_FIELD_NUMBER = 10; + /** * * @@ -477,6 +490,7 @@ public com.google.protobuf.ByteString getTransaction() { public boolean hasSingleUseTransaction() { return transactionSelectorCase_ == 10; } + /** * * @@ -498,6 +512,7 @@ public com.google.datastore.v1.TransactionOptions getSingleUseTransaction() { } return com.google.datastore.v1.TransactionOptions.getDefaultInstance(); } + /** * * @@ -522,6 +537,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransacti @SuppressWarnings("serial") private java.util.List mutations_; + /** * * @@ -547,6 +563,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransacti public java.util.List getMutationsList() { return mutations_; } + /** * * @@ -573,6 +590,7 @@ public java.util.List getMutationsList() { getMutationsOrBuilderList() { return mutations_; } + /** * * @@ -598,6 +616,7 @@ public java.util.List getMutationsList() { public int getMutationsCount() { return mutations_.size(); } + /** * * @@ -623,6 +642,7 @@ public int getMutationsCount() { public com.google.datastore.v1.Mutation getMutations(int index) { return mutations_.get(index); } + /** * * @@ -874,6 +894,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1201,6 +1222,7 @@ public Builder clearTransactionSelector() { private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -1223,6 +1245,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -1245,6 +1268,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1266,6 +1290,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1283,6 +1308,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -1307,6 +1333,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object databaseId_ = ""; + /** * * @@ -1332,6 +1359,7 @@ public java.lang.String getDatabaseId() { return (java.lang.String) ref; } } + /** * * @@ -1357,6 +1385,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1381,6 +1410,7 @@ public Builder setDatabaseId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1401,6 +1431,7 @@ public Builder clearDatabaseId() { onChanged(); return this; } + /** * * @@ -1428,6 +1459,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { } private int mode_ = 0; + /** * * @@ -1443,6 +1475,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { public int getModeValue() { return mode_; } + /** * * @@ -1461,6 +1494,7 @@ public Builder setModeValue(int value) { onChanged(); return this; } + /** * * @@ -1478,6 +1512,7 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() { com.google.datastore.v1.CommitRequest.Mode.forNumber(mode_); return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result; } + /** * * @@ -1499,6 +1534,7 @@ public Builder setMode(com.google.datastore.v1.CommitRequest.Mode value) { onChanged(); return this; } + /** * * @@ -1533,6 +1569,7 @@ public Builder clearMode() { public boolean hasTransaction() { return transactionSelectorCase_ == 1; } + /** * * @@ -1552,6 +1589,7 @@ public com.google.protobuf.ByteString getTransaction() { } return com.google.protobuf.ByteString.EMPTY; } + /** * * @@ -1575,6 +1613,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -1602,6 +1641,7 @@ public Builder clearTransaction() { com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder> singleUseTransactionBuilder_; + /** * * @@ -1620,6 +1660,7 @@ public Builder clearTransaction() { public boolean hasSingleUseTransaction() { return transactionSelectorCase_ == 10; } + /** * * @@ -1648,6 +1689,7 @@ public com.google.datastore.v1.TransactionOptions getSingleUseTransaction() { return com.google.datastore.v1.TransactionOptions.getDefaultInstance(); } } + /** * * @@ -1673,6 +1715,7 @@ public Builder setSingleUseTransaction(com.google.datastore.v1.TransactionOption transactionSelectorCase_ = 10; return this; } + /** * * @@ -1696,6 +1739,7 @@ public Builder setSingleUseTransaction( transactionSelectorCase_ = 10; return this; } + /** * * @@ -1732,6 +1776,7 @@ public Builder mergeSingleUseTransaction(com.google.datastore.v1.TransactionOpti transactionSelectorCase_ = 10; return this; } + /** * * @@ -1760,6 +1805,7 @@ public Builder clearSingleUseTransaction() { } return this; } + /** * * @@ -1775,6 +1821,7 @@ public Builder clearSingleUseTransaction() { public com.google.datastore.v1.TransactionOptions.Builder getSingleUseTransactionBuilder() { return getSingleUseTransactionFieldBuilder().getBuilder(); } + /** * * @@ -1798,6 +1845,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransacti return com.google.datastore.v1.TransactionOptions.getDefaultInstance(); } } + /** * * @@ -1878,6 +1926,7 @@ public java.util.List getMutationsList() { return mutationsBuilder_.getMessageList(); } } + /** * * @@ -1906,6 +1955,7 @@ public int getMutationsCount() { return mutationsBuilder_.getCount(); } } + /** * * @@ -1934,6 +1984,7 @@ public com.google.datastore.v1.Mutation getMutations(int index) { return mutationsBuilder_.getMessage(index); } } + /** * * @@ -1968,6 +2019,7 @@ public Builder setMutations(int index, com.google.datastore.v1.Mutation value) { } return this; } + /** * * @@ -2000,6 +2052,7 @@ public Builder setMutations( } return this; } + /** * * @@ -2034,6 +2087,7 @@ public Builder addMutations(com.google.datastore.v1.Mutation value) { } return this; } + /** * * @@ -2068,6 +2122,7 @@ public Builder addMutations(int index, com.google.datastore.v1.Mutation value) { } return this; } + /** * * @@ -2099,6 +2154,7 @@ public Builder addMutations(com.google.datastore.v1.Mutation.Builder builderForV } return this; } + /** * * @@ -2131,6 +2187,7 @@ public Builder addMutations( } return this; } + /** * * @@ -2163,6 +2220,7 @@ public Builder addAllMutations( } return this; } + /** * * @@ -2194,6 +2252,7 @@ public Builder clearMutations() { } return this; } + /** * * @@ -2225,6 +2284,7 @@ public Builder removeMutations(int index) { } return this; } + /** * * @@ -2249,6 +2309,7 @@ public Builder removeMutations(int index) { public com.google.datastore.v1.Mutation.Builder getMutationsBuilder(int index) { return getMutationsFieldBuilder().getBuilder(index); } + /** * * @@ -2277,6 +2338,7 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index return mutationsBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -2306,6 +2368,7 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index return java.util.Collections.unmodifiableList(mutations_); } } + /** * * @@ -2331,6 +2394,7 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder() { return getMutationsFieldBuilder() .addBuilder(com.google.datastore.v1.Mutation.getDefaultInstance()); } + /** * * @@ -2356,6 +2420,7 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(int index) { return getMutationsFieldBuilder() .addBuilder(index, com.google.datastore.v1.Mutation.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java index 02dd0e53b..2602a23f5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface CommitRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -64,6 +65,7 @@ public interface CommitRequestOrBuilder * @return The databaseId. */ java.lang.String getDatabaseId(); + /** * * @@ -92,6 +94,7 @@ public interface CommitRequestOrBuilder * @return The enum numeric value on the wire for mode. */ int getModeValue(); + /** * * @@ -119,6 +122,7 @@ public interface CommitRequestOrBuilder * @return Whether the transaction field is set. */ boolean hasTransaction(); + /** * * @@ -149,6 +153,7 @@ public interface CommitRequestOrBuilder * @return Whether the singleUseTransaction field is set. */ boolean hasSingleUseTransaction(); + /** * * @@ -164,6 +169,7 @@ public interface CommitRequestOrBuilder * @return The singleUseTransaction. */ com.google.datastore.v1.TransactionOptions getSingleUseTransaction(); + /** * * @@ -200,6 +206,7 @@ public interface CommitRequestOrBuilder * repeated .google.datastore.v1.Mutation mutations = 6; */ java.util.List getMutationsList(); + /** * * @@ -222,6 +229,7 @@ public interface CommitRequestOrBuilder * repeated .google.datastore.v1.Mutation mutations = 6; */ com.google.datastore.v1.Mutation getMutations(int index); + /** * * @@ -244,6 +252,7 @@ public interface CommitRequestOrBuilder * repeated .google.datastore.v1.Mutation mutations = 6; */ int getMutationsCount(); + /** * * @@ -266,6 +275,7 @@ public interface CommitRequestOrBuilder * repeated .google.datastore.v1.Mutation mutations = 6; */ java.util.List getMutationsOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java index 1c99dbe42..51aadd20b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java @@ -33,6 +33,7 @@ public final class CommitResponse extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.CommitResponse) CommitResponseOrBuilder { private static final long serialVersionUID = 0L; + // Use CommitResponse.newBuilder() to construct. private CommitResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -68,6 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private java.util.List mutationResults_; + /** * * @@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public java.util.List getMutationResultsList() { return mutationResults_; } + /** * * @@ -97,6 +100,7 @@ public java.util.List getMutationResults getMutationResultsOrBuilderList() { return mutationResults_; } + /** * * @@ -111,6 +115,7 @@ public java.util.List getMutationResults public int getMutationResultsCount() { return mutationResults_.size(); } + /** * * @@ -125,6 +130,7 @@ public int getMutationResultsCount() { public com.google.datastore.v1.MutationResult getMutationResults(int index) { return mutationResults_.get(index); } + /** * * @@ -142,6 +148,7 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild public static final int INDEX_UPDATES_FIELD_NUMBER = 4; private int indexUpdates_ = 0; + /** * * @@ -161,6 +168,7 @@ public int getIndexUpdates() { public static final int COMMIT_TIME_FIELD_NUMBER = 8; private com.google.protobuf.Timestamp commitTime_; + /** * * @@ -176,6 +184,7 @@ public int getIndexUpdates() { public boolean hasCommitTime() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -191,6 +200,7 @@ public boolean hasCommitTime() { public com.google.protobuf.Timestamp getCommitTime() { return commitTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : commitTime_; } + /** * * @@ -388,6 +398,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -692,6 +703,7 @@ public java.util.List getMutationResults return mutationResultsBuilder_.getMessageList(); } } + /** * * @@ -709,6 +721,7 @@ public int getMutationResultsCount() { return mutationResultsBuilder_.getCount(); } } + /** * * @@ -726,6 +739,7 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) { return mutationResultsBuilder_.getMessage(index); } } + /** * * @@ -749,6 +763,7 @@ public Builder setMutationResults(int index, com.google.datastore.v1.MutationRes } return this; } + /** * * @@ -770,6 +785,7 @@ public Builder setMutationResults( } return this; } + /** * * @@ -793,6 +809,7 @@ public Builder addMutationResults(com.google.datastore.v1.MutationResult value) } return this; } + /** * * @@ -816,6 +833,7 @@ public Builder addMutationResults(int index, com.google.datastore.v1.MutationRes } return this; } + /** * * @@ -837,6 +855,7 @@ public Builder addMutationResults( } return this; } + /** * * @@ -858,6 +877,7 @@ public Builder addMutationResults( } return this; } + /** * * @@ -879,6 +899,7 @@ public Builder addAllMutationResults( } return this; } + /** * * @@ -899,6 +920,7 @@ public Builder clearMutationResults() { } return this; } + /** * * @@ -919,6 +941,7 @@ public Builder removeMutationResults(int index) { } return this; } + /** * * @@ -932,6 +955,7 @@ public Builder removeMutationResults(int index) { public com.google.datastore.v1.MutationResult.Builder getMutationResultsBuilder(int index) { return getMutationResultsFieldBuilder().getBuilder(index); } + /** * * @@ -949,6 +973,7 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild return mutationResultsBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -967,6 +992,7 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild return java.util.Collections.unmodifiableList(mutationResults_); } } + /** * * @@ -981,6 +1007,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder( return getMutationResultsFieldBuilder() .addBuilder(com.google.datastore.v1.MutationResult.getDefaultInstance()); } + /** * * @@ -995,6 +1022,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder( return getMutationResultsFieldBuilder() .addBuilder(index, com.google.datastore.v1.MutationResult.getDefaultInstance()); } + /** * * @@ -1031,6 +1059,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder( } private int indexUpdates_; + /** * * @@ -1047,6 +1076,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder( public int getIndexUpdates() { return indexUpdates_; } + /** * * @@ -1067,6 +1097,7 @@ public Builder setIndexUpdates(int value) { onChanged(); return this; } + /** * * @@ -1092,6 +1123,7 @@ public Builder clearIndexUpdates() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> commitTimeBuilder_; + /** * * @@ -1106,6 +1138,7 @@ public Builder clearIndexUpdates() { public boolean hasCommitTime() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1126,6 +1159,7 @@ public com.google.protobuf.Timestamp getCommitTime() { return commitTimeBuilder_.getMessage(); } } + /** * * @@ -1148,6 +1182,7 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -1167,6 +1202,7 @@ public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForVal onChanged(); return this; } + /** * * @@ -1194,6 +1230,7 @@ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -1213,6 +1250,7 @@ public Builder clearCommitTime() { onChanged(); return this; } + /** * * @@ -1227,6 +1265,7 @@ public com.google.protobuf.Timestamp.Builder getCommitTimeBuilder() { onChanged(); return getCommitTimeFieldBuilder().getBuilder(); } + /** * * @@ -1245,6 +1284,7 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { : commitTime_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java index 14881db57..734dab60a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java @@ -35,6 +35,7 @@ public interface CommitResponseOrBuilder * repeated .google.datastore.v1.MutationResult mutation_results = 3; */ java.util.List getMutationResultsList(); + /** * * @@ -46,6 +47,7 @@ public interface CommitResponseOrBuilder * repeated .google.datastore.v1.MutationResult mutation_results = 3; */ com.google.datastore.v1.MutationResult getMutationResults(int index); + /** * * @@ -57,6 +59,7 @@ public interface CommitResponseOrBuilder * repeated .google.datastore.v1.MutationResult mutation_results = 3; */ int getMutationResultsCount(); + /** * * @@ -69,6 +72,7 @@ public interface CommitResponseOrBuilder */ java.util.List getMutationResultsOrBuilderList(); + /** * * @@ -107,6 +111,7 @@ public interface CommitResponseOrBuilder * @return Whether the commitTime field is set. */ boolean hasCommitTime(); + /** * * @@ -119,6 +124,7 @@ public interface CommitResponseOrBuilder * @return The commitTime. */ com.google.protobuf.Timestamp getCommitTime(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java index 549b6c60d..48ce71656 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java @@ -33,6 +33,7 @@ public final class CompositeFilter extends com.google.protobuf.GeneratedMessageV // @@protoc_insertion_point(message_implements:google.datastore.v1.CompositeFilter) CompositeFilterOrBuilder { private static final long serialVersionUID = 0L; + // Use CompositeFilter.newBuilder() to construct. private CompositeFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -117,6 +118,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * OPERATOR_UNSPECIFIED = 0; */ public static final int OPERATOR_UNSPECIFIED_VALUE = 0; + /** * * @@ -127,6 +129,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * AND = 1; */ public static final int AND_VALUE = 1; + /** * * @@ -223,6 +226,7 @@ private Operator(int value) { public static final int OP_FIELD_NUMBER = 1; private int op_ = 0; + /** * * @@ -238,6 +242,7 @@ private Operator(int value) { public int getOpValue() { return op_; } + /** * * @@ -260,6 +265,7 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() { @SuppressWarnings("serial") private java.util.List filters_; + /** * * @@ -277,6 +283,7 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() { public java.util.List getFiltersList() { return filters_; } + /** * * @@ -295,6 +302,7 @@ public java.util.List getFiltersList() { getFiltersOrBuilderList() { return filters_; } + /** * * @@ -312,6 +320,7 @@ public java.util.List getFiltersList() { public int getFiltersCount() { return filters_.size(); } + /** * * @@ -329,6 +338,7 @@ public int getFiltersCount() { public com.google.datastore.v1.Filter getFilters(int index) { return filters_.get(index); } + /** * * @@ -516,6 +526,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -756,6 +767,7 @@ public Builder mergeFrom( private int bitField0_; private int op_ = 0; + /** * * @@ -771,6 +783,7 @@ public Builder mergeFrom( public int getOpValue() { return op_; } + /** * * @@ -789,6 +802,7 @@ public Builder setOpValue(int value) { onChanged(); return this; } + /** * * @@ -808,6 +822,7 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() { ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result; } + /** * * @@ -829,6 +844,7 @@ public Builder setOp(com.google.datastore.v1.CompositeFilter.Operator value) { onChanged(); return this; } + /** * * @@ -883,6 +899,7 @@ public java.util.List getFiltersList() { return filtersBuilder_.getMessageList(); } } + /** * * @@ -903,6 +920,7 @@ public int getFiltersCount() { return filtersBuilder_.getCount(); } } + /** * * @@ -923,6 +941,7 @@ public com.google.datastore.v1.Filter getFilters(int index) { return filtersBuilder_.getMessage(index); } } + /** * * @@ -949,6 +968,7 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter value) { } return this; } + /** * * @@ -972,6 +992,7 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter.Builder buil } return this; } + /** * * @@ -998,6 +1019,7 @@ public Builder addFilters(com.google.datastore.v1.Filter value) { } return this; } + /** * * @@ -1024,6 +1046,7 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter value) { } return this; } + /** * * @@ -1047,6 +1070,7 @@ public Builder addFilters(com.google.datastore.v1.Filter.Builder builderForValue } return this; } + /** * * @@ -1070,6 +1094,7 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter.Builder buil } return this; } + /** * * @@ -1094,6 +1119,7 @@ public Builder addAllFilters( } return this; } + /** * * @@ -1117,6 +1143,7 @@ public Builder clearFilters() { } return this; } + /** * * @@ -1140,6 +1167,7 @@ public Builder removeFilters(int index) { } return this; } + /** * * @@ -1156,6 +1184,7 @@ public Builder removeFilters(int index) { public com.google.datastore.v1.Filter.Builder getFiltersBuilder(int index) { return getFiltersFieldBuilder().getBuilder(index); } + /** * * @@ -1176,6 +1205,7 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) { return filtersBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -1197,6 +1227,7 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) { return java.util.Collections.unmodifiableList(filters_); } } + /** * * @@ -1214,6 +1245,7 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder() { return getFiltersFieldBuilder() .addBuilder(com.google.datastore.v1.Filter.getDefaultInstance()); } + /** * * @@ -1231,6 +1263,7 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder(int index) { return getFiltersFieldBuilder() .addBuilder(index, com.google.datastore.v1.Filter.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java index 43f56bd57..da11961a0 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java @@ -36,6 +36,7 @@ public interface CompositeFilterOrBuilder * @return The enum numeric value on the wire for op. */ int getOpValue(); + /** * * @@ -63,6 +64,7 @@ public interface CompositeFilterOrBuilder * repeated .google.datastore.v1.Filter filters = 2; */ java.util.List getFiltersList(); + /** * * @@ -77,6 +79,7 @@ public interface CompositeFilterOrBuilder * repeated .google.datastore.v1.Filter filters = 2; */ com.google.datastore.v1.Filter getFilters(int index); + /** * * @@ -91,6 +94,7 @@ public interface CompositeFilterOrBuilder * repeated .google.datastore.v1.Filter filters = 2; */ int getFiltersCount(); + /** * * @@ -105,6 +109,7 @@ public interface CompositeFilterOrBuilder * repeated .google.datastore.v1.Filter filters = 2; */ java.util.List getFiltersOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java index 2764eb38f..b7fd2e6b5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java @@ -133,181 +133,213 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { - "\n#google/datastore/v1/datastore.proto\022\023g" + "\n" + + "#google/datastore/v1/datastore.proto\022\023g" + "oogle.datastore.v1\032\034google/api/annotatio" + "ns.proto\032\027google/api/client.proto\032\037googl" + "e/api/field_behavior.proto\032\030google/api/r" - + "outing.proto\032,google/datastore/v1/aggreg" - + "ation_result.proto\032 google/datastore/v1/" + + "outing.proto\032,google/datastore/v1/aggregation_result.proto\032 google/datastore/v1/" + "entity.proto\032\037google/datastore/v1/query." + "proto\032\'google/datastore/v1/query_profile" - + ".proto\032\037google/protobuf/timestamp.proto\"" - + "\334\001\n\rLookupRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340" - + "A\002\022\023\n\013database_id\030\t \001(\t\0226\n\014read_options\030" - + "\001 \001(\0132 .google.datastore.v1.ReadOptions\022" - + "+\n\004keys\030\003 \003(\0132\030.google.datastore.v1.KeyB" - + "\003\340A\002\0228\n\rproperty_mask\030\005 \001(\0132!.google.dat" - + "astore.v1.PropertyMask\"\346\001\n\016LookupRespons" - + "e\0220\n\005found\030\001 \003(\0132!.google.datastore.v1.E" - + "ntityResult\0222\n\007missing\030\002 \003(\0132!.google.da" - + "tastore.v1.EntityResult\022*\n\010deferred\030\003 \003(" - + "\0132\030.google.datastore.v1.Key\022\023\n\013transacti" - + "on\030\005 \001(\014\022-\n\tread_time\030\007 \001(\0132\032.google.pro" - + "tobuf.Timestamp\"\233\003\n\017RunQueryRequest\022\027\n\np" - + "roject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(" - + "\t\0226\n\014partition_id\030\002 \001(\0132 .google.datasto" - + "re.v1.PartitionId\0226\n\014read_options\030\001 \001(\0132" - + " .google.datastore.v1.ReadOptions\022+\n\005que" - + "ry\030\003 \001(\0132\032.google.datastore.v1.QueryH\000\0222" - + "\n\tgql_query\030\007 \001(\0132\035.google.datastore.v1." - + "GqlQueryH\000\0228\n\rproperty_mask\030\n \001(\0132!.goog" - + "le.datastore.v1.PropertyMask\022A\n\017explain_" - + "options\030\014 \001(\0132#.google.datastore.v1.Expl" - + "ainOptionsB\003\340A\001B\014\n\nquery_type\"\306\001\n\020RunQue" - + "ryResponse\0224\n\005batch\030\001 \001(\0132%.google.datas" - + "tore.v1.QueryResultBatch\022)\n\005query\030\002 \001(\0132" - + "\032.google.datastore.v1.Query\022\023\n\013transacti" - + "on\030\005 \001(\014\022<\n\017explain_metrics\030\t \001(\0132#.goog" - + "le.datastore.v1.ExplainMetrics\"\203\003\n\032RunAg" - + "gregationQueryRequest\022\027\n\nproject_id\030\010 \001(" - + "\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\0226\n\014partition" - + "_id\030\002 \001(\0132 .google.datastore.v1.Partitio" - + "nId\0226\n\014read_options\030\001 \001(\0132 .google.datas" - + "tore.v1.ReadOptions\022B\n\021aggregation_query" - + "\030\003 \001(\0132%.google.datastore.v1.Aggregation" - + "QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google.data" - + "store.v1.GqlQueryH\000\022A\n\017explain_options\030\013" - + " \001(\0132#.google.datastore.v1.ExplainOption" - + "sB\003\340A\001B\014\n\nquery_type\"\342\001\n\033RunAggregationQ" - + "ueryResponse\022:\n\005batch\030\001 \001(\0132+.google.dat" - + "astore.v1.AggregationResultBatch\0224\n\005quer" - + "y\030\002 \001(\0132%.google.datastore.v1.Aggregatio" - + "nQuery\022\023\n\013transaction\030\005 \001(\014\022<\n\017explain_m" - + "etrics\030\t \001(\0132#.google.datastore.v1.Expla" - + "inMetrics\"\215\001\n\027BeginTransactionRequest\022\027\n" - + "\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t " - + "\001(\t\022D\n\023transaction_options\030\n \001(\0132\'.googl" - + "e.datastore.v1.TransactionOptions\"/\n\030Beg" - + "inTransactionResponse\022\023\n\013transaction\030\001 \001" - + "(\014\"Y\n\017RollbackRequest\022\027\n\nproject_id\030\010 \001(" - + "\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022\030\n\013transacti" - + "on\030\001 \001(\014B\003\340A\002\"\022\n\020RollbackResponse\"\350\002\n\rCo" - + "mmitRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013" - + "database_id\030\t \001(\t\0225\n\004mode\030\005 \001(\0162\'.google" - + ".datastore.v1.CommitRequest.Mode\022\025\n\013tran" - + "saction\030\001 \001(\014H\000\022I\n\026single_use_transactio" - + "n\030\n \001(\0132\'.google.datastore.v1.Transactio" - + "nOptionsH\000\0220\n\tmutations\030\006 \003(\0132\035.google.d" - + "atastore.v1.Mutation\"F\n\004Mode\022\024\n\020MODE_UNS" - + "PECIFIED\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021NON_TRA" - + "NSACTIONAL\020\002B\026\n\024transaction_selector\"\227\001\n" - + "\016CommitResponse\022=\n\020mutation_results\030\003 \003(" - + "\0132#.google.datastore.v1.MutationResult\022\025" - + "\n\rindex_updates\030\004 \001(\005\022/\n\013commit_time\030\010 \001" - + "(\0132\032.google.protobuf.Timestamp\"o\n\022Alloca" - + "teIdsRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n" - + "\013database_id\030\t \001(\t\022+\n\004keys\030\001 \003(\0132\030.googl" - + "e.datastore.v1.KeyB\003\340A\002\"=\n\023AllocateIdsRe" - + "sponse\022&\n\004keys\030\001 \003(\0132\030.google.datastore." - + "v1.Key\"n\n\021ReserveIdsRequest\022\027\n\nproject_i" - + "d\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022+\n\004key" - + "s\030\001 \003(\0132\030.google.datastore.v1.KeyB\003\340A\002\"\024" - + "\n\022ReserveIdsResponse\"\362\004\n\010Mutation\022-\n\006ins" - + "ert\030\004 \001(\0132\033.google.datastore.v1.EntityH\000" - + "\022-\n\006update\030\005 \001(\0132\033.google.datastore.v1.E" - + "ntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google.datasto" - + "re.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030.google." - + "datastore.v1.KeyH\000\022\026\n\014base_version\030\010 \001(\003" - + "H\001\0221\n\013update_time\030\013 \001(\0132\032.google.protobu" - + "f.TimestampH\001\022^\n\034conflict_resolution_str" - + "ategy\030\n \001(\01628.google.datastore.v1.Mutati" - + "on.ConflictResolutionStrategy\0228\n\rpropert" - + "y_mask\030\t \001(\0132!.google.datastore.v1.Prope" - + "rtyMask\022H\n\023property_transforms\030\014 \003(\0132&.g" - + "oogle.datastore.v1.PropertyTransformB\003\340A" - + "\001\"R\n\032ConflictResolutionStrategy\022\030\n\024STRAT" - + "EGY_UNSPECIFIED\020\000\022\020\n\014SERVER_VALUE\020\001\022\010\n\004F" - + "AIL\020\003B\013\n\toperationB\035\n\033conflict_detection" - + "_strategy\"\343\003\n\021PropertyTransform\022\025\n\010prope" - + "rty\030\001 \001(\tB\003\340A\001\022Q\n\023set_to_server_value\030\002 " - + "\001(\01622.google.datastore.v1.PropertyTransf" - + "orm.ServerValueH\000\022/\n\tincrement\030\003 \001(\0132\032.g" - + "oogle.datastore.v1.ValueH\000\022-\n\007maximum\030\004 " - + "\001(\0132\032.google.datastore.v1.ValueH\000\022-\n\007min" - + "imum\030\005 \001(\0132\032.google.datastore.v1.ValueH\000" - + "\022B\n\027append_missing_elements\030\006 \001(\0132\037.goog" - + "le.datastore.v1.ArrayValueH\000\022@\n\025remove_a" - + "ll_from_array\030\007 \001(\0132\037.google.datastore.v" - + "1.ArrayValueH\000\"=\n\013ServerValue\022\034\n\030SERVER_" - + "VALUE_UNSPECIFIED\020\000\022\020\n\014REQUEST_TIME\020\001B\020\n" - + "\016transform_type\"\374\001\n\016MutationResult\022%\n\003ke" - + "y\030\003 \001(\0132\030.google.datastore.v1.Key\022\017\n\007ver" - + "sion\030\004 \001(\003\022/\n\013create_time\030\007 \001(\0132\032.google" - + ".protobuf.Timestamp\022/\n\013update_time\030\006 \001(\013" - + "2\032.google.protobuf.Timestamp\022\031\n\021conflict" - + "_detected\030\005 \001(\010\0225\n\021transform_results\030\010 \003" - + "(\0132\032.google.datastore.v1.Value\"\035\n\014Proper" - + "tyMask\022\r\n\005paths\030\001 \003(\t\"\312\002\n\013ReadOptions\022L\n" - + "\020read_consistency\030\001 \001(\01620.google.datasto" - + "re.v1.ReadOptions.ReadConsistencyH\000\022\025\n\013t" - + "ransaction\030\002 \001(\014H\000\022B\n\017new_transaction\030\003 " - + "\001(\0132\'.google.datastore.v1.TransactionOpt" - + "ionsH\000\022/\n\tread_time\030\004 \001(\0132\032.google.proto" - + "buf.TimestampH\000\"M\n\017ReadConsistency\022 \n\034RE" - + "AD_CONSISTENCY_UNSPECIFIED\020\000\022\n\n\006STRONG\020\001" - + "\022\014\n\010EVENTUAL\020\002B\022\n\020consistency_type\"\222\002\n\022T" - + "ransactionOptions\022G\n\nread_write\030\001 \001(\01321." - + "google.datastore.v1.TransactionOptions.R" - + "eadWriteH\000\022E\n\tread_only\030\002 \001(\01320.google.d" - + "atastore.v1.TransactionOptions.ReadOnlyH" - + "\000\032)\n\tReadWrite\022\034\n\024previous_transaction\030\001" - + " \001(\014\0329\n\010ReadOnly\022-\n\tread_time\030\001 \001(\0132\032.go" - + "ogle.protobuf.TimestampB\006\n\004mode2\341\r\n\tData" - + "store\022\300\001\n\006Lookup\022\".google.datastore.v1.L" - + "ookupRequest\032#.google.datastore.v1.Looku" - + "pResponse\"m\332A\034project_id,read_options,ke" - + "ys\202\323\344\223\002%\" /v1/projects/{project_id}:look" - + "up:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id" - + "\022\251\001\n\010RunQuery\022$.google.datastore.v1.RunQ" - + "ueryRequest\032%.google.datastore.v1.RunQue" - + "ryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{projec" - + "t_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n" - + "\013database_id\022\325\001\n\023RunAggregationQuery\022/.g" - + "oogle.datastore.v1.RunAggregationQueryRe" + + ".proto\032\037google/protobuf/timestamp.proto\"\334\001\n\r" + + "LookupRequest\022\027\n\n" + + "project_id\030\010 \001(\tB\003\340A\002\022\023\n" + + "\013database_id\030\t \001(\t\0226\n" + + "\014read_options\030\001 \001(\0132 .google.datastore.v1.ReadOptions\022+\n" + + "\004keys\030\003 \003(\0132\030.google.datastore.v1.KeyB\003\340A\002\0228\n\r" + + "property_mask\030\005 \001(\0132!.google.datastore.v1.PropertyMask\"\346\001\n" + + "\016LookupResponse\0220\n" + + "\005found\030\001 \003(\0132!.google.datastore.v1.EntityResult\0222\n" + + "\007missing\030\002 \003(\0132!.google.datastore.v1.EntityResult\022*\n" + + "\010deferred\030\003 \003(\0132\030.google.datastore.v1.Key\022\023\n" + + "\013transaction\030\005 \001(\014\022-\n" + + "\tread_time\030\007 \001(\0132\032.google.protobuf.Timestamp\"\233\003\n" + + "\017RunQueryRequest\022\027\n\n" + + "project_id\030\010 \001(\tB\003\340A\002\022\023\n" + + "\013database_id\030\t \001(\t\0226\n" + + "\014partition_id\030\002 \001(\0132 .google.datastore.v1.PartitionId\0226\n" + + "\014read_options\030\001 \001(\0132 .google.datastore.v1.ReadOptions\022+\n" + + "\005query\030\003 \001(\0132\032.google.datastore.v1.QueryH\000\0222\n" + + "\tgql_query\030\007 \001(\0132\035.google.datastore.v1.GqlQueryH\000\0228\n\r" + + "property_mask\030\n" + + " \001(\0132!.google.datastore.v1.PropertyMask\022A\n" + + "\017explain_options\030\014" + + " \001(\0132#.google.datastore.v1.ExplainOptionsB\003\340A\001B\014\n\n" + + "query_type\"\306\001\n" + + "\020RunQueryResponse\0224\n" + + "\005batch\030\001 \001(\0132%.google.datastore.v1.QueryResultBatch\022)\n" + + "\005query\030\002 \001(\0132\032.google.datastore.v1.Query\022\023\n" + + "\013transaction\030\005 \001(\014\022<\n" + + "\017explain_metrics\030\t \001(\0132#.google.datastore.v1.ExplainMetrics\"\203\003\n" + + "\032RunAggregationQueryRequest\022\027\n\n" + + "project_id\030\010 \001(\tB\003\340A\002\022\023\n" + + "\013database_id\030\t \001(\t\0226\n" + + "\014partition_id\030\002 \001(\0132 .google.datastore.v1.PartitionId\0226\n" + + "\014read_options\030\001 \001(\0132 .google.datastore.v1.ReadOptions\022B\n" + + "\021aggregation_query\030\003" + + " \001(\0132%.google.datastore.v1.AggregationQueryH\000\0222\n" + + "\tgql_query\030\007 \001(\0132\035.google.datastore.v1.GqlQueryH\000\022A\n" + + "\017explain_options\030\013" + + " \001(\0132#.google.datastore.v1.ExplainOptionsB\003\340A\001B\014\n\n" + + "query_type\"\342\001\n" + + "\033RunAggregationQueryResponse\022:\n" + + "\005batch\030\001 \001(\0132+.google.datastore.v1.AggregationResultBatch\0224\n" + + "\005query\030\002 \001(\0132%.google.datastore.v1.AggregationQuery\022\023\n" + + "\013transaction\030\005 \001(\014\022<\n" + + "\017explain_metrics\030\t \001(\0132#.google.datastore.v1.ExplainMetrics\"\215\001\n" + + "\027BeginTransactionRequest\022\027\n" + + "\n" + + "project_id\030\010 \001(\tB\003\340A\002\022\023\n" + + "\013database_id\030\t \001(\t\022D\n" + + "\023transaction_options\030\n" + + " \001(\0132\'.google.datastore.v1.TransactionOptions\"/\n" + + "\030BeginTransactionResponse\022\023\n" + + "\013transaction\030\001 \001(\014\"Y\n" + + "\017RollbackRequest\022\027\n\n" + + "project_id\030\010 \001(\tB\003\340A\002\022\023\n" + + "\013database_id\030\t \001(\t\022\030\n" + + "\013transaction\030\001 \001(\014B\003\340A\002\"\022\n" + + "\020RollbackResponse\"\350\002\n\r" + + "CommitRequest\022\027\n\n" + + "project_id\030\010 \001(\tB\003\340A\002\022\023\n" + + "\013database_id\030\t \001(\t\0225\n" + + "\004mode\030\005 \001(\0162\'.google.datastore.v1.CommitRequest.Mode\022\025\n" + + "\013transaction\030\001 \001(\014H\000\022I\n" + + "\026single_use_transaction\030\n" + + " \001(\0132\'.google.datastore.v1.TransactionOptionsH\000\0220\n" + + "\tmutations\030\006 \003(\0132\035.google.datastore.v1.Mutation\"F\n" + + "\004Mode\022\024\n" + + "\020MODE_UNSPECIFIED\020\000\022\021\n\r" + + "TRANSACTIONAL\020\001\022\025\n" + + "\021NON_TRANSACTIONAL\020\002B\026\n" + + "\024transaction_selector\"\227\001\n" + + "\016CommitResponse\022=\n" + + "\020mutation_results\030\003 \003(" + + "\0132#.google.datastore.v1.MutationResult\022\025\n\r" + + "index_updates\030\004 \001(\005\022/\n" + + "\013commit_time\030\010 \001(\0132\032.google.protobuf.Timestamp\"o\n" + + "\022AllocateIdsRequest\022\027\n\n" + + "project_id\030\010 \001(\tB\003\340A\002\022\023\n" + + "\013database_id\030\t \001(\t\022+\n" + + "\004keys\030\001 \003(\0132\030.google.datastore.v1.KeyB\003\340A\002\"=\n" + + "\023AllocateIdsResponse\022&\n" + + "\004keys\030\001 \003(\0132\030.google.datastore.v1.Key\"n\n" + + "\021ReserveIdsRequest\022\027\n\n" + + "project_id\030\010 \001(\tB\003\340A\002\022\023\n" + + "\013database_id\030\t \001(\t\022+\n" + + "\004keys\030\001 \003(\0132\030.google.datastore.v1.KeyB\003\340A\002\"\024\n" + + "\022ReserveIdsResponse\"\362\004\n" + + "\010Mutation\022-\n" + + "\006insert\030\004 \001(\0132\033.google.datastore.v1.EntityH\000\022-\n" + + "\006update\030\005 \001(\0132\033.google.datastore.v1.EntityH\000\022-\n" + + "\006upsert\030\006 \001(\0132\033.google.datastore.v1.EntityH\000\022*\n" + + "\006delete\030\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n" + + "\014base_version\030\010 \001(\003H\001\0221\n" + + "\013update_time\030\013 \001(\0132\032.google.protobuf.TimestampH\001\022^\n" + + "\034conflict_resolution_strategy\030\n" + + " \001(\01628.google.datastore.v1.Mutation.ConflictResolutionStrategy\0228\n\r" + + "property_mask\030\t \001(\0132!.google.datastore.v1.PropertyMask\022H\n" + + "\023property_transforms\030\014 \003(\0132&.g" + + "oogle.datastore.v1.PropertyTransformB\003\340A\001\"R\n" + + "\032ConflictResolutionStrategy\022\030\n" + + "\024STRATEGY_UNSPECIFIED\020\000\022\020\n" + + "\014SERVER_VALUE\020\001\022\010\n" + + "\004FAIL\020\003B\013\n" + + "\toperationB\035\n" + + "\033conflict_detection_strategy\"\343\003\n" + + "\021PropertyTransform\022\025\n" + + "\010property\030\001 \001(\tB\003\340A\001\022Q\n" + + "\023set_to_server_value\030\002 " + + "\001(\01622.google.datastore.v1.PropertyTransform.ServerValueH\000\022/\n" + + "\tincrement\030\003 \001(\0132\032.google.datastore.v1.ValueH\000\022-\n" + + "\007maximum\030\004 \001(\0132\032.google.datastore.v1.ValueH\000\022-\n" + + "\007minimum\030\005 \001(\0132\032.google.datastore.v1.ValueH\000\022B\n" + + "\027append_missing_elements\030\006" + + " \001(\0132\037.google.datastore.v1.ArrayValueH\000\022@\n" + + "\025remove_all_from_array\030\007" + + " \001(\0132\037.google.datastore.v1.ArrayValueH\000\"=\n" + + "\013ServerValue\022\034\n" + + "\030SERVER_VALUE_UNSPECIFIED\020\000\022\020\n" + + "\014REQUEST_TIME\020\001B\020\n" + + "\016transform_type\"\374\001\n" + + "\016MutationResult\022%\n" + + "\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017\n" + + "\007version\030\004 \001(\003\022/\n" + + "\013create_time\030\007 \001(\0132\032.google.protobuf.Timestamp\022/\n" + + "\013update_time\030\006 \001(\0132\032.google.protobuf.Timestamp\022\031\n" + + "\021conflict_detected\030\005 \001(\010\0225\n" + + "\021transform_results\030\010 \003(\0132\032.google.datastore.v1.Value\"\035\n" + + "\014PropertyMask\022\r\n" + + "\005paths\030\001 \003(\t\"\312\002\n" + + "\013ReadOptions\022L\n" + + "\020read_consistency\030\001" + + " \001(\01620.google.datastore.v1.ReadOptions.ReadConsistencyH\000\022\025\n" + + "\013transaction\030\002 \001(\014H\000\022B\n" + + "\017new_transaction\030\003 " + + "\001(\0132\'.google.datastore.v1.TransactionOptionsH\000\022/\n" + + "\tread_time\030\004 \001(\0132\032.google.protobuf.TimestampH\000\"M\n" + + "\017ReadConsistency\022 \n" + + "\034READ_CONSISTENCY_UNSPECIFIED\020\000\022\n\n" + + "\006STRONG\020\001\022\014\n" + + "\010EVENTUAL\020\002B\022\n" + + "\020consistency_type\"\222\002\n" + + "\022TransactionOptions\022G\n\n" + + "read_write\030\001 \001(\01321." + + "google.datastore.v1.TransactionOptions.ReadWriteH\000\022E\n" + + "\tread_only\030\002 \001(\01320.google.d" + + "atastore.v1.TransactionOptions.ReadOnlyH\000\032)\n" + + "\tReadWrite\022\034\n" + + "\024previous_transaction\030\001 \001(\014\0329\n" + + "\010ReadOnly\022-\n" + + "\tread_time\030\001 \001(\0132\032.google.protobuf.TimestampB\006\n" + + "\004mode2\341\r\n" + + "\tDatastore\022\300\001\n" + + "\006Lookup\022\".google.datastore.v1.LookupRequest\032#.google.datastore.v1.Looku" + + "pResponse\"m\332A\034project_id,read_options,keys\202\323\344\223\002%\"" + + " /v1/projects/{project_id}:lookup:\001*\212\323\344\223\002\035\022\014\n\n" + + "project_id\022\r\n" + + "\013database_id\022\251\001\n" + + "\010RunQuery\022$.google.datastore.v1.RunQueryRequest\032%.google.datastore.v1.RunQue" + + "ryResponse\"P\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQuery:\001*\212\323\344\223\002\035\022\014\n\n" + + "project_id\022\r\n" + + "\013database_id\022\325\001\n" + + "\023RunAggregationQuery\022/.google.datastore.v1.RunAggregationQueryRe" + "quest\0320.google.datastore.v1.RunAggregati" + "onQueryResponse\"[\202\323\344\223\0022\"-/v1/projects/{p" - + "roject_id}:runAggregationQuery:\001*\212\323\344\223\002\035\022" - + "\014\n\nproject_id\022\r\n\013database_id\022\326\001\n\020BeginTr" - + "ansaction\022,.google.datastore.v1.BeginTra" - + "nsactionRequest\032-.google.datastore.v1.Be" - + "ginTransactionResponse\"e\332A\nproject_id\202\323\344" - + "\223\002/\"*/v1/projects/{project_id}:beginTran" - + "saction:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013databa" - + "se_id\022\346\001\n\006Commit\022\".google.datastore.v1.C" - + "ommitRequest\032#.google.datastore.v1.Commi" + + "roject_id}:runAggregationQuery:\001*\212\323\344\223\002\035\022\014\n\n" + + "project_id\022\r\n" + + "\013database_id\022\326\001\n" + + "\020BeginTransaction\022,.google.datastore.v1.BeginTra" + + "nsactionRequest\032-.google.datastore.v1.BeginTransactionResponse\"e\332A\n" + + "project_id\202\323\344" + + "\223\002/\"*/v1/projects/{project_id}:beginTransaction:\001*\212\323\344\223\002\035\022\014\n\n" + + "project_id\022\r\n" + + "\013database_id\022\346\001\n" + + "\006Commit\022\".google.datastore.v1.CommitRequest\032#.google.datastore.v1.Commi" + "tResponse\"\222\001\332A%project_id,mode,transacti" - + "on,mutations\332A\031project_id,mode,mutations" - + "\202\323\344\223\002%\" /v1/projects/{project_id}:commit" - + ":\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\302" - + "\001\n\010Rollback\022$.google.datastore.v1.Rollba" + + "on,mutations\332A\031project_id,mode,mutations\202\323\344\223\002%\"" + + " /v1/projects/{project_id}:commit:\001*\212\323\344\223\002\035\022\014\n\n" + + "project_id\022\r\n" + + "\013database_id\022\302\001\n" + + "\010Rollback\022$.google.datastore.v1.Rollba" + "ckRequest\032%.google.datastore.v1.Rollback" + "Response\"i\332A\026project_id,transaction\202\323\344\223\002" - + "\'\"\"/v1/projects/{project_id}:rollback:\001*" - + "\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\307\001\n\013" - + "AllocateIds\022\'.google.datastore.v1.Alloca" + + "\'\"\"/v1/projects/{project_id}:rollback:\001*\212\323\344\223\002\035\022\014\n\n" + + "project_id\022\r\n" + + "\013database_id\022\307\001\n" + + "\013AllocateIds\022\'.google.datastore.v1.Alloca" + "teIdsRequest\032(.google.datastore.v1.Alloc" + "ateIdsResponse\"e\332A\017project_id,keys\202\323\344\223\002*" - + "\"%/v1/projects/{project_id}:allocateIds:" - + "\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\303\001" - + "\n\nReserveIds\022&.google.datastore.v1.Reser" - + "veIdsRequest\032\'.google.datastore.v1.Reser" + + "\"%/v1/projects/{project_id}:allocateIds:\001*\212\323\344\223\002\035\022\014\n\n" + + "project_id\022\r\n" + + "\013database_id\022\303\001\n\n" + + "ReserveIds\022&.google.datastore.v1.ReserveIdsRequest\032\'.google.datastore.v1.Reser" + "veIdsResponse\"d\332A\017project_id,keys\202\323\344\223\002)\"" - + "$/v1/projects/{project_id}:reserveIds:\001*" - + "\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\032v\312A\030" - + "datastore.googleapis.com\322AXhttps://www.g" - + "oogleapis.com/auth/cloud-platform,https:" - + "//www.googleapis.com/auth/datastoreB\277\001\n\027" - + "com.google.datastore.v1B\016DatastoreProtoP" + + "$/v1/projects/{project_id}:reserveIds:\001*\212\323\344\223\002\035\022\014\n\n" + + "project_id\022\r\n" + + "\013database_id\032v\312A\030datastore.googleapis.com\322AXhttps://www.g" + + "oogleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/datastoreB\277\001\n" + + "\027com.google.datastore.v1B\016DatastoreProtoP" + "\001Z;cloud.google.com/go/datastore/apiv1/d" + "atastorepb;datastorepb\252\002\031Google.Cloud.Da" + "tastore.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002" diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java index 7217a2bdc..7a16929fa 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java @@ -35,6 +35,7 @@ public final class Entity extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.Entity) EntityOrBuilder { private static final long serialVersionUID = 0L; + // Use Entity.newBuilder() to construct. private Entity(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -77,6 +78,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl private int bitField0_; public static final int KEY_FIELD_NUMBER = 1; private com.google.datastore.v1.Key key_; + /** * * @@ -97,6 +99,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl public boolean hasKey() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -117,6 +120,7 @@ public boolean hasKey() { public com.google.datastore.v1.Key getKey() { return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_; } + /** * * @@ -165,6 +169,7 @@ private static final class PropertiesDefaultEntryHolder { public int getPropertiesCount() { return internalGetProperties().getMap().size(); } + /** * * @@ -186,12 +191,14 @@ public boolean containsProperties(java.lang.String key) { } return internalGetProperties().getMap().containsKey(key); } + /** Use {@link #getPropertiesMap()} instead. */ @java.lang.Override @java.lang.Deprecated public java.util.Map getProperties() { return getPropertiesMap(); } + /** * * @@ -210,6 +217,7 @@ public java.util.Map getPropert public java.util.Map getPropertiesMap() { return internalGetProperties().getMap(); } + /** * * @@ -236,6 +244,7 @@ public java.util.Map getPropert internalGetProperties().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } + /** * * @@ -442,6 +451,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -686,6 +696,7 @@ public Builder mergeFrom( com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyBuilder_; + /** * * @@ -705,6 +716,7 @@ public Builder mergeFrom( public boolean hasKey() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -728,6 +740,7 @@ public com.google.datastore.v1.Key getKey() { return keyBuilder_.getMessage(); } } + /** * * @@ -755,6 +768,7 @@ public Builder setKey(com.google.datastore.v1.Key value) { onChanged(); return this; } + /** * * @@ -779,6 +793,7 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) { onChanged(); return this; } + /** * * @@ -811,6 +826,7 @@ public Builder mergeKey(com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -835,6 +851,7 @@ public Builder clearKey() { onChanged(); return this; } + /** * * @@ -854,6 +871,7 @@ public com.google.datastore.v1.Key.Builder getKeyBuilder() { onChanged(); return getKeyFieldBuilder().getBuilder(); } + /** * * @@ -875,6 +893,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() { return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_; } } + /** * * @@ -923,7 +942,8 @@ public com.google.datastore.v1.Value build(com.google.datastore.v1.ValueOrBuilde defaultEntry() { return PropertiesDefaultEntryHolder.defaultEntry; } - }; + } + ; private static final PropertiesConverter propertiesConverter = new PropertiesConverter(); @@ -963,6 +983,7 @@ public com.google.datastore.v1.Value build(com.google.datastore.v1.ValueOrBuilde public int getPropertiesCount() { return internalGetProperties().ensureBuilderMap().size(); } + /** * * @@ -984,12 +1005,14 @@ public boolean containsProperties(java.lang.String key) { } return internalGetProperties().ensureBuilderMap().containsKey(key); } + /** Use {@link #getPropertiesMap()} instead. */ @java.lang.Override @java.lang.Deprecated public java.util.Map getProperties() { return getPropertiesMap(); } + /** * * @@ -1008,6 +1031,7 @@ public java.util.Map getPropert public java.util.Map getPropertiesMap() { return internalGetProperties().getImmutableMap(); } + /** * * @@ -1034,6 +1058,7 @@ public java.util.Map getPropert internalGetMutableProperties().ensureBuilderMap(); return map.containsKey(key) ? propertiesConverter.build(map.get(key)) : defaultValue; } + /** * * @@ -1066,6 +1091,7 @@ public Builder clearProperties() { internalGetMutableProperties().clear(); return this; } + /** * * @@ -1087,12 +1113,14 @@ public Builder removeProperties(java.lang.String key) { internalGetMutableProperties().ensureBuilderMap().remove(key); return this; } + /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableProperties() { bitField0_ |= 0x00000002; return internalGetMutableProperties().ensureMessageMap(); } + /** * * @@ -1118,6 +1146,7 @@ public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value bitField0_ |= 0x00000002; return this; } + /** * * @@ -1144,6 +1173,7 @@ public Builder putAllProperties( bitField0_ |= 0x00000002; return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java index 1ec6d192b..455c0fe51 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java @@ -41,6 +41,7 @@ public interface EntityOrBuilder * @return Whether the key field is set. */ boolean hasKey(); + /** * * @@ -58,6 +59,7 @@ public interface EntityOrBuilder * @return The key. */ com.google.datastore.v1.Key getKey(); + /** * * @@ -89,6 +91,7 @@ public interface EntityOrBuilder * map<string, .google.datastore.v1.Value> properties = 3; */ int getPropertiesCount(); + /** * * @@ -104,9 +107,11 @@ public interface EntityOrBuilder * map<string, .google.datastore.v1.Value> properties = 3; */ boolean containsProperties(java.lang.String key); + /** Use {@link #getPropertiesMap()} instead. */ @java.lang.Deprecated java.util.Map getProperties(); + /** * * @@ -122,6 +127,7 @@ public interface EntityOrBuilder * map<string, .google.datastore.v1.Value> properties = 3; */ java.util.Map getPropertiesMap(); + /** * * @@ -141,6 +147,7 @@ com.google.datastore.v1.Value getPropertiesOrDefault( java.lang.String key, /* nullable */ com.google.datastore.v1.Value defaultValue); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java index 9bd0e1002..fdccb2240 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java @@ -65,37 +65,47 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { - "\n google/datastore/v1/entity.proto\022\023goog" + "\n" + + " google/datastore/v1/entity.proto\022\023goog" + "le.datastore.v1\032\034google/protobuf/struct." - + "proto\032\037google/protobuf/timestamp.proto\032\030" - + "google/type/latlng.proto\"L\n\013PartitionId\022" - + "\022\n\nproject_id\030\002 \001(\t\022\023\n\013database_id\030\003 \001(\t" - + "\022\024\n\014namespace_id\030\004 \001(\t\"\267\001\n\003Key\0226\n\014partit" - + "ion_id\030\001 \001(\0132 .google.datastore.v1.Parti" - + "tionId\0222\n\004path\030\002 \003(\0132$.google.datastore." - + "v1.Key.PathElement\032D\n\013PathElement\022\014\n\004kin" - + "d\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003 \001(\tH\000B\t\n" - + "\007id_type\"8\n\nArrayValue\022*\n\006values\030\001 \003(\0132\032" - + ".google.datastore.v1.Value\"\361\003\n\005Value\0220\n\n" - + "null_value\030\013 \001(\0162\032.google.protobuf.NullV" - + "alueH\000\022\027\n\rboolean_value\030\001 \001(\010H\000\022\027\n\rinteg" - + "er_value\030\002 \001(\003H\000\022\026\n\014double_value\030\003 \001(\001H\000" - + "\0225\n\017timestamp_value\030\n \001(\0132\032.google.proto" - + "buf.TimestampH\000\022-\n\tkey_value\030\005 \001(\0132\030.goo" - + "gle.datastore.v1.KeyH\000\022\026\n\014string_value\030\021" - + " \001(\tH\000\022\024\n\nblob_value\030\022 \001(\014H\000\022.\n\017geo_poin" - + "t_value\030\010 \001(\0132\023.google.type.LatLngH\000\0223\n\014" - + "entity_value\030\006 \001(\0132\033.google.datastore.v1" - + ".EntityH\000\0226\n\013array_value\030\t \001(\0132\037.google." - + "datastore.v1.ArrayValueH\000\022\017\n\007meaning\030\016 \001" - + "(\005\022\034\n\024exclude_from_indexes\030\023 \001(\010B\014\n\nvalu" - + "e_type\"\277\001\n\006Entity\022%\n\003key\030\001 \001(\0132\030.google." - + "datastore.v1.Key\022?\n\nproperties\030\003 \003(\0132+.g" - + "oogle.datastore.v1.Entity.PropertiesEntr" - + "y\032M\n\017PropertiesEntry\022\013\n\003key\030\001 \001(\t\022)\n\005val" - + "ue\030\002 \001(\0132\032.google.datastore.v1.Value:\0028\001" - + "B\274\001\n\027com.google.datastore.v1B\013EntityProt" - + "oP\001Z;cloud.google.com/go/datastore/apiv1" + + "proto\032\037google/protobuf/timestamp.proto\032\030google/type/latlng.proto\"L\n" + + "\013PartitionId\022\022\n\n" + + "project_id\030\002 \001(\t\022\023\n" + + "\013database_id\030\003 \001(\t\022\024\n" + + "\014namespace_id\030\004 \001(\t\"\267\001\n" + + "\003Key\0226\n" + + "\014partition_id\030\001 \001(\0132 .google.datastore.v1.PartitionId\0222\n" + + "\004path\030\002 \003(\0132$.google.datastore.v1.Key.PathElement\032D\n" + + "\013PathElement\022\014\n" + + "\004kind\030\001 \001(\t\022\014\n" + + "\002id\030\002 \001(\003H\000\022\016\n" + + "\004name\030\003 \001(\tH\000B\t\n" + + "\007id_type\"8\n\n" + + "ArrayValue\022*\n" + + "\006values\030\001 \003(\0132\032.google.datastore.v1.Value\"\361\003\n" + + "\005Value\0220\n\n" + + "null_value\030\013 \001(\0162\032.google.protobuf.NullValueH\000\022\027\n\r" + + "boolean_value\030\001 \001(\010H\000\022\027\n\r" + + "integer_value\030\002 \001(\003H\000\022\026\n" + + "\014double_value\030\003 \001(\001H\000\0225\n" + + "\017timestamp_value\030\n" + + " \001(\0132\032.google.protobuf.TimestampH\000\022-\n" + + "\tkey_value\030\005 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n" + + "\014string_value\030\021 \001(\tH\000\022\024\n\n" + + "blob_value\030\022 \001(\014H\000\022.\n" + + "\017geo_point_value\030\010 \001(\0132\023.google.type.LatLngH\000\0223\n" + + "\014entity_value\030\006 \001(\0132\033.google.datastore.v1.EntityH\000\0226\n" + + "\013array_value\030\t \001(\0132\037.google.datastore.v1.ArrayValueH\000\022\017\n" + + "\007meaning\030\016 \001(\005\022\034\n" + + "\024exclude_from_indexes\030\023 \001(\010B\014\n\n" + + "value_type\"\277\001\n" + + "\006Entity\022%\n" + + "\003key\030\001 \001(\0132\030.google.datastore.v1.Key\022?\n\n" + + "properties\030\003 \003(\0132+.google.datastore.v1.Entity.PropertiesEntry\032M\n" + + "\017PropertiesEntry\022\013\n" + + "\003key\030\001 \001(\t\022)\n" + + "\005value\030\002 \001(\0132\032.google.datastore.v1.Value:\0028\001B\274\001\n" + + "\027com.google.datastore.v1B\013EntityProtoP\001Z;cloud.google.com/go/datastore/apiv1" + "/datastorepb;datastorepb\252\002\031Google.Cloud." + "Datastore.V1\312\002\031Google\\Cloud\\Datastore\\V1" + "\352\002\034Google::Cloud::Datastore::V1b\006proto3" diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java index 58f2b5131..1d5997ea5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java @@ -33,6 +33,7 @@ public final class EntityResult extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.EntityResult) EntityResultOrBuilder { private static final long serialVersionUID = 0L; + // Use EntityResult.newBuilder() to construct. private EntityResult(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -130,6 +131,7 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum { * RESULT_TYPE_UNSPECIFIED = 0; */ public static final int RESULT_TYPE_UNSPECIFIED_VALUE = 0; + /** * * @@ -140,6 +142,7 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum { * FULL = 1; */ public static final int FULL_VALUE = 1; + /** * * @@ -150,6 +153,7 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum { * PROJECTION = 2; */ public static final int PROJECTION_VALUE = 2; + /** * * @@ -249,6 +253,7 @@ private ResultType(int value) { private int bitField0_; public static final int ENTITY_FIELD_NUMBER = 1; private com.google.datastore.v1.Entity entity_; + /** * * @@ -264,6 +269,7 @@ private ResultType(int value) { public boolean hasEntity() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -279,6 +285,7 @@ public boolean hasEntity() { public com.google.datastore.v1.Entity getEntity() { return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_; } + /** * * @@ -295,6 +302,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() { public static final int VERSION_FIELD_NUMBER = 4; private long version_ = 0L; + /** * * @@ -321,6 +329,7 @@ public long getVersion() { public static final int CREATE_TIME_FIELD_NUMBER = 6; private com.google.protobuf.Timestamp createTime_; + /** * * @@ -339,6 +348,7 @@ public long getVersion() { public boolean hasCreateTime() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -357,6 +367,7 @@ public boolean hasCreateTime() { public com.google.protobuf.Timestamp getCreateTime() { return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } + /** * * @@ -376,6 +387,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { public static final int UPDATE_TIME_FIELD_NUMBER = 5; private com.google.protobuf.Timestamp updateTime_; + /** * * @@ -394,6 +406,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { public boolean hasUpdateTime() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -412,6 +425,7 @@ public boolean hasUpdateTime() { public com.google.protobuf.Timestamp getUpdateTime() { return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_; } + /** * * @@ -431,6 +445,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { public static final int CURSOR_FIELD_NUMBER = 3; private com.google.protobuf.ByteString cursor_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -656,6 +671,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -921,6 +937,7 @@ public Builder mergeFrom( com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> entityBuilder_; + /** * * @@ -935,6 +952,7 @@ public Builder mergeFrom( public boolean hasEntity() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -953,6 +971,7 @@ public com.google.datastore.v1.Entity getEntity() { return entityBuilder_.getMessage(); } } + /** * * @@ -975,6 +994,7 @@ public Builder setEntity(com.google.datastore.v1.Entity value) { onChanged(); return this; } + /** * * @@ -994,6 +1014,7 @@ public Builder setEntity(com.google.datastore.v1.Entity.Builder builderForValue) onChanged(); return this; } + /** * * @@ -1021,6 +1042,7 @@ public Builder mergeEntity(com.google.datastore.v1.Entity value) { } return this; } + /** * * @@ -1040,6 +1062,7 @@ public Builder clearEntity() { onChanged(); return this; } + /** * * @@ -1054,6 +1077,7 @@ public com.google.datastore.v1.Entity.Builder getEntityBuilder() { onChanged(); return getEntityFieldBuilder().getBuilder(); } + /** * * @@ -1070,6 +1094,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() { return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_; } } + /** * * @@ -1097,6 +1122,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() { } private long version_; + /** * * @@ -1120,6 +1146,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() { public long getVersion() { return version_; } + /** * * @@ -1147,6 +1174,7 @@ public Builder setVersion(long value) { onChanged(); return this; } + /** * * @@ -1179,6 +1207,7 @@ public Builder clearVersion() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> createTimeBuilder_; + /** * * @@ -1196,6 +1225,7 @@ public Builder clearVersion() { public boolean hasCreateTime() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1219,6 +1249,7 @@ public com.google.protobuf.Timestamp getCreateTime() { return createTimeBuilder_.getMessage(); } } + /** * * @@ -1244,6 +1275,7 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -1266,6 +1298,7 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal onChanged(); return this; } + /** * * @@ -1296,6 +1329,7 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -1318,6 +1352,7 @@ public Builder clearCreateTime() { onChanged(); return this; } + /** * * @@ -1335,6 +1370,7 @@ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } + /** * * @@ -1356,6 +1392,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { : createTime_; } } + /** * * @@ -1391,6 +1428,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> updateTimeBuilder_; + /** * * @@ -1408,6 +1446,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { public boolean hasUpdateTime() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1431,6 +1470,7 @@ public com.google.protobuf.Timestamp getUpdateTime() { return updateTimeBuilder_.getMessage(); } } + /** * * @@ -1456,6 +1496,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -1478,6 +1519,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal onChanged(); return this; } + /** * * @@ -1508,6 +1550,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -1530,6 +1573,7 @@ public Builder clearUpdateTime() { onChanged(); return this; } + /** * * @@ -1547,6 +1591,7 @@ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() { onChanged(); return getUpdateTimeFieldBuilder().getBuilder(); } + /** * * @@ -1568,6 +1613,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { : updateTime_; } } + /** * * @@ -1598,6 +1644,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { } private com.google.protobuf.ByteString cursor_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -1614,6 +1661,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { public com.google.protobuf.ByteString getCursor() { return cursor_; } + /** * * @@ -1636,6 +1684,7 @@ public Builder setCursor(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java index 408813f6b..85d9d4ce1 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java @@ -36,6 +36,7 @@ public interface EntityResultOrBuilder * @return Whether the entity field is set. */ boolean hasEntity(); + /** * * @@ -48,6 +49,7 @@ public interface EntityResultOrBuilder * @return The entity. */ com.google.datastore.v1.Entity getEntity(); + /** * * @@ -95,6 +97,7 @@ public interface EntityResultOrBuilder * @return Whether the createTime field is set. */ boolean hasCreateTime(); + /** * * @@ -110,6 +113,7 @@ public interface EntityResultOrBuilder * @return The createTime. */ com.google.protobuf.Timestamp getCreateTime(); + /** * * @@ -139,6 +143,7 @@ public interface EntityResultOrBuilder * @return Whether the updateTime field is set. */ boolean hasUpdateTime(); + /** * * @@ -154,6 +159,7 @@ public interface EntityResultOrBuilder * @return The updateTime. */ com.google.protobuf.Timestamp getUpdateTime(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java index fca303323..d42944e05 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java @@ -33,6 +33,7 @@ public final class ExecutionStats extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.ExecutionStats) ExecutionStatsOrBuilder { private static final long serialVersionUID = 0L; + // Use ExecutionStats.newBuilder() to construct. private ExecutionStats(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -64,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int RESULTS_RETURNED_FIELD_NUMBER = 1; private long resultsReturned_ = 0L; + /** * * @@ -83,6 +85,7 @@ public long getResultsReturned() { public static final int EXECUTION_DURATION_FIELD_NUMBER = 3; private com.google.protobuf.Duration executionDuration_; + /** * * @@ -98,6 +101,7 @@ public long getResultsReturned() { public boolean hasExecutionDuration() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -115,6 +119,7 @@ public com.google.protobuf.Duration getExecutionDuration() { ? com.google.protobuf.Duration.getDefaultInstance() : executionDuration_; } + /** * * @@ -133,6 +138,7 @@ public com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder() { public static final int READ_OPERATIONS_FIELD_NUMBER = 4; private long readOperations_ = 0L; + /** * * @@ -151,6 +157,7 @@ public long getReadOperations() { public static final int DEBUG_STATS_FIELD_NUMBER = 5; private com.google.protobuf.Struct debugStats_; + /** * * @@ -177,6 +184,7 @@ public long getReadOperations() { public boolean hasDebugStats() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -203,6 +211,7 @@ public boolean hasDebugStats() { public com.google.protobuf.Struct getDebugStats() { return debugStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : debugStats_; } + /** * * @@ -423,6 +432,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -669,6 +679,7 @@ public Builder mergeFrom( private int bitField0_; private long resultsReturned_; + /** * * @@ -685,6 +696,7 @@ public Builder mergeFrom( public long getResultsReturned() { return resultsReturned_; } + /** * * @@ -705,6 +717,7 @@ public Builder setResultsReturned(long value) { onChanged(); return this; } + /** * * @@ -730,6 +743,7 @@ public Builder clearResultsReturned() { com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> executionDurationBuilder_; + /** * * @@ -744,6 +758,7 @@ public Builder clearResultsReturned() { public boolean hasExecutionDuration() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -764,6 +779,7 @@ public com.google.protobuf.Duration getExecutionDuration() { return executionDurationBuilder_.getMessage(); } } + /** * * @@ -786,6 +802,7 @@ public Builder setExecutionDuration(com.google.protobuf.Duration value) { onChanged(); return this; } + /** * * @@ -805,6 +822,7 @@ public Builder setExecutionDuration(com.google.protobuf.Duration.Builder builder onChanged(); return this; } + /** * * @@ -832,6 +850,7 @@ public Builder mergeExecutionDuration(com.google.protobuf.Duration value) { } return this; } + /** * * @@ -851,6 +870,7 @@ public Builder clearExecutionDuration() { onChanged(); return this; } + /** * * @@ -865,6 +885,7 @@ public com.google.protobuf.Duration.Builder getExecutionDurationBuilder() { onChanged(); return getExecutionDurationFieldBuilder().getBuilder(); } + /** * * @@ -883,6 +904,7 @@ public com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder() { : executionDuration_; } } + /** * * @@ -910,6 +932,7 @@ public com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder() { } private long readOperations_; + /** * * @@ -925,6 +948,7 @@ public com.google.protobuf.DurationOrBuilder getExecutionDurationOrBuilder() { public long getReadOperations() { return readOperations_; } + /** * * @@ -944,6 +968,7 @@ public Builder setReadOperations(long value) { onChanged(); return this; } + /** * * @@ -968,6 +993,7 @@ public Builder clearReadOperations() { com.google.protobuf.Struct.Builder, com.google.protobuf.StructOrBuilder> debugStatsBuilder_; + /** * * @@ -993,6 +1019,7 @@ public Builder clearReadOperations() { public boolean hasDebugStats() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1022,6 +1049,7 @@ public com.google.protobuf.Struct getDebugStats() { return debugStatsBuilder_.getMessage(); } } + /** * * @@ -1055,6 +1083,7 @@ public Builder setDebugStats(com.google.protobuf.Struct value) { onChanged(); return this; } + /** * * @@ -1085,6 +1114,7 @@ public Builder setDebugStats(com.google.protobuf.Struct.Builder builderForValue) onChanged(); return this; } + /** * * @@ -1123,6 +1153,7 @@ public Builder mergeDebugStats(com.google.protobuf.Struct value) { } return this; } + /** * * @@ -1153,6 +1184,7 @@ public Builder clearDebugStats() { onChanged(); return this; } + /** * * @@ -1178,6 +1210,7 @@ public com.google.protobuf.Struct.Builder getDebugStatsBuilder() { onChanged(); return getDebugStatsFieldBuilder().getBuilder(); } + /** * * @@ -1205,6 +1238,7 @@ public com.google.protobuf.StructOrBuilder getDebugStatsOrBuilder() { return debugStats_ == null ? com.google.protobuf.Struct.getDefaultInstance() : debugStats_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java index 67957d774..ffbf156bf 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java @@ -50,6 +50,7 @@ public interface ExecutionStatsOrBuilder * @return Whether the executionDuration field is set. */ boolean hasExecutionDuration(); + /** * * @@ -62,6 +63,7 @@ public interface ExecutionStatsOrBuilder * @return The executionDuration. */ com.google.protobuf.Duration getExecutionDuration(); + /** * * @@ -109,6 +111,7 @@ public interface ExecutionStatsOrBuilder * @return Whether the debugStats field is set. */ boolean hasDebugStats(); + /** * * @@ -132,6 +135,7 @@ public interface ExecutionStatsOrBuilder * @return The debugStats. */ com.google.protobuf.Struct getDebugStats(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java index 23a8172e5..7a4f5361d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java @@ -33,6 +33,7 @@ public final class ExplainMetrics extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.ExplainMetrics) ExplainMetricsOrBuilder { private static final long serialVersionUID = 0L; + // Use ExplainMetrics.newBuilder() to construct. private ExplainMetrics(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -64,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int PLAN_SUMMARY_FIELD_NUMBER = 1; private com.google.datastore.v1.PlanSummary planSummary_; + /** * * @@ -79,6 +81,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasPlanSummary() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -96,6 +99,7 @@ public com.google.datastore.v1.PlanSummary getPlanSummary() { ? com.google.datastore.v1.PlanSummary.getDefaultInstance() : planSummary_; } + /** * * @@ -114,6 +118,7 @@ public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() { public static final int EXECUTION_STATS_FIELD_NUMBER = 2; private com.google.datastore.v1.ExecutionStats executionStats_; + /** * * @@ -131,6 +136,7 @@ public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() { public boolean hasExecutionStats() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -150,6 +156,7 @@ public com.google.datastore.v1.ExecutionStats getExecutionStats() { ? com.google.datastore.v1.ExecutionStats.getDefaultInstance() : executionStats_; } + /** * * @@ -345,6 +352,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -568,6 +576,7 @@ public Builder mergeFrom( com.google.datastore.v1.PlanSummary.Builder, com.google.datastore.v1.PlanSummaryOrBuilder> planSummaryBuilder_; + /** * * @@ -582,6 +591,7 @@ public Builder mergeFrom( public boolean hasPlanSummary() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -602,6 +612,7 @@ public com.google.datastore.v1.PlanSummary getPlanSummary() { return planSummaryBuilder_.getMessage(); } } + /** * * @@ -624,6 +635,7 @@ public Builder setPlanSummary(com.google.datastore.v1.PlanSummary value) { onChanged(); return this; } + /** * * @@ -643,6 +655,7 @@ public Builder setPlanSummary(com.google.datastore.v1.PlanSummary.Builder builde onChanged(); return this; } + /** * * @@ -670,6 +683,7 @@ public Builder mergePlanSummary(com.google.datastore.v1.PlanSummary value) { } return this; } + /** * * @@ -689,6 +703,7 @@ public Builder clearPlanSummary() { onChanged(); return this; } + /** * * @@ -703,6 +718,7 @@ public com.google.datastore.v1.PlanSummary.Builder getPlanSummaryBuilder() { onChanged(); return getPlanSummaryFieldBuilder().getBuilder(); } + /** * * @@ -721,6 +737,7 @@ public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() { : planSummary_; } } + /** * * @@ -753,6 +770,7 @@ public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() { com.google.datastore.v1.ExecutionStats.Builder, com.google.datastore.v1.ExecutionStatsOrBuilder> executionStatsBuilder_; + /** * * @@ -769,6 +787,7 @@ public com.google.datastore.v1.PlanSummaryOrBuilder getPlanSummaryOrBuilder() { public boolean hasExecutionStats() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -791,6 +810,7 @@ public com.google.datastore.v1.ExecutionStats getExecutionStats() { return executionStatsBuilder_.getMessage(); } } + /** * * @@ -815,6 +835,7 @@ public Builder setExecutionStats(com.google.datastore.v1.ExecutionStats value) { onChanged(); return this; } + /** * * @@ -837,6 +858,7 @@ public Builder setExecutionStats( onChanged(); return this; } + /** * * @@ -866,6 +888,7 @@ public Builder mergeExecutionStats(com.google.datastore.v1.ExecutionStats value) } return this; } + /** * * @@ -887,6 +910,7 @@ public Builder clearExecutionStats() { onChanged(); return this; } + /** * * @@ -903,6 +927,7 @@ public com.google.datastore.v1.ExecutionStats.Builder getExecutionStatsBuilder() onChanged(); return getExecutionStatsFieldBuilder().getBuilder(); } + /** * * @@ -923,6 +948,7 @@ public com.google.datastore.v1.ExecutionStatsOrBuilder getExecutionStatsOrBuilde : executionStats_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java index bfcc297a2..b9463b3e0 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java @@ -36,6 +36,7 @@ public interface ExplainMetricsOrBuilder * @return Whether the planSummary field is set. */ boolean hasPlanSummary(); + /** * * @@ -48,6 +49,7 @@ public interface ExplainMetricsOrBuilder * @return The planSummary. */ com.google.datastore.v1.PlanSummary getPlanSummary(); + /** * * @@ -73,6 +75,7 @@ public interface ExplainMetricsOrBuilder * @return Whether the executionStats field is set. */ boolean hasExecutionStats(); + /** * * @@ -87,6 +90,7 @@ public interface ExplainMetricsOrBuilder * @return The executionStats. */ com.google.datastore.v1.ExecutionStats getExecutionStats(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java index a7a497c80..5d374909f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java @@ -33,6 +33,7 @@ public final class ExplainOptions extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.ExplainOptions) ExplainOptionsOrBuilder { private static final long serialVersionUID = 0L; + // Use ExplainOptions.newBuilder() to construct. private ExplainOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public static final int ANALYZE_FIELD_NUMBER = 1; private boolean analyze_ = false; + /** * * @@ -243,6 +245,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -424,6 +427,7 @@ public Builder mergeFrom( private int bitField0_; private boolean analyze_; + /** * * @@ -445,6 +449,7 @@ public Builder mergeFrom( public boolean getAnalyze() { return analyze_; } + /** * * @@ -470,6 +475,7 @@ public Builder setAnalyze(boolean value) { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java index c6c71843b..7454f23b6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java @@ -33,6 +33,7 @@ public final class Filter extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.Filter) FilterOrBuilder { private static final long serialVersionUID = 0L; + // Use Filter.newBuilder() to construct. private Filter(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -76,6 +77,7 @@ public enum FilterTypeCase private FilterTypeCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -109,6 +111,7 @@ public FilterTypeCase getFilterTypeCase() { } public static final int COMPOSITE_FILTER_FIELD_NUMBER = 1; + /** * * @@ -124,6 +127,7 @@ public FilterTypeCase getFilterTypeCase() { public boolean hasCompositeFilter() { return filterTypeCase_ == 1; } + /** * * @@ -142,6 +146,7 @@ public com.google.datastore.v1.CompositeFilter getCompositeFilter() { } return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); } + /** * * @@ -160,6 +165,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil } public static final int PROPERTY_FILTER_FIELD_NUMBER = 2; + /** * * @@ -175,6 +181,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil public boolean hasPropertyFilter() { return filterTypeCase_ == 2; } + /** * * @@ -193,6 +200,7 @@ public com.google.datastore.v1.PropertyFilter getPropertyFilter() { } return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); } + /** * * @@ -397,6 +405,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -629,6 +638,7 @@ public Builder clearFilterType() { com.google.datastore.v1.CompositeFilter.Builder, com.google.datastore.v1.CompositeFilterOrBuilder> compositeFilterBuilder_; + /** * * @@ -644,6 +654,7 @@ public Builder clearFilterType() { public boolean hasCompositeFilter() { return filterTypeCase_ == 1; } + /** * * @@ -669,6 +680,7 @@ public com.google.datastore.v1.CompositeFilter getCompositeFilter() { return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); } } + /** * * @@ -691,6 +703,7 @@ public Builder setCompositeFilter(com.google.datastore.v1.CompositeFilter value) filterTypeCase_ = 1; return this; } + /** * * @@ -711,6 +724,7 @@ public Builder setCompositeFilter( filterTypeCase_ = 1; return this; } + /** * * @@ -743,6 +757,7 @@ public Builder mergeCompositeFilter(com.google.datastore.v1.CompositeFilter valu filterTypeCase_ = 1; return this; } + /** * * @@ -768,6 +783,7 @@ public Builder clearCompositeFilter() { } return this; } + /** * * @@ -780,6 +796,7 @@ public Builder clearCompositeFilter() { public com.google.datastore.v1.CompositeFilter.Builder getCompositeFilterBuilder() { return getCompositeFilterFieldBuilder().getBuilder(); } + /** * * @@ -800,6 +817,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil return com.google.datastore.v1.CompositeFilter.getDefaultInstance(); } } + /** * * @@ -838,6 +856,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil com.google.datastore.v1.PropertyFilter.Builder, com.google.datastore.v1.PropertyFilterOrBuilder> propertyFilterBuilder_; + /** * * @@ -853,6 +872,7 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil public boolean hasPropertyFilter() { return filterTypeCase_ == 2; } + /** * * @@ -878,6 +898,7 @@ public com.google.datastore.v1.PropertyFilter getPropertyFilter() { return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); } } + /** * * @@ -900,6 +921,7 @@ public Builder setPropertyFilter(com.google.datastore.v1.PropertyFilter value) { filterTypeCase_ = 2; return this; } + /** * * @@ -920,6 +942,7 @@ public Builder setPropertyFilter( filterTypeCase_ = 2; return this; } + /** * * @@ -952,6 +975,7 @@ public Builder mergePropertyFilter(com.google.datastore.v1.PropertyFilter value) filterTypeCase_ = 2; return this; } + /** * * @@ -977,6 +1001,7 @@ public Builder clearPropertyFilter() { } return this; } + /** * * @@ -989,6 +1014,7 @@ public Builder clearPropertyFilter() { public com.google.datastore.v1.PropertyFilter.Builder getPropertyFilterBuilder() { return getPropertyFilterFieldBuilder().getBuilder(); } + /** * * @@ -1009,6 +1035,7 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde return com.google.datastore.v1.PropertyFilter.getDefaultInstance(); } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java index 4d351a272..1136f49a3 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java @@ -36,6 +36,7 @@ public interface FilterOrBuilder * @return Whether the compositeFilter field is set. */ boolean hasCompositeFilter(); + /** * * @@ -48,6 +49,7 @@ public interface FilterOrBuilder * @return The compositeFilter. */ com.google.datastore.v1.CompositeFilter getCompositeFilter(); + /** * * @@ -71,6 +73,7 @@ public interface FilterOrBuilder * @return Whether the propertyFilter field is set. */ boolean hasPropertyFilter(); + /** * * @@ -83,6 +86,7 @@ public interface FilterOrBuilder * @return The propertyFilter. */ com.google.datastore.v1.PropertyFilter getPropertyFilter(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java index 105ba669e..fd233c99b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java @@ -36,6 +36,7 @@ public final class FindNearest extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.FindNearest) FindNearestOrBuilder { private static final long serialVersionUID = 0L; + // Use FindNearest.newBuilder() to construct. private FindNearest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -141,6 +142,7 @@ public enum DistanceMeasure implements com.google.protobuf.ProtocolMessageEnum { * DISTANCE_MEASURE_UNSPECIFIED = 0; */ public static final int DISTANCE_MEASURE_UNSPECIFIED_VALUE = 0; + /** * * @@ -153,6 +155,7 @@ public enum DistanceMeasure implements com.google.protobuf.ProtocolMessageEnum { * EUCLIDEAN = 1; */ public static final int EUCLIDEAN_VALUE = 1; + /** * * @@ -170,6 +173,7 @@ public enum DistanceMeasure implements com.google.protobuf.ProtocolMessageEnum { * COSINE = 2; */ public static final int COSINE_VALUE = 2; + /** * * @@ -273,6 +277,7 @@ private DistanceMeasure(int value) { private int bitField0_; public static final int VECTOR_PROPERTY_FIELD_NUMBER = 1; private com.google.datastore.v1.PropertyReference vectorProperty_; + /** * * @@ -292,6 +297,7 @@ private DistanceMeasure(int value) { public boolean hasVectorProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -313,6 +319,7 @@ public com.google.datastore.v1.PropertyReference getVectorProperty() { ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : vectorProperty_; } + /** * * @@ -335,6 +342,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBui public static final int QUERY_VECTOR_FIELD_NUMBER = 2; private com.google.datastore.v1.Value queryVector_; + /** * * @@ -352,6 +360,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBui public boolean hasQueryVector() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -369,6 +378,7 @@ public boolean hasQueryVector() { public com.google.datastore.v1.Value getQueryVector() { return queryVector_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : queryVector_; } + /** * * @@ -387,6 +397,7 @@ public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() { public static final int DISTANCE_MEASURE_FIELD_NUMBER = 3; private int distanceMeasure_ = 0; + /** * * @@ -404,6 +415,7 @@ public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() { public int getDistanceMeasureValue() { return distanceMeasure_; } + /** * * @@ -428,6 +440,7 @@ public com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure() public static final int LIMIT_FIELD_NUMBER = 4; private com.google.protobuf.Int32Value limit_; + /** * * @@ -444,6 +457,7 @@ public com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure() public boolean hasLimit() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -460,6 +474,7 @@ public boolean hasLimit() { public com.google.protobuf.Int32Value getLimit() { return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; } + /** * * @@ -479,6 +494,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { @SuppressWarnings("serial") private volatile java.lang.Object distanceResultProperty_ = ""; + /** * * @@ -504,6 +520,7 @@ public java.lang.String getDistanceResultProperty() { return s; } } + /** * * @@ -532,6 +549,7 @@ public com.google.protobuf.ByteString getDistanceResultPropertyBytes() { public static final int DISTANCE_THRESHOLD_FIELD_NUMBER = 6; private com.google.protobuf.DoubleValue distanceThreshold_; + /** * * @@ -555,6 +573,7 @@ public com.google.protobuf.ByteString getDistanceResultPropertyBytes() { public boolean hasDistanceThreshold() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -580,6 +599,7 @@ public com.google.protobuf.DoubleValue getDistanceThreshold() { ? com.google.protobuf.DoubleValue.getDefaultInstance() : distanceThreshold_; } + /** * * @@ -830,6 +850,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1125,6 +1146,7 @@ public Builder mergeFrom( com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> vectorPropertyBuilder_; + /** * * @@ -1143,6 +1165,7 @@ public Builder mergeFrom( public boolean hasVectorProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -1167,6 +1190,7 @@ public com.google.datastore.v1.PropertyReference getVectorProperty() { return vectorPropertyBuilder_.getMessage(); } } + /** * * @@ -1193,6 +1217,7 @@ public Builder setVectorProperty(com.google.datastore.v1.PropertyReference value onChanged(); return this; } + /** * * @@ -1217,6 +1242,7 @@ public Builder setVectorProperty( onChanged(); return this; } + /** * * @@ -1248,6 +1274,7 @@ public Builder mergeVectorProperty(com.google.datastore.v1.PropertyReference val } return this; } + /** * * @@ -1271,6 +1298,7 @@ public Builder clearVectorProperty() { onChanged(); return this; } + /** * * @@ -1289,6 +1317,7 @@ public com.google.datastore.v1.PropertyReference.Builder getVectorPropertyBuilde onChanged(); return getVectorPropertyFieldBuilder().getBuilder(); } + /** * * @@ -1311,6 +1340,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBui : vectorProperty_; } } + /** * * @@ -1347,6 +1377,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBui com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> queryVectorBuilder_; + /** * * @@ -1363,6 +1394,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getVectorPropertyOrBui public boolean hasQueryVector() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -1385,6 +1417,7 @@ public com.google.datastore.v1.Value getQueryVector() { return queryVectorBuilder_.getMessage(); } } + /** * * @@ -1409,6 +1442,7 @@ public Builder setQueryVector(com.google.datastore.v1.Value value) { onChanged(); return this; } + /** * * @@ -1430,6 +1464,7 @@ public Builder setQueryVector(com.google.datastore.v1.Value.Builder builderForVa onChanged(); return this; } + /** * * @@ -1459,6 +1494,7 @@ public Builder mergeQueryVector(com.google.datastore.v1.Value value) { } return this; } + /** * * @@ -1480,6 +1516,7 @@ public Builder clearQueryVector() { onChanged(); return this; } + /** * * @@ -1496,6 +1533,7 @@ public com.google.datastore.v1.Value.Builder getQueryVectorBuilder() { onChanged(); return getQueryVectorFieldBuilder().getBuilder(); } + /** * * @@ -1516,6 +1554,7 @@ public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() { : queryVector_; } } + /** * * @@ -1545,6 +1584,7 @@ public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() { } private int distanceMeasure_ = 0; + /** * * @@ -1562,6 +1602,7 @@ public com.google.datastore.v1.ValueOrBuilder getQueryVectorOrBuilder() { public int getDistanceMeasureValue() { return distanceMeasure_; } + /** * * @@ -1582,6 +1623,7 @@ public Builder setDistanceMeasureValue(int value) { onChanged(); return this; } + /** * * @@ -1603,6 +1645,7 @@ public com.google.datastore.v1.FindNearest.DistanceMeasure getDistanceMeasure() ? com.google.datastore.v1.FindNearest.DistanceMeasure.UNRECOGNIZED : result; } + /** * * @@ -1626,6 +1669,7 @@ public Builder setDistanceMeasure(com.google.datastore.v1.FindNearest.DistanceMe onChanged(); return this; } + /** * * @@ -1652,6 +1696,7 @@ public Builder clearDistanceMeasure() { com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder> limitBuilder_; + /** * * @@ -1667,6 +1712,7 @@ public Builder clearDistanceMeasure() { public boolean hasLimit() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1686,6 +1732,7 @@ public com.google.protobuf.Int32Value getLimit() { return limitBuilder_.getMessage(); } } + /** * * @@ -1709,6 +1756,7 @@ public Builder setLimit(com.google.protobuf.Int32Value value) { onChanged(); return this; } + /** * * @@ -1729,6 +1777,7 @@ public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue) onChanged(); return this; } + /** * * @@ -1757,6 +1806,7 @@ public Builder mergeLimit(com.google.protobuf.Int32Value value) { } return this; } + /** * * @@ -1777,6 +1827,7 @@ public Builder clearLimit() { onChanged(); return this; } + /** * * @@ -1792,6 +1843,7 @@ public com.google.protobuf.Int32Value.Builder getLimitBuilder() { onChanged(); return getLimitFieldBuilder().getBuilder(); } + /** * * @@ -1809,6 +1861,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; } } + /** * * @@ -1837,6 +1890,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { } private java.lang.Object distanceResultProperty_ = ""; + /** * * @@ -1861,6 +1915,7 @@ public java.lang.String getDistanceResultProperty() { return (java.lang.String) ref; } } + /** * * @@ -1885,6 +1940,7 @@ public com.google.protobuf.ByteString getDistanceResultPropertyBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1908,6 +1964,7 @@ public Builder setDistanceResultProperty(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1927,6 +1984,7 @@ public Builder clearDistanceResultProperty() { onChanged(); return this; } + /** * * @@ -1958,6 +2016,7 @@ public Builder setDistanceResultPropertyBytes(com.google.protobuf.ByteString val com.google.protobuf.DoubleValue.Builder, com.google.protobuf.DoubleValueOrBuilder> distanceThresholdBuilder_; + /** * * @@ -1980,6 +2039,7 @@ public Builder setDistanceResultPropertyBytes(com.google.protobuf.ByteString val public boolean hasDistanceThreshold() { return ((bitField0_ & 0x00000020) != 0); } + /** * * @@ -2008,6 +2068,7 @@ public com.google.protobuf.DoubleValue getDistanceThreshold() { return distanceThresholdBuilder_.getMessage(); } } + /** * * @@ -2038,6 +2099,7 @@ public Builder setDistanceThreshold(com.google.protobuf.DoubleValue value) { onChanged(); return this; } + /** * * @@ -2065,6 +2127,7 @@ public Builder setDistanceThreshold(com.google.protobuf.DoubleValue.Builder buil onChanged(); return this; } + /** * * @@ -2100,6 +2163,7 @@ public Builder mergeDistanceThreshold(com.google.protobuf.DoubleValue value) { } return this; } + /** * * @@ -2127,6 +2191,7 @@ public Builder clearDistanceThreshold() { onChanged(); return this; } + /** * * @@ -2149,6 +2214,7 @@ public com.google.protobuf.DoubleValue.Builder getDistanceThresholdBuilder() { onChanged(); return getDistanceThresholdFieldBuilder().getBuilder(); } + /** * * @@ -2175,6 +2241,7 @@ public com.google.protobuf.DoubleValueOrBuilder getDistanceThresholdOrBuilder() : distanceThreshold_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java index 504c10bb5..4e21ec5c3 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java @@ -40,6 +40,7 @@ public interface FindNearestOrBuilder * @return Whether the vectorProperty field is set. */ boolean hasVectorProperty(); + /** * * @@ -56,6 +57,7 @@ public interface FindNearestOrBuilder * @return The vectorProperty. */ com.google.datastore.v1.PropertyReference getVectorProperty(); + /** * * @@ -85,6 +87,7 @@ public interface FindNearestOrBuilder * @return Whether the queryVector field is set. */ boolean hasQueryVector(); + /** * * @@ -99,6 +102,7 @@ public interface FindNearestOrBuilder * @return The queryVector. */ com.google.datastore.v1.Value getQueryVector(); + /** * * @@ -126,6 +130,7 @@ public interface FindNearestOrBuilder * @return The enum numeric value on the wire for distanceMeasure. */ int getDistanceMeasureValue(); + /** * * @@ -154,6 +159,7 @@ public interface FindNearestOrBuilder * @return Whether the limit field is set. */ boolean hasLimit(); + /** * * @@ -167,6 +173,7 @@ public interface FindNearestOrBuilder * @return The limit. */ com.google.protobuf.Int32Value getLimit(); + /** * * @@ -193,6 +200,7 @@ public interface FindNearestOrBuilder * @return The distanceResultProperty. */ java.lang.String getDistanceResultProperty(); + /** * * @@ -228,6 +236,7 @@ public interface FindNearestOrBuilder * @return Whether the distanceThreshold field is set. */ boolean hasDistanceThreshold(); + /** * * @@ -248,6 +257,7 @@ public interface FindNearestOrBuilder * @return The distanceThreshold. */ com.google.protobuf.DoubleValue getDistanceThreshold(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java index 766dfa10e..86ae757ad 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java @@ -34,6 +34,7 @@ public final class GqlQuery extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.GqlQuery) GqlQueryOrBuilder { private static final long serialVersionUID = 0L; + // Use GqlQuery.newBuilder() to construct. private GqlQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -80,6 +81,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl @SuppressWarnings("serial") private volatile java.lang.Object queryString_ = ""; + /** * * @@ -104,6 +106,7 @@ public java.lang.String getQueryString() { return s; } } + /** * * @@ -131,6 +134,7 @@ public com.google.protobuf.ByteString getQueryStringBytes() { public static final int ALLOW_LITERALS_FIELD_NUMBER = 2; private boolean allowLiterals_ = false; + /** * * @@ -182,6 +186,7 @@ private static final class NamedBindingsDefaultEntryHolder { public int getNamedBindingsCount() { return internalGetNamedBindings().getMap().size(); } + /** * * @@ -202,6 +207,7 @@ public boolean containsNamedBindings(java.lang.String key) { } return internalGetNamedBindings().getMap().containsKey(key); } + /** Use {@link #getNamedBindingsMap()} instead. */ @java.lang.Override @java.lang.Deprecated @@ -209,6 +215,7 @@ public boolean containsNamedBindings(java.lang.String key) { getNamedBindings() { return getNamedBindingsMap(); } + /** * * @@ -227,6 +234,7 @@ public boolean containsNamedBindings(java.lang.String key) { getNamedBindingsMap() { return internalGetNamedBindings().getMap(); } + /** * * @@ -252,6 +260,7 @@ public boolean containsNamedBindings(java.lang.String key) { internalGetNamedBindings().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } + /** * * @@ -282,6 +291,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la @SuppressWarnings("serial") private java.util.List positionalBindings_; + /** * * @@ -299,6 +309,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la public java.util.List getPositionalBindingsList() { return positionalBindings_; } + /** * * @@ -317,6 +328,7 @@ public java.util.List getPositionalBi getPositionalBindingsOrBuilderList() { return positionalBindings_; } + /** * * @@ -334,6 +346,7 @@ public java.util.List getPositionalBi public int getPositionalBindingsCount() { return positionalBindings_.size(); } + /** * * @@ -351,6 +364,7 @@ public int getPositionalBindingsCount() { public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index) { return positionalBindings_.get(index); } + /** * * @@ -566,6 +580,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -865,6 +880,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object queryString_ = ""; + /** * * @@ -888,6 +904,7 @@ public java.lang.String getQueryString() { return (java.lang.String) ref; } } + /** * * @@ -911,6 +928,7 @@ public com.google.protobuf.ByteString getQueryStringBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -933,6 +951,7 @@ public Builder setQueryString(java.lang.String value) { onChanged(); return this; } + /** * * @@ -951,6 +970,7 @@ public Builder clearQueryString() { onChanged(); return this; } + /** * * @@ -976,6 +996,7 @@ public Builder setQueryStringBytes(com.google.protobuf.ByteString value) { } private boolean allowLiterals_; + /** * * @@ -994,6 +1015,7 @@ public Builder setQueryStringBytes(com.google.protobuf.ByteString value) { public boolean getAllowLiterals() { return allowLiterals_; } + /** * * @@ -1016,6 +1038,7 @@ public Builder setAllowLiterals(boolean value) { onChanged(); return this; } + /** * * @@ -1057,7 +1080,8 @@ public com.google.datastore.v1.GqlQueryParameter build( defaultEntry() { return NamedBindingsDefaultEntryHolder.defaultEntry; } - }; + } + ; private static final NamedBindingsConverter namedBindingsConverter = new NamedBindingsConverter(); @@ -1098,6 +1122,7 @@ public com.google.datastore.v1.GqlQueryParameter build( public int getNamedBindingsCount() { return internalGetNamedBindings().ensureBuilderMap().size(); } + /** * * @@ -1118,6 +1143,7 @@ public boolean containsNamedBindings(java.lang.String key) { } return internalGetNamedBindings().ensureBuilderMap().containsKey(key); } + /** Use {@link #getNamedBindingsMap()} instead. */ @java.lang.Override @java.lang.Deprecated @@ -1125,6 +1151,7 @@ public boolean containsNamedBindings(java.lang.String key) { getNamedBindings() { return getNamedBindingsMap(); } + /** * * @@ -1143,6 +1170,7 @@ public boolean containsNamedBindings(java.lang.String key) { getNamedBindingsMap() { return internalGetNamedBindings().getImmutableMap(); } + /** * * @@ -1168,6 +1196,7 @@ public boolean containsNamedBindings(java.lang.String key) { internalGetMutableNamedBindings().ensureBuilderMap(); return map.containsKey(key) ? namedBindingsConverter.build(map.get(key)) : defaultValue; } + /** * * @@ -1199,6 +1228,7 @@ public Builder clearNamedBindings() { internalGetMutableNamedBindings().clear(); return this; } + /** * * @@ -1219,6 +1249,7 @@ public Builder removeNamedBindings(java.lang.String key) { internalGetMutableNamedBindings().ensureBuilderMap().remove(key); return this; } + /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map @@ -1226,6 +1257,7 @@ public Builder removeNamedBindings(java.lang.String key) { bitField0_ |= 0x00000004; return internalGetMutableNamedBindings().ensureMessageMap(); } + /** * * @@ -1251,6 +1283,7 @@ public Builder putNamedBindings( bitField0_ |= 0x00000004; return this; } + /** * * @@ -1276,6 +1309,7 @@ public Builder putAllNamedBindings( bitField0_ |= 0x00000004; return this; } + /** * * @@ -1342,6 +1376,7 @@ public java.util.List getPositionalBi return positionalBindingsBuilder_.getMessageList(); } } + /** * * @@ -1362,6 +1397,7 @@ public int getPositionalBindingsCount() { return positionalBindingsBuilder_.getCount(); } } + /** * * @@ -1382,6 +1418,7 @@ public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index return positionalBindingsBuilder_.getMessage(index); } } + /** * * @@ -1409,6 +1446,7 @@ public Builder setPositionalBindings( } return this; } + /** * * @@ -1433,6 +1471,7 @@ public Builder setPositionalBindings( } return this; } + /** * * @@ -1459,6 +1498,7 @@ public Builder addPositionalBindings(com.google.datastore.v1.GqlQueryParameter v } return this; } + /** * * @@ -1486,6 +1526,7 @@ public Builder addPositionalBindings( } return this; } + /** * * @@ -1510,6 +1551,7 @@ public Builder addPositionalBindings( } return this; } + /** * * @@ -1534,6 +1576,7 @@ public Builder addPositionalBindings( } return this; } + /** * * @@ -1558,6 +1601,7 @@ public Builder addAllPositionalBindings( } return this; } + /** * * @@ -1581,6 +1625,7 @@ public Builder clearPositionalBindings() { } return this; } + /** * * @@ -1604,6 +1649,7 @@ public Builder removePositionalBindings(int index) { } return this; } + /** * * @@ -1621,6 +1667,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder getPositionalBindingsBu int index) { return getPositionalBindingsFieldBuilder().getBuilder(index); } + /** * * @@ -1642,6 +1689,7 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO return positionalBindingsBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -1663,6 +1711,7 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO return java.util.Collections.unmodifiableList(positionalBindings_); } } + /** * * @@ -1680,6 +1729,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu return getPositionalBindingsFieldBuilder() .addBuilder(com.google.datastore.v1.GqlQueryParameter.getDefaultInstance()); } + /** * * @@ -1698,6 +1748,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu return getPositionalBindingsFieldBuilder() .addBuilder(index, com.google.datastore.v1.GqlQueryParameter.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java index 1ce49ae7a..36d73aa77 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java @@ -37,6 +37,7 @@ public interface GqlQueryOrBuilder * @return The queryString. */ java.lang.String getQueryString(); + /** * * @@ -81,6 +82,7 @@ public interface GqlQueryOrBuilder * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; */ int getNamedBindingsCount(); + /** * * @@ -95,9 +97,11 @@ public interface GqlQueryOrBuilder * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; */ boolean containsNamedBindings(java.lang.String key); + /** Use {@link #getNamedBindingsMap()} instead. */ @java.lang.Deprecated java.util.Map getNamedBindings(); + /** * * @@ -112,6 +116,7 @@ public interface GqlQueryOrBuilder * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5; */ java.util.Map getNamedBindingsMap(); + /** * * @@ -130,6 +135,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault( java.lang.String key, /* nullable */ com.google.datastore.v1.GqlQueryParameter defaultValue); + /** * * @@ -159,6 +165,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault( * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; */ java.util.List getPositionalBindingsList(); + /** * * @@ -173,6 +180,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault( * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; */ com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index); + /** * * @@ -187,6 +195,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault( * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4; */ int getPositionalBindingsCount(); + /** * * @@ -202,6 +211,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault( */ java.util.List getPositionalBindingsOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java index d57a38e85..eb6b3850e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java @@ -33,6 +33,7 @@ public final class GqlQueryParameter extends com.google.protobuf.GeneratedMessag // @@protoc_insertion_point(message_implements:google.datastore.v1.GqlQueryParameter) GqlQueryParameterOrBuilder { private static final long serialVersionUID = 0L; + // Use GqlQueryParameter.newBuilder() to construct. private GqlQueryParameter(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -78,6 +79,7 @@ public enum ParameterTypeCase private ParameterTypeCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -111,6 +113,7 @@ public ParameterTypeCase getParameterTypeCase() { } public static final int VALUE_FIELD_NUMBER = 2; + /** * * @@ -126,6 +129,7 @@ public ParameterTypeCase getParameterTypeCase() { public boolean hasValue() { return parameterTypeCase_ == 2; } + /** * * @@ -144,6 +148,7 @@ public com.google.datastore.v1.Value getValue() { } return com.google.datastore.v1.Value.getDefaultInstance(); } + /** * * @@ -162,6 +167,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { } public static final int CURSOR_FIELD_NUMBER = 3; + /** * * @@ -178,6 +184,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { public boolean hasCursor() { return parameterTypeCase_ == 3; } + /** * * @@ -387,6 +394,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -615,6 +623,7 @@ public Builder clearParameterType() { com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valueBuilder_; + /** * * @@ -630,6 +639,7 @@ public Builder clearParameterType() { public boolean hasValue() { return parameterTypeCase_ == 2; } + /** * * @@ -655,6 +665,7 @@ public com.google.datastore.v1.Value getValue() { return com.google.datastore.v1.Value.getDefaultInstance(); } } + /** * * @@ -677,6 +688,7 @@ public Builder setValue(com.google.datastore.v1.Value value) { parameterTypeCase_ = 2; return this; } + /** * * @@ -696,6 +708,7 @@ public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) { parameterTypeCase_ = 2; return this; } + /** * * @@ -728,6 +741,7 @@ public Builder mergeValue(com.google.datastore.v1.Value value) { parameterTypeCase_ = 2; return this; } + /** * * @@ -753,6 +767,7 @@ public Builder clearValue() { } return this; } + /** * * @@ -765,6 +780,7 @@ public Builder clearValue() { public com.google.datastore.v1.Value.Builder getValueBuilder() { return getValueFieldBuilder().getBuilder(); } + /** * * @@ -785,6 +801,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { return com.google.datastore.v1.Value.getDefaultInstance(); } } + /** * * @@ -831,6 +848,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { public boolean hasCursor() { return parameterTypeCase_ == 3; } + /** * * @@ -849,6 +867,7 @@ public com.google.protobuf.ByteString getCursor() { } return com.google.protobuf.ByteString.EMPTY; } + /** * * @@ -871,6 +890,7 @@ public Builder setCursor(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java index 5c3fc53da..7c3e07894 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java @@ -36,6 +36,7 @@ public interface GqlQueryParameterOrBuilder * @return Whether the value field is set. */ boolean hasValue(); + /** * * @@ -48,6 +49,7 @@ public interface GqlQueryParameterOrBuilder * @return The value. */ com.google.datastore.v1.Value getValue(); + /** * * @@ -72,6 +74,7 @@ public interface GqlQueryParameterOrBuilder * @return Whether the cursor field is set. */ boolean hasCursor(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java index 9cd165e42..28314fbb8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java @@ -36,6 +36,7 @@ public final class Key extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.Key) KeyOrBuilder { private static final long serialVersionUID = 0L; + // Use Key.newBuilder() to construct. private Key(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -89,6 +90,7 @@ public interface PathElementOrBuilder * @return The kind. */ java.lang.String getKind(); + /** * * @@ -125,6 +127,7 @@ public interface PathElementOrBuilder * @return Whether the id field is set. */ boolean hasId(); + /** * * @@ -161,6 +164,7 @@ public interface PathElementOrBuilder * @return Whether the name field is set. */ boolean hasName(); + /** * * @@ -181,6 +185,7 @@ public interface PathElementOrBuilder * @return The name. */ java.lang.String getName(); + /** * * @@ -204,6 +209,7 @@ public interface PathElementOrBuilder com.google.datastore.v1.Key.PathElement.IdTypeCase getIdTypeCase(); } + /** * * @@ -221,6 +227,7 @@ public static final class PathElement extends com.google.protobuf.GeneratedMessa // @@protoc_insertion_point(message_implements:google.datastore.v1.Key.PathElement) PathElementOrBuilder { private static final long serialVersionUID = 0L; + // Use PathElement.newBuilder() to construct. private PathElement(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -268,6 +275,7 @@ public enum IdTypeCase private IdTypeCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -304,6 +312,7 @@ public IdTypeCase getIdTypeCase() { @SuppressWarnings("serial") private volatile java.lang.Object kind_ = ""; + /** * * @@ -335,6 +344,7 @@ public java.lang.String getKind() { return s; } } + /** * * @@ -368,6 +378,7 @@ public com.google.protobuf.ByteString getKindBytes() { } public static final int ID_FIELD_NUMBER = 2; + /** * * @@ -386,6 +397,7 @@ public com.google.protobuf.ByteString getKindBytes() { public boolean hasId() { return idTypeCase_ == 2; } + /** * * @@ -409,6 +421,7 @@ public long getId() { } public static final int NAME_FIELD_NUMBER = 3; + /** * * @@ -431,6 +444,7 @@ public long getId() { public boolean hasName() { return idTypeCase_ == 3; } + /** * * @@ -466,6 +480,7 @@ public java.lang.String getName() { return s; } } + /** * * @@ -698,6 +713,7 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } + /** * * @@ -940,6 +956,7 @@ public Builder clearIdType() { private int bitField0_; private java.lang.Object kind_ = ""; + /** * * @@ -970,6 +987,7 @@ public java.lang.String getKind() { return (java.lang.String) ref; } } + /** * * @@ -1000,6 +1018,7 @@ public com.google.protobuf.ByteString getKindBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1029,6 +1048,7 @@ public Builder setKind(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1054,6 +1074,7 @@ public Builder clearKind() { onChanged(); return this; } + /** * * @@ -1102,6 +1123,7 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) { public boolean hasId() { return idTypeCase_ == 2; } + /** * * @@ -1122,6 +1144,7 @@ public long getId() { } return 0L; } + /** * * @@ -1144,6 +1167,7 @@ public Builder setId(long value) { onChanged(); return this; } + /** * * @@ -1190,6 +1214,7 @@ public Builder clearId() { public boolean hasName() { return idTypeCase_ == 3; } + /** * * @@ -1226,6 +1251,7 @@ public java.lang.String getName() { return (java.lang.String) ref; } } + /** * * @@ -1262,6 +1288,7 @@ public com.google.protobuf.ByteString getNameBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1291,6 +1318,7 @@ public Builder setName(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1318,6 +1346,7 @@ public Builder clearName() { } return this; } + /** * * @@ -1416,6 +1445,7 @@ public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() { private int bitField0_; public static final int PARTITION_ID_FIELD_NUMBER = 1; private com.google.datastore.v1.PartitionId partitionId_; + /** * * @@ -1433,6 +1463,7 @@ public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() { public boolean hasPartitionId() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -1452,6 +1483,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() { ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_; } + /** * * @@ -1474,6 +1506,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { @SuppressWarnings("serial") private java.util.List path_; + /** * * @@ -1502,6 +1535,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { public java.util.List getPathList() { return path_; } + /** * * @@ -1531,6 +1565,7 @@ public java.util.List getPathList() { getPathOrBuilderList() { return path_; } + /** * * @@ -1559,6 +1594,7 @@ public java.util.List getPathList() { public int getPathCount() { return path_.size(); } + /** * * @@ -1587,6 +1623,7 @@ public int getPathCount() { public com.google.datastore.v1.Key.PathElement getPath(int index) { return path_.get(index); } + /** * * @@ -1789,6 +1826,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -2052,6 +2090,7 @@ public Builder mergeFrom( com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> partitionIdBuilder_; + /** * * @@ -2068,6 +2107,7 @@ public Builder mergeFrom( public boolean hasPartitionId() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -2090,6 +2130,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() { return partitionIdBuilder_.getMessage(); } } + /** * * @@ -2114,6 +2155,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) { onChanged(); return this; } + /** * * @@ -2135,6 +2177,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde onChanged(); return this; } + /** * * @@ -2164,6 +2207,7 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) { } return this; } + /** * * @@ -2185,6 +2229,7 @@ public Builder clearPartitionId() { onChanged(); return this; } + /** * * @@ -2201,6 +2246,7 @@ public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() { onChanged(); return getPartitionIdFieldBuilder().getBuilder(); } + /** * * @@ -2221,6 +2267,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { : partitionId_; } } + /** * * @@ -2296,6 +2343,7 @@ public java.util.List getPathList() { return pathBuilder_.getMessageList(); } } + /** * * @@ -2327,6 +2375,7 @@ public int getPathCount() { return pathBuilder_.getCount(); } } + /** * * @@ -2358,6 +2407,7 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) { return pathBuilder_.getMessage(index); } } + /** * * @@ -2395,6 +2445,7 @@ public Builder setPath(int index, com.google.datastore.v1.Key.PathElement value) } return this; } + /** * * @@ -2430,6 +2481,7 @@ public Builder setPath( } return this; } + /** * * @@ -2467,6 +2519,7 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement value) { } return this; } + /** * * @@ -2504,6 +2557,7 @@ public Builder addPath(int index, com.google.datastore.v1.Key.PathElement value) } return this; } + /** * * @@ -2538,6 +2592,7 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement.Builder builderFo } return this; } + /** * * @@ -2573,6 +2628,7 @@ public Builder addPath( } return this; } + /** * * @@ -2608,6 +2664,7 @@ public Builder addAllPath( } return this; } + /** * * @@ -2642,6 +2699,7 @@ public Builder clearPath() { } return this; } + /** * * @@ -2676,6 +2734,7 @@ public Builder removePath(int index) { } return this; } + /** * * @@ -2703,6 +2762,7 @@ public Builder removePath(int index) { public com.google.datastore.v1.Key.PathElement.Builder getPathBuilder(int index) { return getPathFieldBuilder().getBuilder(index); } + /** * * @@ -2734,6 +2794,7 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int ind return pathBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -2766,6 +2827,7 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int ind return java.util.Collections.unmodifiableList(path_); } } + /** * * @@ -2794,6 +2856,7 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder() { return getPathFieldBuilder() .addBuilder(com.google.datastore.v1.Key.PathElement.getDefaultInstance()); } + /** * * @@ -2822,6 +2885,7 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(int index) return getPathFieldBuilder() .addBuilder(index, com.google.datastore.v1.Key.PathElement.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java index dca0ac300..4c72915d8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java @@ -38,6 +38,7 @@ public interface KeyOrBuilder * @return Whether the partitionId field is set. */ boolean hasPartitionId(); + /** * * @@ -52,6 +53,7 @@ public interface KeyOrBuilder * @return The partitionId. */ com.google.datastore.v1.PartitionId getPartitionId(); + /** * * @@ -90,6 +92,7 @@ public interface KeyOrBuilder * repeated .google.datastore.v1.Key.PathElement path = 2; */ java.util.List getPathList(); + /** * * @@ -115,6 +118,7 @@ public interface KeyOrBuilder * repeated .google.datastore.v1.Key.PathElement path = 2; */ com.google.datastore.v1.Key.PathElement getPath(int index); + /** * * @@ -140,6 +144,7 @@ public interface KeyOrBuilder * repeated .google.datastore.v1.Key.PathElement path = 2; */ int getPathCount(); + /** * * @@ -165,6 +170,7 @@ public interface KeyOrBuilder * repeated .google.datastore.v1.Key.PathElement path = 2; */ java.util.List getPathOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java index 2440248b2..9b3d26ef9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java @@ -33,6 +33,7 @@ public final class KindExpression extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.KindExpression) KindExpressionOrBuilder { private static final long serialVersionUID = 0L; + // Use KindExpression.newBuilder() to construct. private KindExpression(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object name_ = ""; + /** * * @@ -90,6 +92,7 @@ public java.lang.String getName() { return s; } } + /** * * @@ -272,6 +275,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -455,6 +459,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object name_ = ""; + /** * * @@ -477,6 +482,7 @@ public java.lang.String getName() { return (java.lang.String) ref; } } + /** * * @@ -499,6 +505,7 @@ public com.google.protobuf.ByteString getNameBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -520,6 +527,7 @@ public Builder setName(java.lang.String value) { onChanged(); return this; } + /** * * @@ -537,6 +545,7 @@ public Builder clearName() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java index 75f85f5fa..ad9b5f9b6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java @@ -36,6 +36,7 @@ public interface KindExpressionOrBuilder * @return The name. */ java.lang.String getName(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java index c9debbee5..68b94adaa 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java @@ -33,6 +33,7 @@ public final class LookupRequest extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.LookupRequest) LookupRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use LookupRequest.newBuilder() to construct. private LookupRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -70,6 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -93,6 +95,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -121,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object databaseId_ = ""; + /** * * @@ -147,6 +151,7 @@ public java.lang.String getDatabaseId() { return s; } } + /** * * @@ -176,6 +181,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public static final int READ_OPTIONS_FIELD_NUMBER = 1; private com.google.datastore.v1.ReadOptions readOptions_; + /** * * @@ -191,6 +197,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public boolean hasReadOptions() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -208,6 +215,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() { ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_; } + /** * * @@ -228,6 +236,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { @SuppressWarnings("serial") private java.util.List keys_; + /** * * @@ -242,6 +251,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { public java.util.List getKeysList() { return keys_; } + /** * * @@ -256,6 +266,7 @@ public java.util.List getKeysList() { public java.util.List getKeysOrBuilderList() { return keys_; } + /** * * @@ -270,6 +281,7 @@ public java.util.List getKeysOrB public int getKeysCount() { return keys_.size(); } + /** * * @@ -284,6 +296,7 @@ public int getKeysCount() { public com.google.datastore.v1.Key getKeys(int index) { return keys_.get(index); } + /** * * @@ -301,6 +314,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) { public static final int PROPERTY_MASK_FIELD_NUMBER = 5; private com.google.datastore.v1.PropertyMask propertyMask_; + /** * * @@ -321,6 +335,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) { public boolean hasPropertyMask() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -343,6 +358,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() { ? com.google.datastore.v1.PropertyMask.getDefaultInstance() : propertyMask_; } + /** * * @@ -569,6 +585,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -877,6 +894,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -899,6 +917,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -921,6 +940,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -942,6 +962,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -959,6 +980,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -983,6 +1005,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object databaseId_ = ""; + /** * * @@ -1008,6 +1031,7 @@ public java.lang.String getDatabaseId() { return (java.lang.String) ref; } } + /** * * @@ -1033,6 +1057,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1057,6 +1082,7 @@ public Builder setDatabaseId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1077,6 +1103,7 @@ public Builder clearDatabaseId() { onChanged(); return this; } + /** * * @@ -1109,6 +1136,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> readOptionsBuilder_; + /** * * @@ -1123,6 +1151,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { public boolean hasReadOptions() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1143,6 +1172,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() { return readOptionsBuilder_.getMessage(); } } + /** * * @@ -1165,6 +1195,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) { onChanged(); return this; } + /** * * @@ -1184,6 +1215,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde onChanged(); return this; } + /** * * @@ -1211,6 +1243,7 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) { } return this; } + /** * * @@ -1230,6 +1263,7 @@ public Builder clearReadOptions() { onChanged(); return this; } + /** * * @@ -1244,6 +1278,7 @@ public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() { onChanged(); return getReadOptionsFieldBuilder().getBuilder(); } + /** * * @@ -1262,6 +1297,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { : readOptions_; } } + /** * * @@ -1320,6 +1356,7 @@ public java.util.List getKeysList() { return keysBuilder_.getMessageList(); } } + /** * * @@ -1337,6 +1374,7 @@ public int getKeysCount() { return keysBuilder_.getCount(); } } + /** * * @@ -1354,6 +1392,7 @@ public com.google.datastore.v1.Key getKeys(int index) { return keysBuilder_.getMessage(index); } } + /** * * @@ -1377,6 +1416,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1397,6 +1437,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor } return this; } + /** * * @@ -1420,6 +1461,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1443,6 +1485,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1463,6 +1506,7 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) { } return this; } + /** * * @@ -1483,6 +1527,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor } return this; } + /** * * @@ -1503,6 +1548,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysOrB return java.util.Collections.unmodifiableList(keys_); } } + /** * * @@ -1603,6 +1654,7 @@ public java.util.List getKeysOrB public com.google.datastore.v1.Key.Builder addKeysBuilder() { return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance()); } + /** * * @@ -1617,6 +1669,7 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) { return getKeysFieldBuilder() .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance()); } + /** * * @@ -1654,6 +1707,7 @@ public java.util.List getKeysBuilderList() com.google.datastore.v1.PropertyMask.Builder, com.google.datastore.v1.PropertyMaskOrBuilder> propertyMaskBuilder_; + /** * * @@ -1673,6 +1727,7 @@ public java.util.List getKeysBuilderList() public boolean hasPropertyMask() { return ((bitField0_ & 0x00000010) != 0); } + /** * * @@ -1698,6 +1753,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() { return propertyMaskBuilder_.getMessage(); } } + /** * * @@ -1725,6 +1781,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) { onChanged(); return this; } + /** * * @@ -1749,6 +1806,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder buil onChanged(); return this; } + /** * * @@ -1781,6 +1839,7 @@ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) { } return this; } + /** * * @@ -1805,6 +1864,7 @@ public Builder clearPropertyMask() { onChanged(); return this; } + /** * * @@ -1824,6 +1884,7 @@ public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() { onChanged(); return getPropertyMaskFieldBuilder().getBuilder(); } + /** * * @@ -1847,6 +1908,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() : propertyMask_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java index 645d311f2..f10219815 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface LookupRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -64,6 +65,7 @@ public interface LookupRequestOrBuilder * @return The databaseId. */ java.lang.String getDatabaseId(); + /** * * @@ -92,6 +94,7 @@ public interface LookupRequestOrBuilder * @return Whether the readOptions field is set. */ boolean hasReadOptions(); + /** * * @@ -104,6 +107,7 @@ public interface LookupRequestOrBuilder * @return The readOptions. */ com.google.datastore.v1.ReadOptions getReadOptions(); + /** * * @@ -126,6 +130,7 @@ public interface LookupRequestOrBuilder * */ java.util.List getKeysList(); + /** * * @@ -137,6 +142,7 @@ public interface LookupRequestOrBuilder * */ com.google.datastore.v1.Key getKeys(int index); + /** * * @@ -148,6 +154,7 @@ public interface LookupRequestOrBuilder * */ int getKeysCount(); + /** * * @@ -159,6 +166,7 @@ public interface LookupRequestOrBuilder * */ java.util.List getKeysOrBuilderList(); + /** * * @@ -188,6 +196,7 @@ public interface LookupRequestOrBuilder * @return Whether the propertyMask field is set. */ boolean hasPropertyMask(); + /** * * @@ -205,6 +214,7 @@ public interface LookupRequestOrBuilder * @return The propertyMask. */ com.google.datastore.v1.PropertyMask getPropertyMask(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java index 211ecfd32..1f02e007c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java @@ -33,6 +33,7 @@ public final class LookupResponse extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.LookupResponse) LookupResponseOrBuilder { private static final long serialVersionUID = 0L; + // Use LookupResponse.newBuilder() to construct. private LookupResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -71,6 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private java.util.List found_; + /** * * @@ -86,6 +88,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public java.util.List getFoundList() { return found_; } + /** * * @@ -102,6 +105,7 @@ public java.util.List getFoundList() { getFoundOrBuilderList() { return found_; } + /** * * @@ -117,6 +121,7 @@ public java.util.List getFoundList() { public int getFoundCount() { return found_.size(); } + /** * * @@ -132,6 +137,7 @@ public int getFoundCount() { public com.google.datastore.v1.EntityResult getFound(int index) { return found_.get(index); } + /** * * @@ -152,6 +158,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index @SuppressWarnings("serial") private java.util.List missing_; + /** * * @@ -167,6 +174,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index public java.util.List getMissingList() { return missing_; } + /** * * @@ -183,6 +191,7 @@ public java.util.List getMissingList() { getMissingOrBuilderList() { return missing_; } + /** * * @@ -198,6 +207,7 @@ public java.util.List getMissingList() { public int getMissingCount() { return missing_.size(); } + /** * * @@ -213,6 +223,7 @@ public int getMissingCount() { public com.google.datastore.v1.EntityResult getMissing(int index) { return missing_.get(index); } + /** * * @@ -233,6 +244,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind @SuppressWarnings("serial") private java.util.List deferred_; + /** * * @@ -248,6 +260,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind public java.util.List getDeferredList() { return deferred_; } + /** * * @@ -263,6 +276,7 @@ public java.util.List getDeferredList() { public java.util.List getDeferredOrBuilderList() { return deferred_; } + /** * * @@ -278,6 +292,7 @@ public java.util.List getDeferre public int getDeferredCount() { return deferred_.size(); } + /** * * @@ -293,6 +308,7 @@ public int getDeferredCount() { public com.google.datastore.v1.Key getDeferred(int index) { return deferred_.get(index); } + /** * * @@ -311,6 +327,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) { public static final int TRANSACTION_FIELD_NUMBER = 5; private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -335,6 +352,7 @@ public com.google.protobuf.ByteString getTransaction() { public static final int READ_TIME_FIELD_NUMBER = 7; private com.google.protobuf.Timestamp readTime_; + /** * * @@ -350,6 +368,7 @@ public com.google.protobuf.ByteString getTransaction() { public boolean hasReadTime() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -365,6 +384,7 @@ public boolean hasReadTime() { public com.google.protobuf.Timestamp getReadTime() { return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; } + /** * * @@ -584,6 +604,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1001,6 +1022,7 @@ public java.util.List getFoundList() { return foundBuilder_.getMessageList(); } } + /** * * @@ -1019,6 +1041,7 @@ public int getFoundCount() { return foundBuilder_.getCount(); } } + /** * * @@ -1037,6 +1060,7 @@ public com.google.datastore.v1.EntityResult getFound(int index) { return foundBuilder_.getMessage(index); } } + /** * * @@ -1061,6 +1085,7 @@ public Builder setFound(int index, com.google.datastore.v1.EntityResult value) { } return this; } + /** * * @@ -1083,6 +1108,7 @@ public Builder setFound( } return this; } + /** * * @@ -1107,6 +1133,7 @@ public Builder addFound(com.google.datastore.v1.EntityResult value) { } return this; } + /** * * @@ -1131,6 +1158,7 @@ public Builder addFound(int index, com.google.datastore.v1.EntityResult value) { } return this; } + /** * * @@ -1152,6 +1180,7 @@ public Builder addFound(com.google.datastore.v1.EntityResult.Builder builderForV } return this; } + /** * * @@ -1174,6 +1203,7 @@ public Builder addFound( } return this; } + /** * * @@ -1196,6 +1226,7 @@ public Builder addAllFound( } return this; } + /** * * @@ -1217,6 +1248,7 @@ public Builder clearFound() { } return this; } + /** * * @@ -1238,6 +1270,7 @@ public Builder removeFound(int index) { } return this; } + /** * * @@ -1252,6 +1285,7 @@ public Builder removeFound(int index) { public com.google.datastore.v1.EntityResult.Builder getFoundBuilder(int index) { return getFoundFieldBuilder().getBuilder(index); } + /** * * @@ -1270,6 +1304,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index return foundBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -1289,6 +1324,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index return java.util.Collections.unmodifiableList(found_); } } + /** * * @@ -1304,6 +1340,7 @@ public com.google.datastore.v1.EntityResult.Builder addFoundBuilder() { return getFoundFieldBuilder() .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance()); } + /** * * @@ -1319,6 +1356,7 @@ public com.google.datastore.v1.EntityResult.Builder addFoundBuilder(int index) { return getFoundFieldBuilder() .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance()); } + /** * * @@ -1385,6 +1423,7 @@ public java.util.List getMissingList() { return missingBuilder_.getMessageList(); } } + /** * * @@ -1403,6 +1442,7 @@ public int getMissingCount() { return missingBuilder_.getCount(); } } + /** * * @@ -1421,6 +1461,7 @@ public com.google.datastore.v1.EntityResult getMissing(int index) { return missingBuilder_.getMessage(index); } } + /** * * @@ -1445,6 +1486,7 @@ public Builder setMissing(int index, com.google.datastore.v1.EntityResult value) } return this; } + /** * * @@ -1467,6 +1509,7 @@ public Builder setMissing( } return this; } + /** * * @@ -1491,6 +1534,7 @@ public Builder addMissing(com.google.datastore.v1.EntityResult value) { } return this; } + /** * * @@ -1515,6 +1559,7 @@ public Builder addMissing(int index, com.google.datastore.v1.EntityResult value) } return this; } + /** * * @@ -1536,6 +1581,7 @@ public Builder addMissing(com.google.datastore.v1.EntityResult.Builder builderFo } return this; } + /** * * @@ -1558,6 +1604,7 @@ public Builder addMissing( } return this; } + /** * * @@ -1580,6 +1627,7 @@ public Builder addAllMissing( } return this; } + /** * * @@ -1601,6 +1649,7 @@ public Builder clearMissing() { } return this; } + /** * * @@ -1622,6 +1671,7 @@ public Builder removeMissing(int index) { } return this; } + /** * * @@ -1636,6 +1686,7 @@ public Builder removeMissing(int index) { public com.google.datastore.v1.EntityResult.Builder getMissingBuilder(int index) { return getMissingFieldBuilder().getBuilder(index); } + /** * * @@ -1654,6 +1705,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind return missingBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -1673,6 +1725,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind return java.util.Collections.unmodifiableList(missing_); } } + /** * * @@ -1688,6 +1741,7 @@ public com.google.datastore.v1.EntityResult.Builder addMissingBuilder() { return getMissingFieldBuilder() .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance()); } + /** * * @@ -1703,6 +1757,7 @@ public com.google.datastore.v1.EntityResult.Builder addMissingBuilder(int index) return getMissingFieldBuilder() .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance()); } + /** * * @@ -1769,6 +1824,7 @@ public java.util.List getDeferredList() { return deferredBuilder_.getMessageList(); } } + /** * * @@ -1787,6 +1843,7 @@ public int getDeferredCount() { return deferredBuilder_.getCount(); } } + /** * * @@ -1805,6 +1862,7 @@ public com.google.datastore.v1.Key getDeferred(int index) { return deferredBuilder_.getMessage(index); } } + /** * * @@ -1829,6 +1887,7 @@ public Builder setDeferred(int index, com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1850,6 +1909,7 @@ public Builder setDeferred(int index, com.google.datastore.v1.Key.Builder builde } return this; } + /** * * @@ -1874,6 +1934,7 @@ public Builder addDeferred(com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1898,6 +1959,7 @@ public Builder addDeferred(int index, com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1919,6 +1981,7 @@ public Builder addDeferred(com.google.datastore.v1.Key.Builder builderForValue) } return this; } + /** * * @@ -1940,6 +2003,7 @@ public Builder addDeferred(int index, com.google.datastore.v1.Key.Builder builde } return this; } + /** * * @@ -1962,6 +2026,7 @@ public Builder addAllDeferred( } return this; } + /** * * @@ -1983,6 +2048,7 @@ public Builder clearDeferred() { } return this; } + /** * * @@ -2004,6 +2070,7 @@ public Builder removeDeferred(int index) { } return this; } + /** * * @@ -2018,6 +2085,7 @@ public Builder removeDeferred(int index) { public com.google.datastore.v1.Key.Builder getDeferredBuilder(int index) { return getDeferredFieldBuilder().getBuilder(index); } + /** * * @@ -2036,6 +2104,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) { return deferredBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -2055,6 +2124,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) { return java.util.Collections.unmodifiableList(deferred_); } } + /** * * @@ -2069,6 +2139,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) { public com.google.datastore.v1.Key.Builder addDeferredBuilder() { return getDeferredFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance()); } + /** * * @@ -2084,6 +2155,7 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder(int index) { return getDeferredFieldBuilder() .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance()); } + /** * * @@ -2117,6 +2189,7 @@ public java.util.List getDeferredBuilderLis } private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -2138,6 +2211,7 @@ public java.util.List getDeferredBuilderLis public com.google.protobuf.ByteString getTransaction() { return transaction_; } + /** * * @@ -2165,6 +2239,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -2195,6 +2270,7 @@ public Builder clearTransaction() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> readTimeBuilder_; + /** * * @@ -2209,6 +2285,7 @@ public Builder clearTransaction() { public boolean hasReadTime() { return ((bitField0_ & 0x00000010) != 0); } + /** * * @@ -2227,6 +2304,7 @@ public com.google.protobuf.Timestamp getReadTime() { return readTimeBuilder_.getMessage(); } } + /** * * @@ -2249,6 +2327,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -2268,6 +2347,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue onChanged(); return this; } + /** * * @@ -2295,6 +2375,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -2314,6 +2395,7 @@ public Builder clearReadTime() { onChanged(); return this; } + /** * * @@ -2328,6 +2410,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() { onChanged(); return getReadTimeFieldBuilder().getBuilder(); } + /** * * @@ -2344,6 +2427,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java index 540ffdd11..ae3bfc36d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java @@ -36,6 +36,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.EntityResult found = 1; */ java.util.List getFoundList(); + /** * * @@ -48,6 +49,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.EntityResult found = 1; */ com.google.datastore.v1.EntityResult getFound(int index); + /** * * @@ -60,6 +62,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.EntityResult found = 1; */ int getFoundCount(); + /** * * @@ -72,6 +75,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.EntityResult found = 1; */ java.util.List getFoundOrBuilderList(); + /** * * @@ -97,6 +101,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.EntityResult missing = 2; */ java.util.List getMissingList(); + /** * * @@ -109,6 +114,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.EntityResult missing = 2; */ com.google.datastore.v1.EntityResult getMissing(int index); + /** * * @@ -121,6 +127,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.EntityResult missing = 2; */ int getMissingCount(); + /** * * @@ -133,6 +140,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.EntityResult missing = 2; */ java.util.List getMissingOrBuilderList(); + /** * * @@ -158,6 +166,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.Key deferred = 3; */ java.util.List getDeferredList(); + /** * * @@ -170,6 +179,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.Key deferred = 3; */ com.google.datastore.v1.Key getDeferred(int index); + /** * * @@ -182,6 +192,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.Key deferred = 3; */ int getDeferredCount(); + /** * * @@ -194,6 +205,7 @@ public interface LookupResponseOrBuilder * repeated .google.datastore.v1.Key deferred = 3; */ java.util.List getDeferredOrBuilderList(); + /** * * @@ -238,6 +250,7 @@ public interface LookupResponseOrBuilder * @return Whether the readTime field is set. */ boolean hasReadTime(); + /** * * @@ -250,6 +263,7 @@ public interface LookupResponseOrBuilder * @return The readTime. */ com.google.protobuf.Timestamp getReadTime(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java index e9d1e8527..be1d7e191 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java @@ -33,6 +33,7 @@ public final class Mutation extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.Mutation) MutationOrBuilder { private static final long serialVersionUID = 0L; + // Use Mutation.newBuilder() to construct. private Mutation(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -116,6 +117,7 @@ public enum ConflictResolutionStrategy implements com.google.protobuf.ProtocolMe * STRATEGY_UNSPECIFIED = 0; */ public static final int STRATEGY_UNSPECIFIED_VALUE = 0; + /** * * @@ -126,6 +128,7 @@ public enum ConflictResolutionStrategy implements com.google.protobuf.ProtocolMe * SERVER_VALUE = 1; */ public static final int SERVER_VALUE_VALUE = 1; + /** * * @@ -243,6 +246,7 @@ public enum OperationCase private OperationCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -296,6 +300,7 @@ public enum ConflictDetectionStrategyCase private ConflictDetectionStrategyCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -329,6 +334,7 @@ public ConflictDetectionStrategyCase getConflictDetectionStrategyCase() { } public static final int INSERT_FIELD_NUMBER = 4; + /** * * @@ -345,6 +351,7 @@ public ConflictDetectionStrategyCase getConflictDetectionStrategyCase() { public boolean hasInsert() { return operationCase_ == 4; } + /** * * @@ -364,6 +371,7 @@ public com.google.datastore.v1.Entity getInsert() { } return com.google.datastore.v1.Entity.getDefaultInstance(); } + /** * * @@ -383,6 +391,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() { } public static final int UPDATE_FIELD_NUMBER = 5; + /** * * @@ -399,6 +408,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() { public boolean hasUpdate() { return operationCase_ == 5; } + /** * * @@ -418,6 +428,7 @@ public com.google.datastore.v1.Entity getUpdate() { } return com.google.datastore.v1.Entity.getDefaultInstance(); } + /** * * @@ -437,6 +448,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() { } public static final int UPSERT_FIELD_NUMBER = 6; + /** * * @@ -453,6 +465,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() { public boolean hasUpsert() { return operationCase_ == 6; } + /** * * @@ -472,6 +485,7 @@ public com.google.datastore.v1.Entity getUpsert() { } return com.google.datastore.v1.Entity.getDefaultInstance(); } + /** * * @@ -491,6 +505,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() { } public static final int DELETE_FIELD_NUMBER = 7; + /** * * @@ -507,6 +522,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() { public boolean hasDelete() { return operationCase_ == 7; } + /** * * @@ -526,6 +542,7 @@ public com.google.datastore.v1.Key getDelete() { } return com.google.datastore.v1.Key.getDefaultInstance(); } + /** * * @@ -545,6 +562,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() { } public static final int BASE_VERSION_FIELD_NUMBER = 8; + /** * * @@ -562,6 +580,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() { public boolean hasBaseVersion() { return conflictDetectionStrategyCase_ == 8; } + /** * * @@ -584,6 +603,7 @@ public long getBaseVersion() { } public static final int UPDATE_TIME_FIELD_NUMBER = 11; + /** * * @@ -601,6 +621,7 @@ public long getBaseVersion() { public boolean hasUpdateTime() { return conflictDetectionStrategyCase_ == 11; } + /** * * @@ -621,6 +642,7 @@ public com.google.protobuf.Timestamp getUpdateTime() { } return com.google.protobuf.Timestamp.getDefaultInstance(); } + /** * * @@ -642,6 +664,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { public static final int CONFLICT_RESOLUTION_STRATEGY_FIELD_NUMBER = 10; private int conflictResolutionStrategy_ = 0; + /** * * @@ -661,6 +684,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { public int getConflictResolutionStrategyValue() { return conflictResolutionStrategy_; } + /** * * @@ -689,6 +713,7 @@ public int getConflictResolutionStrategyValue() { public static final int PROPERTY_MASK_FIELD_NUMBER = 9; private com.google.datastore.v1.PropertyMask propertyMask_; + /** * * @@ -711,6 +736,7 @@ public int getConflictResolutionStrategyValue() { public boolean hasPropertyMask() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -735,6 +761,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() { ? com.google.datastore.v1.PropertyMask.getDefaultInstance() : propertyMask_; } + /** * * @@ -762,6 +789,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() @SuppressWarnings("serial") private java.util.List propertyTransforms_; + /** * * @@ -781,6 +809,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() public java.util.List getPropertyTransformsList() { return propertyTransforms_; } + /** * * @@ -801,6 +830,7 @@ public java.util.List getPropertyTran getPropertyTransformsOrBuilderList() { return propertyTransforms_; } + /** * * @@ -820,6 +850,7 @@ public java.util.List getPropertyTran public int getPropertyTransformsCount() { return propertyTransforms_.size(); } + /** * * @@ -839,6 +870,7 @@ public int getPropertyTransformsCount() { public com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index) { return propertyTransforms_.get(index); } + /** * * @@ -1157,6 +1189,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1580,6 +1613,7 @@ public Builder clearConflictDetectionStrategy() { com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> insertBuilder_; + /** * * @@ -1596,6 +1630,7 @@ public Builder clearConflictDetectionStrategy() { public boolean hasInsert() { return operationCase_ == 4; } + /** * * @@ -1622,6 +1657,7 @@ public com.google.datastore.v1.Entity getInsert() { return com.google.datastore.v1.Entity.getDefaultInstance(); } } + /** * * @@ -1645,6 +1681,7 @@ public Builder setInsert(com.google.datastore.v1.Entity value) { operationCase_ = 4; return this; } + /** * * @@ -1665,6 +1702,7 @@ public Builder setInsert(com.google.datastore.v1.Entity.Builder builderForValue) operationCase_ = 4; return this; } + /** * * @@ -1697,6 +1735,7 @@ public Builder mergeInsert(com.google.datastore.v1.Entity value) { operationCase_ = 4; return this; } + /** * * @@ -1723,6 +1762,7 @@ public Builder clearInsert() { } return this; } + /** * * @@ -1736,6 +1776,7 @@ public Builder clearInsert() { public com.google.datastore.v1.Entity.Builder getInsertBuilder() { return getInsertFieldBuilder().getBuilder(); } + /** * * @@ -1757,6 +1798,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() { return com.google.datastore.v1.Entity.getDefaultInstance(); } } + /** * * @@ -1794,6 +1836,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() { com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> updateBuilder_; + /** * * @@ -1810,6 +1853,7 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() { public boolean hasUpdate() { return operationCase_ == 5; } + /** * * @@ -1836,6 +1880,7 @@ public com.google.datastore.v1.Entity getUpdate() { return com.google.datastore.v1.Entity.getDefaultInstance(); } } + /** * * @@ -1859,6 +1904,7 @@ public Builder setUpdate(com.google.datastore.v1.Entity value) { operationCase_ = 5; return this; } + /** * * @@ -1879,6 +1925,7 @@ public Builder setUpdate(com.google.datastore.v1.Entity.Builder builderForValue) operationCase_ = 5; return this; } + /** * * @@ -1911,6 +1958,7 @@ public Builder mergeUpdate(com.google.datastore.v1.Entity value) { operationCase_ = 5; return this; } + /** * * @@ -1937,6 +1985,7 @@ public Builder clearUpdate() { } return this; } + /** * * @@ -1950,6 +1999,7 @@ public Builder clearUpdate() { public com.google.datastore.v1.Entity.Builder getUpdateBuilder() { return getUpdateFieldBuilder().getBuilder(); } + /** * * @@ -1971,6 +2021,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() { return com.google.datastore.v1.Entity.getDefaultInstance(); } } + /** * * @@ -2008,6 +2059,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() { com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> upsertBuilder_; + /** * * @@ -2024,6 +2076,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() { public boolean hasUpsert() { return operationCase_ == 6; } + /** * * @@ -2050,6 +2103,7 @@ public com.google.datastore.v1.Entity getUpsert() { return com.google.datastore.v1.Entity.getDefaultInstance(); } } + /** * * @@ -2073,6 +2127,7 @@ public Builder setUpsert(com.google.datastore.v1.Entity value) { operationCase_ = 6; return this; } + /** * * @@ -2093,6 +2148,7 @@ public Builder setUpsert(com.google.datastore.v1.Entity.Builder builderForValue) operationCase_ = 6; return this; } + /** * * @@ -2125,6 +2181,7 @@ public Builder mergeUpsert(com.google.datastore.v1.Entity value) { operationCase_ = 6; return this; } + /** * * @@ -2151,6 +2208,7 @@ public Builder clearUpsert() { } return this; } + /** * * @@ -2164,6 +2222,7 @@ public Builder clearUpsert() { public com.google.datastore.v1.Entity.Builder getUpsertBuilder() { return getUpsertFieldBuilder().getBuilder(); } + /** * * @@ -2185,6 +2244,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() { return com.google.datastore.v1.Entity.getDefaultInstance(); } } + /** * * @@ -2222,6 +2282,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() { com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> deleteBuilder_; + /** * * @@ -2238,6 +2299,7 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() { public boolean hasDelete() { return operationCase_ == 7; } + /** * * @@ -2264,6 +2326,7 @@ public com.google.datastore.v1.Key getDelete() { return com.google.datastore.v1.Key.getDefaultInstance(); } } + /** * * @@ -2287,6 +2350,7 @@ public Builder setDelete(com.google.datastore.v1.Key value) { operationCase_ = 7; return this; } + /** * * @@ -2307,6 +2371,7 @@ public Builder setDelete(com.google.datastore.v1.Key.Builder builderForValue) { operationCase_ = 7; return this; } + /** * * @@ -2338,6 +2403,7 @@ public Builder mergeDelete(com.google.datastore.v1.Key value) { operationCase_ = 7; return this; } + /** * * @@ -2364,6 +2430,7 @@ public Builder clearDelete() { } return this; } + /** * * @@ -2377,6 +2444,7 @@ public Builder clearDelete() { public com.google.datastore.v1.Key.Builder getDeleteBuilder() { return getDeleteFieldBuilder().getBuilder(); } + /** * * @@ -2398,6 +2466,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() { return com.google.datastore.v1.Key.getDefaultInstance(); } } + /** * * @@ -2446,6 +2515,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() { public boolean hasBaseVersion() { return conflictDetectionStrategyCase_ == 8; } + /** * * @@ -2465,6 +2535,7 @@ public long getBaseVersion() { } return 0L; } + /** * * @@ -2486,6 +2557,7 @@ public Builder setBaseVersion(long value) { onChanged(); return this; } + /** * * @@ -2513,6 +2585,7 @@ public Builder clearBaseVersion() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> updateTimeBuilder_; + /** * * @@ -2530,6 +2603,7 @@ public Builder clearBaseVersion() { public boolean hasUpdateTime() { return conflictDetectionStrategyCase_ == 11; } + /** * * @@ -2557,6 +2631,7 @@ public com.google.protobuf.Timestamp getUpdateTime() { return com.google.protobuf.Timestamp.getDefaultInstance(); } } + /** * * @@ -2581,6 +2656,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { conflictDetectionStrategyCase_ = 11; return this; } + /** * * @@ -2602,6 +2678,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal conflictDetectionStrategyCase_ = 11; return this; } + /** * * @@ -2636,6 +2713,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { conflictDetectionStrategyCase_ = 11; return this; } + /** * * @@ -2663,6 +2741,7 @@ public Builder clearUpdateTime() { } return this; } + /** * * @@ -2677,6 +2756,7 @@ public Builder clearUpdateTime() { public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() { return getUpdateTimeFieldBuilder().getBuilder(); } + /** * * @@ -2699,6 +2779,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { return com.google.protobuf.Timestamp.getDefaultInstance(); } } + /** * * @@ -2735,6 +2816,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { } private int conflictResolutionStrategy_ = 0; + /** * * @@ -2754,6 +2836,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { public int getConflictResolutionStrategyValue() { return conflictResolutionStrategy_; } + /** * * @@ -2776,6 +2859,7 @@ public Builder setConflictResolutionStrategyValue(int value) { onChanged(); return this; } + /** * * @@ -2801,6 +2885,7 @@ public Builder setConflictResolutionStrategyValue(int value) { ? com.google.datastore.v1.Mutation.ConflictResolutionStrategy.UNRECOGNIZED : result; } + /** * * @@ -2827,6 +2912,7 @@ public Builder setConflictResolutionStrategy( onChanged(); return this; } + /** * * @@ -2855,6 +2941,7 @@ public Builder clearConflictResolutionStrategy() { com.google.datastore.v1.PropertyMask.Builder, com.google.datastore.v1.PropertyMaskOrBuilder> propertyMaskBuilder_; + /** * * @@ -2876,6 +2963,7 @@ public Builder clearConflictResolutionStrategy() { public boolean hasPropertyMask() { return ((bitField0_ & 0x00000080) != 0); } + /** * * @@ -2903,6 +2991,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() { return propertyMaskBuilder_.getMessage(); } } + /** * * @@ -2932,6 +3021,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) { onChanged(); return this; } + /** * * @@ -2958,6 +3048,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder buil onChanged(); return this; } + /** * * @@ -2992,6 +3083,7 @@ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) { } return this; } + /** * * @@ -3018,6 +3110,7 @@ public Builder clearPropertyMask() { onChanged(); return this; } + /** * * @@ -3039,6 +3132,7 @@ public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() { onChanged(); return getPropertyMaskFieldBuilder().getBuilder(); } + /** * * @@ -3064,6 +3158,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() : propertyMask_; } } + /** * * @@ -3136,6 +3231,7 @@ public java.util.List getPropertyTran return propertyTransformsBuilder_.getMessageList(); } } + /** * * @@ -3158,6 +3254,7 @@ public int getPropertyTransformsCount() { return propertyTransformsBuilder_.getCount(); } } + /** * * @@ -3180,6 +3277,7 @@ public com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index return propertyTransformsBuilder_.getMessage(index); } } + /** * * @@ -3209,6 +3307,7 @@ public Builder setPropertyTransforms( } return this; } + /** * * @@ -3235,6 +3334,7 @@ public Builder setPropertyTransforms( } return this; } + /** * * @@ -3263,6 +3363,7 @@ public Builder addPropertyTransforms(com.google.datastore.v1.PropertyTransform v } return this; } + /** * * @@ -3292,6 +3393,7 @@ public Builder addPropertyTransforms( } return this; } + /** * * @@ -3318,6 +3420,7 @@ public Builder addPropertyTransforms( } return this; } + /** * * @@ -3344,6 +3447,7 @@ public Builder addPropertyTransforms( } return this; } + /** * * @@ -3370,6 +3474,7 @@ public Builder addAllPropertyTransforms( } return this; } + /** * * @@ -3395,6 +3500,7 @@ public Builder clearPropertyTransforms() { } return this; } + /** * * @@ -3420,6 +3526,7 @@ public Builder removePropertyTransforms(int index) { } return this; } + /** * * @@ -3439,6 +3546,7 @@ public com.google.datastore.v1.PropertyTransform.Builder getPropertyTransformsBu int index) { return getPropertyTransformsFieldBuilder().getBuilder(index); } + /** * * @@ -3462,6 +3570,7 @@ public com.google.datastore.v1.PropertyTransformOrBuilder getPropertyTransformsO return propertyTransformsBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -3485,6 +3594,7 @@ public com.google.datastore.v1.PropertyTransformOrBuilder getPropertyTransformsO return java.util.Collections.unmodifiableList(propertyTransforms_); } } + /** * * @@ -3504,6 +3614,7 @@ public com.google.datastore.v1.PropertyTransform.Builder addPropertyTransformsBu return getPropertyTransformsFieldBuilder() .addBuilder(com.google.datastore.v1.PropertyTransform.getDefaultInstance()); } + /** * * @@ -3524,6 +3635,7 @@ public com.google.datastore.v1.PropertyTransform.Builder addPropertyTransformsBu return getPropertyTransformsFieldBuilder() .addBuilder(index, com.google.datastore.v1.PropertyTransform.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java index f608c8c71..3b01c9ae5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java @@ -37,6 +37,7 @@ public interface MutationOrBuilder * @return Whether the insert field is set. */ boolean hasInsert(); + /** * * @@ -50,6 +51,7 @@ public interface MutationOrBuilder * @return The insert. */ com.google.datastore.v1.Entity getInsert(); + /** * * @@ -75,6 +77,7 @@ public interface MutationOrBuilder * @return Whether the update field is set. */ boolean hasUpdate(); + /** * * @@ -88,6 +91,7 @@ public interface MutationOrBuilder * @return The update. */ com.google.datastore.v1.Entity getUpdate(); + /** * * @@ -113,6 +117,7 @@ public interface MutationOrBuilder * @return Whether the upsert field is set. */ boolean hasUpsert(); + /** * * @@ -126,6 +131,7 @@ public interface MutationOrBuilder * @return The upsert. */ com.google.datastore.v1.Entity getUpsert(); + /** * * @@ -151,6 +157,7 @@ public interface MutationOrBuilder * @return Whether the delete field is set. */ boolean hasDelete(); + /** * * @@ -164,6 +171,7 @@ public interface MutationOrBuilder * @return The delete. */ com.google.datastore.v1.Key getDelete(); + /** * * @@ -190,6 +198,7 @@ public interface MutationOrBuilder * @return Whether the baseVersion field is set. */ boolean hasBaseVersion(); + /** * * @@ -219,6 +228,7 @@ public interface MutationOrBuilder * @return Whether the updateTime field is set. */ boolean hasUpdateTime(); + /** * * @@ -233,6 +243,7 @@ public interface MutationOrBuilder * @return The updateTime. */ com.google.protobuf.Timestamp getUpdateTime(); + /** * * @@ -262,6 +273,7 @@ public interface MutationOrBuilder * @return The enum numeric value on the wire for conflictResolutionStrategy. */ int getConflictResolutionStrategyValue(); + /** * * @@ -298,6 +310,7 @@ public interface MutationOrBuilder * @return Whether the propertyMask field is set. */ boolean hasPropertyMask(); + /** * * @@ -317,6 +330,7 @@ public interface MutationOrBuilder * @return The propertyMask. */ com.google.datastore.v1.PropertyMask getPropertyMask(); + /** * * @@ -351,6 +365,7 @@ public interface MutationOrBuilder * */ java.util.List getPropertyTransformsList(); + /** * * @@ -367,6 +382,7 @@ public interface MutationOrBuilder * */ com.google.datastore.v1.PropertyTransform getPropertyTransforms(int index); + /** * * @@ -383,6 +399,7 @@ public interface MutationOrBuilder * */ int getPropertyTransformsCount(); + /** * * @@ -400,6 +417,7 @@ public interface MutationOrBuilder */ java.util.List getPropertyTransformsOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java index e2bd44311..8f82a5c95 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java @@ -33,6 +33,7 @@ public final class MutationResult extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.MutationResult) MutationResultOrBuilder { private static final long serialVersionUID = 0L; + // Use MutationResult.newBuilder() to construct. private MutationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -66,6 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int KEY_FIELD_NUMBER = 3; private com.google.datastore.v1.Key key_; + /** * * @@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasKey() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -98,6 +101,7 @@ public boolean hasKey() { public com.google.datastore.v1.Key getKey() { return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_; } + /** * * @@ -115,6 +119,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() { public static final int VERSION_FIELD_NUMBER = 4; private long version_ = 0L; + /** * * @@ -137,6 +142,7 @@ public long getVersion() { public static final int CREATE_TIME_FIELD_NUMBER = 7; private com.google.protobuf.Timestamp createTime_; + /** * * @@ -152,6 +158,7 @@ public long getVersion() { public boolean hasCreateTime() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -167,6 +174,7 @@ public boolean hasCreateTime() { public com.google.protobuf.Timestamp getCreateTime() { return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } + /** * * @@ -183,6 +191,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { public static final int UPDATE_TIME_FIELD_NUMBER = 6; private com.google.protobuf.Timestamp updateTime_; + /** * * @@ -201,6 +210,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { public boolean hasUpdateTime() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -219,6 +229,7 @@ public boolean hasUpdateTime() { public com.google.protobuf.Timestamp getUpdateTime() { return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_; } + /** * * @@ -238,6 +249,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { public static final int CONFLICT_DETECTED_FIELD_NUMBER = 5; private boolean conflictDetected_ = false; + /** * * @@ -259,6 +271,7 @@ public boolean getConflictDetected() { @SuppressWarnings("serial") private java.util.List transformResults_; + /** * * @@ -274,6 +287,7 @@ public boolean getConflictDetected() { public java.util.List getTransformResultsList() { return transformResults_; } + /** * * @@ -290,6 +304,7 @@ public java.util.List getTransformResultsList() { getTransformResultsOrBuilderList() { return transformResults_; } + /** * * @@ -305,6 +320,7 @@ public java.util.List getTransformResultsList() { public int getTransformResultsCount() { return transformResults_.size(); } + /** * * @@ -320,6 +336,7 @@ public int getTransformResultsCount() { public com.google.datastore.v1.Value getTransformResults(int index) { return transformResults_.get(index); } + /** * * @@ -556,6 +573,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -882,6 +900,7 @@ public Builder mergeFrom( com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyBuilder_; + /** * * @@ -897,6 +916,7 @@ public Builder mergeFrom( public boolean hasKey() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -916,6 +936,7 @@ public com.google.datastore.v1.Key getKey() { return keyBuilder_.getMessage(); } } + /** * * @@ -939,6 +960,7 @@ public Builder setKey(com.google.datastore.v1.Key value) { onChanged(); return this; } + /** * * @@ -959,6 +981,7 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) { onChanged(); return this; } + /** * * @@ -987,6 +1010,7 @@ public Builder mergeKey(com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1007,6 +1031,7 @@ public Builder clearKey() { onChanged(); return this; } + /** * * @@ -1022,6 +1047,7 @@ public com.google.datastore.v1.Key.Builder getKeyBuilder() { onChanged(); return getKeyFieldBuilder().getBuilder(); } + /** * * @@ -1039,6 +1065,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() { return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_; } } + /** * * @@ -1066,6 +1093,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() { } private long version_; + /** * * @@ -1085,6 +1113,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() { public long getVersion() { return version_; } + /** * * @@ -1108,6 +1137,7 @@ public Builder setVersion(long value) { onChanged(); return this; } + /** * * @@ -1136,6 +1166,7 @@ public Builder clearVersion() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> createTimeBuilder_; + /** * * @@ -1150,6 +1181,7 @@ public Builder clearVersion() { public boolean hasCreateTime() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1170,6 +1202,7 @@ public com.google.protobuf.Timestamp getCreateTime() { return createTimeBuilder_.getMessage(); } } + /** * * @@ -1192,6 +1225,7 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -1211,6 +1245,7 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal onChanged(); return this; } + /** * * @@ -1238,6 +1273,7 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -1257,6 +1293,7 @@ public Builder clearCreateTime() { onChanged(); return this; } + /** * * @@ -1271,6 +1308,7 @@ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } + /** * * @@ -1289,6 +1327,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { : createTime_; } } + /** * * @@ -1321,6 +1360,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> updateTimeBuilder_; + /** * * @@ -1338,6 +1378,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { public boolean hasUpdateTime() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1361,6 +1402,7 @@ public com.google.protobuf.Timestamp getUpdateTime() { return updateTimeBuilder_.getMessage(); } } + /** * * @@ -1386,6 +1428,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -1408,6 +1451,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal onChanged(); return this; } + /** * * @@ -1438,6 +1482,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -1460,6 +1505,7 @@ public Builder clearUpdateTime() { onChanged(); return this; } + /** * * @@ -1477,6 +1523,7 @@ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() { onChanged(); return getUpdateTimeFieldBuilder().getBuilder(); } + /** * * @@ -1498,6 +1545,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { : updateTime_; } } + /** * * @@ -1528,6 +1576,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { } private boolean conflictDetected_; + /** * * @@ -1544,6 +1593,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { public boolean getConflictDetected() { return conflictDetected_; } + /** * * @@ -1564,6 +1614,7 @@ public Builder setConflictDetected(boolean value) { onChanged(); return this; } + /** * * @@ -1618,6 +1669,7 @@ public java.util.List getTransformResultsList() { return transformResultsBuilder_.getMessageList(); } } + /** * * @@ -1636,6 +1688,7 @@ public int getTransformResultsCount() { return transformResultsBuilder_.getCount(); } } + /** * * @@ -1654,6 +1707,7 @@ public com.google.datastore.v1.Value getTransformResults(int index) { return transformResultsBuilder_.getMessage(index); } } + /** * * @@ -1678,6 +1732,7 @@ public Builder setTransformResults(int index, com.google.datastore.v1.Value valu } return this; } + /** * * @@ -1700,6 +1755,7 @@ public Builder setTransformResults( } return this; } + /** * * @@ -1724,6 +1780,7 @@ public Builder addTransformResults(com.google.datastore.v1.Value value) { } return this; } + /** * * @@ -1748,6 +1805,7 @@ public Builder addTransformResults(int index, com.google.datastore.v1.Value valu } return this; } + /** * * @@ -1769,6 +1827,7 @@ public Builder addTransformResults(com.google.datastore.v1.Value.Builder builder } return this; } + /** * * @@ -1791,6 +1850,7 @@ public Builder addTransformResults( } return this; } + /** * * @@ -1813,6 +1873,7 @@ public Builder addAllTransformResults( } return this; } + /** * * @@ -1834,6 +1895,7 @@ public Builder clearTransformResults() { } return this; } + /** * * @@ -1855,6 +1917,7 @@ public Builder removeTransformResults(int index) { } return this; } + /** * * @@ -1869,6 +1932,7 @@ public Builder removeTransformResults(int index) { public com.google.datastore.v1.Value.Builder getTransformResultsBuilder(int index) { return getTransformResultsFieldBuilder().getBuilder(index); } + /** * * @@ -1887,6 +1951,7 @@ public com.google.datastore.v1.ValueOrBuilder getTransformResultsOrBuilder(int i return transformResultsBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -1906,6 +1971,7 @@ public com.google.datastore.v1.ValueOrBuilder getTransformResultsOrBuilder(int i return java.util.Collections.unmodifiableList(transformResults_); } } + /** * * @@ -1921,6 +1987,7 @@ public com.google.datastore.v1.Value.Builder addTransformResultsBuilder() { return getTransformResultsFieldBuilder() .addBuilder(com.google.datastore.v1.Value.getDefaultInstance()); } + /** * * @@ -1936,6 +2003,7 @@ public com.google.datastore.v1.Value.Builder addTransformResultsBuilder(int inde return getTransformResultsFieldBuilder() .addBuilder(index, com.google.datastore.v1.Value.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java index c948ceffb..5df6b9c3a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java @@ -37,6 +37,7 @@ public interface MutationResultOrBuilder * @return Whether the key field is set. */ boolean hasKey(); + /** * * @@ -50,6 +51,7 @@ public interface MutationResultOrBuilder * @return The key. */ com.google.datastore.v1.Key getKey(); + /** * * @@ -91,6 +93,7 @@ public interface MutationResultOrBuilder * @return Whether the createTime field is set. */ boolean hasCreateTime(); + /** * * @@ -103,6 +106,7 @@ public interface MutationResultOrBuilder * @return The createTime. */ com.google.protobuf.Timestamp getCreateTime(); + /** * * @@ -129,6 +133,7 @@ public interface MutationResultOrBuilder * @return Whether the updateTime field is set. */ boolean hasUpdateTime(); + /** * * @@ -144,6 +149,7 @@ public interface MutationResultOrBuilder * @return The updateTime. */ com.google.protobuf.Timestamp getUpdateTime(); + /** * * @@ -184,6 +190,7 @@ public interface MutationResultOrBuilder * repeated .google.datastore.v1.Value transform_results = 8; */ java.util.List getTransformResultsList(); + /** * * @@ -196,6 +203,7 @@ public interface MutationResultOrBuilder * repeated .google.datastore.v1.Value transform_results = 8; */ com.google.datastore.v1.Value getTransformResults(int index); + /** * * @@ -208,6 +216,7 @@ public interface MutationResultOrBuilder * repeated .google.datastore.v1.Value transform_results = 8; */ int getTransformResultsCount(); + /** * * @@ -221,6 +230,7 @@ public interface MutationResultOrBuilder */ java.util.List getTransformResultsOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java index c5c480230..be1529aca 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java @@ -52,6 +52,7 @@ public final class PartitionId extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.PartitionId) PartitionIdOrBuilder { private static final long serialVersionUID = 0L; + // Use PartitionId.newBuilder() to construct. private PartitionId(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -88,6 +89,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -111,6 +113,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -139,6 +142,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object databaseId_ = ""; + /** * * @@ -163,6 +167,7 @@ public java.lang.String getDatabaseId() { return s; } } + /** * * @@ -192,6 +197,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object namespaceId_ = ""; + /** * * @@ -215,6 +221,7 @@ public java.lang.String getNamespaceId() { return s; } } + /** * * @@ -414,6 +421,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -645,6 +653,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -667,6 +676,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -689,6 +699,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -710,6 +721,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -727,6 +739,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -751,6 +764,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object databaseId_ = ""; + /** * * @@ -774,6 +788,7 @@ public java.lang.String getDatabaseId() { return (java.lang.String) ref; } } + /** * * @@ -797,6 +812,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -819,6 +835,7 @@ public Builder setDatabaseId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -837,6 +854,7 @@ public Builder clearDatabaseId() { onChanged(); return this; } + /** * * @@ -862,6 +880,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object namespaceId_ = ""; + /** * * @@ -884,6 +903,7 @@ public java.lang.String getNamespaceId() { return (java.lang.String) ref; } } + /** * * @@ -906,6 +926,7 @@ public com.google.protobuf.ByteString getNamespaceIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -927,6 +948,7 @@ public Builder setNamespaceId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -944,6 +966,7 @@ public Builder clearNamespaceId() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java index 0fd99d809..17e4eb659 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java @@ -36,6 +36,7 @@ public interface PartitionIdOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -62,6 +63,7 @@ public interface PartitionIdOrBuilder * @return The databaseId. */ java.lang.String getDatabaseId(); + /** * * @@ -88,6 +90,7 @@ public interface PartitionIdOrBuilder * @return The namespaceId. */ java.lang.String getNamespaceId(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java index 25c75ada8..e378ba566 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java @@ -33,6 +33,7 @@ public final class PlanSummary extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.PlanSummary) PlanSummaryOrBuilder { private static final long serialVersionUID = 0L; + // Use PlanSummary.newBuilder() to construct. private PlanSummary(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private java.util.List indexesUsed_; + /** * * @@ -84,6 +86,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public java.util.List getIndexesUsedList() { return indexesUsed_; } + /** * * @@ -102,6 +105,7 @@ public java.util.List getIndexesUsedList() { getIndexesUsedOrBuilderList() { return indexesUsed_; } + /** * * @@ -119,6 +123,7 @@ public java.util.List getIndexesUsedList() { public int getIndexesUsedCount() { return indexesUsed_.size(); } + /** * * @@ -136,6 +141,7 @@ public int getIndexesUsedCount() { public com.google.protobuf.Struct getIndexesUsed(int index) { return indexesUsed_.get(index); } + /** * * @@ -313,6 +319,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -574,6 +581,7 @@ public java.util.List getIndexesUsedList() { return indexesUsedBuilder_.getMessageList(); } } + /** * * @@ -594,6 +602,7 @@ public int getIndexesUsedCount() { return indexesUsedBuilder_.getCount(); } } + /** * * @@ -614,6 +623,7 @@ public com.google.protobuf.Struct getIndexesUsed(int index) { return indexesUsedBuilder_.getMessage(index); } } + /** * * @@ -640,6 +650,7 @@ public Builder setIndexesUsed(int index, com.google.protobuf.Struct value) { } return this; } + /** * * @@ -663,6 +674,7 @@ public Builder setIndexesUsed(int index, com.google.protobuf.Struct.Builder buil } return this; } + /** * * @@ -689,6 +701,7 @@ public Builder addIndexesUsed(com.google.protobuf.Struct value) { } return this; } + /** * * @@ -715,6 +728,7 @@ public Builder addIndexesUsed(int index, com.google.protobuf.Struct value) { } return this; } + /** * * @@ -738,6 +752,7 @@ public Builder addIndexesUsed(com.google.protobuf.Struct.Builder builderForValue } return this; } + /** * * @@ -761,6 +776,7 @@ public Builder addIndexesUsed(int index, com.google.protobuf.Struct.Builder buil } return this; } + /** * * @@ -785,6 +801,7 @@ public Builder addAllIndexesUsed( } return this; } + /** * * @@ -808,6 +825,7 @@ public Builder clearIndexesUsed() { } return this; } + /** * * @@ -831,6 +849,7 @@ public Builder removeIndexesUsed(int index) { } return this; } + /** * * @@ -847,6 +866,7 @@ public Builder removeIndexesUsed(int index) { public com.google.protobuf.Struct.Builder getIndexesUsedBuilder(int index) { return getIndexesUsedFieldBuilder().getBuilder(index); } + /** * * @@ -867,6 +887,7 @@ public com.google.protobuf.StructOrBuilder getIndexesUsedOrBuilder(int index) { return indexesUsedBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -888,6 +909,7 @@ public com.google.protobuf.StructOrBuilder getIndexesUsedOrBuilder(int index) { return java.util.Collections.unmodifiableList(indexesUsed_); } } + /** * * @@ -905,6 +927,7 @@ public com.google.protobuf.Struct.Builder addIndexesUsedBuilder() { return getIndexesUsedFieldBuilder() .addBuilder(com.google.protobuf.Struct.getDefaultInstance()); } + /** * * @@ -922,6 +945,7 @@ public com.google.protobuf.Struct.Builder addIndexesUsedBuilder(int index) { return getIndexesUsedFieldBuilder() .addBuilder(index, com.google.protobuf.Struct.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java index ace5cbe50..b132b1c66 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java @@ -38,6 +38,7 @@ public interface PlanSummaryOrBuilder * repeated .google.protobuf.Struct indexes_used = 1; */ java.util.List getIndexesUsedList(); + /** * * @@ -52,6 +53,7 @@ public interface PlanSummaryOrBuilder * repeated .google.protobuf.Struct indexes_used = 1; */ com.google.protobuf.Struct getIndexesUsed(int index); + /** * * @@ -66,6 +68,7 @@ public interface PlanSummaryOrBuilder * repeated .google.protobuf.Struct indexes_used = 1; */ int getIndexesUsedCount(); + /** * * @@ -80,6 +83,7 @@ public interface PlanSummaryOrBuilder * repeated .google.protobuf.Struct indexes_used = 1; */ java.util.List getIndexesUsedOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java index 440ca2b2c..e3a262b14 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java @@ -33,6 +33,7 @@ public final class Projection extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.Projection) ProjectionOrBuilder { private static final long serialVersionUID = 0L; + // Use Projection.newBuilder() to construct. private Projection(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -64,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int PROPERTY_FIELD_NUMBER = 1; private com.google.datastore.v1.PropertyReference property_; + /** * * @@ -79,6 +81,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -96,6 +99,7 @@ public com.google.datastore.v1.PropertyReference getProperty() { ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; } + /** * * @@ -274,6 +278,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -475,6 +480,7 @@ public Builder mergeFrom( com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_; + /** * * @@ -489,6 +495,7 @@ public Builder mergeFrom( public boolean hasProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -509,6 +516,7 @@ public com.google.datastore.v1.PropertyReference getProperty() { return propertyBuilder_.getMessage(); } } + /** * * @@ -531,6 +539,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) { onChanged(); return this; } + /** * * @@ -550,6 +559,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui onChanged(); return this; } + /** * * @@ -577,6 +587,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) { } return this; } + /** * * @@ -596,6 +607,7 @@ public Builder clearProperty() { onChanged(); return this; } + /** * * @@ -610,6 +622,7 @@ public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() { onChanged(); return getPropertyFieldBuilder().getBuilder(); } + /** * * @@ -628,6 +641,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() : property_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java index 179dddadc..0b4cb23d8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java @@ -36,6 +36,7 @@ public interface ProjectionOrBuilder * @return Whether the property field is set. */ boolean hasProperty(); + /** * * @@ -48,6 +49,7 @@ public interface ProjectionOrBuilder * @return The property. */ com.google.datastore.v1.PropertyReference getProperty(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java index e549f15f9..2b9946906 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java @@ -33,6 +33,7 @@ public final class PropertyFilter extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyFilter) PropertyFilterOrBuilder { private static final long serialVersionUID = 0L; + // Use PropertyFilter.newBuilder() to construct. private PropertyFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -224,6 +225,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * OPERATOR_UNSPECIFIED = 0; */ public static final int OPERATOR_UNSPECIFIED_VALUE = 0; + /** * * @@ -238,6 +240,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * LESS_THAN = 1; */ public static final int LESS_THAN_VALUE = 1; + /** * * @@ -252,6 +255,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * LESS_THAN_OR_EQUAL = 2; */ public static final int LESS_THAN_OR_EQUAL_VALUE = 2; + /** * * @@ -266,6 +270,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * GREATER_THAN = 3; */ public static final int GREATER_THAN_VALUE = 3; + /** * * @@ -280,6 +285,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * GREATER_THAN_OR_EQUAL = 4; */ public static final int GREATER_THAN_OR_EQUAL_VALUE = 4; + /** * * @@ -290,6 +296,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * EQUAL = 5; */ public static final int EQUAL_VALUE = 5; + /** * * @@ -306,6 +313,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * IN = 6; */ public static final int IN_VALUE = 6; + /** * * @@ -321,6 +329,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * NOT_EQUAL = 9; */ public static final int NOT_EQUAL_VALUE = 9; + /** * * @@ -336,6 +345,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum { * HAS_ANCESTOR = 11; */ public static final int HAS_ANCESTOR_VALUE = 11; + /** * * @@ -453,6 +463,7 @@ private Operator(int value) { private int bitField0_; public static final int PROPERTY_FIELD_NUMBER = 1; private com.google.datastore.v1.PropertyReference property_; + /** * * @@ -468,6 +479,7 @@ private Operator(int value) { public boolean hasProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -485,6 +497,7 @@ public com.google.datastore.v1.PropertyReference getProperty() { ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; } + /** * * @@ -503,6 +516,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() public static final int OP_FIELD_NUMBER = 2; private int op_ = 0; + /** * * @@ -518,6 +532,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() public int getOpValue() { return op_; } + /** * * @@ -538,6 +553,7 @@ public com.google.datastore.v1.PropertyFilter.Operator getOp() { public static final int VALUE_FIELD_NUMBER = 3; private com.google.datastore.v1.Value value_; + /** * * @@ -553,6 +569,7 @@ public com.google.datastore.v1.PropertyFilter.Operator getOp() { public boolean hasValue() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -568,6 +585,7 @@ public boolean hasValue() { public com.google.datastore.v1.Value getValue() { return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_; } + /** * * @@ -768,6 +786,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1002,6 +1021,7 @@ public Builder mergeFrom( com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_; + /** * * @@ -1016,6 +1036,7 @@ public Builder mergeFrom( public boolean hasProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -1036,6 +1057,7 @@ public com.google.datastore.v1.PropertyReference getProperty() { return propertyBuilder_.getMessage(); } } + /** * * @@ -1058,6 +1080,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) { onChanged(); return this; } + /** * * @@ -1077,6 +1100,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui onChanged(); return this; } + /** * * @@ -1104,6 +1128,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) { } return this; } + /** * * @@ -1123,6 +1148,7 @@ public Builder clearProperty() { onChanged(); return this; } + /** * * @@ -1137,6 +1163,7 @@ public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() { onChanged(); return getPropertyFieldBuilder().getBuilder(); } + /** * * @@ -1155,6 +1182,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() : property_; } } + /** * * @@ -1182,6 +1210,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() } private int op_ = 0; + /** * * @@ -1197,6 +1226,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() public int getOpValue() { return op_; } + /** * * @@ -1215,6 +1245,7 @@ public Builder setOpValue(int value) { onChanged(); return this; } + /** * * @@ -1232,6 +1263,7 @@ public com.google.datastore.v1.PropertyFilter.Operator getOp() { com.google.datastore.v1.PropertyFilter.Operator.forNumber(op_); return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result; } + /** * * @@ -1253,6 +1285,7 @@ public Builder setOp(com.google.datastore.v1.PropertyFilter.Operator value) { onChanged(); return this; } + /** * * @@ -1277,6 +1310,7 @@ public Builder clearOp() { com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valueBuilder_; + /** * * @@ -1291,6 +1325,7 @@ public Builder clearOp() { public boolean hasValue() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1309,6 +1344,7 @@ public com.google.datastore.v1.Value getValue() { return valueBuilder_.getMessage(); } } + /** * * @@ -1331,6 +1367,7 @@ public Builder setValue(com.google.datastore.v1.Value value) { onChanged(); return this; } + /** * * @@ -1350,6 +1387,7 @@ public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) { onChanged(); return this; } + /** * * @@ -1377,6 +1415,7 @@ public Builder mergeValue(com.google.datastore.v1.Value value) { } return this; } + /** * * @@ -1396,6 +1435,7 @@ public Builder clearValue() { onChanged(); return this; } + /** * * @@ -1410,6 +1450,7 @@ public com.google.datastore.v1.Value.Builder getValueBuilder() { onChanged(); return getValueFieldBuilder().getBuilder(); } + /** * * @@ -1426,6 +1467,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java index 1cd09dd3e..b4efa5d93 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java @@ -36,6 +36,7 @@ public interface PropertyFilterOrBuilder * @return Whether the property field is set. */ boolean hasProperty(); + /** * * @@ -48,6 +49,7 @@ public interface PropertyFilterOrBuilder * @return The property. */ com.google.datastore.v1.PropertyReference getProperty(); + /** * * @@ -71,6 +73,7 @@ public interface PropertyFilterOrBuilder * @return The enum numeric value on the wire for op. */ int getOpValue(); + /** * * @@ -96,6 +99,7 @@ public interface PropertyFilterOrBuilder * @return Whether the value field is set. */ boolean hasValue(); + /** * * @@ -108,6 +112,7 @@ public interface PropertyFilterOrBuilder * @return The value. */ com.google.datastore.v1.Value getValue(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java index a60894f47..d8fc11dec 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java @@ -34,6 +34,7 @@ public final class PropertyMask extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyMask) PropertyMaskOrBuilder { private static final long serialVersionUID = 0L; + // Use PropertyMask.newBuilder() to construct. private PropertyMask(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private com.google.protobuf.LazyStringArrayList paths_ = com.google.protobuf.LazyStringArrayList.emptyList(); + /** * * @@ -93,6 +95,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public com.google.protobuf.ProtocolStringList getPathsList() { return paths_; } + /** * * @@ -117,6 +120,7 @@ public com.google.protobuf.ProtocolStringList getPathsList() { public int getPathsCount() { return paths_.size(); } + /** * * @@ -142,6 +146,7 @@ public int getPathsCount() { public java.lang.String getPaths(int index) { return paths_.get(index); } + /** * * @@ -332,6 +337,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -530,6 +536,7 @@ private void ensurePathsIsMutable() { } bitField0_ |= 0x00000001; } + /** * * @@ -555,6 +562,7 @@ public com.google.protobuf.ProtocolStringList getPathsList() { paths_.makeImmutable(); return paths_; } + /** * * @@ -579,6 +587,7 @@ public com.google.protobuf.ProtocolStringList getPathsList() { public int getPathsCount() { return paths_.size(); } + /** * * @@ -604,6 +613,7 @@ public int getPathsCount() { public java.lang.String getPaths(int index) { return paths_.get(index); } + /** * * @@ -629,6 +639,7 @@ public java.lang.String getPaths(int index) { public com.google.protobuf.ByteString getPathsBytes(int index) { return paths_.getByteString(index); } + /** * * @@ -662,6 +673,7 @@ public Builder setPaths(int index, java.lang.String value) { onChanged(); return this; } + /** * * @@ -694,6 +706,7 @@ public Builder addPaths(java.lang.String value) { onChanged(); return this; } + /** * * @@ -723,6 +736,7 @@ public Builder addAllPaths(java.lang.Iterable values) { onChanged(); return this; } + /** * * @@ -751,6 +765,7 @@ public Builder clearPaths() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java index f34a77f67..ebd49c682 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java @@ -46,6 +46,7 @@ public interface PropertyMaskOrBuilder * @return A list containing the paths. */ java.util.List getPathsList(); + /** * * @@ -68,6 +69,7 @@ public interface PropertyMaskOrBuilder * @return The count of paths. */ int getPathsCount(); + /** * * @@ -91,6 +93,7 @@ public interface PropertyMaskOrBuilder * @return The paths at the given index. */ java.lang.String getPaths(int index); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java index 7991da53c..a4315a539 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java @@ -33,6 +33,7 @@ public final class PropertyOrder extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyOrder) PropertyOrderOrBuilder { private static final long serialVersionUID = 0L; + // Use PropertyOrder.newBuilder() to construct. private PropertyOrder(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -116,6 +117,7 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum { * DIRECTION_UNSPECIFIED = 0; */ public static final int DIRECTION_UNSPECIFIED_VALUE = 0; + /** * * @@ -126,6 +128,7 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum { * ASCENDING = 1; */ public static final int ASCENDING_VALUE = 1; + /** * * @@ -223,6 +226,7 @@ private Direction(int value) { private int bitField0_; public static final int PROPERTY_FIELD_NUMBER = 1; private com.google.datastore.v1.PropertyReference property_; + /** * * @@ -238,6 +242,7 @@ private Direction(int value) { public boolean hasProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -255,6 +260,7 @@ public com.google.datastore.v1.PropertyReference getProperty() { ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_; } + /** * * @@ -273,6 +279,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() public static final int DIRECTION_FIELD_NUMBER = 2; private int direction_ = 0; + /** * * @@ -288,6 +295,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() public int getDirectionValue() { return direction_; } + /** * * @@ -479,6 +487,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -694,6 +703,7 @@ public Builder mergeFrom( com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_; + /** * * @@ -708,6 +718,7 @@ public Builder mergeFrom( public boolean hasProperty() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -728,6 +739,7 @@ public com.google.datastore.v1.PropertyReference getProperty() { return propertyBuilder_.getMessage(); } } + /** * * @@ -750,6 +762,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) { onChanged(); return this; } + /** * * @@ -769,6 +782,7 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui onChanged(); return this; } + /** * * @@ -796,6 +810,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) { } return this; } + /** * * @@ -815,6 +830,7 @@ public Builder clearProperty() { onChanged(); return this; } + /** * * @@ -829,6 +845,7 @@ public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() { onChanged(); return getPropertyFieldBuilder().getBuilder(); } + /** * * @@ -847,6 +864,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() : property_; } } + /** * * @@ -874,6 +892,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() } private int direction_ = 0; + /** * * @@ -889,6 +908,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() public int getDirectionValue() { return direction_; } + /** * * @@ -907,6 +927,7 @@ public Builder setDirectionValue(int value) { onChanged(); return this; } + /** * * @@ -924,6 +945,7 @@ public com.google.datastore.v1.PropertyOrder.Direction getDirection() { com.google.datastore.v1.PropertyOrder.Direction.forNumber(direction_); return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result; } + /** * * @@ -945,6 +967,7 @@ public Builder setDirection(com.google.datastore.v1.PropertyOrder.Direction valu onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java index a190d59d3..e1f589f07 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java @@ -36,6 +36,7 @@ public interface PropertyOrderOrBuilder * @return Whether the property field is set. */ boolean hasProperty(); + /** * * @@ -48,6 +49,7 @@ public interface PropertyOrderOrBuilder * @return The property. */ com.google.datastore.v1.PropertyReference getProperty(); + /** * * @@ -71,6 +73,7 @@ public interface PropertyOrderOrBuilder * @return The enum numeric value on the wire for direction. */ int getDirectionValue(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java index 56ee78cec..c301b8518 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java @@ -33,6 +33,7 @@ public final class PropertyReference extends com.google.protobuf.GeneratedMessag // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyReference) PropertyReferenceOrBuilder { private static final long serialVersionUID = 0L; + // Use PropertyReference.newBuilder() to construct. private PropertyReference(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object name_ = ""; + /** * * @@ -96,6 +98,7 @@ public java.lang.String getName() { return s; } } + /** * * @@ -285,6 +288,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -468,6 +472,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object name_ = ""; + /** * * @@ -496,6 +501,7 @@ public java.lang.String getName() { return (java.lang.String) ref; } } + /** * * @@ -524,6 +530,7 @@ public com.google.protobuf.ByteString getNameBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -551,6 +558,7 @@ public Builder setName(java.lang.String value) { onChanged(); return this; } + /** * * @@ -574,6 +582,7 @@ public Builder clearName() { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java index 6e93680de..0fb61d2e0 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java @@ -42,6 +42,7 @@ public interface PropertyReferenceOrBuilder * @return The name. */ java.lang.String getName(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java index 516aa58ad..51bf34d7c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java @@ -33,6 +33,7 @@ public final class PropertyTransform extends com.google.protobuf.GeneratedMessag // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyTransform) PropertyTransformOrBuilder { private static final long serialVersionUID = 0L; + // Use PropertyTransform.newBuilder() to construct. private PropertyTransform(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -108,6 +109,7 @@ public enum ServerValue implements com.google.protobuf.ProtocolMessageEnum { * SERVER_VALUE_UNSPECIFIED = 0; */ public static final int SERVER_VALUE_UNSPECIFIED_VALUE = 0; + /** * * @@ -223,6 +225,7 @@ public enum TransformTypeCase private TransformTypeCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -267,6 +270,7 @@ public TransformTypeCase getTransformTypeCase() { @SuppressWarnings("serial") private volatile java.lang.Object property_ = ""; + /** * * @@ -297,6 +301,7 @@ public java.lang.String getProperty() { return s; } } + /** * * @@ -329,6 +334,7 @@ public com.google.protobuf.ByteString getPropertyBytes() { } public static final int SET_TO_SERVER_VALUE_FIELD_NUMBER = 2; + /** * * @@ -343,6 +349,7 @@ public com.google.protobuf.ByteString getPropertyBytes() { public boolean hasSetToServerValue() { return transformTypeCase_ == 2; } + /** * * @@ -360,6 +367,7 @@ public int getSetToServerValueValue() { } return 0; } + /** * * @@ -384,6 +392,7 @@ public com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue } public static final int INCREMENT_FIELD_NUMBER = 3; + /** * * @@ -408,6 +417,7 @@ public com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue public boolean hasIncrement() { return transformTypeCase_ == 3; } + /** * * @@ -435,6 +445,7 @@ public com.google.datastore.v1.Value getIncrement() { } return com.google.datastore.v1.Value.getDefaultInstance(); } + /** * * @@ -462,6 +473,7 @@ public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() { } public static final int MAXIMUM_FIELD_NUMBER = 4; + /** * * @@ -489,6 +501,7 @@ public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() { public boolean hasMaximum() { return transformTypeCase_ == 4; } + /** * * @@ -519,6 +532,7 @@ public com.google.datastore.v1.Value getMaximum() { } return com.google.datastore.v1.Value.getDefaultInstance(); } + /** * * @@ -549,6 +563,7 @@ public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() { } public static final int MINIMUM_FIELD_NUMBER = 5; + /** * * @@ -576,6 +591,7 @@ public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() { public boolean hasMinimum() { return transformTypeCase_ == 5; } + /** * * @@ -606,6 +622,7 @@ public com.google.datastore.v1.Value getMinimum() { } return com.google.datastore.v1.Value.getDefaultInstance(); } + /** * * @@ -636,6 +653,7 @@ public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() { } public static final int APPEND_MISSING_ELEMENTS_FIELD_NUMBER = 6; + /** * * @@ -662,6 +680,7 @@ public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() { public boolean hasAppendMissingElements() { return transformTypeCase_ == 6; } + /** * * @@ -691,6 +710,7 @@ public com.google.datastore.v1.ArrayValue getAppendMissingElements() { } return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } + /** * * @@ -720,6 +740,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBui } public static final int REMOVE_ALL_FROM_ARRAY_FIELD_NUMBER = 7; + /** * * @@ -744,6 +765,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBui public boolean hasRemoveAllFromArray() { return transformTypeCase_ == 7; } + /** * * @@ -771,6 +793,7 @@ public com.google.datastore.v1.ArrayValue getRemoveAllFromArray() { } return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } + /** * * @@ -1055,6 +1078,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1365,6 +1389,7 @@ public Builder clearTransformType() { private int bitField0_; private java.lang.Object property_ = ""; + /** * * @@ -1394,6 +1419,7 @@ public java.lang.String getProperty() { return (java.lang.String) ref; } } + /** * * @@ -1423,6 +1449,7 @@ public com.google.protobuf.ByteString getPropertyBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1451,6 +1478,7 @@ public Builder setProperty(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1475,6 +1503,7 @@ public Builder clearProperty() { onChanged(); return this; } + /** * * @@ -1520,6 +1549,7 @@ public Builder setPropertyBytes(com.google.protobuf.ByteString value) { public boolean hasSetToServerValue() { return transformTypeCase_ == 2; } + /** * * @@ -1538,6 +1568,7 @@ public int getSetToServerValueValue() { } return 0; } + /** * * @@ -1556,6 +1587,7 @@ public Builder setSetToServerValueValue(int value) { onChanged(); return this; } + /** * * @@ -1579,6 +1611,7 @@ public com.google.datastore.v1.PropertyTransform.ServerValue getSetToServerValue } return com.google.datastore.v1.PropertyTransform.ServerValue.SERVER_VALUE_UNSPECIFIED; } + /** * * @@ -1601,6 +1634,7 @@ public Builder setSetToServerValue( onChanged(); return this; } + /** * * @@ -1626,6 +1660,7 @@ public Builder clearSetToServerValue() { com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> incrementBuilder_; + /** * * @@ -1650,6 +1685,7 @@ public Builder clearSetToServerValue() { public boolean hasIncrement() { return transformTypeCase_ == 3; } + /** * * @@ -1684,6 +1720,7 @@ public com.google.datastore.v1.Value getIncrement() { return com.google.datastore.v1.Value.getDefaultInstance(); } } + /** * * @@ -1715,6 +1752,7 @@ public Builder setIncrement(com.google.datastore.v1.Value value) { transformTypeCase_ = 3; return this; } + /** * * @@ -1743,6 +1781,7 @@ public Builder setIncrement(com.google.datastore.v1.Value.Builder builderForValu transformTypeCase_ = 3; return this; } + /** * * @@ -1784,6 +1823,7 @@ public Builder mergeIncrement(com.google.datastore.v1.Value value) { transformTypeCase_ = 3; return this; } + /** * * @@ -1818,6 +1858,7 @@ public Builder clearIncrement() { } return this; } + /** * * @@ -1839,6 +1880,7 @@ public Builder clearIncrement() { public com.google.datastore.v1.Value.Builder getIncrementBuilder() { return getIncrementFieldBuilder().getBuilder(); } + /** * * @@ -1868,6 +1910,7 @@ public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() { return com.google.datastore.v1.Value.getDefaultInstance(); } } + /** * * @@ -1913,6 +1956,7 @@ public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() { com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> maximumBuilder_; + /** * * @@ -1940,6 +1984,7 @@ public com.google.datastore.v1.ValueOrBuilder getIncrementOrBuilder() { public boolean hasMaximum() { return transformTypeCase_ == 4; } + /** * * @@ -1977,6 +2022,7 @@ public com.google.datastore.v1.Value getMaximum() { return com.google.datastore.v1.Value.getDefaultInstance(); } } + /** * * @@ -2011,6 +2057,7 @@ public Builder setMaximum(com.google.datastore.v1.Value value) { transformTypeCase_ = 4; return this; } + /** * * @@ -2042,6 +2089,7 @@ public Builder setMaximum(com.google.datastore.v1.Value.Builder builderForValue) transformTypeCase_ = 4; return this; } + /** * * @@ -2086,6 +2134,7 @@ public Builder mergeMaximum(com.google.datastore.v1.Value value) { transformTypeCase_ = 4; return this; } + /** * * @@ -2123,6 +2172,7 @@ public Builder clearMaximum() { } return this; } + /** * * @@ -2147,6 +2197,7 @@ public Builder clearMaximum() { public com.google.datastore.v1.Value.Builder getMaximumBuilder() { return getMaximumFieldBuilder().getBuilder(); } + /** * * @@ -2179,6 +2230,7 @@ public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() { return com.google.datastore.v1.Value.getDefaultInstance(); } } + /** * * @@ -2227,6 +2279,7 @@ public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() { com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> minimumBuilder_; + /** * * @@ -2254,6 +2307,7 @@ public com.google.datastore.v1.ValueOrBuilder getMaximumOrBuilder() { public boolean hasMinimum() { return transformTypeCase_ == 5; } + /** * * @@ -2291,6 +2345,7 @@ public com.google.datastore.v1.Value getMinimum() { return com.google.datastore.v1.Value.getDefaultInstance(); } } + /** * * @@ -2325,6 +2380,7 @@ public Builder setMinimum(com.google.datastore.v1.Value value) { transformTypeCase_ = 5; return this; } + /** * * @@ -2356,6 +2412,7 @@ public Builder setMinimum(com.google.datastore.v1.Value.Builder builderForValue) transformTypeCase_ = 5; return this; } + /** * * @@ -2400,6 +2457,7 @@ public Builder mergeMinimum(com.google.datastore.v1.Value value) { transformTypeCase_ = 5; return this; } + /** * * @@ -2437,6 +2495,7 @@ public Builder clearMinimum() { } return this; } + /** * * @@ -2461,6 +2520,7 @@ public Builder clearMinimum() { public com.google.datastore.v1.Value.Builder getMinimumBuilder() { return getMinimumFieldBuilder().getBuilder(); } + /** * * @@ -2493,6 +2553,7 @@ public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() { return com.google.datastore.v1.Value.getDefaultInstance(); } } + /** * * @@ -2541,6 +2602,7 @@ public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() { com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder> appendMissingElementsBuilder_; + /** * * @@ -2567,6 +2629,7 @@ public com.google.datastore.v1.ValueOrBuilder getMinimumOrBuilder() { public boolean hasAppendMissingElements() { return transformTypeCase_ == 6; } + /** * * @@ -2603,6 +2666,7 @@ public com.google.datastore.v1.ArrayValue getAppendMissingElements() { return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } } + /** * * @@ -2636,6 +2700,7 @@ public Builder setAppendMissingElements(com.google.datastore.v1.ArrayValue value transformTypeCase_ = 6; return this; } + /** * * @@ -2667,6 +2732,7 @@ public Builder setAppendMissingElements( transformTypeCase_ = 6; return this; } + /** * * @@ -2710,6 +2776,7 @@ public Builder mergeAppendMissingElements(com.google.datastore.v1.ArrayValue val transformTypeCase_ = 6; return this; } + /** * * @@ -2746,6 +2813,7 @@ public Builder clearAppendMissingElements() { } return this; } + /** * * @@ -2769,6 +2837,7 @@ public Builder clearAppendMissingElements() { public com.google.datastore.v1.ArrayValue.Builder getAppendMissingElementsBuilder() { return getAppendMissingElementsFieldBuilder().getBuilder(); } + /** * * @@ -2800,6 +2869,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBui return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } } + /** * * @@ -2849,6 +2919,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBui com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder> removeAllFromArrayBuilder_; + /** * * @@ -2873,6 +2944,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getAppendMissingElementsOrBui public boolean hasRemoveAllFromArray() { return transformTypeCase_ == 7; } + /** * * @@ -2907,6 +2979,7 @@ public com.google.datastore.v1.ArrayValue getRemoveAllFromArray() { return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } } + /** * * @@ -2938,6 +3011,7 @@ public Builder setRemoveAllFromArray(com.google.datastore.v1.ArrayValue value) { transformTypeCase_ = 7; return this; } + /** * * @@ -2967,6 +3041,7 @@ public Builder setRemoveAllFromArray( transformTypeCase_ = 7; return this; } + /** * * @@ -3008,6 +3083,7 @@ public Builder mergeRemoveAllFromArray(com.google.datastore.v1.ArrayValue value) transformTypeCase_ = 7; return this; } + /** * * @@ -3042,6 +3118,7 @@ public Builder clearRemoveAllFromArray() { } return this; } + /** * * @@ -3063,6 +3140,7 @@ public Builder clearRemoveAllFromArray() { public com.google.datastore.v1.ArrayValue.Builder getRemoveAllFromArrayBuilder() { return getRemoveAllFromArrayFieldBuilder().getBuilder(); } + /** * * @@ -3092,6 +3170,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getRemoveAllFromArrayOrBuilde return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java index 169427dd6..7371d380a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java @@ -43,6 +43,7 @@ public interface PropertyTransformOrBuilder * @return The property. */ java.lang.String getProperty(); + /** * * @@ -75,6 +76,7 @@ public interface PropertyTransformOrBuilder * @return Whether the setToServerValue field is set. */ boolean hasSetToServerValue(); + /** * * @@ -87,6 +89,7 @@ public interface PropertyTransformOrBuilder * @return The enum numeric value on the wire for setToServerValue. */ int getSetToServerValueValue(); + /** * * @@ -121,6 +124,7 @@ public interface PropertyTransformOrBuilder * @return Whether the increment field is set. */ boolean hasIncrement(); + /** * * @@ -142,6 +146,7 @@ public interface PropertyTransformOrBuilder * @return The increment. */ com.google.datastore.v1.Value getIncrement(); + /** * * @@ -186,6 +191,7 @@ public interface PropertyTransformOrBuilder * @return Whether the maximum field is set. */ boolean hasMaximum(); + /** * * @@ -210,6 +216,7 @@ public interface PropertyTransformOrBuilder * @return The maximum. */ com.google.datastore.v1.Value getMaximum(); + /** * * @@ -257,6 +264,7 @@ public interface PropertyTransformOrBuilder * @return Whether the minimum field is set. */ boolean hasMinimum(); + /** * * @@ -281,6 +289,7 @@ public interface PropertyTransformOrBuilder * @return The minimum. */ com.google.datastore.v1.Value getMinimum(); + /** * * @@ -327,6 +336,7 @@ public interface PropertyTransformOrBuilder * @return Whether the appendMissingElements field is set. */ boolean hasAppendMissingElements(); + /** * * @@ -350,6 +360,7 @@ public interface PropertyTransformOrBuilder * @return The appendMissingElements. */ com.google.datastore.v1.ArrayValue getAppendMissingElements(); + /** * * @@ -393,6 +404,7 @@ public interface PropertyTransformOrBuilder * @return Whether the removeAllFromArray field is set. */ boolean hasRemoveAllFromArray(); + /** * * @@ -414,6 +426,7 @@ public interface PropertyTransformOrBuilder * @return The removeAllFromArray. */ com.google.datastore.v1.ArrayValue getRemoveAllFromArray(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java index d210c1636..1e8e6ef92 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java @@ -42,6 +42,7 @@ public final class Query extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.Query) QueryOrBuilder { private static final long serialVersionUID = 0L; + // Use Query.newBuilder() to construct. private Query(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -80,6 +81,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private java.util.List projection_; + /** * * @@ -93,6 +95,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public java.util.List getProjectionList() { return projection_; } + /** * * @@ -107,6 +110,7 @@ public java.util.List getProjectionList() { getProjectionOrBuilderList() { return projection_; } + /** * * @@ -120,6 +124,7 @@ public java.util.List getProjectionList() { public int getProjectionCount() { return projection_.size(); } + /** * * @@ -133,6 +138,7 @@ public int getProjectionCount() { public com.google.datastore.v1.Projection getProjection(int index) { return projection_.get(index); } + /** * * @@ -151,6 +157,7 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in @SuppressWarnings("serial") private java.util.List kind_; + /** * * @@ -165,6 +172,7 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in public java.util.List getKindList() { return kind_; } + /** * * @@ -180,6 +188,7 @@ public java.util.List getKindList() { getKindOrBuilderList() { return kind_; } + /** * * @@ -194,6 +203,7 @@ public java.util.List getKindList() { public int getKindCount() { return kind_.size(); } + /** * * @@ -208,6 +218,7 @@ public int getKindCount() { public com.google.datastore.v1.KindExpression getKind(int index) { return kind_.get(index); } + /** * * @@ -225,6 +236,7 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde public static final int FILTER_FIELD_NUMBER = 4; private com.google.datastore.v1.Filter filter_; + /** * * @@ -240,6 +252,7 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde public boolean hasFilter() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -255,6 +268,7 @@ public boolean hasFilter() { public com.google.datastore.v1.Filter getFilter() { return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_; } + /** * * @@ -273,6 +287,7 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() { @SuppressWarnings("serial") private java.util.List order_; + /** * * @@ -286,6 +301,7 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() { public java.util.List getOrderList() { return order_; } + /** * * @@ -300,6 +316,7 @@ public java.util.List getOrderList() { getOrderOrBuilderList() { return order_; } + /** * * @@ -313,6 +330,7 @@ public java.util.List getOrderList() { public int getOrderCount() { return order_.size(); } + /** * * @@ -326,6 +344,7 @@ public int getOrderCount() { public com.google.datastore.v1.PropertyOrder getOrder(int index) { return order_.get(index); } + /** * * @@ -344,6 +363,7 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde @SuppressWarnings("serial") private java.util.List distinctOn_; + /** * * @@ -364,6 +384,7 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde public java.util.List getDistinctOnList() { return distinctOn_; } + /** * * @@ -385,6 +406,7 @@ public java.util.List getDistinctOnLi getDistinctOnOrBuilderList() { return distinctOn_; } + /** * * @@ -405,6 +427,7 @@ public java.util.List getDistinctOnLi public int getDistinctOnCount() { return distinctOn_.size(); } + /** * * @@ -425,6 +448,7 @@ public int getDistinctOnCount() { public com.google.datastore.v1.PropertyReference getDistinctOn(int index) { return distinctOn_.get(index); } + /** * * @@ -448,6 +472,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder public static final int START_CURSOR_FIELD_NUMBER = 7; private com.google.protobuf.ByteString startCursor_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -469,6 +494,7 @@ public com.google.protobuf.ByteString getStartCursor() { public static final int END_CURSOR_FIELD_NUMBER = 8; private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -490,6 +516,7 @@ public com.google.protobuf.ByteString getEndCursor() { public static final int OFFSET_FIELD_NUMBER = 10; private int offset_ = 0; + /** * * @@ -509,6 +536,7 @@ public int getOffset() { public static final int LIMIT_FIELD_NUMBER = 12; private com.google.protobuf.Int32Value limit_; + /** * * @@ -527,6 +555,7 @@ public int getOffset() { public boolean hasLimit() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -545,6 +574,7 @@ public boolean hasLimit() { public com.google.protobuf.Int32Value getLimit() { return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; } + /** * * @@ -564,6 +594,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { public static final int FIND_NEAREST_FIELD_NUMBER = 13; private com.google.datastore.v1.FindNearest findNearest_; + /** * * @@ -585,6 +616,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { public boolean hasFindNearest() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -608,6 +640,7 @@ public com.google.datastore.v1.FindNearest getFindNearest() { ? com.google.datastore.v1.FindNearest.getDefaultInstance() : findNearest_; } + /** * * @@ -891,6 +924,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1436,6 +1470,7 @@ public java.util.List getProjectionList() { return projectionBuilder_.getMessageList(); } } + /** * * @@ -1452,6 +1487,7 @@ public int getProjectionCount() { return projectionBuilder_.getCount(); } } + /** * * @@ -1468,6 +1504,7 @@ public com.google.datastore.v1.Projection getProjection(int index) { return projectionBuilder_.getMessage(index); } } + /** * * @@ -1490,6 +1527,7 @@ public Builder setProjection(int index, com.google.datastore.v1.Projection value } return this; } + /** * * @@ -1510,6 +1548,7 @@ public Builder setProjection( } return this; } + /** * * @@ -1532,6 +1571,7 @@ public Builder addProjection(com.google.datastore.v1.Projection value) { } return this; } + /** * * @@ -1554,6 +1594,7 @@ public Builder addProjection(int index, com.google.datastore.v1.Projection value } return this; } + /** * * @@ -1573,6 +1614,7 @@ public Builder addProjection(com.google.datastore.v1.Projection.Builder builderF } return this; } + /** * * @@ -1593,6 +1635,7 @@ public Builder addProjection( } return this; } + /** * * @@ -1613,6 +1656,7 @@ public Builder addAllProjection( } return this; } + /** * * @@ -1632,6 +1676,7 @@ public Builder clearProjection() { } return this; } + /** * * @@ -1651,6 +1696,7 @@ public Builder removeProjection(int index) { } return this; } + /** * * @@ -1663,6 +1709,7 @@ public Builder removeProjection(int index) { public com.google.datastore.v1.Projection.Builder getProjectionBuilder(int index) { return getProjectionFieldBuilder().getBuilder(index); } + /** * * @@ -1679,6 +1726,7 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in return projectionBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -1696,6 +1744,7 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in return java.util.Collections.unmodifiableList(projection_); } } + /** * * @@ -1709,6 +1758,7 @@ public com.google.datastore.v1.Projection.Builder addProjectionBuilder() { return getProjectionFieldBuilder() .addBuilder(com.google.datastore.v1.Projection.getDefaultInstance()); } + /** * * @@ -1722,6 +1772,7 @@ public com.google.datastore.v1.Projection.Builder addProjectionBuilder(int index return getProjectionFieldBuilder() .addBuilder(index, com.google.datastore.v1.Projection.getDefaultInstance()); } + /** * * @@ -1785,6 +1836,7 @@ public java.util.List getKindList() { return kindBuilder_.getMessageList(); } } + /** * * @@ -1802,6 +1854,7 @@ public int getKindCount() { return kindBuilder_.getCount(); } } + /** * * @@ -1819,6 +1872,7 @@ public com.google.datastore.v1.KindExpression getKind(int index) { return kindBuilder_.getMessage(index); } } + /** * * @@ -1842,6 +1896,7 @@ public Builder setKind(int index, com.google.datastore.v1.KindExpression value) } return this; } + /** * * @@ -1863,6 +1918,7 @@ public Builder setKind( } return this; } + /** * * @@ -1886,6 +1942,7 @@ public Builder addKind(com.google.datastore.v1.KindExpression value) { } return this; } + /** * * @@ -1909,6 +1966,7 @@ public Builder addKind(int index, com.google.datastore.v1.KindExpression value) } return this; } + /** * * @@ -1929,6 +1987,7 @@ public Builder addKind(com.google.datastore.v1.KindExpression.Builder builderFor } return this; } + /** * * @@ -1950,6 +2009,7 @@ public Builder addKind( } return this; } + /** * * @@ -1971,6 +2031,7 @@ public Builder addAllKind( } return this; } + /** * * @@ -1991,6 +2052,7 @@ public Builder clearKind() { } return this; } + /** * * @@ -2011,6 +2073,7 @@ public Builder removeKind(int index) { } return this; } + /** * * @@ -2024,6 +2087,7 @@ public Builder removeKind(int index) { public com.google.datastore.v1.KindExpression.Builder getKindBuilder(int index) { return getKindFieldBuilder().getBuilder(index); } + /** * * @@ -2041,6 +2105,7 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde return kindBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -2059,6 +2124,7 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde return java.util.Collections.unmodifiableList(kind_); } } + /** * * @@ -2073,6 +2139,7 @@ public com.google.datastore.v1.KindExpression.Builder addKindBuilder() { return getKindFieldBuilder() .addBuilder(com.google.datastore.v1.KindExpression.getDefaultInstance()); } + /** * * @@ -2087,6 +2154,7 @@ public com.google.datastore.v1.KindExpression.Builder addKindBuilder(int index) return getKindFieldBuilder() .addBuilder(index, com.google.datastore.v1.KindExpression.getDefaultInstance()); } + /** * * @@ -2124,6 +2192,7 @@ public java.util.List getKindBui com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> filterBuilder_; + /** * * @@ -2138,6 +2207,7 @@ public java.util.List getKindBui public boolean hasFilter() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -2156,6 +2226,7 @@ public com.google.datastore.v1.Filter getFilter() { return filterBuilder_.getMessage(); } } + /** * * @@ -2178,6 +2249,7 @@ public Builder setFilter(com.google.datastore.v1.Filter value) { onChanged(); return this; } + /** * * @@ -2197,6 +2269,7 @@ public Builder setFilter(com.google.datastore.v1.Filter.Builder builderForValue) onChanged(); return this; } + /** * * @@ -2224,6 +2297,7 @@ public Builder mergeFilter(com.google.datastore.v1.Filter value) { } return this; } + /** * * @@ -2243,6 +2317,7 @@ public Builder clearFilter() { onChanged(); return this; } + /** * * @@ -2257,6 +2332,7 @@ public com.google.datastore.v1.Filter.Builder getFilterBuilder() { onChanged(); return getFilterFieldBuilder().getBuilder(); } + /** * * @@ -2273,6 +2349,7 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() { return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_; } } + /** * * @@ -2331,6 +2408,7 @@ public java.util.List getOrderList() { return orderBuilder_.getMessageList(); } } + /** * * @@ -2347,6 +2425,7 @@ public int getOrderCount() { return orderBuilder_.getCount(); } } + /** * * @@ -2363,6 +2442,7 @@ public com.google.datastore.v1.PropertyOrder getOrder(int index) { return orderBuilder_.getMessage(index); } } + /** * * @@ -2385,6 +2465,7 @@ public Builder setOrder(int index, com.google.datastore.v1.PropertyOrder value) } return this; } + /** * * @@ -2405,6 +2486,7 @@ public Builder setOrder( } return this; } + /** * * @@ -2427,6 +2509,7 @@ public Builder addOrder(com.google.datastore.v1.PropertyOrder value) { } return this; } + /** * * @@ -2449,6 +2532,7 @@ public Builder addOrder(int index, com.google.datastore.v1.PropertyOrder value) } return this; } + /** * * @@ -2468,6 +2552,7 @@ public Builder addOrder(com.google.datastore.v1.PropertyOrder.Builder builderFor } return this; } + /** * * @@ -2488,6 +2573,7 @@ public Builder addOrder( } return this; } + /** * * @@ -2508,6 +2594,7 @@ public Builder addAllOrder( } return this; } + /** * * @@ -2527,6 +2614,7 @@ public Builder clearOrder() { } return this; } + /** * * @@ -2546,6 +2634,7 @@ public Builder removeOrder(int index) { } return this; } + /** * * @@ -2558,6 +2647,7 @@ public Builder removeOrder(int index) { public com.google.datastore.v1.PropertyOrder.Builder getOrderBuilder(int index) { return getOrderFieldBuilder().getBuilder(index); } + /** * * @@ -2574,6 +2664,7 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde return orderBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -2591,6 +2682,7 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde return java.util.Collections.unmodifiableList(order_); } } + /** * * @@ -2604,6 +2696,7 @@ public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder() { return getOrderFieldBuilder() .addBuilder(com.google.datastore.v1.PropertyOrder.getDefaultInstance()); } + /** * * @@ -2617,6 +2710,7 @@ public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder(int index) return getOrderFieldBuilder() .addBuilder(index, com.google.datastore.v1.PropertyOrder.getDefaultInstance()); } + /** * * @@ -2687,6 +2781,7 @@ public java.util.List getDistinctOnLi return distinctOnBuilder_.getMessageList(); } } + /** * * @@ -2710,6 +2805,7 @@ public int getDistinctOnCount() { return distinctOnBuilder_.getCount(); } } + /** * * @@ -2733,6 +2829,7 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) { return distinctOnBuilder_.getMessage(index); } } + /** * * @@ -2762,6 +2859,7 @@ public Builder setDistinctOn(int index, com.google.datastore.v1.PropertyReferenc } return this; } + /** * * @@ -2789,6 +2887,7 @@ public Builder setDistinctOn( } return this; } + /** * * @@ -2818,6 +2917,7 @@ public Builder addDistinctOn(com.google.datastore.v1.PropertyReference value) { } return this; } + /** * * @@ -2847,6 +2947,7 @@ public Builder addDistinctOn(int index, com.google.datastore.v1.PropertyReferenc } return this; } + /** * * @@ -2874,6 +2975,7 @@ public Builder addDistinctOn( } return this; } + /** * * @@ -2901,6 +3003,7 @@ public Builder addDistinctOn( } return this; } + /** * * @@ -2928,6 +3031,7 @@ public Builder addAllDistinctOn( } return this; } + /** * * @@ -2954,6 +3058,7 @@ public Builder clearDistinctOn() { } return this; } + /** * * @@ -2980,6 +3085,7 @@ public Builder removeDistinctOn(int index) { } return this; } + /** * * @@ -2999,6 +3105,7 @@ public Builder removeDistinctOn(int index) { public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder(int index) { return getDistinctOnFieldBuilder().getBuilder(index); } + /** * * @@ -3022,6 +3129,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder return distinctOnBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -3046,6 +3154,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder return java.util.Collections.unmodifiableList(distinctOn_); } } + /** * * @@ -3066,6 +3175,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder() return getDistinctOnFieldBuilder() .addBuilder(com.google.datastore.v1.PropertyReference.getDefaultInstance()); } + /** * * @@ -3086,6 +3196,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in return getDistinctOnFieldBuilder() .addBuilder(index, com.google.datastore.v1.PropertyReference.getDefaultInstance()); } + /** * * @@ -3125,6 +3236,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in } private com.google.protobuf.ByteString startCursor_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -3143,6 +3255,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in public com.google.protobuf.ByteString getStartCursor() { return startCursor_; } + /** * * @@ -3167,6 +3280,7 @@ public Builder setStartCursor(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -3189,6 +3303,7 @@ public Builder clearStartCursor() { } private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -3207,6 +3322,7 @@ public Builder clearStartCursor() { public com.google.protobuf.ByteString getEndCursor() { return endCursor_; } + /** * * @@ -3231,6 +3347,7 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -3253,6 +3370,7 @@ public Builder clearEndCursor() { } private int offset_; + /** * * @@ -3269,6 +3387,7 @@ public Builder clearEndCursor() { public int getOffset() { return offset_; } + /** * * @@ -3289,6 +3408,7 @@ public Builder setOffset(int value) { onChanged(); return this; } + /** * * @@ -3314,6 +3434,7 @@ public Builder clearOffset() { com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder> limitBuilder_; + /** * * @@ -3331,6 +3452,7 @@ public Builder clearOffset() { public boolean hasLimit() { return ((bitField0_ & 0x00000100) != 0); } + /** * * @@ -3352,6 +3474,7 @@ public com.google.protobuf.Int32Value getLimit() { return limitBuilder_.getMessage(); } } + /** * * @@ -3377,6 +3500,7 @@ public Builder setLimit(com.google.protobuf.Int32Value value) { onChanged(); return this; } + /** * * @@ -3399,6 +3523,7 @@ public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue) onChanged(); return this; } + /** * * @@ -3429,6 +3554,7 @@ public Builder mergeLimit(com.google.protobuf.Int32Value value) { } return this; } + /** * * @@ -3451,6 +3577,7 @@ public Builder clearLimit() { onChanged(); return this; } + /** * * @@ -3468,6 +3595,7 @@ public com.google.protobuf.Int32Value.Builder getLimitBuilder() { onChanged(); return getLimitFieldBuilder().getBuilder(); } + /** * * @@ -3487,6 +3615,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_; } } + /** * * @@ -3522,6 +3651,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { com.google.datastore.v1.FindNearest.Builder, com.google.datastore.v1.FindNearestOrBuilder> findNearestBuilder_; + /** * * @@ -3542,6 +3672,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { public boolean hasFindNearest() { return ((bitField0_ & 0x00000200) != 0); } + /** * * @@ -3568,6 +3699,7 @@ public com.google.datastore.v1.FindNearest getFindNearest() { return findNearestBuilder_.getMessage(); } } + /** * * @@ -3596,6 +3728,7 @@ public Builder setFindNearest(com.google.datastore.v1.FindNearest value) { onChanged(); return this; } + /** * * @@ -3621,6 +3754,7 @@ public Builder setFindNearest(com.google.datastore.v1.FindNearest.Builder builde onChanged(); return this; } + /** * * @@ -3654,6 +3788,7 @@ public Builder mergeFindNearest(com.google.datastore.v1.FindNearest value) { } return this; } + /** * * @@ -3679,6 +3814,7 @@ public Builder clearFindNearest() { onChanged(); return this; } + /** * * @@ -3699,6 +3835,7 @@ public com.google.datastore.v1.FindNearest.Builder getFindNearestBuilder() { onChanged(); return getFindNearestFieldBuilder().getBuilder(); } + /** * * @@ -3723,6 +3860,7 @@ public com.google.datastore.v1.FindNearestOrBuilder getFindNearestOrBuilder() { : findNearest_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java index 4ae6b255d..7629bf17e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java @@ -34,6 +34,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.Projection projection = 2; */ java.util.List getProjectionList(); + /** * * @@ -44,6 +45,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.Projection projection = 2; */ com.google.datastore.v1.Projection getProjection(int index); + /** * * @@ -54,6 +56,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.Projection projection = 2; */ int getProjectionCount(); + /** * * @@ -65,6 +68,7 @@ public interface QueryOrBuilder */ java.util.List getProjectionOrBuilderList(); + /** * * @@ -87,6 +91,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.KindExpression kind = 3; */ java.util.List getKindList(); + /** * * @@ -98,6 +103,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.KindExpression kind = 3; */ com.google.datastore.v1.KindExpression getKind(int index); + /** * * @@ -109,6 +115,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.KindExpression kind = 3; */ int getKindCount(); + /** * * @@ -120,6 +127,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.KindExpression kind = 3; */ java.util.List getKindOrBuilderList(); + /** * * @@ -144,6 +152,7 @@ public interface QueryOrBuilder * @return Whether the filter field is set. */ boolean hasFilter(); + /** * * @@ -156,6 +165,7 @@ public interface QueryOrBuilder * @return The filter. */ com.google.datastore.v1.Filter getFilter(); + /** * * @@ -177,6 +187,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.PropertyOrder order = 5; */ java.util.List getOrderList(); + /** * * @@ -187,6 +198,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.PropertyOrder order = 5; */ com.google.datastore.v1.PropertyOrder getOrder(int index); + /** * * @@ -197,6 +209,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.PropertyOrder order = 5; */ int getOrderCount(); + /** * * @@ -207,6 +220,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.PropertyOrder order = 5; */ java.util.List getOrderOrBuilderList(); + /** * * @@ -235,6 +249,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.PropertyReference distinct_on = 6; */ java.util.List getDistinctOnList(); + /** * * @@ -252,6 +267,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.PropertyReference distinct_on = 6; */ com.google.datastore.v1.PropertyReference getDistinctOn(int index); + /** * * @@ -269,6 +285,7 @@ public interface QueryOrBuilder * repeated .google.datastore.v1.PropertyReference distinct_on = 6; */ int getDistinctOnCount(); + /** * * @@ -287,6 +304,7 @@ public interface QueryOrBuilder */ java.util.List getDistinctOnOrBuilderList(); + /** * * @@ -366,6 +384,7 @@ public interface QueryOrBuilder * @return Whether the limit field is set. */ boolean hasLimit(); + /** * * @@ -381,6 +400,7 @@ public interface QueryOrBuilder * @return The limit. */ com.google.protobuf.Int32Value getLimit(); + /** * * @@ -413,6 +433,7 @@ public interface QueryOrBuilder * @return Whether the findNearest field is set. */ boolean hasFindNearest(); + /** * * @@ -431,6 +452,7 @@ public interface QueryOrBuilder * @return The findNearest. */ com.google.datastore.v1.FindNearest getFindNearest(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java index bdd8d7682..d63999bb5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java @@ -113,107 +113,145 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { - "\n\037google/datastore/v1/query.proto\022\023googl" - + "e.datastore.v1\032\037google/api/field_behavio" - + "r.proto\032 google/datastore/v1/entity.prot" - + "o\032\037google/protobuf/timestamp.proto\032\036goog" - + "le/protobuf/wrappers.proto\"\221\002\n\014EntityRes" - + "ult\022+\n\006entity\030\001 \001(\0132\033.google.datastore.v" - + "1.Entity\022\017\n\007version\030\004 \001(\003\022/\n\013create_time" - + "\030\006 \001(\0132\032.google.protobuf.Timestamp\022/\n\013up" - + "date_time\030\005 \001(\0132\032.google.protobuf.Timest" - + "amp\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RES" - + "ULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJ" - + "ECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\257\003\n\005Query\0223\n\nproj" - + "ection\030\002 \003(\0132\037.google.datastore.v1.Proje" - + "ction\0221\n\004kind\030\003 \003(\0132#.google.datastore.v" - + "1.KindExpression\022+\n\006filter\030\004 \001(\0132\033.googl" - + "e.datastore.v1.Filter\0221\n\005order\030\005 \003(\0132\".g" - + "oogle.datastore.v1.PropertyOrder\022;\n\013dist" - + "inct_on\030\006 \003(\0132&.google.datastore.v1.Prop" - + "ertyReference\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\ne" - + "nd_cursor\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit" - + "\030\014 \001(\0132\033.google.protobuf.Int32Value\022;\n\014f" - + "ind_nearest\030\r \001(\0132 .google.datastore.v1." - + "FindNearestB\003\340A\001\"\344\004\n\020AggregationQuery\0222\n" - + "\014nested_query\030\001 \001(\0132\032.google.datastore.v" - + "1.QueryH\000\022L\n\014aggregations\030\003 \003(\01321.google" - + ".datastore.v1.AggregationQuery.Aggregati" - + "onB\003\340A\001\032\277\003\n\013Aggregation\022H\n\005count\030\001 \001(\01327" - + ".google.datastore.v1.AggregationQuery.Ag" - + "gregation.CountH\000\022D\n\003sum\030\002 \001(\01325.google." - + "datastore.v1.AggregationQuery.Aggregatio" - + "n.SumH\000\022D\n\003avg\030\003 \001(\01325.google.datastore." - + "v1.AggregationQuery.Aggregation.AvgH\000\022\022\n" - + "\005alias\030\007 \001(\tB\003\340A\001\0328\n\005Count\022/\n\005up_to\030\001 \001(" - + "\0132\033.google.protobuf.Int64ValueB\003\340A\001\032?\n\003S" - + "um\0228\n\010property\030\001 \001(\0132&.google.datastore." - + "v1.PropertyReference\032?\n\003Avg\0228\n\010property\030" - + "\001 \001(\0132&.google.datastore.v1.PropertyRefe" - + "renceB\n\n\010operatorB\014\n\nquery_type\"\036\n\016KindE" - + "xpression\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyRefer" - + "ence\022\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010prop" - + "erty\030\001 \001(\0132&.google.datastore.v1.Propert" - + "yReference\"\321\001\n\rPropertyOrder\0228\n\010property" - + "\030\001 \001(\0132&.google.datastore.v1.PropertyRef" - + "erence\022?\n\tdirection\030\002 \001(\0162,.google.datas" - + "tore.v1.PropertyOrder.Direction\"E\n\tDirec" - + "tion\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCEN" - + "DING\020\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020com" - + "posite_filter\030\001 \001(\0132$.google.datastore.v" - + "1.CompositeFilterH\000\022>\n\017property_filter\030\002" - + " \001(\0132#.google.datastore.v1.PropertyFilte" - + "rH\000B\r\n\013filter_type\"\261\001\n\017CompositeFilter\0229" - + "\n\002op\030\001 \001(\0162-.google.datastore.v1.Composi" - + "teFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.goo" - + "gle.datastore.v1.Filter\"5\n\010Operator\022\030\n\024O" - + "PERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352" - + "\002\n\016PropertyFilter\0228\n\010property\030\001 \001(\0132&.go" - + "ogle.datastore.v1.PropertyReference\0228\n\002o" - + "p\030\002 \001(\0162,.google.datastore.v1.PropertyFi" - + "lter.Operator\022)\n\005value\030\003 \001(\0132\032.google.da" - + "tastore.v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATO" - + "R_UNSPECIFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026\n\022LESS_T" - + "HAN_OR_EQUAL\020\002\022\020\n\014GREATER_THAN\020\003\022\031\n\025GREA" - + "TER_THAN_OR_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r" - + "\n\tNOT_EQUAL\020\t\022\020\n\014HAS_ANCESTOR\020\013\022\n\n\006NOT_I" - + "N\020\r\"\323\003\n\013FindNearest\022D\n\017vector_property\030\001" - + " \001(\0132&.google.datastore.v1.PropertyRefer" - + "enceB\003\340A\002\0225\n\014query_vector\030\002 \001(\0132\032.google" - + ".datastore.v1.ValueB\003\340A\002\022O\n\020distance_mea" - + "sure\030\003 \001(\01620.google.datastore.v1.FindNea" - + "rest.DistanceMeasureB\003\340A\002\022/\n\005limit\030\004 \001(\013" - + "2\033.google.protobuf.Int32ValueB\003\340A\002\022%\n\030di" - + "stance_result_property\030\005 \001(\tB\003\340A\001\022=\n\022dis" - + "tance_threshold\030\006 \001(\0132\034.google.protobuf." - + "DoubleValueB\003\340A\001\"_\n\017DistanceMeasure\022 \n\034D" - + "ISTANCE_MEASURE_UNSPECIFIED\020\000\022\r\n\tEUCLIDE" - + "AN\020\001\022\n\n\006COSINE\020\002\022\017\n\013DOT_PRODUCT\020\003\"\245\002\n\010Gq" - + "lQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allow_li" - + "terals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\01320.g" - + "oogle.datastore.v1.GqlQuery.NamedBinding" - + "sEntry\022C\n\023positional_bindings\030\004 \003(\0132&.go" - + "ogle.datastore.v1.GqlQueryParameter\032\\\n\022N" - + "amedBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030" - + "\002 \001(\0132&.google.datastore.v1.GqlQueryPara" - + "meter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005value\030" - + "\002 \001(\0132\032.google.datastore.v1.ValueH\000\022\020\n\006c" - + "ursor\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020Quer" - + "yResultBatch\022\027\n\017skipped_results\030\006 \001(\005\022\026\n" - + "\016skipped_cursor\030\003 \001(\014\022H\n\022entity_result_t" - + "ype\030\001 \001(\0162,.google.datastore.v1.EntityRe" - + "sult.ResultType\0229\n\016entity_results\030\002 \003(\0132" - + "!.google.datastore.v1.EntityResult\022\022\n\nen" - + "d_cursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625.g" - + "oogle.datastore.v1.QueryResultBatch.More" - + "ResultsType\022\030\n\020snapshot_version\030\007 \001(\003\022-\n" - + "\tread_time\030\010 \001(\0132\032.google.protobuf.Times" - + "tamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RESULTS" - + "_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n" - + "\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESU" - + "LTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B" - + "\273\001\n\027com.google.datastore.v1B\nQueryProtoP" - + "\001Z;cloud.google.com/go/datastore/apiv1/d" + "\n" + + "\037google/datastore/v1/query.proto\022\023googl" + + "e.datastore.v1\032\037google/api/field_behavior.proto\032" + + " google/datastore/v1/entity.prot" + + "o\032\037google/protobuf/timestamp.proto\032\036google/protobuf/wrappers.proto\"\221\002\n" + + "\014EntityResult\022+\n" + + "\006entity\030\001 \001(\0132\033.google.datastore.v1.Entity\022\017\n" + + "\007version\030\004 \001(\003\022/\n" + + "\013create_time\030\006 \001(\0132\032.google.protobuf.Timestamp\022/\n" + + "\013update_time\030\005 \001(\0132\032.google.protobuf.Timestamp\022\016\n" + + "\006cursor\030\003 \001(\014\"Q\n\n" + + "ResultType\022\033\n" + + "\027RESULT_TYPE_UNSPECIFIED\020\000\022\010\n" + + "\004FULL\020\001\022\016\n\n" + + "PROJECTION\020\002\022\014\n" + + "\010KEY_ONLY\020\003\"\257\003\n" + + "\005Query\0223\n\n" + + "projection\030\002 \003(\0132\037.google.datastore.v1.Projection\0221\n" + + "\004kind\030\003 \003(\0132#.google.datastore.v1.KindExpression\022+\n" + + "\006filter\030\004 \001(\0132\033.google.datastore.v1.Filter\0221\n" + + "\005order\030\005 \003(\0132\".google.datastore.v1.PropertyOrder\022;\n" + + "\013distinct_on\030\006 \003(\0132&.google.datastore.v1.PropertyReference\022\024\n" + + "\014start_cursor\030\007 \001(\014\022\022\n\n" + + "end_cursor\030\010 \001(\014\022\016\n" + + "\006offset\030\n" + + " \001(\005\022*\n" + + "\005limit\030\014 \001(\0132\033.google.protobuf.Int32Value\022;\n" + + "\014find_nearest\030\r" + + " \001(\0132 .google.datastore.v1.FindNearestB\003\340A\001\"\344\004\n" + + "\020AggregationQuery\0222\n" + + "\014nested_query\030\001 \001(\0132\032.google.datastore.v1.QueryH\000\022L\n" + + "\014aggregations\030\003 \003(\01321.google" + + ".datastore.v1.AggregationQuery.AggregationB\003\340A\001\032\277\003\n" + + "\013Aggregation\022H\n" + + "\005count\030\001 \001(\01327" + + ".google.datastore.v1.AggregationQuery.Aggregation.CountH\000\022D\n" + + "\003sum\030\002 \001(\01325.google." + + "datastore.v1.AggregationQuery.Aggregation.SumH\000\022D\n" + + "\003avg\030\003" + + " \001(\01325.google.datastore.v1.AggregationQuery.Aggregation.AvgH\000\022\022\n" + + "\005alias\030\007 \001(\tB\003\340A\001\0328\n" + + "\005Count\022/\n" + + "\005up_to\030\001 \001(\0132\033.google.protobuf.Int64ValueB\003\340A\001\032?\n" + + "\003Sum\0228\n" + + "\010property\030\001 \001(\0132&.google.datastore.v1.PropertyReference\032?\n" + + "\003Avg\0228\n" + + "\010property\030\001 \001(\0132&.google.datastore.v1.PropertyReferenceB\n\n" + + "\010operatorB\014\n\n" + + "query_type\"\036\n" + + "\016KindExpression\022\014\n" + + "\004name\030\001 \001(\t\"!\n" + + "\021PropertyReference\022\014\n" + + "\004name\030\002 \001(\t\"F\n\n" + + "Projection\0228\n" + + "\010property\030\001 \001(\0132&.google.datastore.v1.PropertyReference\"\321\001\n\r" + + "PropertyOrder\0228\n" + + "\010property\030\001 \001(\0132&.google.datastore.v1.PropertyReference\022?\n" + + "\tdirection\030\002 \001(\0162,.google.datastore.v1.PropertyOrder.Direction\"E\n" + + "\tDirection\022\031\n" + + "\025DIRECTION_UNSPECIFIED\020\000\022\r\n" + + "\tASCENDING\020\001\022\016\n\n" + + "DESCENDING\020\002\"\231\001\n" + + "\006Filter\022@\n" + + "\020composite_filter\030\001" + + " \001(\0132$.google.datastore.v1.CompositeFilterH\000\022>\n" + + "\017property_filter\030\002 \001(\0132#.google.datastore.v1.PropertyFilterH\000B\r\n" + + "\013filter_type\"\261\001\n" + + "\017CompositeFilter\0229\n" + + "\002op\030\001 \001(\0162-.google.datastore.v1.CompositeFilter.Operator\022,\n" + + "\007filters\030\002 \003(\0132\033.google.datastore.v1.Filter\"5\n" + + "\010Operator\022\030\n" + + "\024OPERATOR_UNSPECIFIED\020\000\022\007\n" + + "\003AND\020\001\022\006\n" + + "\002OR\020\002\"\352\002\n" + + "\016PropertyFilter\0228\n" + + "\010property\030\001 \001(\0132&.google.datastore.v1.PropertyReference\0228\n" + + "\002op\030\002 \001(\0162,.google.datastore.v1.PropertyFilter.Operator\022)\n" + + "\005value\030\003 \001(\0132\032.google.datastore.v1.Value\"\270\001\n" + + "\010Operator\022\030\n" + + "\024OPERATOR_UNSPECIFIED\020\000\022\r\n" + + "\tLESS_THAN\020\001\022\026\n" + + "\022LESS_THAN_OR_EQUAL\020\002\022\020\n" + + "\014GREATER_THAN\020\003\022\031\n" + + "\025GREATER_THAN_OR_EQUAL\020\004\022\t\n" + + "\005EQUAL\020\005\022\006\n" + + "\002IN\020\006\022\r" + + "\n" + + "\tNOT_EQUAL\020\t\022\020\n" + + "\014HAS_ANCESTOR\020\013\022\n\n" + + "\006NOT_IN\020\r" + + "\"\323\003\n" + + "\013FindNearest\022D\n" + + "\017vector_property\030\001" + + " \001(\0132&.google.datastore.v1.PropertyReferenceB\003\340A\002\0225\n" + + "\014query_vector\030\002 \001(\0132\032.google.datastore.v1.ValueB\003\340A\002\022O\n" + + "\020distance_measure\030\003" + + " \001(\01620.google.datastore.v1.FindNearest.DistanceMeasureB\003\340A\002\022/\n" + + "\005limit\030\004 \001(\0132\033.google.protobuf.Int32ValueB\003\340A\002\022%\n" + + "\030distance_result_property\030\005 \001(\tB\003\340A\001\022=\n" + + "\022distance_threshold\030\006" + + " \001(\0132\034.google.protobuf.DoubleValueB\003\340A\001\"_\n" + + "\017DistanceMeasure\022 \n" + + "\034DISTANCE_MEASURE_UNSPECIFIED\020\000\022\r\n" + + "\tEUCLIDEAN\020\001\022\n\n" + + "\006COSINE\020\002\022\017\n" + + "\013DOT_PRODUCT\020\003\"\245\002\n" + + "\010GqlQuery\022\024\n" + + "\014query_string\030\001 \001(\t\022\026\n" + + "\016allow_literals\030\002 \001(\010\022H\n" + + "\016named_bindings\030\005 \003(\01320.g" + + "oogle.datastore.v1.GqlQuery.NamedBindingsEntry\022C\n" + + "\023positional_bindings\030\004" + + " \003(\0132&.google.datastore.v1.GqlQueryParameter\032\\\n" + + "\022NamedBindingsEntry\022\013\n" + + "\003key\030\001 \001(\t\0225\n" + + "\005value\030\002 \001(\0132&.google.datastore.v1.GqlQueryParameter:\0028\001\"d\n" + + "\021GqlQueryParameter\022+\n" + + "\005value\030\002 \001(\0132\032.google.datastore.v1.ValueH\000\022\020\n" + + "\006cursor\030\003 \001(\014H\000B\020\n" + + "\016parameter_type\"\215\004\n" + + "\020QueryResultBatch\022\027\n" + + "\017skipped_results\030\006 \001(\005\022\026\n" + + "\016skipped_cursor\030\003 \001(\014\022H\n" + + "\022entity_result_type\030\001" + + " \001(\0162,.google.datastore.v1.EntityResult.ResultType\0229\n" + + "\016entity_results\030\002 \003(\0132!.google.datastore.v1.EntityResult\022\022\n\n" + + "end_cursor\030\004 \001(\014\022K\n" + + "\014more_results\030\005 \001(\01625.g" + + "oogle.datastore.v1.QueryResultBatch.MoreResultsType\022\030\n" + + "\020snapshot_version\030\007 \001(\003\022-\n" + + "\tread_time\030\010 \001(\0132\032.google.protobuf.Timestamp\"\230\001\n" + + "\017MoreResultsType\022!\n" + + "\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n" + + "\014NOT_FINISHED\020\001\022\034\n" + + "\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n" + + "\031MORE_RESULTS_AFTER_CURSOR\020\004\022\023\n" + + "\017NO_MORE_RESULTS\020\003B\273\001\n" + + "\027com.google.datastore.v1B\n" + + "QueryProtoP\001Z;cloud.google.com/go/datastore/apiv1/d" + "atastorepb;datastorepb\252\002\031Google.Cloud.Da" + "tastore.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002" + "\034Google::Cloud::Datastore::V1b\006proto3" diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java index a5f09b7c9..ecd44fa37 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java @@ -33,6 +33,7 @@ public final class QueryResultBatch extends com.google.protobuf.GeneratedMessage // @@protoc_insertion_point(message_implements:google.datastore.v1.QueryResultBatch) QueryResultBatchOrBuilder { private static final long serialVersionUID = 0L; + // Use QueryResultBatch.newBuilder() to construct. private QueryResultBatch(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -141,6 +142,7 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum { * MORE_RESULTS_TYPE_UNSPECIFIED = 0; */ public static final int MORE_RESULTS_TYPE_UNSPECIFIED_VALUE = 0; + /** * * @@ -151,6 +153,7 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum { * NOT_FINISHED = 1; */ public static final int NOT_FINISHED_VALUE = 1; + /** * * @@ -161,6 +164,7 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum { * MORE_RESULTS_AFTER_LIMIT = 2; */ public static final int MORE_RESULTS_AFTER_LIMIT_VALUE = 2; + /** * * @@ -172,6 +176,7 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum { * MORE_RESULTS_AFTER_CURSOR = 4; */ public static final int MORE_RESULTS_AFTER_CURSOR_VALUE = 4; + /** * * @@ -275,6 +280,7 @@ private MoreResultsType(int value) { private int bitField0_; public static final int SKIPPED_RESULTS_FIELD_NUMBER = 6; private int skippedResults_ = 0; + /** * * @@ -293,6 +299,7 @@ public int getSkippedResults() { public static final int SKIPPED_CURSOR_FIELD_NUMBER = 3; private com.google.protobuf.ByteString skippedCursor_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -312,6 +319,7 @@ public com.google.protobuf.ByteString getSkippedCursor() { public static final int ENTITY_RESULT_TYPE_FIELD_NUMBER = 1; private int entityResultType_ = 0; + /** * * @@ -327,6 +335,7 @@ public com.google.protobuf.ByteString getSkippedCursor() { public int getEntityResultTypeValue() { return entityResultType_; } + /** * * @@ -349,6 +358,7 @@ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { @SuppressWarnings("serial") private java.util.List entityResults_; + /** * * @@ -362,6 +372,7 @@ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { public java.util.List getEntityResultsList() { return entityResults_; } + /** * * @@ -376,6 +387,7 @@ public java.util.List getEntityResultsList getEntityResultsOrBuilderList() { return entityResults_; } + /** * * @@ -389,6 +401,7 @@ public java.util.List getEntityResultsList public int getEntityResultsCount() { return entityResults_.size(); } + /** * * @@ -402,6 +415,7 @@ public int getEntityResultsCount() { public com.google.datastore.v1.EntityResult getEntityResults(int index) { return entityResults_.get(index); } + /** * * @@ -418,6 +432,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i public static final int END_CURSOR_FIELD_NUMBER = 4; private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -436,6 +451,7 @@ public com.google.protobuf.ByteString getEndCursor() { public static final int MORE_RESULTS_FIELD_NUMBER = 5; private int moreResults_ = 0; + /** * * @@ -451,6 +467,7 @@ public com.google.protobuf.ByteString getEndCursor() { public int getMoreResultsValue() { return moreResults_; } + /** * * @@ -473,6 +490,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() public static final int SNAPSHOT_VERSION_FIELD_NUMBER = 7; private long snapshotVersion_ = 0L; + /** * * @@ -499,6 +517,7 @@ public long getSnapshotVersion() { public static final int READ_TIME_FIELD_NUMBER = 8; private com.google.protobuf.Timestamp readTime_; + /** * * @@ -523,6 +542,7 @@ public long getSnapshotVersion() { public boolean hasReadTime() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -547,6 +567,7 @@ public boolean hasReadTime() { public com.google.protobuf.Timestamp getReadTime() { return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; } + /** * * @@ -804,6 +825,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1140,6 +1162,7 @@ public Builder mergeFrom( private int bitField0_; private int skippedResults_; + /** * * @@ -1155,6 +1178,7 @@ public Builder mergeFrom( public int getSkippedResults() { return skippedResults_; } + /** * * @@ -1174,6 +1198,7 @@ public Builder setSkippedResults(int value) { onChanged(); return this; } + /** * * @@ -1193,6 +1218,7 @@ public Builder clearSkippedResults() { } private com.google.protobuf.ByteString skippedCursor_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -1209,6 +1235,7 @@ public Builder clearSkippedResults() { public com.google.protobuf.ByteString getSkippedCursor() { return skippedCursor_; } + /** * * @@ -1231,6 +1258,7 @@ public Builder setSkippedCursor(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -1251,6 +1279,7 @@ public Builder clearSkippedCursor() { } private int entityResultType_ = 0; + /** * * @@ -1266,6 +1295,7 @@ public Builder clearSkippedCursor() { public int getEntityResultTypeValue() { return entityResultType_; } + /** * * @@ -1284,6 +1314,7 @@ public Builder setEntityResultTypeValue(int value) { onChanged(); return this; } + /** * * @@ -1301,6 +1332,7 @@ public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() { com.google.datastore.v1.EntityResult.ResultType.forNumber(entityResultType_); return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result; } + /** * * @@ -1322,6 +1354,7 @@ public Builder setEntityResultType(com.google.datastore.v1.EntityResult.ResultTy onChanged(); return this; } + /** * * @@ -1373,6 +1406,7 @@ public java.util.List getEntityResultsList return entityResultsBuilder_.getMessageList(); } } + /** * * @@ -1389,6 +1423,7 @@ public int getEntityResultsCount() { return entityResultsBuilder_.getCount(); } } + /** * * @@ -1405,6 +1440,7 @@ public com.google.datastore.v1.EntityResult getEntityResults(int index) { return entityResultsBuilder_.getMessage(index); } } + /** * * @@ -1427,6 +1463,7 @@ public Builder setEntityResults(int index, com.google.datastore.v1.EntityResult } return this; } + /** * * @@ -1447,6 +1484,7 @@ public Builder setEntityResults( } return this; } + /** * * @@ -1469,6 +1507,7 @@ public Builder addEntityResults(com.google.datastore.v1.EntityResult value) { } return this; } + /** * * @@ -1491,6 +1530,7 @@ public Builder addEntityResults(int index, com.google.datastore.v1.EntityResult } return this; } + /** * * @@ -1510,6 +1550,7 @@ public Builder addEntityResults(com.google.datastore.v1.EntityResult.Builder bui } return this; } + /** * * @@ -1530,6 +1571,7 @@ public Builder addEntityResults( } return this; } + /** * * @@ -1550,6 +1592,7 @@ public Builder addAllEntityResults( } return this; } + /** * * @@ -1569,6 +1612,7 @@ public Builder clearEntityResults() { } return this; } + /** * * @@ -1588,6 +1632,7 @@ public Builder removeEntityResults(int index) { } return this; } + /** * * @@ -1600,6 +1645,7 @@ public Builder removeEntityResults(int index) { public com.google.datastore.v1.EntityResult.Builder getEntityResultsBuilder(int index) { return getEntityResultsFieldBuilder().getBuilder(index); } + /** * * @@ -1616,6 +1662,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i return entityResultsBuilder_.getMessageOrBuilder(index); } } + /** * * @@ -1633,6 +1680,7 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i return java.util.Collections.unmodifiableList(entityResults_); } } + /** * * @@ -1646,6 +1694,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder() { return getEntityResultsFieldBuilder() .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance()); } + /** * * @@ -1659,6 +1708,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int return getEntityResultsFieldBuilder() .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance()); } + /** * * @@ -1694,6 +1744,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int } private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -1709,6 +1760,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int public com.google.protobuf.ByteString getEndCursor() { return endCursor_; } + /** * * @@ -1730,6 +1782,7 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -1749,6 +1802,7 @@ public Builder clearEndCursor() { } private int moreResults_ = 0; + /** * * @@ -1764,6 +1818,7 @@ public Builder clearEndCursor() { public int getMoreResultsValue() { return moreResults_; } + /** * * @@ -1782,6 +1837,7 @@ public Builder setMoreResultsValue(int value) { onChanged(); return this; } + /** * * @@ -1801,6 +1857,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result; } + /** * * @@ -1822,6 +1879,7 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul onChanged(); return this; } + /** * * @@ -1841,6 +1899,7 @@ public Builder clearMoreResults() { } private long snapshotVersion_; + /** * * @@ -1864,6 +1923,7 @@ public Builder clearMoreResults() { public long getSnapshotVersion() { return snapshotVersion_; } + /** * * @@ -1891,6 +1951,7 @@ public Builder setSnapshotVersion(long value) { onChanged(); return this; } + /** * * @@ -1923,6 +1984,7 @@ public Builder clearSnapshotVersion() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> readTimeBuilder_; + /** * * @@ -1946,6 +2008,7 @@ public Builder clearSnapshotVersion() { public boolean hasReadTime() { return ((bitField0_ & 0x00000080) != 0); } + /** * * @@ -1973,6 +2036,7 @@ public com.google.protobuf.Timestamp getReadTime() { return readTimeBuilder_.getMessage(); } } + /** * * @@ -2004,6 +2068,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -2032,6 +2097,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue onChanged(); return this; } + /** * * @@ -2068,6 +2134,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -2096,6 +2163,7 @@ public Builder clearReadTime() { onChanged(); return this; } + /** * * @@ -2119,6 +2187,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() { onChanged(); return getReadTimeFieldBuilder().getBuilder(); } + /** * * @@ -2144,6 +2213,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java index 01f9c75a7..99483d9d6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java @@ -63,6 +63,7 @@ public interface QueryResultBatchOrBuilder * @return The enum numeric value on the wire for entityResultType. */ int getEntityResultTypeValue(); + /** * * @@ -86,6 +87,7 @@ public interface QueryResultBatchOrBuilder * repeated .google.datastore.v1.EntityResult entity_results = 2; */ java.util.List getEntityResultsList(); + /** * * @@ -96,6 +98,7 @@ public interface QueryResultBatchOrBuilder * repeated .google.datastore.v1.EntityResult entity_results = 2; */ com.google.datastore.v1.EntityResult getEntityResults(int index); + /** * * @@ -106,6 +109,7 @@ public interface QueryResultBatchOrBuilder * repeated .google.datastore.v1.EntityResult entity_results = 2; */ int getEntityResultsCount(); + /** * * @@ -117,6 +121,7 @@ public interface QueryResultBatchOrBuilder */ java.util.List getEntityResultsOrBuilderList(); + /** * * @@ -153,6 +158,7 @@ public interface QueryResultBatchOrBuilder * @return The enum numeric value on the wire for moreResults. */ int getMoreResultsValue(); + /** * * @@ -208,6 +214,7 @@ public interface QueryResultBatchOrBuilder * @return Whether the readTime field is set. */ boolean hasReadTime(); + /** * * @@ -229,6 +236,7 @@ public interface QueryResultBatchOrBuilder * @return The readTime. */ com.google.protobuf.Timestamp getReadTime(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java index ed5ac6a48..954270bf8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -33,6 +33,7 @@ public final class ReadOptions extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.ReadOptions) ReadOptionsOrBuilder { private static final long serialVersionUID = 0L; + // Use ReadOptions.newBuilder() to construct. private ReadOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -114,6 +115,7 @@ public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum { * READ_CONSISTENCY_UNSPECIFIED = 0; */ public static final int READ_CONSISTENCY_UNSPECIFIED_VALUE = 0; + /** * * @@ -124,6 +126,7 @@ public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum { * STRONG = 1; */ public static final int STRONG_VALUE = 1; + /** * * @@ -239,6 +242,7 @@ public enum ConsistencyTypeCase private ConsistencyTypeCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -276,6 +280,7 @@ public ConsistencyTypeCase getConsistencyTypeCase() { } public static final int READ_CONSISTENCY_FIELD_NUMBER = 1; + /** * * @@ -290,6 +295,7 @@ public ConsistencyTypeCase getConsistencyTypeCase() { public boolean hasReadConsistency() { return consistencyTypeCase_ == 1; } + /** * * @@ -307,6 +313,7 @@ public int getReadConsistencyValue() { } return 0; } + /** * * @@ -331,6 +338,7 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() } public static final int TRANSACTION_FIELD_NUMBER = 2; + /** * * @@ -348,6 +356,7 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() public boolean hasTransaction() { return consistencyTypeCase_ == 2; } + /** * * @@ -370,6 +379,7 @@ public com.google.protobuf.ByteString getTransaction() { } public static final int NEW_TRANSACTION_FIELD_NUMBER = 3; + /** * * @@ -391,6 +401,7 @@ public com.google.protobuf.ByteString getTransaction() { public boolean hasNewTransaction() { return consistencyTypeCase_ == 3; } + /** * * @@ -415,6 +426,7 @@ public com.google.datastore.v1.TransactionOptions getNewTransaction() { } return com.google.datastore.v1.TransactionOptions.getDefaultInstance(); } + /** * * @@ -439,6 +451,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu } public static final int READ_TIME_FIELD_NUMBER = 4; + /** * * @@ -459,6 +472,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu public boolean hasReadTime() { return consistencyTypeCase_ == 4; } + /** * * @@ -482,6 +496,7 @@ public com.google.protobuf.Timestamp getReadTime() { } return com.google.protobuf.Timestamp.getDefaultInstance(); } + /** * * @@ -721,6 +736,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -987,6 +1003,7 @@ public Builder clearConsistencyType() { public boolean hasReadConsistency() { return consistencyTypeCase_ == 1; } + /** * * @@ -1005,6 +1022,7 @@ public int getReadConsistencyValue() { } return 0; } + /** * * @@ -1023,6 +1041,7 @@ public Builder setReadConsistencyValue(int value) { onChanged(); return this; } + /** * * @@ -1046,6 +1065,7 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() } return com.google.datastore.v1.ReadOptions.ReadConsistency.READ_CONSISTENCY_UNSPECIFIED; } + /** * * @@ -1067,6 +1087,7 @@ public Builder setReadConsistency(com.google.datastore.v1.ReadOptions.ReadConsis onChanged(); return this; } + /** * * @@ -1103,6 +1124,7 @@ public Builder clearReadConsistency() { public boolean hasTransaction() { return consistencyTypeCase_ == 2; } + /** * * @@ -1122,6 +1144,7 @@ public com.google.protobuf.ByteString getTransaction() { } return com.google.protobuf.ByteString.EMPTY; } + /** * * @@ -1145,6 +1168,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -1172,6 +1196,7 @@ public Builder clearTransaction() { com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder> newTransactionBuilder_; + /** * * @@ -1193,6 +1218,7 @@ public Builder clearTransaction() { public boolean hasNewTransaction() { return consistencyTypeCase_ == 3; } + /** * * @@ -1224,6 +1250,7 @@ public com.google.datastore.v1.TransactionOptions getNewTransaction() { return com.google.datastore.v1.TransactionOptions.getDefaultInstance(); } } + /** * * @@ -1252,6 +1279,7 @@ public Builder setNewTransaction(com.google.datastore.v1.TransactionOptions valu consistencyTypeCase_ = 3; return this; } + /** * * @@ -1278,6 +1306,7 @@ public Builder setNewTransaction( consistencyTypeCase_ = 3; return this; } + /** * * @@ -1317,6 +1346,7 @@ public Builder mergeNewTransaction(com.google.datastore.v1.TransactionOptions va consistencyTypeCase_ = 3; return this; } + /** * * @@ -1348,6 +1378,7 @@ public Builder clearNewTransaction() { } return this; } + /** * * @@ -1366,6 +1397,7 @@ public Builder clearNewTransaction() { public com.google.datastore.v1.TransactionOptions.Builder getNewTransactionBuilder() { return getNewTransactionFieldBuilder().getBuilder(); } + /** * * @@ -1392,6 +1424,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu return com.google.datastore.v1.TransactionOptions.getDefaultInstance(); } } + /** * * @@ -1436,6 +1469,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> readTimeBuilder_; + /** * * @@ -1456,6 +1490,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu public boolean hasReadTime() { return consistencyTypeCase_ == 4; } + /** * * @@ -1486,6 +1521,7 @@ public com.google.protobuf.Timestamp getReadTime() { return com.google.protobuf.Timestamp.getDefaultInstance(); } } + /** * * @@ -1513,6 +1549,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) { consistencyTypeCase_ = 4; return this; } + /** * * @@ -1537,6 +1574,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue consistencyTypeCase_ = 4; return this; } + /** * * @@ -1574,6 +1612,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) { consistencyTypeCase_ = 4; return this; } + /** * * @@ -1604,6 +1643,7 @@ public Builder clearReadTime() { } return this; } + /** * * @@ -1621,6 +1661,7 @@ public Builder clearReadTime() { public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() { return getReadTimeFieldBuilder().getBuilder(); } + /** * * @@ -1646,6 +1687,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { return com.google.protobuf.Timestamp.getDefaultInstance(); } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java index 4c0ac317b..7ba3d1fad 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java @@ -36,6 +36,7 @@ public interface ReadOptionsOrBuilder * @return Whether the readConsistency field is set. */ boolean hasReadConsistency(); + /** * * @@ -48,6 +49,7 @@ public interface ReadOptionsOrBuilder * @return The enum numeric value on the wire for readConsistency. */ int getReadConsistencyValue(); + /** * * @@ -75,6 +77,7 @@ public interface ReadOptionsOrBuilder * @return Whether the transaction field is set. */ boolean hasTransaction(); + /** * * @@ -108,6 +111,7 @@ public interface ReadOptionsOrBuilder * @return Whether the newTransaction field is set. */ boolean hasNewTransaction(); + /** * * @@ -126,6 +130,7 @@ public interface ReadOptionsOrBuilder * @return The newTransaction. */ com.google.datastore.v1.TransactionOptions getNewTransaction(); + /** * * @@ -160,6 +165,7 @@ public interface ReadOptionsOrBuilder * @return Whether the readTime field is set. */ boolean hasReadTime(); + /** * * @@ -177,6 +183,7 @@ public interface ReadOptionsOrBuilder * @return The readTime. */ com.google.protobuf.Timestamp getReadTime(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java index bec6a7ae9..3a23ce121 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java @@ -34,6 +34,7 @@ public final class ReserveIdsRequest extends com.google.protobuf.GeneratedMessag // @@protoc_insertion_point(message_implements:google.datastore.v1.ReserveIdsRequest) ReserveIdsRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use ReserveIdsRequest.newBuilder() to construct. private ReserveIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -70,6 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -93,6 +95,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -121,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object databaseId_ = ""; + /** * * @@ -147,6 +151,7 @@ public java.lang.String getDatabaseId() { return s; } } + /** * * @@ -178,6 +183,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { @SuppressWarnings("serial") private java.util.List keys_; + /** * * @@ -193,6 +199,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public java.util.List getKeysList() { return keys_; } + /** * * @@ -208,6 +215,7 @@ public java.util.List getKeysList() { public java.util.List getKeysOrBuilderList() { return keys_; } + /** * * @@ -223,6 +231,7 @@ public java.util.List getKeysOrB public int getKeysCount() { return keys_.size(); } + /** * * @@ -238,6 +247,7 @@ public int getKeysCount() { public com.google.datastore.v1.Key getKeys(int index) { return keys_.get(index); } + /** * * @@ -433,6 +443,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -691,6 +702,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -713,6 +725,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -735,6 +748,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -756,6 +770,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -773,6 +788,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -797,6 +813,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object databaseId_ = ""; + /** * * @@ -822,6 +839,7 @@ public java.lang.String getDatabaseId() { return (java.lang.String) ref; } } + /** * * @@ -847,6 +865,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -871,6 +890,7 @@ public Builder setDatabaseId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -891,6 +911,7 @@ public Builder clearDatabaseId() { onChanged(); return this; } + /** * * @@ -950,6 +971,7 @@ public java.util.List getKeysList() { return keysBuilder_.getMessageList(); } } + /** * * @@ -968,6 +990,7 @@ public int getKeysCount() { return keysBuilder_.getCount(); } } + /** * * @@ -986,6 +1009,7 @@ public com.google.datastore.v1.Key getKeys(int index) { return keysBuilder_.getMessage(index); } } + /** * * @@ -1010,6 +1034,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1031,6 +1056,7 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor } return this; } + /** * * @@ -1055,6 +1081,7 @@ public Builder addKeys(com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1079,6 +1106,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) { } return this; } + /** * * @@ -1100,6 +1128,7 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) { } return this; } + /** * * @@ -1121,6 +1150,7 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor } return this; } + /** * * @@ -1142,6 +1172,7 @@ public Builder addAllKeys(java.lang.Iterable getKeysOrB return java.util.Collections.unmodifiableList(keys_); } } + /** * * @@ -1248,6 +1284,7 @@ public java.util.List getKeysOrB public com.google.datastore.v1.Key.Builder addKeysBuilder() { return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance()); } + /** * * @@ -1263,6 +1300,7 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) { return getKeysFieldBuilder() .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance()); } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java index 794b3102f..7b26ed5c0 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface ReserveIdsRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -64,6 +65,7 @@ public interface ReserveIdsRequestOrBuilder * @return The databaseId. */ java.lang.String getDatabaseId(); + /** * * @@ -92,6 +94,7 @@ public interface ReserveIdsRequestOrBuilder * */ java.util.List getKeysList(); + /** * * @@ -104,6 +107,7 @@ public interface ReserveIdsRequestOrBuilder * */ com.google.datastore.v1.Key getKeys(int index); + /** * * @@ -116,6 +120,7 @@ public interface ReserveIdsRequestOrBuilder * */ int getKeysCount(); + /** * * @@ -128,6 +133,7 @@ public interface ReserveIdsRequestOrBuilder * */ java.util.List getKeysOrBuilderList(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java index 5100f525e..7d89c33f3 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java @@ -34,6 +34,7 @@ public final class ReserveIdsResponse extends com.google.protobuf.GeneratedMessa // @@protoc_insertion_point(message_implements:google.datastore.v1.ReserveIdsResponse) ReserveIdsResponseOrBuilder { private static final long serialVersionUID = 0L; + // Use ReserveIdsResponse.newBuilder() to construct. private ReserveIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -212,6 +213,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java index edae24a6c..df1b5a581 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java @@ -33,6 +33,7 @@ public final class RollbackRequest extends com.google.protobuf.GeneratedMessageV // @@protoc_insertion_point(message_implements:google.datastore.v1.RollbackRequest) RollbackRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use RollbackRequest.newBuilder() to construct. private RollbackRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -69,6 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -92,6 +94,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -120,6 +123,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object databaseId_ = ""; + /** * * @@ -146,6 +150,7 @@ public java.lang.String getDatabaseId() { return s; } } + /** * * @@ -175,6 +180,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public static final int TRANSACTION_FIELD_NUMBER = 1; private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -368,6 +374,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -579,6 +586,7 @@ public Builder mergeFrom( private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -601,6 +609,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -623,6 +632,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -644,6 +654,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -661,6 +672,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -685,6 +697,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object databaseId_ = ""; + /** * * @@ -710,6 +723,7 @@ public java.lang.String getDatabaseId() { return (java.lang.String) ref; } } + /** * * @@ -735,6 +749,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -759,6 +774,7 @@ public Builder setDatabaseId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -779,6 +795,7 @@ public Builder clearDatabaseId() { onChanged(); return this; } + /** * * @@ -806,6 +823,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { } private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -822,6 +840,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { public com.google.protobuf.ByteString getTransaction() { return transaction_; } + /** * * @@ -844,6 +863,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java index 754a19210..8fc63434d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface RollbackRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -64,6 +65,7 @@ public interface RollbackRequestOrBuilder * @return The databaseId. */ java.lang.String getDatabaseId(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java index b7aae8596..22c7c565f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java @@ -35,6 +35,7 @@ public final class RollbackResponse extends com.google.protobuf.GeneratedMessage // @@protoc_insertion_point(message_implements:google.datastore.v1.RollbackResponse) RollbackResponseOrBuilder { private static final long serialVersionUID = 0L; + // Use RollbackResponse.newBuilder() to construct. private RollbackResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -212,6 +213,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java index 1d262da92..5c4fd8a80 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java @@ -34,6 +34,7 @@ public final class RunAggregationQueryRequest extends com.google.protobuf.Genera // @@protoc_insertion_point(message_implements:google.datastore.v1.RunAggregationQueryRequest) RunAggregationQueryRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use RunAggregationQueryRequest.newBuilder() to construct. private RunAggregationQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -83,6 +84,7 @@ public enum QueryTypeCase private QueryTypeCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -119,6 +121,7 @@ public QueryTypeCase getQueryTypeCase() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -142,6 +145,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -170,6 +174,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object databaseId_ = ""; + /** * * @@ -196,6 +201,7 @@ public java.lang.String getDatabaseId() { return s; } } + /** * * @@ -225,6 +231,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public static final int PARTITION_ID_FIELD_NUMBER = 2; private com.google.datastore.v1.PartitionId partitionId_; + /** * * @@ -243,6 +250,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public boolean hasPartitionId() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -263,6 +271,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() { ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_; } + /** * * @@ -284,6 +293,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { public static final int READ_OPTIONS_FIELD_NUMBER = 1; private com.google.datastore.v1.ReadOptions readOptions_; + /** * * @@ -299,6 +309,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { public boolean hasReadOptions() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -316,6 +327,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() { ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_; } + /** * * @@ -333,6 +345,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { } public static final int AGGREGATION_QUERY_FIELD_NUMBER = 3; + /** * * @@ -348,6 +361,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { public boolean hasAggregationQuery() { return queryTypeCase_ == 3; } + /** * * @@ -366,6 +380,7 @@ public com.google.datastore.v1.AggregationQuery getAggregationQuery() { } return com.google.datastore.v1.AggregationQuery.getDefaultInstance(); } + /** * * @@ -384,6 +399,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu } public static final int GQL_QUERY_FIELD_NUMBER = 7; + /** * * @@ -399,6 +415,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu public boolean hasGqlQuery() { return queryTypeCase_ == 7; } + /** * * @@ -417,6 +434,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() { } return com.google.datastore.v1.GqlQuery.getDefaultInstance(); } + /** * * @@ -436,6 +454,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { public static final int EXPLAIN_OPTIONS_FIELD_NUMBER = 11; private com.google.datastore.v1.ExplainOptions explainOptions_; + /** * * @@ -454,6 +473,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { public boolean hasExplainOptions() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -474,6 +494,7 @@ public com.google.datastore.v1.ExplainOptions getExplainOptions() { ? com.google.datastore.v1.ExplainOptions.getDefaultInstance() : explainOptions_; } + /** * * @@ -742,6 +763,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1075,6 +1097,7 @@ public Builder clearQueryType() { private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -1097,6 +1120,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -1119,6 +1143,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1140,6 +1165,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1157,6 +1183,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -1181,6 +1208,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object databaseId_ = ""; + /** * * @@ -1206,6 +1234,7 @@ public java.lang.String getDatabaseId() { return (java.lang.String) ref; } } + /** * * @@ -1231,6 +1260,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1255,6 +1285,7 @@ public Builder setDatabaseId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1275,6 +1306,7 @@ public Builder clearDatabaseId() { onChanged(); return this; } + /** * * @@ -1307,6 +1339,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> partitionIdBuilder_; + /** * * @@ -1324,6 +1357,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { public boolean hasPartitionId() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1347,6 +1381,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() { return partitionIdBuilder_.getMessage(); } } + /** * * @@ -1372,6 +1407,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) { onChanged(); return this; } + /** * * @@ -1394,6 +1430,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde onChanged(); return this; } + /** * * @@ -1424,6 +1461,7 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) { } return this; } + /** * * @@ -1446,6 +1484,7 @@ public Builder clearPartitionId() { onChanged(); return this; } + /** * * @@ -1463,6 +1502,7 @@ public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() { onChanged(); return getPartitionIdFieldBuilder().getBuilder(); } + /** * * @@ -1484,6 +1524,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { : partitionId_; } } + /** * * @@ -1519,6 +1560,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> readOptionsBuilder_; + /** * * @@ -1533,6 +1575,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { public boolean hasReadOptions() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1553,6 +1596,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() { return readOptionsBuilder_.getMessage(); } } + /** * * @@ -1575,6 +1619,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) { onChanged(); return this; } + /** * * @@ -1594,6 +1639,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde onChanged(); return this; } + /** * * @@ -1621,6 +1667,7 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) { } return this; } + /** * * @@ -1640,6 +1687,7 @@ public Builder clearReadOptions() { onChanged(); return this; } + /** * * @@ -1654,6 +1702,7 @@ public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() { onChanged(); return getReadOptionsFieldBuilder().getBuilder(); } + /** * * @@ -1672,6 +1721,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { : readOptions_; } } + /** * * @@ -1703,6 +1753,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { com.google.datastore.v1.AggregationQuery.Builder, com.google.datastore.v1.AggregationQueryOrBuilder> aggregationQueryBuilder_; + /** * * @@ -1718,6 +1769,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { public boolean hasAggregationQuery() { return queryTypeCase_ == 3; } + /** * * @@ -1743,6 +1795,7 @@ public com.google.datastore.v1.AggregationQuery getAggregationQuery() { return com.google.datastore.v1.AggregationQuery.getDefaultInstance(); } } + /** * * @@ -1765,6 +1818,7 @@ public Builder setAggregationQuery(com.google.datastore.v1.AggregationQuery valu queryTypeCase_ = 3; return this; } + /** * * @@ -1785,6 +1839,7 @@ public Builder setAggregationQuery( queryTypeCase_ = 3; return this; } + /** * * @@ -1817,6 +1872,7 @@ public Builder mergeAggregationQuery(com.google.datastore.v1.AggregationQuery va queryTypeCase_ = 3; return this; } + /** * * @@ -1842,6 +1898,7 @@ public Builder clearAggregationQuery() { } return this; } + /** * * @@ -1854,6 +1911,7 @@ public Builder clearAggregationQuery() { public com.google.datastore.v1.AggregationQuery.Builder getAggregationQueryBuilder() { return getAggregationQueryFieldBuilder().getBuilder(); } + /** * * @@ -1874,6 +1932,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu return com.google.datastore.v1.AggregationQuery.getDefaultInstance(); } } + /** * * @@ -1912,6 +1971,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder> gqlQueryBuilder_; + /** * * @@ -1927,6 +1987,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBu public boolean hasGqlQuery() { return queryTypeCase_ == 7; } + /** * * @@ -1952,6 +2013,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() { return com.google.datastore.v1.GqlQuery.getDefaultInstance(); } } + /** * * @@ -1974,6 +2036,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) { queryTypeCase_ = 7; return this; } + /** * * @@ -1993,6 +2056,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForVa queryTypeCase_ = 7; return this; } + /** * * @@ -2025,6 +2089,7 @@ public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) { queryTypeCase_ = 7; return this; } + /** * * @@ -2050,6 +2115,7 @@ public Builder clearGqlQuery() { } return this; } + /** * * @@ -2062,6 +2128,7 @@ public Builder clearGqlQuery() { public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() { return getGqlQueryFieldBuilder().getBuilder(); } + /** * * @@ -2082,6 +2149,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { return com.google.datastore.v1.GqlQuery.getDefaultInstance(); } } + /** * * @@ -2119,6 +2187,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { com.google.datastore.v1.ExplainOptions.Builder, com.google.datastore.v1.ExplainOptionsOrBuilder> explainOptionsBuilder_; + /** * * @@ -2136,6 +2205,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { public boolean hasExplainOptions() { return ((bitField0_ & 0x00000040) != 0); } + /** * * @@ -2159,6 +2229,7 @@ public com.google.datastore.v1.ExplainOptions getExplainOptions() { return explainOptionsBuilder_.getMessage(); } } + /** * * @@ -2184,6 +2255,7 @@ public Builder setExplainOptions(com.google.datastore.v1.ExplainOptions value) { onChanged(); return this; } + /** * * @@ -2207,6 +2279,7 @@ public Builder setExplainOptions( onChanged(); return this; } + /** * * @@ -2237,6 +2310,7 @@ public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value) } return this; } + /** * * @@ -2259,6 +2333,7 @@ public Builder clearExplainOptions() { onChanged(); return this; } + /** * * @@ -2276,6 +2351,7 @@ public com.google.datastore.v1.ExplainOptions.Builder getExplainOptionsBuilder() onChanged(); return getExplainOptionsFieldBuilder().getBuilder(); } + /** * * @@ -2297,6 +2373,7 @@ public com.google.datastore.v1.ExplainOptionsOrBuilder getExplainOptionsOrBuilde : explainOptions_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java index 7f12bcfe2..d29e50071 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -64,6 +65,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return The databaseId. */ java.lang.String getDatabaseId(); + /** * * @@ -95,6 +97,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return Whether the partitionId field is set. */ boolean hasPartitionId(); + /** * * @@ -110,6 +113,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return The partitionId. */ com.google.datastore.v1.PartitionId getPartitionId(); + /** * * @@ -136,6 +140,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return Whether the readOptions field is set. */ boolean hasReadOptions(); + /** * * @@ -148,6 +153,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return The readOptions. */ com.google.datastore.v1.ReadOptions getReadOptions(); + /** * * @@ -171,6 +177,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return Whether the aggregationQuery field is set. */ boolean hasAggregationQuery(); + /** * * @@ -183,6 +190,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return The aggregationQuery. */ com.google.datastore.v1.AggregationQuery getAggregationQuery(); + /** * * @@ -206,6 +214,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return Whether the gqlQuery field is set. */ boolean hasGqlQuery(); + /** * * @@ -218,6 +227,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return The gqlQuery. */ com.google.datastore.v1.GqlQuery getGqlQuery(); + /** * * @@ -244,6 +254,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return Whether the explainOptions field is set. */ boolean hasExplainOptions(); + /** * * @@ -259,6 +270,7 @@ public interface RunAggregationQueryRequestOrBuilder * @return The explainOptions. */ com.google.datastore.v1.ExplainOptions getExplainOptions(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java index 54453de38..21e58fece 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java @@ -34,6 +34,7 @@ public final class RunAggregationQueryResponse extends com.google.protobuf.Gener // @@protoc_insertion_point(message_implements:google.datastore.v1.RunAggregationQueryResponse) RunAggregationQueryResponseOrBuilder { private static final long serialVersionUID = 0L; + // Use RunAggregationQueryResponse.newBuilder() to construct. private RunAggregationQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int BATCH_FIELD_NUMBER = 1; private com.google.datastore.v1.AggregationResultBatch batch_; + /** * * @@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasBatch() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -99,6 +102,7 @@ public com.google.datastore.v1.AggregationResultBatch getBatch() { ? com.google.datastore.v1.AggregationResultBatch.getDefaultInstance() : batch_; } + /** * * @@ -117,6 +121,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder public static final int QUERY_FIELD_NUMBER = 2; private com.google.datastore.v1.AggregationQuery query_; + /** * * @@ -132,6 +137,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder public boolean hasQuery() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -147,6 +153,7 @@ public boolean hasQuery() { public com.google.datastore.v1.AggregationQuery getQuery() { return query_ == null ? com.google.datastore.v1.AggregationQuery.getDefaultInstance() : query_; } + /** * * @@ -163,6 +170,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() { public static final int TRANSACTION_FIELD_NUMBER = 5; private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -187,6 +195,7 @@ public com.google.protobuf.ByteString getTransaction() { public static final int EXPLAIN_METRICS_FIELD_NUMBER = 9; private com.google.datastore.v1.ExplainMetrics explainMetrics_; + /** * * @@ -204,6 +213,7 @@ public com.google.protobuf.ByteString getTransaction() { public boolean hasExplainMetrics() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -223,6 +233,7 @@ public com.google.datastore.v1.ExplainMetrics getExplainMetrics() { ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance() : explainMetrics_; } + /** * * @@ -442,6 +453,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -698,6 +710,7 @@ public Builder mergeFrom( com.google.datastore.v1.AggregationResultBatch.Builder, com.google.datastore.v1.AggregationResultBatchOrBuilder> batchBuilder_; + /** * * @@ -712,6 +725,7 @@ public Builder mergeFrom( public boolean hasBatch() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -732,6 +746,7 @@ public com.google.datastore.v1.AggregationResultBatch getBatch() { return batchBuilder_.getMessage(); } } + /** * * @@ -754,6 +769,7 @@ public Builder setBatch(com.google.datastore.v1.AggregationResultBatch value) { onChanged(); return this; } + /** * * @@ -774,6 +790,7 @@ public Builder setBatch( onChanged(); return this; } + /** * * @@ -801,6 +818,7 @@ public Builder mergeBatch(com.google.datastore.v1.AggregationResultBatch value) } return this; } + /** * * @@ -820,6 +838,7 @@ public Builder clearBatch() { onChanged(); return this; } + /** * * @@ -834,6 +853,7 @@ public com.google.datastore.v1.AggregationResultBatch.Builder getBatchBuilder() onChanged(); return getBatchFieldBuilder().getBuilder(); } + /** * * @@ -852,6 +872,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder : batch_; } } + /** * * @@ -884,6 +905,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder com.google.datastore.v1.AggregationQuery.Builder, com.google.datastore.v1.AggregationQueryOrBuilder> queryBuilder_; + /** * * @@ -898,6 +920,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder public boolean hasQuery() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -918,6 +941,7 @@ public com.google.datastore.v1.AggregationQuery getQuery() { return queryBuilder_.getMessage(); } } + /** * * @@ -940,6 +964,7 @@ public Builder setQuery(com.google.datastore.v1.AggregationQuery value) { onChanged(); return this; } + /** * * @@ -959,6 +984,7 @@ public Builder setQuery(com.google.datastore.v1.AggregationQuery.Builder builder onChanged(); return this; } + /** * * @@ -986,6 +1012,7 @@ public Builder mergeQuery(com.google.datastore.v1.AggregationQuery value) { } return this; } + /** * * @@ -1005,6 +1032,7 @@ public Builder clearQuery() { onChanged(); return this; } + /** * * @@ -1019,6 +1047,7 @@ public com.google.datastore.v1.AggregationQuery.Builder getQueryBuilder() { onChanged(); return getQueryFieldBuilder().getBuilder(); } + /** * * @@ -1037,6 +1066,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() { : query_; } } + /** * * @@ -1064,6 +1094,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() { } private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -1085,6 +1116,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() { public com.google.protobuf.ByteString getTransaction() { return transaction_; } + /** * * @@ -1112,6 +1144,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -1142,6 +1175,7 @@ public Builder clearTransaction() { com.google.datastore.v1.ExplainMetrics.Builder, com.google.datastore.v1.ExplainMetricsOrBuilder> explainMetricsBuilder_; + /** * * @@ -1158,6 +1192,7 @@ public Builder clearTransaction() { public boolean hasExplainMetrics() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1180,6 +1215,7 @@ public com.google.datastore.v1.ExplainMetrics getExplainMetrics() { return explainMetricsBuilder_.getMessage(); } } + /** * * @@ -1204,6 +1240,7 @@ public Builder setExplainMetrics(com.google.datastore.v1.ExplainMetrics value) { onChanged(); return this; } + /** * * @@ -1226,6 +1263,7 @@ public Builder setExplainMetrics( onChanged(); return this; } + /** * * @@ -1255,6 +1293,7 @@ public Builder mergeExplainMetrics(com.google.datastore.v1.ExplainMetrics value) } return this; } + /** * * @@ -1276,6 +1315,7 @@ public Builder clearExplainMetrics() { onChanged(); return this; } + /** * * @@ -1292,6 +1332,7 @@ public com.google.datastore.v1.ExplainMetrics.Builder getExplainMetricsBuilder() onChanged(); return getExplainMetricsFieldBuilder().getBuilder(); } + /** * * @@ -1312,6 +1353,7 @@ public com.google.datastore.v1.ExplainMetricsOrBuilder getExplainMetricsOrBuilde : explainMetrics_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java index a8845ed1a..c404a126e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java @@ -36,6 +36,7 @@ public interface RunAggregationQueryResponseOrBuilder * @return Whether the batch field is set. */ boolean hasBatch(); + /** * * @@ -48,6 +49,7 @@ public interface RunAggregationQueryResponseOrBuilder * @return The batch. */ com.google.datastore.v1.AggregationResultBatch getBatch(); + /** * * @@ -71,6 +73,7 @@ public interface RunAggregationQueryResponseOrBuilder * @return Whether the query field is set. */ boolean hasQuery(); + /** * * @@ -83,6 +86,7 @@ public interface RunAggregationQueryResponseOrBuilder * @return The query. */ com.google.datastore.v1.AggregationQuery getQuery(); + /** * * @@ -127,6 +131,7 @@ public interface RunAggregationQueryResponseOrBuilder * @return Whether the explainMetrics field is set. */ boolean hasExplainMetrics(); + /** * * @@ -141,6 +146,7 @@ public interface RunAggregationQueryResponseOrBuilder * @return The explainMetrics. */ com.google.datastore.v1.ExplainMetrics getExplainMetrics(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java index 0dc924f05..39365a38b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java @@ -33,6 +33,7 @@ public final class RunQueryRequest extends com.google.protobuf.GeneratedMessageV // @@protoc_insertion_point(message_implements:google.datastore.v1.RunQueryRequest) RunQueryRequestOrBuilder { private static final long serialVersionUID = 0L; + // Use RunQueryRequest.newBuilder() to construct. private RunQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -82,6 +83,7 @@ public enum QueryTypeCase private QueryTypeCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -118,6 +120,7 @@ public QueryTypeCase getQueryTypeCase() { @SuppressWarnings("serial") private volatile java.lang.Object projectId_ = ""; + /** * * @@ -141,6 +144,7 @@ public java.lang.String getProjectId() { return s; } } + /** * * @@ -169,6 +173,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { @SuppressWarnings("serial") private volatile java.lang.Object databaseId_ = ""; + /** * * @@ -195,6 +200,7 @@ public java.lang.String getDatabaseId() { return s; } } + /** * * @@ -224,6 +230,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public static final int PARTITION_ID_FIELD_NUMBER = 2; private com.google.datastore.v1.PartitionId partitionId_; + /** * * @@ -242,6 +249,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { public boolean hasPartitionId() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -262,6 +270,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() { ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_; } + /** * * @@ -283,6 +292,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { public static final int READ_OPTIONS_FIELD_NUMBER = 1; private com.google.datastore.v1.ReadOptions readOptions_; + /** * * @@ -298,6 +308,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { public boolean hasReadOptions() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -315,6 +326,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() { ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_; } + /** * * @@ -332,6 +344,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { } public static final int QUERY_FIELD_NUMBER = 3; + /** * * @@ -347,6 +360,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { public boolean hasQuery() { return queryTypeCase_ == 3; } + /** * * @@ -365,6 +379,7 @@ public com.google.datastore.v1.Query getQuery() { } return com.google.datastore.v1.Query.getDefaultInstance(); } + /** * * @@ -383,6 +398,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { } public static final int GQL_QUERY_FIELD_NUMBER = 7; + /** * * @@ -398,6 +414,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { public boolean hasGqlQuery() { return queryTypeCase_ == 7; } + /** * * @@ -416,6 +433,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() { } return com.google.datastore.v1.GqlQuery.getDefaultInstance(); } + /** * * @@ -435,6 +453,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { public static final int PROPERTY_MASK_FIELD_NUMBER = 10; private com.google.datastore.v1.PropertyMask propertyMask_; + /** * * @@ -454,6 +473,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { public boolean hasPropertyMask() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -475,6 +495,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() { ? com.google.datastore.v1.PropertyMask.getDefaultInstance() : propertyMask_; } + /** * * @@ -497,6 +518,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() public static final int EXPLAIN_OPTIONS_FIELD_NUMBER = 12; private com.google.datastore.v1.ExplainOptions explainOptions_; + /** * * @@ -515,6 +537,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() public boolean hasExplainOptions() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -535,6 +558,7 @@ public com.google.datastore.v1.ExplainOptions getExplainOptions() { ? com.google.datastore.v1.ExplainOptions.getDefaultInstance() : explainOptions_; } + /** * * @@ -816,6 +840,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1166,6 +1191,7 @@ public Builder clearQueryType() { private int bitField0_; private java.lang.Object projectId_ = ""; + /** * * @@ -1188,6 +1214,7 @@ public java.lang.String getProjectId() { return (java.lang.String) ref; } } + /** * * @@ -1210,6 +1237,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1231,6 +1259,7 @@ public Builder setProjectId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1248,6 +1277,7 @@ public Builder clearProjectId() { onChanged(); return this; } + /** * * @@ -1272,6 +1302,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { } private java.lang.Object databaseId_ = ""; + /** * * @@ -1297,6 +1328,7 @@ public java.lang.String getDatabaseId() { return (java.lang.String) ref; } } + /** * * @@ -1322,6 +1354,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -1346,6 +1379,7 @@ public Builder setDatabaseId(java.lang.String value) { onChanged(); return this; } + /** * * @@ -1366,6 +1400,7 @@ public Builder clearDatabaseId() { onChanged(); return this; } + /** * * @@ -1398,6 +1433,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> partitionIdBuilder_; + /** * * @@ -1415,6 +1451,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { public boolean hasPartitionId() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -1438,6 +1475,7 @@ public com.google.datastore.v1.PartitionId getPartitionId() { return partitionIdBuilder_.getMessage(); } } + /** * * @@ -1463,6 +1501,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) { onChanged(); return this; } + /** * * @@ -1485,6 +1524,7 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde onChanged(); return this; } + /** * * @@ -1515,6 +1555,7 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) { } return this; } + /** * * @@ -1537,6 +1578,7 @@ public Builder clearPartitionId() { onChanged(); return this; } + /** * * @@ -1554,6 +1596,7 @@ public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() { onChanged(); return getPartitionIdFieldBuilder().getBuilder(); } + /** * * @@ -1575,6 +1618,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { : partitionId_; } } + /** * * @@ -1610,6 +1654,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> readOptionsBuilder_; + /** * * @@ -1624,6 +1669,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { public boolean hasReadOptions() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1644,6 +1690,7 @@ public com.google.datastore.v1.ReadOptions getReadOptions() { return readOptionsBuilder_.getMessage(); } } + /** * * @@ -1666,6 +1713,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) { onChanged(); return this; } + /** * * @@ -1685,6 +1733,7 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde onChanged(); return this; } + /** * * @@ -1712,6 +1761,7 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) { } return this; } + /** * * @@ -1731,6 +1781,7 @@ public Builder clearReadOptions() { onChanged(); return this; } + /** * * @@ -1745,6 +1796,7 @@ public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() { onChanged(); return getReadOptionsFieldBuilder().getBuilder(); } + /** * * @@ -1763,6 +1815,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { : readOptions_; } } + /** * * @@ -1794,6 +1847,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> queryBuilder_; + /** * * @@ -1809,6 +1863,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { public boolean hasQuery() { return queryTypeCase_ == 3; } + /** * * @@ -1834,6 +1889,7 @@ public com.google.datastore.v1.Query getQuery() { return com.google.datastore.v1.Query.getDefaultInstance(); } } + /** * * @@ -1856,6 +1912,7 @@ public Builder setQuery(com.google.datastore.v1.Query value) { queryTypeCase_ = 3; return this; } + /** * * @@ -1875,6 +1932,7 @@ public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) { queryTypeCase_ = 3; return this; } + /** * * @@ -1906,6 +1964,7 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) { queryTypeCase_ = 3; return this; } + /** * * @@ -1931,6 +1990,7 @@ public Builder clearQuery() { } return this; } + /** * * @@ -1943,6 +2003,7 @@ public Builder clearQuery() { public com.google.datastore.v1.Query.Builder getQueryBuilder() { return getQueryFieldBuilder().getBuilder(); } + /** * * @@ -1963,6 +2024,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { return com.google.datastore.v1.Query.getDefaultInstance(); } } + /** * * @@ -1999,6 +2061,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder> gqlQueryBuilder_; + /** * * @@ -2014,6 +2077,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { public boolean hasGqlQuery() { return queryTypeCase_ == 7; } + /** * * @@ -2039,6 +2103,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() { return com.google.datastore.v1.GqlQuery.getDefaultInstance(); } } + /** * * @@ -2061,6 +2126,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) { queryTypeCase_ = 7; return this; } + /** * * @@ -2080,6 +2146,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForVa queryTypeCase_ = 7; return this; } + /** * * @@ -2112,6 +2179,7 @@ public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) { queryTypeCase_ = 7; return this; } + /** * * @@ -2137,6 +2205,7 @@ public Builder clearGqlQuery() { } return this; } + /** * * @@ -2149,6 +2218,7 @@ public Builder clearGqlQuery() { public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() { return getGqlQueryFieldBuilder().getBuilder(); } + /** * * @@ -2169,6 +2239,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { return com.google.datastore.v1.GqlQuery.getDefaultInstance(); } } + /** * * @@ -2206,6 +2277,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { com.google.datastore.v1.PropertyMask.Builder, com.google.datastore.v1.PropertyMaskOrBuilder> propertyMaskBuilder_; + /** * * @@ -2224,6 +2296,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { public boolean hasPropertyMask() { return ((bitField0_ & 0x00000040) != 0); } + /** * * @@ -2248,6 +2321,7 @@ public com.google.datastore.v1.PropertyMask getPropertyMask() { return propertyMaskBuilder_.getMessage(); } } + /** * * @@ -2274,6 +2348,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask value) { onChanged(); return this; } + /** * * @@ -2297,6 +2372,7 @@ public Builder setPropertyMask(com.google.datastore.v1.PropertyMask.Builder buil onChanged(); return this; } + /** * * @@ -2328,6 +2404,7 @@ public Builder mergePropertyMask(com.google.datastore.v1.PropertyMask value) { } return this; } + /** * * @@ -2351,6 +2428,7 @@ public Builder clearPropertyMask() { onChanged(); return this; } + /** * * @@ -2369,6 +2447,7 @@ public com.google.datastore.v1.PropertyMask.Builder getPropertyMaskBuilder() { onChanged(); return getPropertyMaskFieldBuilder().getBuilder(); } + /** * * @@ -2391,6 +2470,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() : propertyMask_; } } + /** * * @@ -2427,6 +2507,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() com.google.datastore.v1.ExplainOptions.Builder, com.google.datastore.v1.ExplainOptionsOrBuilder> explainOptionsBuilder_; + /** * * @@ -2444,6 +2525,7 @@ public com.google.datastore.v1.PropertyMaskOrBuilder getPropertyMaskOrBuilder() public boolean hasExplainOptions() { return ((bitField0_ & 0x00000080) != 0); } + /** * * @@ -2467,6 +2549,7 @@ public com.google.datastore.v1.ExplainOptions getExplainOptions() { return explainOptionsBuilder_.getMessage(); } } + /** * * @@ -2492,6 +2575,7 @@ public Builder setExplainOptions(com.google.datastore.v1.ExplainOptions value) { onChanged(); return this; } + /** * * @@ -2515,6 +2599,7 @@ public Builder setExplainOptions( onChanged(); return this; } + /** * * @@ -2545,6 +2630,7 @@ public Builder mergeExplainOptions(com.google.datastore.v1.ExplainOptions value) } return this; } + /** * * @@ -2567,6 +2653,7 @@ public Builder clearExplainOptions() { onChanged(); return this; } + /** * * @@ -2584,6 +2671,7 @@ public com.google.datastore.v1.ExplainOptions.Builder getExplainOptionsBuilder() onChanged(); return getExplainOptionsFieldBuilder().getBuilder(); } + /** * * @@ -2605,6 +2693,7 @@ public com.google.datastore.v1.ExplainOptionsOrBuilder getExplainOptionsOrBuilde : explainOptions_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java index 7135a9e04..f7f29842a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java @@ -36,6 +36,7 @@ public interface RunQueryRequestOrBuilder * @return The projectId. */ java.lang.String getProjectId(); + /** * * @@ -64,6 +65,7 @@ public interface RunQueryRequestOrBuilder * @return The databaseId. */ java.lang.String getDatabaseId(); + /** * * @@ -95,6 +97,7 @@ public interface RunQueryRequestOrBuilder * @return Whether the partitionId field is set. */ boolean hasPartitionId(); + /** * * @@ -110,6 +113,7 @@ public interface RunQueryRequestOrBuilder * @return The partitionId. */ com.google.datastore.v1.PartitionId getPartitionId(); + /** * * @@ -136,6 +140,7 @@ public interface RunQueryRequestOrBuilder * @return Whether the readOptions field is set. */ boolean hasReadOptions(); + /** * * @@ -148,6 +153,7 @@ public interface RunQueryRequestOrBuilder * @return The readOptions. */ com.google.datastore.v1.ReadOptions getReadOptions(); + /** * * @@ -171,6 +177,7 @@ public interface RunQueryRequestOrBuilder * @return Whether the query field is set. */ boolean hasQuery(); + /** * * @@ -183,6 +190,7 @@ public interface RunQueryRequestOrBuilder * @return The query. */ com.google.datastore.v1.Query getQuery(); + /** * * @@ -206,6 +214,7 @@ public interface RunQueryRequestOrBuilder * @return Whether the gqlQuery field is set. */ boolean hasGqlQuery(); + /** * * @@ -218,6 +227,7 @@ public interface RunQueryRequestOrBuilder * @return The gqlQuery. */ com.google.datastore.v1.GqlQuery getGqlQuery(); + /** * * @@ -245,6 +255,7 @@ public interface RunQueryRequestOrBuilder * @return Whether the propertyMask field is set. */ boolean hasPropertyMask(); + /** * * @@ -261,6 +272,7 @@ public interface RunQueryRequestOrBuilder * @return The propertyMask. */ com.google.datastore.v1.PropertyMask getPropertyMask(); + /** * * @@ -291,6 +303,7 @@ public interface RunQueryRequestOrBuilder * @return Whether the explainOptions field is set. */ boolean hasExplainOptions(); + /** * * @@ -306,6 +319,7 @@ public interface RunQueryRequestOrBuilder * @return The explainOptions. */ com.google.datastore.v1.ExplainOptions getExplainOptions(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java index 814bd4257..224e9b21d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java @@ -34,6 +34,7 @@ public final class RunQueryResponse extends com.google.protobuf.GeneratedMessage // @@protoc_insertion_point(message_implements:google.datastore.v1.RunQueryResponse) RunQueryResponseOrBuilder { private static final long serialVersionUID = 0L; + // Use RunQueryResponse.newBuilder() to construct. private RunQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -67,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int BATCH_FIELD_NUMBER = 1; private com.google.datastore.v1.QueryResultBatch batch_; + /** * * @@ -82,6 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasBatch() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -97,6 +100,7 @@ public boolean hasBatch() { public com.google.datastore.v1.QueryResultBatch getBatch() { return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_; } + /** * * @@ -113,6 +117,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() { public static final int QUERY_FIELD_NUMBER = 2; private com.google.datastore.v1.Query query_; + /** * * @@ -128,6 +133,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() { public boolean hasQuery() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -143,6 +149,7 @@ public boolean hasQuery() { public com.google.datastore.v1.Query getQuery() { return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_; } + /** * * @@ -159,6 +166,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { public static final int TRANSACTION_FIELD_NUMBER = 5; private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -183,6 +191,7 @@ public com.google.protobuf.ByteString getTransaction() { public static final int EXPLAIN_METRICS_FIELD_NUMBER = 9; private com.google.datastore.v1.ExplainMetrics explainMetrics_; + /** * * @@ -200,6 +209,7 @@ public com.google.protobuf.ByteString getTransaction() { public boolean hasExplainMetrics() { return ((bitField0_ & 0x00000004) != 0); } + /** * * @@ -219,6 +229,7 @@ public com.google.datastore.v1.ExplainMetrics getExplainMetrics() { ? com.google.datastore.v1.ExplainMetrics.getDefaultInstance() : explainMetrics_; } + /** * * @@ -437,6 +448,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -692,6 +704,7 @@ public Builder mergeFrom( com.google.datastore.v1.QueryResultBatch.Builder, com.google.datastore.v1.QueryResultBatchOrBuilder> batchBuilder_; + /** * * @@ -706,6 +719,7 @@ public Builder mergeFrom( public boolean hasBatch() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -726,6 +740,7 @@ public com.google.datastore.v1.QueryResultBatch getBatch() { return batchBuilder_.getMessage(); } } + /** * * @@ -748,6 +763,7 @@ public Builder setBatch(com.google.datastore.v1.QueryResultBatch value) { onChanged(); return this; } + /** * * @@ -767,6 +783,7 @@ public Builder setBatch(com.google.datastore.v1.QueryResultBatch.Builder builder onChanged(); return this; } + /** * * @@ -794,6 +811,7 @@ public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) { } return this; } + /** * * @@ -813,6 +831,7 @@ public Builder clearBatch() { onChanged(); return this; } + /** * * @@ -827,6 +846,7 @@ public com.google.datastore.v1.QueryResultBatch.Builder getBatchBuilder() { onChanged(); return getBatchFieldBuilder().getBuilder(); } + /** * * @@ -845,6 +865,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() { : batch_; } } + /** * * @@ -877,6 +898,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() { com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> queryBuilder_; + /** * * @@ -891,6 +913,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() { public boolean hasQuery() { return ((bitField0_ & 0x00000002) != 0); } + /** * * @@ -909,6 +932,7 @@ public com.google.datastore.v1.Query getQuery() { return queryBuilder_.getMessage(); } } + /** * * @@ -931,6 +955,7 @@ public Builder setQuery(com.google.datastore.v1.Query value) { onChanged(); return this; } + /** * * @@ -950,6 +975,7 @@ public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) { onChanged(); return this; } + /** * * @@ -977,6 +1003,7 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) { } return this; } + /** * * @@ -996,6 +1023,7 @@ public Builder clearQuery() { onChanged(); return this; } + /** * * @@ -1010,6 +1038,7 @@ public com.google.datastore.v1.Query.Builder getQueryBuilder() { onChanged(); return getQueryFieldBuilder().getBuilder(); } + /** * * @@ -1026,6 +1055,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_; } } + /** * * @@ -1053,6 +1083,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { } private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -1074,6 +1105,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { public com.google.protobuf.ByteString getTransaction() { return transaction_; } + /** * * @@ -1101,6 +1133,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -1131,6 +1164,7 @@ public Builder clearTransaction() { com.google.datastore.v1.ExplainMetrics.Builder, com.google.datastore.v1.ExplainMetricsOrBuilder> explainMetricsBuilder_; + /** * * @@ -1147,6 +1181,7 @@ public Builder clearTransaction() { public boolean hasExplainMetrics() { return ((bitField0_ & 0x00000008) != 0); } + /** * * @@ -1169,6 +1204,7 @@ public com.google.datastore.v1.ExplainMetrics getExplainMetrics() { return explainMetricsBuilder_.getMessage(); } } + /** * * @@ -1193,6 +1229,7 @@ public Builder setExplainMetrics(com.google.datastore.v1.ExplainMetrics value) { onChanged(); return this; } + /** * * @@ -1215,6 +1252,7 @@ public Builder setExplainMetrics( onChanged(); return this; } + /** * * @@ -1244,6 +1282,7 @@ public Builder mergeExplainMetrics(com.google.datastore.v1.ExplainMetrics value) } return this; } + /** * * @@ -1265,6 +1304,7 @@ public Builder clearExplainMetrics() { onChanged(); return this; } + /** * * @@ -1281,6 +1321,7 @@ public com.google.datastore.v1.ExplainMetrics.Builder getExplainMetricsBuilder() onChanged(); return getExplainMetricsFieldBuilder().getBuilder(); } + /** * * @@ -1301,6 +1342,7 @@ public com.google.datastore.v1.ExplainMetricsOrBuilder getExplainMetricsOrBuilde : explainMetrics_; } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java index c4ad0528c..a3316b6ef 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java @@ -36,6 +36,7 @@ public interface RunQueryResponseOrBuilder * @return Whether the batch field is set. */ boolean hasBatch(); + /** * * @@ -48,6 +49,7 @@ public interface RunQueryResponseOrBuilder * @return The batch. */ com.google.datastore.v1.QueryResultBatch getBatch(); + /** * * @@ -71,6 +73,7 @@ public interface RunQueryResponseOrBuilder * @return Whether the query field is set. */ boolean hasQuery(); + /** * * @@ -83,6 +86,7 @@ public interface RunQueryResponseOrBuilder * @return The query. */ com.google.datastore.v1.Query getQuery(); + /** * * @@ -127,6 +131,7 @@ public interface RunQueryResponseOrBuilder * @return Whether the explainMetrics field is set. */ boolean hasExplainMetrics(); + /** * * @@ -141,6 +146,7 @@ public interface RunQueryResponseOrBuilder * @return The explainMetrics. */ com.google.datastore.v1.ExplainMetrics getExplainMetrics(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java index 3da613369..256238e25 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java @@ -39,6 +39,7 @@ public final class TransactionOptions extends com.google.protobuf.GeneratedMessa // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions) TransactionOptionsOrBuilder { private static final long serialVersionUID = 0L; + // Use TransactionOptions.newBuilder() to construct. private TransactionOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -85,6 +86,7 @@ public interface ReadWriteOrBuilder */ com.google.protobuf.ByteString getPreviousTransaction(); } + /** * * @@ -99,6 +101,7 @@ public static final class ReadWrite extends com.google.protobuf.GeneratedMessage // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions.ReadWrite) ReadWriteOrBuilder { private static final long serialVersionUID = 0L; + // Use ReadWrite.newBuilder() to construct. private ReadWrite(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -132,6 +135,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public static final int PREVIOUS_TRANSACTION_FIELD_NUMBER = 1; private com.google.protobuf.ByteString previousTransaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -309,6 +313,7 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } + /** * * @@ -495,6 +500,7 @@ public Builder mergeFrom( private com.google.protobuf.ByteString previousTransaction_ = com.google.protobuf.ByteString.EMPTY; + /** * * @@ -510,6 +516,7 @@ public Builder mergeFrom( public com.google.protobuf.ByteString getPreviousTransaction() { return previousTransaction_; } + /** * * @@ -531,6 +538,7 @@ public Builder setPreviousTransaction(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -634,6 +642,7 @@ public interface ReadOnlyOrBuilder * @return Whether the readTime field is set. */ boolean hasReadTime(); + /** * * @@ -650,6 +659,7 @@ public interface ReadOnlyOrBuilder * @return The readTime. */ com.google.protobuf.Timestamp getReadTime(); + /** * * @@ -665,6 +675,7 @@ public interface ReadOnlyOrBuilder */ com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder(); } + /** * * @@ -679,6 +690,7 @@ public static final class ReadOnly extends com.google.protobuf.GeneratedMessageV // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions.ReadOnly) ReadOnlyOrBuilder { private static final long serialVersionUID = 0L; + // Use ReadOnly.newBuilder() to construct. private ReadOnly(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -710,6 +722,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int READ_TIME_FIELD_NUMBER = 1; private com.google.protobuf.Timestamp readTime_; + /** * * @@ -729,6 +742,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { public boolean hasReadTime() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -748,6 +762,7 @@ public boolean hasReadTime() { public com.google.protobuf.Timestamp getReadTime() { return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; } + /** * * @@ -932,6 +947,7 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } + /** * * @@ -1138,6 +1154,7 @@ public Builder mergeFrom( com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> readTimeBuilder_; + /** * * @@ -1156,6 +1173,7 @@ public Builder mergeFrom( public boolean hasReadTime() { return ((bitField0_ & 0x00000001) != 0); } + /** * * @@ -1178,6 +1196,7 @@ public com.google.protobuf.Timestamp getReadTime() { return readTimeBuilder_.getMessage(); } } + /** * * @@ -1204,6 +1223,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) { onChanged(); return this; } + /** * * @@ -1227,6 +1247,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue onChanged(); return this; } + /** * * @@ -1258,6 +1279,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) { } return this; } + /** * * @@ -1281,6 +1303,7 @@ public Builder clearReadTime() { onChanged(); return this; } + /** * * @@ -1299,6 +1322,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() { onChanged(); return getReadTimeFieldBuilder().getBuilder(); } + /** * * @@ -1319,6 +1343,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; } } + /** * * @@ -1430,6 +1455,7 @@ public enum ModeCase private ModeCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -1463,6 +1489,7 @@ public ModeCase getModeCase() { } public static final int READ_WRITE_FIELD_NUMBER = 1; + /** * * @@ -1478,6 +1505,7 @@ public ModeCase getModeCase() { public boolean hasReadWrite() { return modeCase_ == 1; } + /** * * @@ -1496,6 +1524,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() { } return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); } + /** * * @@ -1514,6 +1543,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit } public static final int READ_ONLY_FIELD_NUMBER = 2; + /** * * @@ -1529,6 +1559,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit public boolean hasReadOnly() { return modeCase_ == 2; } + /** * * @@ -1547,6 +1578,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() { } return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); } + /** * * @@ -1753,6 +1785,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1993,6 +2026,7 @@ public Builder clearMode() { com.google.datastore.v1.TransactionOptions.ReadWrite.Builder, com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder> readWriteBuilder_; + /** * * @@ -2008,6 +2042,7 @@ public Builder clearMode() { public boolean hasReadWrite() { return modeCase_ == 1; } + /** * * @@ -2033,6 +2068,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() { return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); } } + /** * * @@ -2055,6 +2091,7 @@ public Builder setReadWrite(com.google.datastore.v1.TransactionOptions.ReadWrite modeCase_ = 1; return this; } + /** * * @@ -2075,6 +2112,7 @@ public Builder setReadWrite( modeCase_ = 1; return this; } + /** * * @@ -2107,6 +2145,7 @@ public Builder mergeReadWrite(com.google.datastore.v1.TransactionOptions.ReadWri modeCase_ = 1; return this; } + /** * * @@ -2132,6 +2171,7 @@ public Builder clearReadWrite() { } return this; } + /** * * @@ -2144,6 +2184,7 @@ public Builder clearReadWrite() { public com.google.datastore.v1.TransactionOptions.ReadWrite.Builder getReadWriteBuilder() { return getReadWriteFieldBuilder().getBuilder(); } + /** * * @@ -2164,6 +2205,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance(); } } + /** * * @@ -2202,6 +2244,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit com.google.datastore.v1.TransactionOptions.ReadOnly.Builder, com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder> readOnlyBuilder_; + /** * * @@ -2217,6 +2260,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit public boolean hasReadOnly() { return modeCase_ == 2; } + /** * * @@ -2242,6 +2286,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() { return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); } } + /** * * @@ -2264,6 +2309,7 @@ public Builder setReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly v modeCase_ = 2; return this; } + /** * * @@ -2284,6 +2330,7 @@ public Builder setReadOnly( modeCase_ = 2; return this; } + /** * * @@ -2316,6 +2363,7 @@ public Builder mergeReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly modeCase_ = 2; return this; } + /** * * @@ -2341,6 +2389,7 @@ public Builder clearReadOnly() { } return this; } + /** * * @@ -2353,6 +2402,7 @@ public Builder clearReadOnly() { public com.google.datastore.v1.TransactionOptions.ReadOnly.Builder getReadOnlyBuilder() { return getReadOnlyFieldBuilder().getBuilder(); } + /** * * @@ -2373,6 +2423,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance(); } } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java index 6d256b615..2fbfe302b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java @@ -36,6 +36,7 @@ public interface TransactionOptionsOrBuilder * @return Whether the readWrite field is set. */ boolean hasReadWrite(); + /** * * @@ -48,6 +49,7 @@ public interface TransactionOptionsOrBuilder * @return The readWrite. */ com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite(); + /** * * @@ -71,6 +73,7 @@ public interface TransactionOptionsOrBuilder * @return Whether the readOnly field is set. */ boolean hasReadOnly(); + /** * * @@ -83,6 +86,7 @@ public interface TransactionOptionsOrBuilder * @return The readOnly. */ com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly(); + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java index 14ce00607..b917baaa3 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java @@ -34,6 +34,7 @@ public final class Value extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(message_implements:google.datastore.v1.Value) ValueOrBuilder { private static final long serialVersionUID = 0L; + // Use Value.newBuilder() to construct. private Value(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -86,6 +87,7 @@ public enum ValueTypeCase private ValueTypeCase(int value) { this.value = value; } + /** * @param value The number of the enum to look for. * @return The enum associated with the given number. @@ -137,6 +139,7 @@ public ValueTypeCase getValueTypeCase() { } public static final int NULL_VALUE_FIELD_NUMBER = 11; + /** * * @@ -151,6 +154,7 @@ public ValueTypeCase getValueTypeCase() { public boolean hasNullValue() { return valueTypeCase_ == 11; } + /** * * @@ -168,6 +172,7 @@ public int getNullValueValue() { } return 0; } + /** * * @@ -189,6 +194,7 @@ public com.google.protobuf.NullValue getNullValue() { } public static final int BOOLEAN_VALUE_FIELD_NUMBER = 1; + /** * * @@ -204,6 +210,7 @@ public com.google.protobuf.NullValue getNullValue() { public boolean hasBooleanValue() { return valueTypeCase_ == 1; } + /** * * @@ -224,6 +231,7 @@ public boolean getBooleanValue() { } public static final int INTEGER_VALUE_FIELD_NUMBER = 2; + /** * * @@ -239,6 +247,7 @@ public boolean getBooleanValue() { public boolean hasIntegerValue() { return valueTypeCase_ == 2; } + /** * * @@ -259,6 +268,7 @@ public long getIntegerValue() { } public static final int DOUBLE_VALUE_FIELD_NUMBER = 3; + /** * * @@ -274,6 +284,7 @@ public long getIntegerValue() { public boolean hasDoubleValue() { return valueTypeCase_ == 3; } + /** * * @@ -294,6 +305,7 @@ public double getDoubleValue() { } public static final int TIMESTAMP_VALUE_FIELD_NUMBER = 10; + /** * * @@ -311,6 +323,7 @@ public double getDoubleValue() { public boolean hasTimestampValue() { return valueTypeCase_ == 10; } + /** * * @@ -331,6 +344,7 @@ public com.google.protobuf.Timestamp getTimestampValue() { } return com.google.protobuf.Timestamp.getDefaultInstance(); } + /** * * @@ -351,6 +365,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() { } public static final int KEY_VALUE_FIELD_NUMBER = 5; + /** * * @@ -366,6 +381,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() { public boolean hasKeyValue() { return valueTypeCase_ == 5; } + /** * * @@ -384,6 +400,7 @@ public com.google.datastore.v1.Key getKeyValue() { } return com.google.datastore.v1.Key.getDefaultInstance(); } + /** * * @@ -402,6 +419,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() { } public static final int STRING_VALUE_FIELD_NUMBER = 17; + /** * * @@ -418,6 +436,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() { public boolean hasStringValue() { return valueTypeCase_ == 17; } + /** * * @@ -447,6 +466,7 @@ public java.lang.String getStringValue() { return s; } } + /** * * @@ -478,6 +498,7 @@ public com.google.protobuf.ByteString getStringValueBytes() { } public static final int BLOB_VALUE_FIELD_NUMBER = 18; + /** * * @@ -496,6 +517,7 @@ public com.google.protobuf.ByteString getStringValueBytes() { public boolean hasBlobValue() { return valueTypeCase_ == 18; } + /** * * @@ -519,6 +541,7 @@ public com.google.protobuf.ByteString getBlobValue() { } public static final int GEO_POINT_VALUE_FIELD_NUMBER = 8; + /** * * @@ -534,6 +557,7 @@ public com.google.protobuf.ByteString getBlobValue() { public boolean hasGeoPointValue() { return valueTypeCase_ == 8; } + /** * * @@ -552,6 +576,7 @@ public com.google.type.LatLng getGeoPointValue() { } return com.google.type.LatLng.getDefaultInstance(); } + /** * * @@ -570,6 +595,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() { } public static final int ENTITY_VALUE_FIELD_NUMBER = 6; + /** * * @@ -589,6 +615,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() { public boolean hasEntityValue() { return valueTypeCase_ == 6; } + /** * * @@ -611,6 +638,7 @@ public com.google.datastore.v1.Entity getEntityValue() { } return com.google.datastore.v1.Entity.getDefaultInstance(); } + /** * * @@ -633,6 +661,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() { } public static final int ARRAY_VALUE_FIELD_NUMBER = 9; + /** * * @@ -651,6 +680,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() { public boolean hasArrayValue() { return valueTypeCase_ == 9; } + /** * * @@ -672,6 +702,7 @@ public com.google.datastore.v1.ArrayValue getArrayValue() { } return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } + /** * * @@ -694,6 +725,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() { public static final int MEANING_FIELD_NUMBER = 14; private int meaning_ = 0; + /** * * @@ -712,6 +744,7 @@ public int getMeaning() { public static final int EXCLUDE_FROM_INDEXES_FIELD_NUMBER = 19; private boolean excludeFromIndexes_ = false; + /** * * @@ -1071,6 +1104,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build Builder builder = new Builder(parent); return builder; } + /** * * @@ -1461,6 +1495,7 @@ public Builder clearValueType() { public boolean hasNullValue() { return valueTypeCase_ == 11; } + /** * * @@ -1479,6 +1514,7 @@ public int getNullValueValue() { } return 0; } + /** * * @@ -1497,6 +1533,7 @@ public Builder setNullValueValue(int value) { onChanged(); return this; } + /** * * @@ -1517,6 +1554,7 @@ public com.google.protobuf.NullValue getNullValue() { } return com.google.protobuf.NullValue.NULL_VALUE; } + /** * * @@ -1538,6 +1576,7 @@ public Builder setNullValue(com.google.protobuf.NullValue value) { onChanged(); return this; } + /** * * @@ -1572,6 +1611,7 @@ public Builder clearNullValue() { public boolean hasBooleanValue() { return valueTypeCase_ == 1; } + /** * * @@ -1589,6 +1629,7 @@ public boolean getBooleanValue() { } return false; } + /** * * @@ -1608,6 +1649,7 @@ public Builder setBooleanValue(boolean value) { onChanged(); return this; } + /** * * @@ -1642,6 +1684,7 @@ public Builder clearBooleanValue() { public boolean hasIntegerValue() { return valueTypeCase_ == 2; } + /** * * @@ -1659,6 +1702,7 @@ public long getIntegerValue() { } return 0L; } + /** * * @@ -1678,6 +1722,7 @@ public Builder setIntegerValue(long value) { onChanged(); return this; } + /** * * @@ -1712,6 +1757,7 @@ public Builder clearIntegerValue() { public boolean hasDoubleValue() { return valueTypeCase_ == 3; } + /** * * @@ -1729,6 +1775,7 @@ public double getDoubleValue() { } return 0D; } + /** * * @@ -1748,6 +1795,7 @@ public Builder setDoubleValue(double value) { onChanged(); return this; } + /** * * @@ -1773,6 +1821,7 @@ public Builder clearDoubleValue() { com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> timestampValueBuilder_; + /** * * @@ -1790,6 +1839,7 @@ public Builder clearDoubleValue() { public boolean hasTimestampValue() { return valueTypeCase_ == 10; } + /** * * @@ -1817,6 +1867,7 @@ public com.google.protobuf.Timestamp getTimestampValue() { return com.google.protobuf.Timestamp.getDefaultInstance(); } } + /** * * @@ -1841,6 +1892,7 @@ public Builder setTimestampValue(com.google.protobuf.Timestamp value) { valueTypeCase_ = 10; return this; } + /** * * @@ -1862,6 +1914,7 @@ public Builder setTimestampValue(com.google.protobuf.Timestamp.Builder builderFo valueTypeCase_ = 10; return this; } + /** * * @@ -1895,6 +1948,7 @@ public Builder mergeTimestampValue(com.google.protobuf.Timestamp value) { valueTypeCase_ = 10; return this; } + /** * * @@ -1922,6 +1976,7 @@ public Builder clearTimestampValue() { } return this; } + /** * * @@ -1936,6 +1991,7 @@ public Builder clearTimestampValue() { public com.google.protobuf.Timestamp.Builder getTimestampValueBuilder() { return getTimestampValueFieldBuilder().getBuilder(); } + /** * * @@ -1958,6 +2014,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() { return com.google.protobuf.Timestamp.getDefaultInstance(); } } + /** * * @@ -1996,6 +2053,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() { com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyValueBuilder_; + /** * * @@ -2011,6 +2069,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() { public boolean hasKeyValue() { return valueTypeCase_ == 5; } + /** * * @@ -2036,6 +2095,7 @@ public com.google.datastore.v1.Key getKeyValue() { return com.google.datastore.v1.Key.getDefaultInstance(); } } + /** * * @@ -2058,6 +2118,7 @@ public Builder setKeyValue(com.google.datastore.v1.Key value) { valueTypeCase_ = 5; return this; } + /** * * @@ -2077,6 +2138,7 @@ public Builder setKeyValue(com.google.datastore.v1.Key.Builder builderForValue) valueTypeCase_ = 5; return this; } + /** * * @@ -2107,6 +2169,7 @@ public Builder mergeKeyValue(com.google.datastore.v1.Key value) { valueTypeCase_ = 5; return this; } + /** * * @@ -2132,6 +2195,7 @@ public Builder clearKeyValue() { } return this; } + /** * * @@ -2144,6 +2208,7 @@ public Builder clearKeyValue() { public com.google.datastore.v1.Key.Builder getKeyValueBuilder() { return getKeyValueFieldBuilder().getBuilder(); } + /** * * @@ -2164,6 +2229,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() { return com.google.datastore.v1.Key.getDefaultInstance(); } } + /** * * @@ -2212,6 +2278,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() { public boolean hasStringValue() { return valueTypeCase_ == 17; } + /** * * @@ -2242,6 +2309,7 @@ public java.lang.String getStringValue() { return (java.lang.String) ref; } } + /** * * @@ -2272,6 +2340,7 @@ public com.google.protobuf.ByteString getStringValueBytes() { return (com.google.protobuf.ByteString) ref; } } + /** * * @@ -2295,6 +2364,7 @@ public Builder setStringValue(java.lang.String value) { onChanged(); return this; } + /** * * @@ -2316,6 +2386,7 @@ public Builder clearStringValue() { } return this; } + /** * * @@ -2358,6 +2429,7 @@ public Builder setStringValueBytes(com.google.protobuf.ByteString value) { public boolean hasBlobValue() { return valueTypeCase_ == 18; } + /** * * @@ -2378,6 +2450,7 @@ public com.google.protobuf.ByteString getBlobValue() { } return com.google.protobuf.ByteString.EMPTY; } + /** * * @@ -2402,6 +2475,7 @@ public Builder setBlobValue(com.google.protobuf.ByteString value) { onChanged(); return this; } + /** * * @@ -2428,6 +2502,7 @@ public Builder clearBlobValue() { private com.google.protobuf.SingleFieldBuilderV3< com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder> geoPointValueBuilder_; + /** * * @@ -2443,6 +2518,7 @@ public Builder clearBlobValue() { public boolean hasGeoPointValue() { return valueTypeCase_ == 8; } + /** * * @@ -2468,6 +2544,7 @@ public com.google.type.LatLng getGeoPointValue() { return com.google.type.LatLng.getDefaultInstance(); } } + /** * * @@ -2490,6 +2567,7 @@ public Builder setGeoPointValue(com.google.type.LatLng value) { valueTypeCase_ = 8; return this; } + /** * * @@ -2509,6 +2587,7 @@ public Builder setGeoPointValue(com.google.type.LatLng.Builder builderForValue) valueTypeCase_ = 8; return this; } + /** * * @@ -2539,6 +2618,7 @@ public Builder mergeGeoPointValue(com.google.type.LatLng value) { valueTypeCase_ = 8; return this; } + /** * * @@ -2564,6 +2644,7 @@ public Builder clearGeoPointValue() { } return this; } + /** * * @@ -2576,6 +2657,7 @@ public Builder clearGeoPointValue() { public com.google.type.LatLng.Builder getGeoPointValueBuilder() { return getGeoPointValueFieldBuilder().getBuilder(); } + /** * * @@ -2596,6 +2678,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() { return com.google.type.LatLng.getDefaultInstance(); } } + /** * * @@ -2630,6 +2713,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() { com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> entityValueBuilder_; + /** * * @@ -2649,6 +2733,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() { public boolean hasEntityValue() { return valueTypeCase_ == 6; } + /** * * @@ -2678,6 +2763,7 @@ public com.google.datastore.v1.Entity getEntityValue() { return com.google.datastore.v1.Entity.getDefaultInstance(); } } + /** * * @@ -2704,6 +2790,7 @@ public Builder setEntityValue(com.google.datastore.v1.Entity value) { valueTypeCase_ = 6; return this; } + /** * * @@ -2727,6 +2814,7 @@ public Builder setEntityValue(com.google.datastore.v1.Entity.Builder builderForV valueTypeCase_ = 6; return this; } + /** * * @@ -2762,6 +2850,7 @@ public Builder mergeEntityValue(com.google.datastore.v1.Entity value) { valueTypeCase_ = 6; return this; } + /** * * @@ -2791,6 +2880,7 @@ public Builder clearEntityValue() { } return this; } + /** * * @@ -2807,6 +2897,7 @@ public Builder clearEntityValue() { public com.google.datastore.v1.Entity.Builder getEntityValueBuilder() { return getEntityValueFieldBuilder().getBuilder(); } + /** * * @@ -2831,6 +2922,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() { return com.google.datastore.v1.Entity.getDefaultInstance(); } } + /** * * @@ -2871,6 +2963,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() { com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder> arrayValueBuilder_; + /** * * @@ -2889,6 +2982,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() { public boolean hasArrayValue() { return valueTypeCase_ == 9; } + /** * * @@ -2917,6 +3011,7 @@ public com.google.datastore.v1.ArrayValue getArrayValue() { return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } } + /** * * @@ -2942,6 +3037,7 @@ public Builder setArrayValue(com.google.datastore.v1.ArrayValue value) { valueTypeCase_ = 9; return this; } + /** * * @@ -2964,6 +3060,7 @@ public Builder setArrayValue(com.google.datastore.v1.ArrayValue.Builder builderF valueTypeCase_ = 9; return this; } + /** * * @@ -2999,6 +3096,7 @@ public Builder mergeArrayValue(com.google.datastore.v1.ArrayValue value) { valueTypeCase_ = 9; return this; } + /** * * @@ -3027,6 +3125,7 @@ public Builder clearArrayValue() { } return this; } + /** * * @@ -3042,6 +3141,7 @@ public Builder clearArrayValue() { public com.google.datastore.v1.ArrayValue.Builder getArrayValueBuilder() { return getArrayValueFieldBuilder().getBuilder(); } + /** * * @@ -3065,6 +3165,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() { return com.google.datastore.v1.ArrayValue.getDefaultInstance(); } } + /** * * @@ -3100,6 +3201,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() { } private int meaning_; + /** * * @@ -3115,6 +3217,7 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() { public int getMeaning() { return meaning_; } + /** * * @@ -3134,6 +3237,7 @@ public Builder setMeaning(int value) { onChanged(); return this; } + /** * * @@ -3153,6 +3257,7 @@ public Builder clearMeaning() { } private boolean excludeFromIndexes_; + /** * * @@ -3169,6 +3274,7 @@ public Builder clearMeaning() { public boolean getExcludeFromIndexes() { return excludeFromIndexes_; } + /** * * @@ -3189,6 +3295,7 @@ public Builder setExcludeFromIndexes(boolean value) { onChanged(); return this; } + /** * * diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java index 96773b933..a133a19b6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java @@ -36,6 +36,7 @@ public interface ValueOrBuilder * @return Whether the nullValue field is set. */ boolean hasNullValue(); + /** * * @@ -48,6 +49,7 @@ public interface ValueOrBuilder * @return The enum numeric value on the wire for nullValue. */ int getNullValueValue(); + /** * * @@ -73,6 +75,7 @@ public interface ValueOrBuilder * @return Whether the booleanValue field is set. */ boolean hasBooleanValue(); + /** * * @@ -98,6 +101,7 @@ public interface ValueOrBuilder * @return Whether the integerValue field is set. */ boolean hasIntegerValue(); + /** * * @@ -123,6 +127,7 @@ public interface ValueOrBuilder * @return Whether the doubleValue field is set. */ boolean hasDoubleValue(); + /** * * @@ -150,6 +155,7 @@ public interface ValueOrBuilder * @return Whether the timestampValue field is set. */ boolean hasTimestampValue(); + /** * * @@ -164,6 +170,7 @@ public interface ValueOrBuilder * @return The timestampValue. */ com.google.protobuf.Timestamp getTimestampValue(); + /** * * @@ -189,6 +196,7 @@ public interface ValueOrBuilder * @return Whether the keyValue field is set. */ boolean hasKeyValue(); + /** * * @@ -201,6 +209,7 @@ public interface ValueOrBuilder * @return The keyValue. */ com.google.datastore.v1.Key getKeyValue(); + /** * * @@ -226,6 +235,7 @@ public interface ValueOrBuilder * @return Whether the stringValue field is set. */ boolean hasStringValue(); + /** * * @@ -240,6 +250,7 @@ public interface ValueOrBuilder * @return The stringValue. */ java.lang.String getStringValue(); + /** * * @@ -270,6 +281,7 @@ public interface ValueOrBuilder * @return Whether the blobValue field is set. */ boolean hasBlobValue(); + /** * * @@ -298,6 +310,7 @@ public interface ValueOrBuilder * @return Whether the geoPointValue field is set. */ boolean hasGeoPointValue(); + /** * * @@ -310,6 +323,7 @@ public interface ValueOrBuilder * @return The geoPointValue. */ com.google.type.LatLng getGeoPointValue(); + /** * * @@ -337,6 +351,7 @@ public interface ValueOrBuilder * @return Whether the entityValue field is set. */ boolean hasEntityValue(); + /** * * @@ -353,6 +368,7 @@ public interface ValueOrBuilder * @return The entityValue. */ com.google.datastore.v1.Entity getEntityValue(); + /** * * @@ -383,6 +399,7 @@ public interface ValueOrBuilder * @return Whether the arrayValue field is set. */ boolean hasArrayValue(); + /** * * @@ -398,6 +415,7 @@ public interface ValueOrBuilder * @return The arrayValue. */ com.google.datastore.v1.ArrayValue getArrayValue(); + /** * * diff --git a/renovate.json b/renovate.json index 586208852..42538270e 100644 --- a/renovate.json +++ b/renovate.json @@ -63,7 +63,6 @@ "^org.jacoco:", "^org.codehaus.mojo:", "^org.sonatype.plugins:", - "^com.coveo:", "^com.google.cloud:google-cloud-shared-config" ], "semanticCommitType": "build", diff --git a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java index 135bedded..7fbc5f8b9 100644 --- a/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/samples/snippets/src/main/java/com/google/datastore/snippets/TaskList.java @@ -42,6 +42,7 @@ public class TaskList { // Create a Key factory to construct keys associated with this project. private final KeyFactory keyFactory = datastore.newKeyFactory().setKind("Task"); + // [END datastore_build_service] // [START datastore_add_entity] @@ -65,6 +66,7 @@ Key addTask(String description) { datastore.put(task); return key; } + // [END datastore_add_entity] // [START datastore_update_entity] @@ -90,6 +92,7 @@ boolean markDone(long id) { } } } + // [END datastore_update_entity] // [START datastore_retrieve_entities] @@ -103,6 +106,7 @@ Iterator listTasks() { Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.asc("created")).build(); return datastore.run(query); } + // [END datastore_retrieve_entities] // [START datastore_delete_entity] @@ -115,6 +119,7 @@ Iterator listTasks() { void deleteTask(long id) { datastore.delete(keyFactory.newKey(id)); } + // [END datastore_delete_entity] /** diff --git a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java index 33aa63ab4..13701eb2d 100644 --- a/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/samples/snippets/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -844,6 +844,7 @@ void transferFunds(Key fromKey, Key toKey, long amount) { } } } + // [END datastore_transactional_update] @Test From 4d2026c330009becc201a95c42af365cc83b8ea5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 25 Apr 2025 18:15:34 +0100 Subject: [PATCH 233/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.46.2 (#1823) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 1ecabfe27..2bb8e4187 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.45.1 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.2 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index f02b30d9e..54bb69d4a 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.45.1 + 3.46.2 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 9fedd55b4..241792087 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.45.1 + 3.46.2 From e1a8983859cdd6f13c8a0ce9ef1348158f074406 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 25 Apr 2025 17:43:28 -0400 Subject: [PATCH 234/292] chore(main): release 2.27.2 (#1827) * chore(main): release 2.27.2 * chore: generate libraries at Fri Apr 25 17:16:31 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 12 ++++++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 43 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 788ff76c4..f6fc874f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.27.2](https://github.com/googleapis/java-datastore/compare/v2.27.1...v2.27.2) (2025-04-25) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.56.2 ([1210f32](https://github.com/googleapis/java-datastore/commit/1210f32662e7aafd2e170643bedbb851f40f3646)) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.46.2 ([#1823](https://github.com/googleapis/java-datastore/issues/1823)) ([4d2026c](https://github.com/googleapis/java-datastore/commit/4d2026c330009becc201a95c42af365cc83b8ea5)) + ## [2.27.1](https://github.com/googleapis/java-datastore/compare/v2.27.0...v2.27.1) (2025-03-18) diff --git a/README.md b/README.md index 8027f49c1..53bbd7cc7 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.27.1' +implementation 'com.google.cloud:google-cloud-datastore:2.27.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.2" ``` ## Authentication @@ -517,7 +517,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.2 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 4178bfa25..3ab169eff 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.27.2-SNAPSHOT + 2.27.2 com.google.cloud google-cloud-datastore-parent - 2.27.2-SNAPSHOT + 2.27.2 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 54bb69d4a..c7327ea50 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.27.2-SNAPSHOT + 2.27.2 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.27.2-SNAPSHOT + 2.27.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.2-SNAPSHOT + 2.27.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.2-SNAPSHOT + 0.118.2 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.2-SNAPSHOT + 2.27.2 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index fb581a186..2b8fe269a 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.27.2-SNAPSHOT + 2.27.2 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.27.2-SNAPSHOT + 2.27.2 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index a0cf3a469..029888ca2 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.2-SNAPSHOT + 2.27.2 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.2-SNAPSHOT + 2.27.2 diff --git a/pom.xml b/pom.xml index 241792087..47aa1a063 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.27.2-SNAPSHOT + 2.27.2 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.2-SNAPSHOT + 2.27.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.2-SNAPSHOT + 2.27.2 com.google.cloud google-cloud-datastore - 2.27.2-SNAPSHOT + 2.27.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.2-SNAPSHOT + 0.118.2 com.google.cloud.datastore datastore-v1-proto-client - 2.27.2-SNAPSHOT + 2.27.2 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index a8f1bb464..7b69a95a2 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.2-SNAPSHOT + 2.27.2 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.2-SNAPSHOT + 2.27.2 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 1cc404ce6..2c5a8e3b8 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.2-SNAPSHOT + 0.118.2 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.27.2-SNAPSHOT + 2.27.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 4273064f8..e9ff8fa53 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.27.2-SNAPSHOT + 2.27.2 diff --git a/versions.txt b/versions.txt index f3fa92479..59e0c205e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.27.1:2.27.2-SNAPSHOT -google-cloud-datastore-bom:2.27.1:2.27.2-SNAPSHOT -proto-google-cloud-datastore-v1:0.118.1:0.118.2-SNAPSHOT -datastore-v1-proto-client:2.27.1:2.27.2-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.27.1:2.27.2-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.27.1:2.27.2-SNAPSHOT +google-cloud-datastore:2.27.2:2.27.2 +google-cloud-datastore-bom:2.27.2:2.27.2 +proto-google-cloud-datastore-v1:0.118.2:0.118.2 +datastore-v1-proto-client:2.27.2:2.27.2 +proto-google-cloud-datastore-admin-v1:2.27.2:2.27.2 +grpc-google-cloud-datastore-admin-v1:2.27.2:2.27.2 From 2b22096ae8f87ae7d308e5f8d16c43b56675193c Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Mon, 28 Apr 2025 12:37:53 -0400 Subject: [PATCH 235/292] chore: Update generation configuration at Sun Apr 27 02:30:03 UTC 2025 (#1829) * chore: Update generation configuration at Sat Apr 26 02:27:15 UTC 2025 * chore: Update generation configuration at Sun Apr 27 02:30:03 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 5e7d6072a..ca5a13acf 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.56.2 -googleapis_commitish: 2e5f8ba097342c6ef4efeba5c07677b3d35571d4 +googleapis_commitish: 2eec62dc7ed836c8d9f73fb313afb8f48c361bef libraries_bom_version: 26.59.0 libraries: - api_shortname: datastore From 126cf093dd331e8c822284bce4bc3e9b1a53e08c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 28 Apr 2025 21:40:56 +0200 Subject: [PATCH 236/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.27.1 (#1820) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 8f6d763fe..22cd4507b 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.27.0 + 2.27.1 From c5a5593f21f33fe68f64a5210740f782bce60b3e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 28 Apr 2025 22:26:49 +0200 Subject: [PATCH 237/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.27.2 (#1830) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.27.1` -> `2.27.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.27.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.27.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.27.1/2.27.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.27.1/2.27.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.27.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2272-2025-04-25) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.27.1...v2.27.2) ##### Bug Fixes - **deps:** Update the Java code generator (gapic-generator-java) to 2.56.2 ([1210f32](https://redirect.github.com/googleapis/java-datastore/commit/1210f32662e7aafd2e170643bedbb851f40f3646)) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.46.2 ([#​1823](https://redirect.github.com/googleapis/java-datastore/issues/1823)) ([4d2026c](https://redirect.github.com/googleapis/java-datastore/commit/4d2026c330009becc201a95c42af365cc83b8ea5))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 22cd4507b..ca5f70689 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.27.1 + 2.27.2 From c71b786ac548aa6afcf9bd9d642a5842e09fbbad Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 29 Apr 2025 00:02:31 +0000 Subject: [PATCH 238/292] chore(main): release 2.27.3-SNAPSHOT (#1828) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- README.md | 2 +- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 53bbd7cc7..d94fcb890 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.27.0 + 2.27.2 ``` diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 3ab169eff..8bac6a329 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.27.2 + 2.27.3-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.27.2 + 2.27.3-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index c7327ea50..76840bb8b 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.27.2 + 2.27.3-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.27.2 + 2.27.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.2 + 2.27.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.2 + 0.118.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.2 + 2.27.3-SNAPSHOT diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 2b8fe269a..397d98c1d 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.27.2 + 2.27.3-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.27.2 + 2.27.3-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 029888ca2..907c878d2 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.2 + 2.27.3-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.2 + 2.27.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index 47aa1a063..8a73f4502 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.27.2 + 2.27.3-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.2 + 2.27.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.2 + 2.27.3-SNAPSHOT com.google.cloud google-cloud-datastore - 2.27.2 + 2.27.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.2 + 0.118.3-SNAPSHOT com.google.cloud.datastore datastore-v1-proto-client - 2.27.2 + 2.27.3-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 7b69a95a2..6684f2fdd 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.2 + 2.27.3-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.2 + 2.27.3-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 2c5a8e3b8..290e29408 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.2 + 0.118.3-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.27.2 + 2.27.3-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e9ff8fa53..d6ec5f36d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.27.2 + 2.27.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index 59e0c205e..c965ffe8b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.27.2:2.27.2 -google-cloud-datastore-bom:2.27.2:2.27.2 -proto-google-cloud-datastore-v1:0.118.2:0.118.2 -datastore-v1-proto-client:2.27.2:2.27.2 -proto-google-cloud-datastore-admin-v1:2.27.2:2.27.2 -grpc-google-cloud-datastore-admin-v1:2.27.2:2.27.2 +google-cloud-datastore:2.27.2:2.27.3-SNAPSHOT +google-cloud-datastore-bom:2.27.2:2.27.3-SNAPSHOT +proto-google-cloud-datastore-v1:0.118.2:0.118.3-SNAPSHOT +datastore-v1-proto-client:2.27.2:2.27.3-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT From a296d43724c57aba6a69ebed249261e3d367d625 Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Tue, 29 Apr 2025 12:54:26 -0700 Subject: [PATCH 239/292] feat: Java datastore gapic upgrade (#1824) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: enable experimental grpc support (#1419) * chore: Importing auto-generated code from googleapis-gen (#1235) * Script to setup generated code from googleapis-gen * fixing script and gitignore * adding generated code * add maven config for new grpc module * fixing script * owlbot config to fetch grpc and gapic modules for V1 * fix lint * Revert "add maven config for new grpc module" This reverts commit 7769d8083a84f3ae9255c51c3ecb01fbfdd49320. * Reapply "add maven config for new grpc module" This reverts commit 759475d121afa772f66f549958e8b092cf3c5f0a. * remove unused dependency * fix library version * fix library version * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * removing exclusion of grpc-google-cloud-datastore-v1 module from repo metadata * 🦉 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 * refactor: Swap usage of HttpDatastoreRpc with GrpcDatastoreRpc (#1240) * Create basic structure of GrpcDatastoreRpc and using it in DatastoreOptions * applying unary settings to all the unary methods * Configuring header provider for GrpcDatastoreRpc * fixing emulator tests to be able to run successfully with grpc now * ignoring one more test which will be fixed in actionable error implementation * Making HttpDatastoreRpc completely unused * Making GrpcDatastoreRpc implement AutoCloseable * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * incorporating feedbacks * pinging emulator after each test for debugging * Revert "pinging emulator after each test for debugging" This reverts commit 60ee45d27412aab8140fc7065010633cf59a0ae8. * Reapply "pinging emulator after each test for debugging" This reverts commit d42e3b995fe56ded8c5f080a262e8ea02c00c9d9. * more debugging * Constant ping to avoid flaky behaviour of /shutdown endpoint * fixing test * checking if emulator is running before sending a shutdown command * fix lint * implement helper method for localhost * fix header lint * moving emulator health check to src/test * fix lint * adding no extra headers * minor cleanup * using mutlipleAttemptsRule in DatastoreTest * Revert "adding no extra headers" This reverts commit 9b43798422dc0627b1b2bc6dea8b9f4169682292. * using classRule --------- Co-authored-by: Owl Bot * feat!: Actionable Error (#1244) * Create basic structure of GrpcDatastoreRpc and using it in DatastoreOptions * applying unary settings to all the unary methods * Configuring header provider for GrpcDatastoreRpc * fixing emulator tests to be able to run successfully with grpc now * ignoring one more test which will be fixed in actionable error implementation * Making HttpDatastoreRpc completely unused * Making GrpcDatastoreRpc implement AutoCloseable * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * incorporating feedbacks * pinging emulator after each test for debugging * Revert "pinging emulator after each test for debugging" This reverts commit 60ee45d27412aab8140fc7065010633cf59a0ae8. * Reapply "pinging emulator after each test for debugging" This reverts commit d42e3b995fe56ded8c5f080a262e8ea02c00c9d9. * more debugging * Constant ping to avoid flaky behaviour of /shutdown endpoint * fixing test * checking if emulator is running before sending a shutdown command * fix lint * implement helper method for localhost * fix header lint * moving emulator health check to src/test * fix lint * adding no extra headers * minor cleanup * Making DatastoreException extend BaseGrpcServiceException * Creating DatastoreException through ApiException and exposing methods to extract out domain, reason and metadata * Wrapping ApiException in DatastoreException before throwing it * adding clirr configuration * javadoc for getReason * deleting unused file * enabling tests which were ignore for actionable error implementation * added clirr comments * fix lint --------- Co-authored-by: Owl Bot * feat!: Making Datastore implement Closeable (#1246) * Making Datastore closeable and fixing integration test * Closing datastore in datastore test * fix lint * fix clirr config * test to verify if datastore client is getting closed after invoking close() method * Using a consistent port and reinitializing Datastore instance in @BeforeClass method * trying to fix connection reset problem * upgrading datastore emulator to fix DatastoreTest * 🦉 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 * feat: enabling regapic by giving an option to user to use http (#1261) * feat: enabling regapic by giving an option to user to use http * enabling retry settings * fix lint * fix deps failure * fix deps failure * trying out ipv6 address resolution * Revert "trying out ipv6 address resolution" This reverts commit 1bf0e299b163df5ad7c510fdce6dc71d681801b5. * upgrading emulator * fix lint * downgrading to 2.0.2 to maintain java 8 compatibility * incorporating feedbacks * test retry settings while configuring DatastoreRpc instance * fix test * fix header * fix clirr check * fix lint * fix integration test * fix lint * incorporating feedback * test: Creating multi db rule to run tests multiple times against different named databases. (#1270) * integrating aggregation integration test with multidb rule * integrating multidb rule with ITDatastoreTest * addressing feedbacks * feat: remove `@BetaApi` annotations from get/setDatabaseId methods (#1277) Cherry pick of #1272 * feat!: mark interfaces as `@InternalExtensionOnly` (#1275) * feat!: mark interfaces as `@InternalExtensionOnly` * lint * refactor: rename internal class QueryAndReadOptions to QueryConfig (#1245) (#1283) (cherry picked from commit 41d43e852d07a9026ae5be2add860c1f6980c7d6) * deps: remove dependency on datastore-v1-proto-client module in google-cloud-datastore (#1281) * feat: use existing transport options API to set transport (#1276) * feat: use existing transport options API to set transport * lint * remove stale test * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 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 * deps: bump com.google.truth:truth from 1.1.5 to 1.4.0 (#1323) Bumps [com.google.truth:truth](https://togithub.com/google/truth) from 1.1.5 to 1.4.0.
Release notes

Sourced from com.google.truth:truth's releases.

1.4.0

In this release, our assertions on Java 8 types continue to move from the Truth8 class to the main Truth class. This change should not break compatibility for any supported JDK or Android version, even users who test under old versions of Android without API desugaring. Additionally, we will never break binary compatibility, though some users will have to make changes to their source code in order for it to compile against newer versions.

This release is likely to lead to more build failures than 1.3.0 did. However, those failures should be straightforward to fix.

Example build failure

Foo.java:152: error: reference to assertThat is ambiguous
    assertThat(repo.findFileWithName("foo")).isNull();
    ^
  both method assertThat(@org.jspecify.nullness.Nullable Path) in Truth8 and method assertThat(@org.jspecify.nullness.Nullable Path) in Truth match

Simplest upgrade strategy (if you can update all your code atomically in the same commit as the Truth upgrade)

In the same commit:

  1. Upgrade Truth to 1.4.0.
  2. Replace import static com.google.common.truth.Truth8.assertThat; with import static com.google.common.truth.Truth.assertThat;.
    • If you use Kotlin, replace import com.google.common.truth.Truth8.assertThat with import com.google.common.truth.Truth.assertThat.
  3. Replace import com.google.common.truth.Truth8; with import com.google.common.truth.Truth;.
    • again, similarly for Kotlin if needed
  4. Optionally replace remaining references to Truth8 with references to Truth.
    • For example, replace Truth8.assertThat(optional).isPresent() with Truth.assertThat(optional).isPresent().

If you're feeling lucky, you can try this one-liner for the code updates:

git grep -l Truth8 | xargs perl -pi -e 's/import static com.google.common.truth.Truth8.assertThat;/import static com.google.common.truth.Truth.assertThat;/g; s/import com.google.common.truth.Truth8.assertThat/import com.google.common.truth.Truth.assertThat/g; s/import com.google.common.truth.Truth8/import com.google.common.truth.Truth/g; s/\bTruth8[.]/Truth./g;'

In most cases, that can be further simplified to:

git grep -l Truth8 | xargs perl -pi -e 's/\bTruth8\b/Truth/g;'

After that process, it is possible that you'll still see build errors from ambiguous usages of assertThat static imports. If so, you can find a workaround in the section about overload ambiguity in the release notes for 1.3.0. Alternatively, you can wait to upgrade until after a future Truth release, which will eliminate the ambiguity by changing the signatures of some Truth.assertThat overloads.

Incremental upgrade strategy

If you have a very large repo or you have other reasons to prefer to upgrade incrementally, you can use the approach that we used inside Google. Roughly, that approach was:

  1. Make the optional changes discussed in the release notes for 1.3.0.
  2. For any remaining calls to Truth8.assertThat, change them to avoid static import.
    • That is, replace assertThat(optional).isPresent() with Truth8.assertThat(optional).isPresent().
  3. Upgrade Truth to 1.4.0.
  4. Optionally replace references to Truth8 with references to Truth (including restoring static imports if desired), as discussed in section about the simple upgrade strategy above.

... (truncated)

Commits
  • 2e8e488 Set version number for truth-parent to 1.4.0.
  • 1f81827 Copy Truth8.assertThat overloads for Path and OptionalLong to the main ...
  • 9be8e77 Copy remaining Truth8.assertThat overloads to the main Truth class—except...
  • b02a658 Migrate most usages of Truth8.assertThat to equivalent usages of `Truth.ass...
  • 0999369 Automated Code Change
  • 7c65fc6 Make it possible to write expect.that(optionalInt).isPresent(), `assertWith...
  • 87b371d Bump styfle/cancel-workflow-action from 0.12.0 to 0.12.1
  • 93b4d93 Add @since tags for the first batch of Java-8-related APIs.
  • 78d27dd Remove stale suppressions.
  • 7be930d Bump actions/cache from 3.3.3 to 4.0.0
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.truth:truth&package-manager=maven&previous-version=1.1.5&new-version=1.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
* deps: bump com.google.cloud:google-cloud-shared-config from 1.6.1 to 1.7.1 (#1324) Bumps [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) from 1.6.1 to 1.7.1.
Release notes

Sourced from com.google.cloud:google-cloud-shared-config's releases.

v1.7.1

1.7.1 (2023-12-07)

Bug Fixes

  • Move release configs to native-image-shared-config (#725) (58ffb4e)

v1.7.0

1.7.0 (2023-12-04)

Features

  • Separate native-image-shared-config into its own module (#712) (567fecb)
Changelog

Sourced from com.google.cloud:google-cloud-shared-config's changelog.

1.7.1 (2023-12-07)

Bug Fixes

  • Move release configs to native-image-shared-config (#725) (58ffb4e)

1.7.0 (2023-12-04)

Features

  • Separate native-image-shared-config into its own module (#712) (567fecb)
Commits
  • f5f57c8 chore(main): release 1.7.1 (#727)
  • 9fcbe9e chore: update release-please.yml to include cloudbuild test yamls (#728)
  • c432bae chore(main): release 1.7.1-SNAPSHOT (#719)
  • 58ffb4e fix: move release configs to native-image-shared-config (#725)
  • 8d411bc ci: Update ci.yaml to introduce Java 21 unit testing (#1907) (#717)
  • 3382cee chore: add downstream check for native image tests in cloud build (#715)
  • b22a75a chore: update graalvm docker image for 1.7.0 release (#720)
  • 93824e5 chore(main): release 1.7.0 (#716)
  • 7435981 chore: remove docker validation check (#718)
  • 567fecb feat: separate native-image-shared-config into its own module (#712)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.cloud:google-cloud-shared-config&package-manager=maven&previous-version=1.6.1&new-version=1.7.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
* deps: bump com.google.cloud:google-cloud-shared-dependencies from 3.19.0 to 3.24.0 (#1325) Bumps com.google.cloud:google-cloud-shared-dependencies from 3.19.0 to 3.24.0. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.cloud:google-cloud-shared-dependencies&package-manager=maven&previous-version=3.19.0&new-version=3.24.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
* deps: bump org.apache.maven.plugins:maven-compiler-plugin from 3.11.0 to 3.12.1 (#1327) Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://togithub.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.1.
Release notes

Sourced from org.apache.maven.plugins:maven-compiler-plugin's releases.

3.12.1

🐛 Bug Fixes

📦 Dependency updates

3.12.0

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

👻 Maintenance

Commits
  • 736da68 [maven-release-plugin] prepare release maven-compiler-plugin-3.12.1
  • ef93f3d [MCOMPILER-568] Bump plexusCompilerVersion from 2.14.1 to 2.14.2 (#220)
  • eb7840c [MCOMPILER-567] - Fail to compile if the "generated-sources/annotations" does...
  • 2a7a73b [maven-release-plugin] prepare for next development iteration
  • c08b0fd [maven-release-plugin] prepare release maven-compiler-plugin-3.12.0
  • a1c5b13 [MCOMPILER-565] Allow project build by Maven 4
  • 4855773 Bump plexusCompilerVersion from 2.13.0 to 2.14.1
  • 1d05342 [MCOMPILER-562] Add property maven.compiler.outputDirectory to CompilerMojo (...
  • ea74978 [MCOMPILER-381] - Refactor incremental detection (#181)
  • fd37f09 [MCOMPILER-333] Cleanup generated source files (#214)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-compiler-plugin&package-manager=maven&previous-version=3.11.0&new-version=3.12.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
* test(deps): upgrade errorprone to 2.24.0 (#1271) (#1329) * test(deps): upgrade errorprone to 2.24.0 (#1271) * deps: upgrade errorprone to 2.24.0 * 🦉 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 * 🦉 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 * deps: bump com.google.errorprone:error_prone_core from 2.23.0 to 2.24.1 (#1326) Bumps [com.google.errorprone:error_prone_core](https://togithub.com/google/error-prone) from 2.23.0 to 2.24.1.
Release notes

Sourced from com.google.errorprone:error_prone_core's releases.

Error Prone 2.24.1

Changes:

Full Changelog: https://togithub.com/google/error-prone/compare/v2.24.0...v2.24.1

Error Prone 2.24.0

New checks:

Full Changelog: https://togithub.com/google/error-prone/compare/v2.23.0...v2.24.0

Commits
  • ecf7e10 Release Error Prone 2.24.1
  • 2bd7859 Add an assertion to try to help debug https://togithub.com/google/error-prone/i...
  • 58a9e80 Update a few checks (and a class of tests, with AbstractToString) to handle #...
  • fd21bc9 Reflow a comment that didn't appreciate being formatted in unknown commit
  • 63cf192 Update CanIgnoreReturnValueSuggester summary.
  • 5fa727a Actually test that hasExtraParameterForEnclosingInstance works.
  • 21c190a Document that javadoc shouldn't appear between annotations and the documented...
  • d272dfa Automated rollback of commit 654d1dbf1e6dd652cd6e8ca003643ddf02266ec2.
  • 654d1db Handle Joiner.on(...) in AbstractToString.
  • da7be27 Descend into VariableTrees when looking for variables to check.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_core&package-manager=maven&previous-version=2.23.0&new-version=2.24.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
* feat: allow setting channel and credential providers in DatastoreOptions (#1299) * feat: allow setting channel and credential providers in DatastoreOptions * add additional validation and test * mark new fields as transient * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * update test * review feedback * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * review feedback * 🦉 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 * chore: Update CODEOWNERS (#1297) (#1331) * chore: Update CODEOWNERS * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Update .repo-metadata.json * 🦉 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 * chore: run owlbot (#1330) * chore: run owlbot * update owlbot lock * deps: bump com.google.cloud:google-cloud-shared-dependencies from 3.24.0 to 3.25.0 (#1335) Bumps com.google.cloud:google-cloud-shared-dependencies from 3.24.0 to 3.25.0. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.cloud:google-cloud-shared-dependencies&package-manager=maven&previous-version=3.24.0&new-version=3.25.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
* deps: bump com.google.truth:truth from 1.4.0 to 1.4.1 (#1341) Bumps [com.google.truth:truth](https://togithub.com/google/truth) from 1.4.0 to 1.4.1.
Release notes

Sourced from com.google.truth:truth's releases.

1.4.1

This release deprecates Truth8.

All its methods have become available on the main Truth class. In most cases, you can migrate your whole project mechanically: git grep -l Truth8 | xargs perl -pi -e 's/\bTruth8\b/Truth/g;'

While we do not plan to delete Truth8, we recommend migrating off it, at least if you static import assertThat: If you do not migrate, such static imports will become ambiguous in Truth 1.4.2, breaking your build.

Commits
  • a920d7d Set version number for truth-parent to 1.4.1.
  • 3406074 Document more about how and why to migrate off Truth8.
  • 2be0061 Update docs to reflect that the Java 8 assertions have "moved" to the main `T...
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.truth:truth&package-manager=maven&previous-version=1.4.0&new-version=1.4.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
* deps: bump com.google.errorprone:error_prone_core from 2.24.1 to 2.25.0 (#1340) Bumps [com.google.errorprone:error_prone_core](https://togithub.com/google/error-prone) from 2.24.1 to 2.25.0.
Release notes

Sourced from com.google.errorprone:error_prone_core's releases.

Error Prone 2.25.0

New checks:

Closed issues: #4195, #4224, #4228, #4248, #4249, #4251

Full Changelog: https://togithub.com/google/error-prone/compare/v2.24.1...v2.25.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_core&package-manager=maven&previous-version=2.24.1&new-version=2.25.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
* revert: "test: Creating multi db rule to run tests multiple times agai… (#1346) * Revert "test: Creating multi db rule to run tests multiple times against different named databases. (#1270)" This reverts commit 780c9f40f1ae04d0ec919d203bf256e3cff8fcc1. * 🦉 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 * deps: bump com.google.truth:truth from 1.4.1 to 1.4.2 (#1354) Bumps [com.google.truth:truth](https://togithub.com/google/truth) from 1.4.1 to 1.4.2.
Release notes

Sourced from com.google.truth:truth's releases.

1.4.2

This release is the final step of copying all our methods from Truth8 to Truth. If you have not already migrated your usages from Truth8 to Truth, you may see build errors:

OptionalSubjectTest.java:39: error: reference to assertThat is ambiguous
    assertThat(Optional.of("foo")).isPresent();
    ^
  both method assertThat(@org.checkerframework.checker.nullness.qual.Nullable Optional<?>) in Truth8 and method assertThat(@org.checkerframework.checker.nullness.qual.Nullable Optional<?>) in Truth match

In most cases, you can migrate your whole project mechanically: git grep -l Truth8 | xargs perl -pi -e 's/\bTruth8\b/Truth/g;'. (You can make that change before upgrading to Truth 1.4.2 or as part of the same commit.)

If you instead need to migrate your project incrementally (for example, because it is very large), you may want to upgrade your version of Truth incrementally, too, following our instructions for 1.3.0 and 1.4.0.

For help

Please feel welcome to open an issue to report problems or request help.

Changelog

  • Removed temporary type parameters from Truth.assertThat(Stream) and Truth.assertThat(Optional). This can create build errors, which you can fix by replacing all your references to Truth8 with references to Truth. (45782bd0e)
Commits
  • 0ca7ef0 Set version number for truth-parent to 1.4.2.
  • e3b4354 Enable a few more Guava Primitives tests for J2KT
  • ae78f4a Bump actions/setup-java from 4.0.0 to 4.1.0
  • 996a844 Remove more copies of a workaround for an ancient Android bug.
  • a43223e Suppress TruthSelfEquals violations in Truth.
  • 559d636 Suppress NullableOptional, as we already do in, e.g., `Truth.assertThat(Opt...
  • 3efe353 Automated Code Change
  • 5efd53f Change assertThat(array) to allow arrays of non-nullable elements
  • bbd8d12 Bump com.google.errorprone:error_prone_annotations from 2.24.1 to 2.25.0
  • c243961 Remove @J2ktIncompatible from StringSubject#matches
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.truth:truth&package-manager=maven&previous-version=1.4.1&new-version=1.4.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
* deps: bump com.google.cloud:google-cloud-shared-dependencies from 3.25.0 to 3.27.0 (#1353) Bumps com.google.cloud:google-cloud-shared-dependencies from 3.25.0 to 3.27.0. [![Dependabot compat… * chore: update version numbers (#1425) * fix: make removeScheme case insensitive (#1423) * chore: sync with main, update version numbers (#1465) * chore: update sync-repo-settings.yaml (#1417) Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ If you write sample code, please follow the [samples format]( https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). * deps: update dependency com.google.errorprone:error_prone_core to v2.27.1 (#1421) * deps: update dependency com.google.guava:guava-testlib to v33.2.0-jre (#1422) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 (#1426) * fix(deps): Update the Java code generator (gapic-generator-java) to 2.39.0 (#1406) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 626430774 Source-Link: https://togithub.com/googleapis/googleapis/commit/835b84ebfc4974ab5dcd9b31ad66c01ef3455475 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/43f369d90f19d09ac18720151ab106042beb811b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDNmMzY5ZDkwZjE5ZDA5YWMxODcyMDE1MWFiMTA2MDQyYmViODExYiJ9 * chore(main): release 2.19.2 (#1414) :robot: I have created a release *beep* *boop* --- ## [2.19.2](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03) ### Bug Fixes * **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) * Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) * Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) * Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.19.3-SNAPSHOT (#1432) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#1412) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.2 (#1433) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.1` -> `2.19.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.19.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2192-2024-05-03) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) ##### Bug Fixes - **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#​1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#​1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) - Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#​1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) - Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#​1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) - Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#​1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore). * chore: autogen updates (#1434) * fix: An existing method `UpdateVehicleLocation` is removed from service `VehicleService` fix: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService` fix: An existing message `UpdateVehicleLocationRequest` is removed PiperOrigin-RevId: 631557549 Source-Link: https://github.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9 * 🦉 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 * chore: update dependency versions in java templates (#1964) (#1435) * chore: update dependency versions in java templates * update other templates Source-Link: https://togithub.com/googleapis/synthtool/commit/0b86c72fe652dd7e52ba05a63f61bc1399ad5d65 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e * chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 (#1436) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 * 🦉 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 * build: update actions/setup-java action to v4 (#1391) * deps: update actions/checkout action to v4 (#1390) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 (#1443) * chore(main): release 2.19.3 (#1438) :robot: I have created a release *beep* *boop* --- ## [2.19.3](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16) ### Dependencies * Update actions/checkout action to v4 ([#1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.19.4-SNAPSHOT (#1444) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.3 (#1446) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.2` -> `2.19.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.19.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2193-2024-05-16) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) ##### Dependencies - Update actions/checkout action to v4 ([#​1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) - Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#​1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore). * test(deps): update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 (#1448) * deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 * 🦉 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 * build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#1453) * chore: [java] allow passing libraries_bom_version from env (#1967) (#1451) * feat: [java] allow passing libraries_bom_version from env * reformat Source-Link: https://togithub.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea * test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 (#1449) * test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 * 🦉 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 * fix: Migrate off TextPrinter's deprecated methods (#1452) * fix: chore: Migrate off TextPrinter's deprecated methods * 🦉 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 * feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455) * feat: New PropertyMask field which allows partial commits, lookups, and query results PiperOrigin-RevId: 635449160 Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9 * 🦉 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 * fix: set the correct database id on the key parent when calling Key#getParent (#1457) * fix: set database ID on parent key * 🦉 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 * chore(main): release 2.20.0 (#1454) :robot: I have created a release *beep* *boop* --- ## [2.20.0](https://togithub.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27) ### Features * New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://togithub.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://togithub.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b)) ### Bug Fixes * Migrate off TextPrinter's deprecated methods ([#1452](https://togithub.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://togithub.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92)) * Set the correct database id on the key parent when calling Key#getParent ([#1457](https://togithub.com/googleapis/java-datastore/issues/1457)) ([992815d](https://togithub.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.20.1-SNAPSHOT (#1461) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * test: add integration test for incomplete key (#1460) * test: add integration test for incomplete key * 🦉 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 * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 (#1463) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 * 🦉 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 * fix typo * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix versions * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Mend Renovate Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Owl Bot Co-authored-by: Lawrence Qiu Co-authored-by: Henry Johnson * feat: add some docs, use only setCredentials in DatastoreOptions (#1467) * feat: add some docs, use only setCredentials in DatastoreOptions * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 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 * test: Add GRPC DatastoreTest and parameterize DatastoreTest for both gRPC and HTTP transports (#1478) * test: Parameterize DatastoreTest to run for both gRPC and HTTP transports * test: Parameterize DatastoreTest to run for both gRPC and HTTP transports * fix linting * update copy right * refactor: Pull latest changes from main to Gapic update (#1620) * chore: update sync-repo-settings.yaml (#1417) Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ If you write sample code, please follow the [samples format]( https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). * deps: update dependency com.google.errorprone:error_prone_core to v2.27.1 (#1421) * deps: update dependency com.google.guava:guava-testlib to v33.2.0-jre (#1422) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 (#1426) * fix(deps): Update the Java code generator (gapic-generator-java) to 2.39.0 (#1406) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 626430774 Source-Link: https://togithub.com/googleapis/googleapis/commit/835b84ebfc4974ab5dcd9b31ad66c01ef3455475 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/43f369d90f19d09ac18720151ab106042beb811b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDNmMzY5ZDkwZjE5ZDA5YWMxODcyMDE1MWFiMTA2MDQyYmViODExYiJ9 * chore(main): release 2.19.2 (#1414) :robot: I have created a release *beep* *boop* --- ## [2.19.2](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03) ### Bug Fixes * **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) * Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) * Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) * Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.19.3-SNAPSHOT (#1432) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#1412) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.2 (#1433) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.1` -> `2.19.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.19.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2192-2024-05-03) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) ##### Bug Fixes - **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#​1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#​1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) - Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#​1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) - Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#​1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) - Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#​1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore). * chore: autogen updates (#1434) * fix: An existing method `UpdateVehicleLocation` is removed from service `VehicleService` fix: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService` fix: An existing message `UpdateVehicleLocationRequest` is removed PiperOrigin-RevId: 631557549 Source-Link: https://github.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9 * 🦉 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 * chore: update dependency versions in java templates (#1964) (#1435) * chore: update dependency versions in java templates * update other templates Source-Link: https://togithub.com/googleapis/synthtool/commit/0b86c72fe652dd7e52ba05a63f61bc1399ad5d65 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e * chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 (#1436) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 * 🦉 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 * build: update actions/setup-java action to v4 (#1391) * deps: update actions/checkout action to v4 (#1390) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 (#1443) * chore(main): release 2.19.3 (#1438) :robot: I have created a release *beep* *boop* --- ## [2.19.3](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16) ### Dependencies * Update actions/checkout action to v4 ([#1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.19.4-SNAPSHOT (#1444) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.3 (#1446) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.2` -> `2.19.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.19.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2193-2024-05-16) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) ##### Dependencies - Update actions/checkout action to v4 ([#​1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) - Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#​1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore). * test(deps): update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 (#1448) * deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 * 🦉 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 * build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#1453) * chore: [java] allow passing libraries_bom_version from env (#1967) (#1451) * feat: [java] allow passing libraries_bom_version from env * reformat Source-Link: https://togithub.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea * test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 (#1449) * test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 * 🦉 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 * fix: Migrate off TextPrinter's deprecated methods (#1452) * fix: chore: Migrate off TextPrinter's deprecated methods * 🦉 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 * feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455) * feat: New PropertyMask field which allows partial commits, lookups, and query results PiperOrigin-RevId: 635449160 Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9 * 🦉 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 * fix: set the correct database id on the key parent when calling Key#getParent (#1457) * fix: set database ID on parent key * 🦉 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 * chore(main): release 2.20.0 (#1454) :robot: I have created a release *beep* *boop* --- ## [2.20.0](https://togithub.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27) ### Features * New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://togithub.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://togithub.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b)) ### Bug Fixes * Migrate off TextPrinter's deprecated methods ([#1452](https://togithub.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://togithub.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92)) * Set the correct database id on the key parent when calling Key#getParent ([#1457](https://togithub.com/googleapis/java-datastore/issues/1457)) ([992815d](https://togithub.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.20.1-SNAPSHOT (#1461) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * test: add integration test for incomplete key (#1460) * test: add integration test for incomplete key * 🦉 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 * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 (#1463) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 * 🦉 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 * chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 (#1466) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 * 🦉 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 * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 (#1471) * deps: update dependency com.google.guava:guava-testlib to v33.2.1-jre (#1470) * deps: update dependency com.google.errorprone:error_prone_core to v2.28.0 (#1469) * build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.7.0 (#1459) * chore(main): release 2.20.1 (#1476) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * Doc: Add gRPC datastore gapic upgrade user guide (#1489) * chore: Add read me user guide * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Updating formatting * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fixing formatting * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * adjusting formatting * 🦉 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 * chore(main): release 2.20.2-SNAPSHOT (#1479) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 (#1492) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 * 🦉 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 * chore(main): release 2.20.2 (#1503) :robot: I have created a release *beep* *boop* --- ## [2.20.2](https://togithub.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1492](https://togithub.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://togithub.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * feat: enable hermetic library generation (#1462) * restore to older version * update googleapis_committish * fix googleapis_committish * infer image tag from config yaml * correct workflow name * update config scripts and yamls * remove old update_googleapis_committish workflow * restore proto folder * Revert "restore proto folder" This reverts commit 59046f83269c16fb775d1069b54ee5de0749b8e5. * feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455) * feat: New PropertyMask field which allows partial commits, lookups, and query results PiperOrigin-RevId: 635449160 Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9 * 🦉 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 * sync config structure with that of google-cloud-java * remove quotes from config yamls * fix typo in update_generation_config.yaml * correct * quote codeowners_team in generation config * update generator version * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Owl Bot * ci: [java] automatic kokoro label in and /gcbrun comment (#1965) (#1481) Source-Link: https://github.com/googleapis/synthtool/commit/bd2bae89f70bad380da47fab9ec25985dfb87d67 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3 Co-authored-by: Owl Bot * test(deps): update dependency com.google.truth:truth to v1.4.3 (#1501) * chore: correct hermetic library generation script path (#1506) * fix: correct hermetic library generation script path * 🦉 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 * chore: skip hermetic generation on fork PRs (#1510) * chore: make the owlbot postprocessor check non-required (#1512) * chore: make the owlbot postprocessor check non-required * remove required check in other branches * chore: disable the Owl Bot post-processor (#1511) via deleting .OwlBot.lock.yaml (context) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 (#1485) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 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 Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> * chore(main): release 2.20.3-SNAPSHOT (#1504) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore: setup 2.19.x lts branch (#1535) * chore(main): release 2.21.0 (#1517) :robot: I have created a release *beep* *boop* --- ## [2.21.0](https://togithub.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31) ### Features * Enable hermetic library generation ([#1462](https://togithub.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://togithub.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 (#1531) * chore(main): release 2.21.1-SNAPSHOT (#1538) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore(deps): update dependency com.google.cloud:libraries-bom to v26.43.0 (#1515) * chore(main): release 2.21.1 (#1540) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore(main): release 2.21.2-SNAPSHOT (#1541) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore: secure hermetic_library_generation workflow (#1552) * chore: secure hermetic_library_generation workflow Thanks to @diogoteles08 for the inspection on our repos. This PR inlines environment variables to avoid overriding script injections. * fix wording * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 (#1547) * chore(main): release 2.21.2 (#1553) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore: remove datastore native image sample in favor of sample hosted in google-cloud-java (#1519) * chore: remove unused image tag in .OwlBot-hermetic.yaml (#1559) This removes the unused image tag in this file. Part of the cleanup after enabling Hermetic Library generation in this repo. Newline at EOF automatically added - see [this SO](https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-newline). * chore(main): release 2.21.3-SNAPSHOT (#1554) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore: Update generation configuration at Tue Sep 10 17:00:48 UTC 2024 (#1564) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.45.0 (#1544) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.43.0` -> `26.45.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-cloud-bom (com.google.cloud:libraries-bom) ### [`v26.45.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26450-2024-08-27) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.44.0...v26.45.0) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.34.0 ([#​6707](https://redirect.github.com/googleapis/java-cloud-bom/issues/6707)) ([412f4ba](https://redirect.github.com/googleapis/java-cloud-bom/commit/412f4ba5c2223aabff39c0a60bf07cbd147f02da)) - update dependency com.google.cloud:gapic-libraries-bom to v1.42.0 ([#​6716](https://redirect.github.com/googleapis/java-cloud-bom/issues/6716)) ([6fc3557](https://redirect.github.com/googleapis/java-cloud-bom/commit/6fc35575193baf1d458b63ba166e92b64421c383)) - update dependency com.google.cloud:google-cloud-bigquery to v2.42.1 ([#​6730](https://redirect.github.com/googleapis/java-cloud-bom/issues/6730)) ([b0d939d](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0d939dbbd3a94673206d206369f81429c1a6a7f)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.1 ([#​6712](https://redirect.github.com/googleapis/java-cloud-bom/issues/6712)) ([0121887](https://redirect.github.com/googleapis/java-cloud-bom/commit/0121887c7db48c48d14098d9643a3b73574bf851)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.9.0 ([#​6729](https://redirect.github.com/googleapis/java-cloud-bom/issues/6729)) ([406333e](https://redirect.github.com/googleapis/java-cloud-bom/commit/406333e7870405673e014f6871a31ac9c8822866)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.43.0 ([#​6723](https://redirect.github.com/googleapis/java-cloud-bom/issues/6723)) ([0754a10](https://redirect.github.com/googleapis/java-cloud-bom/commit/0754a10b89b628179d4f115e162e326765de33b3)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.2 ([#​6725](https://redirect.github.com/googleapis/java-cloud-bom/issues/6725)) ([6d96ff4](https://redirect.github.com/googleapis/java-cloud-bom/commit/6d96ff40b279c73700cf85633445880721739d1e)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.25.1 ([#​6705](https://redirect.github.com/googleapis/java-cloud-bom/issues/6705)) ([b0440a8](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0440a82a5b1f66f123b3014ccc5ecdfa783285a)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.20.1 ([#​6720](https://redirect.github.com/googleapis/java-cloud-bom/issues/6720)) ([479182a](https://redirect.github.com/googleapis/java-cloud-bom/commit/479182af6afc7db95fac0bfafc3aaa587a23ff7c)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.131.11-alpha ([#​6721](https://redirect.github.com/googleapis/java-cloud-bom/issues/6721)) ([9394259](https://redirect.github.com/googleapis/java-cloud-bom/commit/93942598cc7b42ad66ebad5557aeff795a9a8644)) - update dependency com.google.cloud:google-cloud-nio to v0.127.22 ([#​6713](https://redirect.github.com/googleapis/java-cloud-bom/issues/6713)) ([f7563bd](https://redirect.github.com/googleapis/java-cloud-bom/commit/f7563bd2822dff72ec01a148b14774bc641b3678)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.1 ([#​6714](https://redirect.github.com/googleapis/java-cloud-bom/issues/6714)) ([439460a](https://redirect.github.com/googleapis/java-cloud-bom/commit/439460a340a4954117ba1f0c49e0f7ab99c0cf73)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.1 ([#​6715](https://redirect.github.com/googleapis/java-cloud-bom/issues/6715)) ([27a374b](https://redirect.github.com/googleapis/java-cloud-bom/commit/27a374b7a8318d5a8b100d3c1edfd420d8cf3cd4)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.73.0 ([#​6722](https://redirect.github.com/googleapis/java-cloud-bom/issues/6722)) ([b93b322](https://redirect.github.com/googleapis/java-cloud-bom/commit/b93b3222f36b8701ed59cb42ddb7636b822a8ece)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.74.0 ([#​6728](https://redirect.github.com/googleapis/java-cloud-bom/issues/6728)) ([9ca5a25](https://redirect.github.com/googleapis/java-cloud-bom/commit/9ca5a25c1772f8283598b4a8fbb64c08d0346557)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.21.0 ([#​6724](https://redirect.github.com/googleapis/java-cloud-bom/issues/6724)) ([4e32a3d](https://redirect.github.com/googleapis/java-cloud-bom/commit/4e32a3d0a5598c3f2a09bbd2155d7c589c81c796)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.42.0 ([#​6717](https://redirect.github.com/googleapis/java-cloud-bom/issues/6717)) ([8302476](https://redirect.github.com/googleapis/java-cloud-bom/commit/8302476bac2908beeb0be2ac4f3a7b766bb9c011)) - update dependency commons-cli:commons-cli to v1.9.0 ([#​6706](https://redirect.github.com/googleapis/java-cloud-bom/issues/6706)) ([539f86c](https://redirect.github.com/googleapis/java-cloud-bom/commit/539f86cf0fab014d0c306bf230253569fab8494f)) ### [`v26.44.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26440-2024-08-08) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.43.0...v26.44.0) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.33.0 ([#​6687](https://redirect.github.com/googleapis/java-cloud-bom/issues/6687)) ([d93c7c1](https://redirect.github.com/googleapis/java-cloud-bom/commit/d93c7c1e5c8cfea5f0bb3b570282af1d17ac9992)) - update dependency com.google.cloud:gapic-libraries-bom to v1.41.0 ([#​6689](https://redirect.github.com/googleapis/java-cloud-bom/issues/6689)) ([e5afcc8](https://redirect.github.com/googleapis/java-cloud-bom/commit/e5afcc8a5afd362f7cdb6d19f446c99db7832fb9)) - update dependency com.google.cloud:google-cloud-bigquery to v2.42.0 ([#​6688](https://redirect.github.com/googleapis/java-cloud-bom/issues/6688)) ([58ed9ce](https://redirect.github.com/googleapis/java-cloud-bom/commit/58ed9cef18361489756bafdf9b6159077f498608)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.0 ([#​6685](https://redirect.github.com/googleapis/java-cloud-bom/issues/6685)) ([c6968cb](https://redirect.github.com/googleapis/java-cloud-bom/commit/c6968cb3315c37d21539daa5001c6b297f600ba4)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.41.0 ([#​6686](https://redirect.github.com/googleapis/java-cloud-bom/issues/6686)) ([256f1b0](https://redirect.github.com/googleapis/java-cloud-bom/commit/256f1b0e97dc1c28453fd0c302e5ecc6958a5a55)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.42.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.0 ([#​6697](https://redirect.github.com/googleapis/java-cloud-bom/issues/6697)) ([046ad04](https://redirect.github.com/googleapis/java-cloud-bom/commit/046ad04177bca0cfd2aecce6bc1170617939bfbb)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.1 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.2 ([#​6681](https://redirect.github.com/googleapis/java-cloud-bom/issues/6681)) ([91673de](https://redirect.github.com/googleapis/java-cloud-bom/commit/91673debfaec89f2c6b49249966f9ed772acc3bd)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.3 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.20.0 ([#​6694](https://redirect.github.com/googleapis/java-cloud-bom/issues/6694)) ([780736c](https://redirect.github.com/googleapis/java-cloud-bom/commit/780736c2b35f8f657b686bd1f4e61946835736ec)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.131.10-alpha ([#​6695](https://redirect.github.com/googleapis/java-cloud-bom/issues/6695)) ([6ecff38](https://redirect.github.com/googleapis/java-cloud-bom/commit/6ecff38a39d0bbc2516ffcba64507afc9b4ac027)) - update dependency com.google.cloud:google-cloud-nio to v0.127.21 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.0 ([#​6693](https://redirect.github.com/googleapis/java-cloud-bom/issues/6693)) ([b0483b9](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0483b95065ae38522547c736a753c751279f014)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.0 ([#​6696](https://redirect.github.com/googleapis/java-cloud-bom/issues/6696)) ([ad905cc](https://redirect.github.com/googleapis/java-cloud-bom/commit/ad905ccb7d41bd64cc519bd855dabb0523bd7fa8)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.72.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.20.2 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.41.0 ([#​6690](https://redirect.github.com/googleapis/java-cloud-bom/issues/6690)) ([43aef8e](https://redirect.github.com/googleapis/java-cloud-bom/commit/43aef8e9bf082ce98afd0c34163b016b8f315ee0)) - update dependency com.google.googlejavaformat:google-java-format to v1.23.0 ([#​6692](https://redirect.github.com/googleapis/java-cloud-bom/issues/6692)) ([b403c50](https://redirect.github.com/googleapis/java-cloud-bom/commit/b403c5040d47ba87dd32162e3be71ded6fdd127c))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 (#1561) * deps: update dependency com.google.guava:guava-testlib to v33.3.0-jre (#1548) * deps: update dependency com.google.errorprone:error_prone_core to v2.31.0 (#1523) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.errorprone:error_prone_core](https://errorprone.info) ([source](https://redirect.github.com/google/error-prone)) | `2.28.0` -> `2.31.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
google/error-prone (com.google.errorprone:error_prone_core) ### [`v2.31.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.31.0): Error Prone 2.31.0 This is the last planned minor release of Error Prone that will support running on JDK 11, see [#​3803](https://redirect.github.com/google/error-prone/issues/3803). Using Error Prone to compile code that is deployed to earlier versions will continue to be fully supported, but will require using JDK 17 or newer for compilation and setting `--release` or `-source`/`-target`/`-bootclasspath`. Changes: - Introduce [`@ThreadSafeTypeParameter`](https://redirect.github.com/google/error-prone/blob/2656f48902f6723f3147caa117372309dbc6c15f/type_annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java) with enforcement by [ThreadSafe](https://errorprone.info/bugpattern/ThreadSafe) - Improved support for latest JDK 24 EA builds - Error Prone is now distributed as a Multi-Release jar ([#​3756](https://redirect.github.com/google/error-prone/issues/3756)) New checks: - [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): AutoValue instances should not usually contain boxed types that are not Nullable. We recommend removing the unnecessary boxing. Full changelog: https://togithub.com/google/error-prone/compare/v2.30.0...v2.31.0 ### [`v2.30.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.30.0): Error Prone 2.30.0 New checks: - [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): Detects unnecessary boxing in AutoValue classes. - [`DefaultLocale`](https://errorprone.info/bugpattern/DefaultLocale): Detects implicit use of the JVM default locale, which can result in differing behaviour between JVM executions. - [`UnnecessaryBreakInSwitch`](https://errorprone.info/bugpattern/UnnecessaryBreakInSwitch): Remove unnecessary `break` statements in `->` switches. Closed issues: [#​632](https://redirect.github.com/google/error-prone/issues/632), [#​4487](https://redirect.github.com/google/error-prone/issues/4487) Full changelog: https://togithub.com/google/error-prone/compare/v2.29.2...v2.30.0 ### [`v2.29.2`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.2): Error Prone 2.29.2 This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0) and [2.29.1](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1), plus: - a bug fix for a crash in `TraditionalSwitchExpression` ([https://togithub.com/google/error-prone/issues/4479](https://redirect.github.com/google/error-prone/issues/4479)) - restores the `module-info` for the annotations jar, which was accidentally removed ([https://togithub.com/google/error-prone/issues/4480](https://redirect.github.com/google/error-prone/issues/4480)) Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.1...v2.29.2 ### [`v2.29.1`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1): Error Prone 2.29.1 This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0), plus: - a bug fix to `UnusedVariable` to handle unnamed `_` variables ([https://togithub.com/google/error-prone/issues/4451](https://redirect.github.com/google/error-prone/issues/4451)) - a bug fix for a crash in `SetUnrecognized` ([https://togithub.com/google/error-prone/issues/4475](https://redirect.github.com/google/error-prone/issues/4475)) Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.0...v2.29.1 ### [`v2.29.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0): Error Prone 2.29.0 New checks: - [`MissingRuntimeRetention`](https://errorprone.info/bugpattern/MissingRuntimeRetention) - [`SetUnrecognized`](https://errorprone.info/bugpattern/SetUnrecognized) - [`StatementSwitchToExpressionSwitch`](https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch) Closed issues: [#​4318](https://redirect.github.com/google/error-prone/issues/4318), [#​4429](https://redirect.github.com/google/error-prone/issues/4429), [#​4467](https://redirect.github.com/google/error-prone/issues/4467) Full Changelog: https://togithub.com/google/error-prone/compare/v2.28.0...v2.29.0
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore: change if condition in workflow (#1567) * chore: change if condition in workflow * add head_ref * add var * chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 (#1568) * chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 * chore: generate libraries at Wed Sep 11 15:41:06 UTC 2024 * build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 (#1551) * test(deps): update dependency com.google.truth:truth to v1.4.4 (#1520) * deps: update dependency org.easymock:easymock to v5.4.0 (#1482) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1480) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff)) ### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed)) ### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) ##### Features - Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) ### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) ### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a)) - Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49)) - Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore(main): release 2.21.3 (#1565) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1570) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff)) ### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed)) ### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) ##### Features - Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) ### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) ### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a)) - Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49)) - Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.3 (#1572) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.21.2` -> `2.21.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.3`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2213-2024-09-11) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#​1561](https://redirect.github.com/googleapis/java-datastore/issues/1561)) ([5a79fd8](https://redirect.github.com/googleapis/java-datastore/commit/5a79fd8d1202e65c02423fe40402c41af6050efa)) - Update dependency com.google.errorprone:error_prone_core to v2.31.0 ([#​1523](https://redirect.github.com/googleapis/java-datastore/issues/1523)) ([8d3af32](https://redirect.github.com/googleapis/java-datastore/commit/8d3af322fb56032cd7a9d29e60fd93d1f3e7e632)) - Update dependency com.google.guava:guava-testlib to v33.3.0-jre ([#​1548](https://redirect.github.com/googleapis/java-datastore/issues/1548)) ([18ba37f](https://redirect.github.com/googleapis/java-datastore/commit/18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9)) - Update dependency org.easymock:easymock to v5.4.0 ([#​1482](https://redirect.github.com/googleapis/java-datastore/issues/1482)) ([ee788a1](https://redirect.github.com/googleapis/java-datastore/commit/ee788a162841994e09a61bb81b94cbe93353a78e))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime (#1575) * chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 (#1573) * chore: Update generation configuration at Thu Sep 12 02:19:58 UTC 2024 * chore: generate libraries at Thu Sep 12 02:20:21 UTC 2024 * chore: Update generation configuration at Fri Sep 13 02:20:43 UTC 2024 * chore: Update generation configuration at Sat Sep 14 02:18:54 UTC 2024 * chore: Update generation configuration at Mon Sep 16 02:25:16 UTC 2024 * chore: Update generation configuration at Tue Sep 17 02:08:30 UTC 2024 * chore: Update generation configuration at Wed Sep 18 02:20:33 UTC 2024 * chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 * chore: generate libraries at Thu Sep 19 02:22:20 UTC 2024 * feat: Introducing Tracing with OpenTelemetry API #1537 (#1576) * feat: Adding TraceUtil interface and its implementation to enable Tracing controls via DatastoreOptions (#1431) * Adding EnabledTraceUtil, DisabledTraceUtil and TraceUtilTest * Annotating DatastoreOpenTelemetryOptions to be transient as they're not serializable * Adding google-auth-library-credentials dependency due to https://github.com/googleapis/java-datastore/actions/runs/8944472794/job/24571458116?pr=1431 * feat: Adding Lookup RPC OpenTelemetry Tracing (#1437) * feat: Adding Lookup RPC OpenTelemetry Tracing - Removed OpenCensus Tracing - Added E2E tests with Global and Local OTel SDK - Moved OTel SDK setup to RemoteDatastoreHelper - Fixed pom to depend on BOM for all shared dependencies * feat: Adding Commit RPC Trace Instrumentation (#1440) - Added end-to-end test for Datastore operationsput, add, update and delete. - Updated E2E Test to use the namespace correctly for efficient clean-up of test data * feat: RunQuery trace instrumentation (#1441) * feat: RunQuery trace instrumentation * feat: RunAggregationQuery instrumentation (#1447) * feat: RunQuery trace instrumentation * Formatting * Formatting * Refactor: s/RUNQUERY/RUN_QUERY * feat: RunAggregationQuery Trace Instrumentation * Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java). * Formatting * Fixing @Test annotation missed after merge * Formatting * feat: RunQuery trace instrumentation * Formatting * Formatting * Refactor: s/RUNQUERY/RUN_QUERY * feat: RunAggregationQuery Trace Instrumentation * Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java). * Formatting * Fixing @Test annotation missed after merge * Formatting * feat: Add Transaction tracing test: transactionalLookupTest * test: Transaction test for RunInTransaction - need to fix trace instrumentation for RunIn.. * Adding transaction span names * TransactionLookupTest * feat: support for transactional operations - tested using newTransaction() and runInTransaction() * Revert "feat: support for transactional operations" This reverts commit 10341c0b97cbc2025f9f928ce8cb09d5c036a5b3. * feat: support for transactional operations (#1468) * feat: support for transactional operations - tested using newTransaction() and runInTransaction() * feat: Allocateid tracing (#1488) * feat: Adding tracing for AllocateIds RPC * formatting * 🦉 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 * feat: Add tracing for ReserveIds operation (#1490) - added end-to-end test * fix: Fixed Span nesting for `ReadWriteTransactionCallable` by using parent SpanContext instead of just parent Context (#1495) * fix: Fixed the TraceUtil.startSpan method to use `SpanContext` for linking with the … * Refactor: merge changes from main branch (#1660) * chore: update sync-repo-settings.yaml (#1417) Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ If you write sample code, please follow the [samples format]( https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). * deps: update dependency com.google.errorprone:error_prone_core to v2.27.1 (#1421) * deps: update dependency com.google.guava:guava-testlib to v33.2.0-jre (#1422) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 (#1426) * fix(deps): Update the Java code generator (gapic-generator-java) to 2.39.0 (#1406) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 626430774 Source-Link: https://togithub.com/googleapis/googleapis/commit/835b84ebfc4974ab5dcd9b31ad66c01ef3455475 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/43f369d90f19d09ac18720151ab106042beb811b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDNmMzY5ZDkwZjE5ZDA5YWMxODcyMDE1MWFiMTA2MDQyYmViODExYiJ9 * chore(main): release 2.19.2 (#1414) :robot: I have created a release *beep* *boop* --- ## [2.19.2](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03) ### Bug Fixes * **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) * Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) * Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) * Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.19.3-SNAPSHOT (#1432) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#1412) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.2 (#1433) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.1` -> `2.19.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.19.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2192-2024-05-03) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) ##### Bug Fixes - **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#​1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#​1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) - Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#​1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) - Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#​1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) - Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#​1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore). * chore: autogen updates (#1434) * fix: An existing method `UpdateVehicleLocation` is removed from service `VehicleService` fix: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService` fix: An existing message `UpdateVehicleLocationRequest` is removed PiperOrigin-RevId: 631557549 Source-Link: https://github.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9 * 🦉 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 * chore: update dependency versions in java templates (#1964) (#1435) * chore: update dependency versions in java templates * update other templates Source-Link: https://togithub.com/googleapis/synthtool/commit/0b86c72fe652dd7e52ba05a63f61bc1399ad5d65 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e * chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 (#1436) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 * 🦉 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 * build: update actions/setup-java action to v4 (#1391) * deps: update actions/checkout action to v4 (#1390) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 (#1443) * chore(main): release 2.19.3 (#1438) :robot: I have created a release *beep* *boop* --- ## [2.19.3](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16) ### Dependencies * Update actions/checkout action to v4 ([#1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.19.4-SNAPSHOT (#1444) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.3 (#1446) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.2` -> `2.19.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.19.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2193-2024-05-16) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) ##### Dependencies - Update actions/checkout action to v4 ([#​1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) - Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#​1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore). * test(deps): update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 (#1448) * deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 * 🦉 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 * build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#1453) * chore: [java] allow passing libraries_bom_version from env (#1967) (#1451) * feat: [java] allow passing libraries_bom_version from env * reformat Source-Link: https://togithub.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea * test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 (#1449) * test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 * 🦉 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 * fix: Migrate off TextPrinter's deprecated methods (#1452) * fix: chore: Migrate off TextPrinter's deprecated methods * 🦉 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 * feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455) * feat: New PropertyMask field which allows partial commits, lookups, and query results PiperOrigin-RevId: 635449160 Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9 * 🦉 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 * fix: set the correct database id on the key parent when calling Key#getParent (#1457) * fix: set database ID on parent key * 🦉 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 * chore(main): release 2.20.0 (#1454) :robot: I have created a release *beep* *boop* --- ## [2.20.0](https://togithub.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27) ### Features * New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://togithub.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://togithub.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b)) ### Bug Fixes * Migrate off TextPrinter's deprecated methods ([#1452](https://togithub.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://togithub.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92)) * Set the correct database id on the key parent when calling Key#getParent ([#1457](https://togithub.com/googleapis/java-datastore/issues/1457)) ([992815d](https://togithub.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.20.1-SNAPSHOT (#1461) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * test: add integration test for incomplete key (#1460) * test: add integration test for incomplete key * 🦉 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 * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 (#1463) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 * 🦉 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 * chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 (#1466) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 * 🦉 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 * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 (#1471) * deps: update dependency com.google.guava:guava-testlib to v33.2.1-jre (#1470) * deps: update dependency com.google.errorprone:error_prone_core to v2.28.0 (#1469) * build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.7.0 (#1459) * chore(main): release 2.20.1 (#1476) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * Doc: Add gRPC datastore gapic upgrade user guide (#1489) * chore: Add read me user guide * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Updating formatting * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fixing formatting * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * adjusting formatting * 🦉 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 * chore(main): release 2.20.2-SNAPSHOT (#1479) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 (#1492) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 * 🦉 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 * chore(main): release 2.20.2 (#1503) :robot: I have created a release *beep* *boop* --- ## [2.20.2](https://togithub.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1492](https://togithub.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://togithub.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * feat: enable hermetic library generation (#1462) * restore to older version * update googleapis_committish * fix googleapis_committish * infer image tag from config yaml * correct workflow name * update config scripts and yamls * remove old update_googleapis_committish workflow * restore proto folder * Revert "restore proto folder" This reverts commit 59046f83269c16fb775d1069b54ee5de0749b8e5. * feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455) * feat: New PropertyMask field which allows partial commits, lookups, and query results PiperOrigin-RevId: 635449160 Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9 * 🦉 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 * sync config structure with that of google-cloud-java * remove quotes from config yamls * fix typo in update_generation_config.yaml * correct * quote codeowners_team in generation config * update generator version * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Owl Bot * ci: [java] automatic kokoro label in and /gcbrun comment (#1965) (#1481) Source-Link: https://github.com/googleapis/synthtool/commit/bd2bae89f70bad380da47fab9ec25985dfb87d67 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3 Co-authored-by: Owl Bot * test(deps): update dependency com.google.truth:truth to v1.4.3 (#1501) * chore: correct hermetic library generation script path (#1506) * fix: correct hermetic library generation script path * 🦉 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 * chore: skip hermetic generation on fork PRs (#1510) * chore: make the owlbot postprocessor check non-required (#1512) * chore: make the owlbot postprocessor check non-required * remove required check in other branches * chore: disable the Owl Bot post-processor (#1511) via deleting .OwlBot.lock.yaml (context) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 (#1485) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 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 Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> * chore(main): release 2.20.3-SNAPSHOT (#1504) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore: setup 2.19.x lts branch (#1535) * chore(main): release 2.21.0 (#1517) :robot: I have created a release *beep* *boop* --- ## [2.21.0](https://togithub.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31) ### Features * Enable hermetic library generation ([#1462](https://togithub.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://togithub.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 (#1531) * chore(main): release 2.21.1-SNAPSHOT (#1538) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore(deps): update dependency com.google.cloud:libraries-bom to v26.43.0 (#1515) * chore(main): release 2.21.1 (#1540) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore(main): release 2.21.2-SNAPSHOT (#1541) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore: secure hermetic_library_generation workflow (#1552) * chore: secure hermetic_library_generation workflow Thanks to @diogoteles08 for the inspection on our repos. This PR inlines environment variables to avoid overriding script injections. * fix wording * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 (#1547) * chore(main): release 2.21.2 (#1553) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore: remove datastore native image sample in favor of sample hosted in google-cloud-java (#1519) * chore: remove unused image tag in .OwlBot-hermetic.yaml (#1559) This removes the unused image tag in this file. Part of the cleanup after enabling Hermetic Library generation in this repo. Newline at EOF automatically added - see [this SO](https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-newline). * chore(main): release 2.21.3-SNAPSHOT (#1554) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore: Update generation configuration at Tue Sep 10 17:00:48 UTC 2024 (#1564) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.45.0 (#1544) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.43.0` -> `26.45.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-cloud-bom (com.google.cloud:libraries-bom) ### [`v26.45.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26450-2024-08-27) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.44.0...v26.45.0) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.34.0 ([#​6707](https://redirect.github.com/googleapis/java-cloud-bom/issues/6707)) ([412f4ba](https://redirect.github.com/googleapis/java-cloud-bom/commit/412f4ba5c2223aabff39c0a60bf07cbd147f02da)) - update dependency com.google.cloud:gapic-libraries-bom to v1.42.0 ([#​6716](https://redirect.github.com/googleapis/java-cloud-bom/issues/6716)) ([6fc3557](https://redirect.github.com/googleapis/java-cloud-bom/commit/6fc35575193baf1d458b63ba166e92b64421c383)) - update dependency com.google.cloud:google-cloud-bigquery to v2.42.1 ([#​6730](https://redirect.github.com/googleapis/java-cloud-bom/issues/6730)) ([b0d939d](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0d939dbbd3a94673206d206369f81429c1a6a7f)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.1 ([#​6712](https://redirect.github.com/googleapis/java-cloud-bom/issues/6712)) ([0121887](https://redirect.github.com/googleapis/java-cloud-bom/commit/0121887c7db48c48d14098d9643a3b73574bf851)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.9.0 ([#​6729](https://redirect.github.com/googleapis/java-cloud-bom/issues/6729)) ([406333e](https://redirect.github.com/googleapis/java-cloud-bom/commit/406333e7870405673e014f6871a31ac9c8822866)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.43.0 ([#​6723](https://redirect.github.com/googleapis/java-cloud-bom/issues/6723)) ([0754a10](https://redirect.github.com/googleapis/java-cloud-bom/commit/0754a10b89b628179d4f115e162e326765de33b3)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.2 ([#​6725](https://redirect.github.com/googleapis/java-cloud-bom/issues/6725)) ([6d96ff4](https://redirect.github.com/googleapis/java-cloud-bom/commit/6d96ff40b279c73700cf85633445880721739d1e)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.25.1 ([#​6705](https://redirect.github.com/googleapis/java-cloud-bom/issues/6705)) ([b0440a8](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0440a82a5b1f66f123b3014ccc5ecdfa783285a)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.20.1 ([#​6720](https://redirect.github.com/googleapis/java-cloud-bom/issues/6720)) ([479182a](https://redirect.github.com/googleapis/java-cloud-bom/commit/479182af6afc7db95fac0bfafc3aaa587a23ff7c)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.131.11-alpha ([#​6721](https://redirect.github.com/googleapis/java-cloud-bom/issues/6721)) ([9394259](https://redirect.github.com/googleapis/java-cloud-bom/commit/93942598cc7b42ad66ebad5557aeff795a9a8644)) - update dependency com.google.cloud:google-cloud-nio to v0.127.22 ([#​6713](https://redirect.github.com/googleapis/java-cloud-bom/issues/6713)) ([f7563bd](https://redirect.github.com/googleapis/java-cloud-bom/commit/f7563bd2822dff72ec01a148b14774bc641b3678)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.1 ([#​6714](https://redirect.github.com/googleapis/java-cloud-bom/issues/6714)) ([439460a](https://redirect.github.com/googleapis/java-cloud-bom/commit/439460a340a4954117ba1f0c49e0f7ab99c0cf73)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.1 ([#​6715](https://redirect.github.com/googleapis/java-cloud-bom/issues/6715)) ([27a374b](https://redirect.github.com/googleapis/java-cloud-bom/commit/27a374b7a8318d5a8b100d3c1edfd420d8cf3cd4)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.73.0 ([#​6722](https://redirect.github.com/googleapis/java-cloud-bom/issues/6722)) ([b93b322](https://redirect.github.com/googleapis/java-cloud-bom/commit/b93b3222f36b8701ed59cb42ddb7636b822a8ece)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.74.0 ([#​6728](https://redirect.github.com/googleapis/java-cloud-bom/issues/6728)) ([9ca5a25](https://redirect.github.com/googleapis/java-cloud-bom/commit/9ca5a25c1772f8283598b4a8fbb64c08d0346557)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.21.0 ([#​6724](https://redirect.github.com/googleapis/java-cloud-bom/issues/6724)) ([4e32a3d](https://redirect.github.com/googleapis/java-cloud-bom/commit/4e32a3d0a5598c3f2a09bbd2155d7c589c81c796)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.42.0 ([#​6717](https://redirect.github.com/googleapis/java-cloud-bom/issues/6717)) ([8302476](https://redirect.github.com/googleapis/java-cloud-bom/commit/8302476bac2908beeb0be2ac4f3a7b766bb9c011)) - update dependency commons-cli:commons-cli to v1.9.0 ([#​6706](https://redirect.github.com/googleapis/java-cloud-bom/issues/6706)) ([539f86c](https://redirect.github.com/googleapis/java-cloud-bom/commit/539f86cf0fab014d0c306bf230253569fab8494f)) ### [`v26.44.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26440-2024-08-08) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.43.0...v26.44.0) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.33.0 ([#​6687](https://redirect.github.com/googleapis/java-cloud-bom/issues/6687)) ([d93c7c1](https://redirect.github.com/googleapis/java-cloud-bom/commit/d93c7c1e5c8cfea5f0bb3b570282af1d17ac9992)) - update dependency com.google.cloud:gapic-libraries-bom to v1.41.0 ([#​6689](https://redirect.github.com/googleapis/java-cloud-bom/issues/6689)) ([e5afcc8](https://redirect.github.com/googleapis/java-cloud-bom/commit/e5afcc8a5afd362f7cdb6d19f446c99db7832fb9)) - update dependency com.google.cloud:google-cloud-bigquery to v2.42.0 ([#​6688](https://redirect.github.com/googleapis/java-cloud-bom/issues/6688)) ([58ed9ce](https://redirect.github.com/googleapis/java-cloud-bom/commit/58ed9cef18361489756bafdf9b6159077f498608)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.0 ([#​6685](https://redirect.github.com/googleapis/java-cloud-bom/issues/6685)) ([c6968cb](https://redirect.github.com/googleapis/java-cloud-bom/commit/c6968cb3315c37d21539daa5001c6b297f600ba4)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.41.0 ([#​6686](https://redirect.github.com/googleapis/java-cloud-bom/issues/6686)) ([256f1b0](https://redirect.github.com/googleapis/java-cloud-bom/commit/256f1b0e97dc1c28453fd0c302e5ecc6958a5a55)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.42.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.0 ([#​6697](https://redirect.github.com/googleapis/java-cloud-bom/issues/6697)) ([046ad04](https://redirect.github.com/googleapis/java-cloud-bom/commit/046ad04177bca0cfd2aecce6bc1170617939bfbb)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.1 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.2 ([#​6681](https://redirect.github.com/googleapis/java-cloud-bom/issues/6681)) ([91673de](https://redirect.github.com/googleapis/java-cloud-bom/commit/91673debfaec89f2c6b49249966f9ed772acc3bd)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.3 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.20.0 ([#​6694](https://redirect.github.com/googleapis/java-cloud-bom/issues/6694)) ([780736c](https://redirect.github.com/googleapis/java-cloud-bom/commit/780736c2b35f8f657b686bd1f4e61946835736ec)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.131.10-alpha ([#​6695](https://redirect.github.com/googleapis/java-cloud-bom/issues/6695)) ([6ecff38](https://redirect.github.com/googleapis/java-cloud-bom/commit/6ecff38a39d0bbc2516ffcba64507afc9b4ac027)) - update dependency com.google.cloud:google-cloud-nio to v0.127.21 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.0 ([#​6693](https://redirect.github.com/googleapis/java-cloud-bom/issues/6693)) ([b0483b9](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0483b95065ae38522547c736a753c751279f014)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.0 ([#​6696](https://redirect.github.com/googleapis/java-cloud-bom/issues/6696)) ([ad905cc](https://redirect.github.com/googleapis/java-cloud-bom/commit/ad905ccb7d41bd64cc519bd855dabb0523bd7fa8)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.72.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.20.2 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.41.0 ([#​6690](https://redirect.github.com/googleapis/java-cloud-bom/issues/6690)) ([43aef8e](https://redirect.github.com/googleapis/java-cloud-bom/commit/43aef8e9bf082ce98afd0c34163b016b8f315ee0)) - update dependency com.google.googlejavaformat:google-java-format to v1.23.0 ([#​6692](https://redirect.github.com/googleapis/java-cloud-bom/issues/6692)) ([b403c50](https://redirect.github.com/googleapis/java-cloud-bom/commit/b403c5040d47ba87dd32162e3be71ded6fdd127c))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 (#1561) * deps: update dependency com.google.guava:guava-testlib to v33.3.0-jre (#1548) * deps: update dependency com.google.errorprone:error_prone_core to v2.31.0 (#1523) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.errorprone:error_prone_core](https://errorprone.info) ([source](https://redirect.github.com/google/error-prone)) | `2.28.0` -> `2.31.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
google/error-prone (com.google.errorprone:error_prone_core) ### [`v2.31.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.31.0): Error Prone 2.31.0 This is the last planned minor release of Error Prone that will support running on JDK 11, see [#​3803](https://redirect.github.com/google/error-prone/issues/3803). Using Error Prone to compile code that is deployed to earlier versions will continue to be fully supported, but will require using JDK 17 or newer for compilation and setting `--release` or `-source`/`-target`/`-bootclasspath`. Changes: - Introduce [`@ThreadSafeTypeParameter`](https://redirect.github.com/google/error-prone/blob/2656f48902f6723f3147caa117372309dbc6c15f/type_annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java) with enforcement by [ThreadSafe](https://errorprone.info/bugpattern/ThreadSafe) - Improved support for latest JDK 24 EA builds - Error Prone is now distributed as a Multi-Release jar ([#​3756](https://redirect.github.com/google/error-prone/issues/3756)) New checks: - [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): AutoValue instances should not usually contain boxed types that are not Nullable. We recommend removing the unnecessary boxing. Full changelog: https://togithub.com/google/error-prone/compare/v2.30.0...v2.31.0 ### [`v2.30.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.30.0): Error Prone 2.30.0 New checks: - [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): Detects unnecessary boxing in AutoValue classes. - [`DefaultLocale`](https://errorprone.info/bugpattern/DefaultLocale): Detects implicit use of the JVM default locale, which can result in differing behaviour between JVM executions. - [`UnnecessaryBreakInSwitch`](https://errorprone.info/bugpattern/UnnecessaryBreakInSwitch): Remove unnecessary `break` statements in `->` switches. Closed issues: [#​632](https://redirect.github.com/google/error-prone/issues/632), [#​4487](https://redirect.github.com/google/error-prone/issues/4487) Full changelog: https://togithub.com/google/error-prone/compare/v2.29.2...v2.30.0 ### [`v2.29.2`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.2): Error Prone 2.29.2 This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0) and [2.29.1](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1), plus: - a bug fix for a crash in `TraditionalSwitchExpression` ([https://togithub.com/google/error-prone/issues/4479](https://redirect.github.com/google/error-prone/issues/4479)) - restores the `module-info` for the annotations jar, which was accidentally removed ([https://togithub.com/google/error-prone/issues/4480](https://redirect.github.com/google/error-prone/issues/4480)) Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.1...v2.29.2 ### [`v2.29.1`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1): Error Prone 2.29.1 This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0), plus: - a bug fix to `UnusedVariable` to handle unnamed `_` variables ([https://togithub.com/google/error-prone/issues/4451](https://redirect.github.com/google/error-prone/issues/4451)) - a bug fix for a crash in `SetUnrecognized` ([https://togithub.com/google/error-prone/issues/4475](https://redirect.github.com/google/error-prone/issues/4475)) Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.0...v2.29.1 ### [`v2.29.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0): Error Prone 2.29.0 New checks: - [`MissingRuntimeRetention`](https://errorprone.info/bugpattern/MissingRuntimeRetention) - [`SetUnrecognized`](https://errorprone.info/bugpattern/SetUnrecognized) - [`StatementSwitchToExpressionSwitch`](https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch) Closed issues: [#​4318](https://redirect.github.com/google/error-prone/issues/4318), [#​4429](https://redirect.github.com/google/error-prone/issues/4429), [#​4467](https://redirect.github.com/google/error-prone/issues/4467) Full Changelog: https://togithub.com/google/error-prone/compare/v2.28.0...v2.29.0
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore: change if condition in workflow (#1567) * chore: change if condition in workflow * add head_ref * add var * chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 (#1568) * chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 * chore: generate libraries at Wed Sep 11 15:41:06 UTC 2024 * build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 (#1551) * test(deps): update dependency com.google.truth:truth to v1.4.4 (#1520) * deps: update dependency org.easymock:easymock to v5.4.0 (#1482) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1480) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff)) ### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed)) ### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) ##### Features - Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) ### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) ### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a)) - Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49)) - Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore(main): release 2.21.3 (#1565) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1570) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff)) ### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed)) ### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) ##### Features - Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) ### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) ### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a)) - Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49)) - Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.3 (#1572) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.21.2` -> `2.21.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.3`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2213-2024-09-11) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#​1561](https://redirect.github.com/googleapis/java-datastore/issues/1561)) ([5a79fd8](https://redirect.github.com/googleapis/java-datastore/commit/5a79fd8d1202e65c02423fe40402c41af6050efa)) - Update dependency com.google.errorprone:error_prone_core to v2.31.0 ([#​1523](https://redirect.github.com/googleapis/java-datastore/issues/1523)) ([8d3af32](https://redirect.github.com/googleapis/java-datastore/commit/8d3af322fb56032cd7a9d29e60fd93d1f3e7e632)) - Update dependency com.google.guava:guava-testlib to v33.3.0-jre ([#​1548](https://redirect.github.com/googleapis/java-datastore/issues/1548)) ([18ba37f](https://redirect.github.com/googleapis/java-datastore/commit/18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9)) - Update dependency org.easymock:easymock to v5.4.0 ([#​1482](https://redirect.github.com/googleapis/java-datastore/issues/1482)) ([ee788a1](https://redirect.github.com/googleapis/java-datastore/commit/ee788a162841994e09a61bb81b94cbe93353a78e))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime (#1575) * chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 (#1573) * chore: Update generation configuration at Thu Sep 12 02:19:58 UTC 2024 * chore: generate libraries at Thu Sep 12 02:20:21 UTC 2024 * chore: Update generation configuration at Fri Sep 13 02:20:43 UTC 2024 * chore: Update generation configuration at Sat Sep 14 02:18:54 UTC 2024 * chore: Update generation configuration at Mon Sep 16 02:25:16 UTC 2024 * chore: Update generation configuration at Tue Sep 17 02:08:30 UTC 2024 * chore: Update generation configuration at Wed Sep 18 02:20:33 UTC 2024 * chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 * chore: generate libraries at Thu Sep 19 02:22:20 UTC 2024 * feat: Introducing Tracing with OpenTelemetry API #1537 (#1576) * feat: Adding TraceUtil interface and its implementation to enable Tracing controls via DatastoreOptions (#1431) * Adding EnabledTraceUtil, DisabledTraceUtil and TraceUtilTest * Annotating DatastoreOpenTelemetryOptions to be transient as they're not serializable * Adding google-auth-library-credentials dependency due to https://github.com/googleapis/java-datastore/actions/runs/8944472794/job/24571458116?pr=1431 * feat: Adding Lookup RPC OpenTelemetry Tracing (#1437) * feat: Adding Lookup RPC OpenTelemetry Tracing - Removed OpenCensus Tracing - Added E2E tests with Global and Local OTel SDK - Moved OTel SDK setup to RemoteDatastoreHelper - Fixed pom to depend on BOM for all shared dependencies * feat: Adding Commit RPC Trace Instrumentation (#1440) - Added end-to-end test for Datastore operationsput, add, update and delete. - Updated E2E Test to use the namespace correctly for efficient clean-up of test data * feat: RunQuery trace instrumentation (#1441) * feat: RunQuery trace instrumentation * feat: RunAggregationQuery instrumentation (#1447) * feat: RunQuery trace instrumentation * Formatting * Formatting * Refactor: s/RUNQUERY/RUN_QUERY * feat: RunAggregationQuery Trace Instrumentation * Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java). * Formatting * Fixing @Test annotation missed after merge * Formatting * feat: RunQuery trace instrumentation * Formatting * Formatting * Refactor: s/RUNQUERY/RUN_QUERY * feat: RunAggregationQuery Trace Instrumentation * Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java). * Formatting * Fixing @Test annotation missed after merge * Formatting * feat: Add Transaction tracing test: transactionalLookupTest * test: Transaction test for RunInTransaction - need to fix trace instrumentation for RunIn.. * Adding transaction span names * TransactionLookupTest * feat: support for transactional operations - tested using newTransaction() and runInTransaction() * Revert "feat: support for transactional operations" This reverts commit 10341c0b97cbc2025f9f928ce8cb09d5c036a5b3. * feat: support for transactional operations (#1468) * feat: support for transactional operations - tested using newTransaction() and runInTransaction() * feat: Allocateid tracing (#1488) * feat: Adding tracing for AllocateIds RPC * formatting * 🦉 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 * feat: Add tracing for ReserveIds operation (#1490) - added end-to-end test * fix: Fixed Span nesting for `ReadWriteTransactionCallable` by using parent SpanContext instead of just parent Context (#1495) * fix: Fixed the TraceUtil.startSpan method to use `SpanContext` for linking with the parent instead … * Refactor: refactor code changes from maincopy (#1676) * chore: update sync-repo-settings.yaml (#1417) Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-datastore/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ If you write sample code, please follow the [samples format]( https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). * deps: update dependency com.google.errorprone:error_prone_core to v2.27.1 (#1421) * deps: update dependency com.google.guava:guava-testlib to v33.2.0-jre (#1422) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 (#1426) * fix(deps): Update the Java code generator (gapic-generator-java) to 2.39.0 (#1406) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 626430774 Source-Link: https://togithub.com/googleapis/googleapis/commit/835b84ebfc4974ab5dcd9b31ad66c01ef3455475 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/43f369d90f19d09ac18720151ab106042beb811b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDNmMzY5ZDkwZjE5ZDA5YWMxODcyMDE1MWFiMTA2MDQyYmViODExYiJ9 * chore(main): release 2.19.2 (#1414) :robot: I have created a release *beep* *boop* --- ## [2.19.2](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03) ### Bug Fixes * **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) * Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) * Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) * Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.19.3-SNAPSHOT (#1432) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#1412) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.2 (#1433) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.1` -> `2.19.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.1/2.19.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.19.2`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2192-2024-05-03) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) ##### Bug Fixes - **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#​1406](https://togithub.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://togithub.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac)) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#​1426](https://togithub.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://togithub.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639)) - Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#​1411](https://togithub.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://togithub.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727)) - Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#​1421](https://togithub.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://togithub.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf)) - Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#​1422](https://togithub.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://togithub.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore). * chore: autogen updates (#1434) * fix: An existing method `UpdateVehicleLocation` is removed from service `VehicleService` fix: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService` fix: An existing message `UpdateVehicleLocationRequest` is removed PiperOrigin-RevId: 631557549 Source-Link: https://github.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9 * 🦉 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 * chore: update dependency versions in java templates (#1964) (#1435) * chore: update dependency versions in java templates * update other templates Source-Link: https://togithub.com/googleapis/synthtool/commit/0b86c72fe652dd7e52ba05a63f61bc1399ad5d65 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e * chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 (#1436) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.39.0 * 🦉 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 * build: update actions/setup-java action to v4 (#1391) * deps: update actions/checkout action to v4 (#1390) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 (#1443) * chore(main): release 2.19.3 (#1438) :robot: I have created a release *beep* *boop* --- ## [2.19.3](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16) ### Dependencies * Update actions/checkout action to v4 ([#1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.19.4-SNAPSHOT (#1444) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.19.3 (#1446) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://togithub.com/googleapis/java-datastore) | `2.19.2` -> `2.19.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.19.2/2.19.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.19.3`](https://togithub.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2193-2024-05-16) [Compare Source](https://togithub.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) ##### Dependencies - Update actions/checkout action to v4 ([#​1390](https://togithub.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://togithub.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63)) - Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#​1443](https://togithub.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://togithub.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-datastore). * test(deps): update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 (#1448) * deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 * 🦉 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 * build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#1453) * chore: [java] allow passing libraries_bom_version from env (#1967) (#1451) * feat: [java] allow passing libraries_bom_version from env * reformat Source-Link: https://togithub.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea * test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 (#1449) * test(deps): update dependency org.graalvm.buildtools:junit-platform-native to v0.10.2 * 🦉 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 * fix: Migrate off TextPrinter's deprecated methods (#1452) * fix: chore: Migrate off TextPrinter's deprecated methods * 🦉 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 * feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455) * feat: New PropertyMask field which allows partial commits, lookups, and query results PiperOrigin-RevId: 635449160 Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9 * 🦉 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 * fix: set the correct database id on the key parent when calling Key#getParent (#1457) * fix: set database ID on parent key * 🦉 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 * chore(main): release 2.20.0 (#1454) :robot: I have created a release *beep* *boop* --- ## [2.20.0](https://togithub.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27) ### Features * New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://togithub.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://togithub.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b)) ### Bug Fixes * Migrate off TextPrinter's deprecated methods ([#1452](https://togithub.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://togithub.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92)) * Set the correct database id on the key parent when calling Key#getParent ([#1457](https://togithub.com/googleapis/java-datastore/issues/1457)) ([992815d](https://togithub.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore(main): release 2.20.1-SNAPSHOT (#1461) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * test: add integration test for incomplete key (#1460) * test: add integration test for incomplete key * 🦉 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 * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 (#1463) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.20.0 * 🦉 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 * chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 (#1466) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 * 🦉 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 * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 (#1471) * deps: update dependency com.google.guava:guava-testlib to v33.2.1-jre (#1470) * deps: update dependency com.google.errorprone:error_prone_core to v2.28.0 (#1469) * build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.7.0 (#1459) * chore(main): release 2.20.1 (#1476) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * Doc: Add gRPC datastore gapic upgrade user guide (#1489) * chore: Add read me user guide * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Updating formatting * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fixing formatting * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * adjusting formatting * 🦉 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 * chore(main): release 2.20.2-SNAPSHOT (#1479) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 (#1492) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 * 🦉 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 * chore(main): release 2.20.2 (#1503) :robot: I have created a release *beep* *boop* --- ## [2.20.2](https://togithub.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1492](https://togithub.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://togithub.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * feat: enable hermetic library generation (#1462) * restore to older version * update googleapis_committish * fix googleapis_committish * infer image tag from config yaml * correct workflow name * update config scripts and yamls * remove old update_googleapis_committish workflow * restore proto folder * Revert "restore proto folder" This reverts commit 59046f83269c16fb775d1069b54ee5de0749b8e5. * feat: New PropertyMask field which allows partial commits, lookups, and query results (#1455) * feat: New PropertyMask field which allows partial commits, lookups, and query results PiperOrigin-RevId: 635449160 Source-Link: https://github.com/googleapis/googleapis/commit/dde0ec1f36cb8cbf9036dd0f1e8e5eda7882db4e Source-Link: https://github.com/googleapis/googleapis-gen/commit/8caa60d9aea82964a19cdf8faf91384911db8bdd Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGNhYTYwZDlhZWE4Mjk2NGExOWNkZjhmYWY5MTM4NDkxMWRiOGJkZCJ9 * 🦉 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 * sync config structure with that of google-cloud-java * remove quotes from config yamls * fix typo in update_generation_config.yaml * correct * quote codeowners_team in generation config * update generator version * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Owl Bot * ci: [java] automatic kokoro label in and /gcbrun comment (#1965) (#1481) Source-Link: https://github.com/googleapis/synthtool/commit/bd2bae89f70bad380da47fab9ec25985dfb87d67 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3 Co-authored-by: Owl Bot * test(deps): update dependency com.google.truth:truth to v1.4.3 (#1501) * chore: correct hermetic library generation script path (#1506) * fix: correct hermetic library generation script path * 🦉 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 * chore: skip hermetic generation on fork PRs (#1510) * chore: make the owlbot postprocessor check non-required (#1512) * chore: make the owlbot postprocessor check non-required * remove required check in other branches * chore: disable the Owl Bot post-processor (#1511) via deleting .OwlBot.lock.yaml (context) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 (#1485) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.41.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 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 Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> * chore(main): release 2.20.3-SNAPSHOT (#1504) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore: setup 2.19.x lts branch (#1535) * chore(main): release 2.21.0 (#1517) :robot: I have created a release *beep* *boop* --- ## [2.21.0](https://togithub.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31) ### Features * Enable hermetic library generation ([#1462](https://togithub.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://togithub.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 (#1531) * chore(main): release 2.21.1-SNAPSHOT (#1538) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore(deps): update dependency com.google.cloud:libraries-bom to v26.43.0 (#1515) * chore(main): release 2.21.1 (#1540) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore(main): release 2.21.2-SNAPSHOT (#1541) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore: secure hermetic_library_generation workflow (#1552) * chore: secure hermetic_library_generation workflow Thanks to @diogoteles08 for the inspection on our repos. This PR inlines environment variables to avoid overriding script injections. * fix wording * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 (#1547) * chore(main): release 2.21.2 (#1553) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore: remove datastore native image sample in favor of sample hosted in google-cloud-java (#1519) * chore: remove unused image tag in .OwlBot-hermetic.yaml (#1559) This removes the unused image tag in this file. Part of the cleanup after enabling Hermetic Library generation in this repo. Newline at EOF automatically added - see [this SO](https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-newline). * chore(main): release 2.21.3-SNAPSHOT (#1554) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). * chore: Update generation configuration at Tue Sep 10 17:00:48 UTC 2024 (#1564) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.45.0 (#1544) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.43.0` -> `26.45.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.43.0/26.45.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-cloud-bom (com.google.cloud:libraries-bom) ### [`v26.45.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26450-2024-08-27) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.44.0...v26.45.0) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.34.0 ([#​6707](https://redirect.github.com/googleapis/java-cloud-bom/issues/6707)) ([412f4ba](https://redirect.github.com/googleapis/java-cloud-bom/commit/412f4ba5c2223aabff39c0a60bf07cbd147f02da)) - update dependency com.google.cloud:gapic-libraries-bom to v1.42.0 ([#​6716](https://redirect.github.com/googleapis/java-cloud-bom/issues/6716)) ([6fc3557](https://redirect.github.com/googleapis/java-cloud-bom/commit/6fc35575193baf1d458b63ba166e92b64421c383)) - update dependency com.google.cloud:google-cloud-bigquery to v2.42.1 ([#​6730](https://redirect.github.com/googleapis/java-cloud-bom/issues/6730)) ([b0d939d](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0d939dbbd3a94673206d206369f81429c1a6a7f)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.1 ([#​6712](https://redirect.github.com/googleapis/java-cloud-bom/issues/6712)) ([0121887](https://redirect.github.com/googleapis/java-cloud-bom/commit/0121887c7db48c48d14098d9643a3b73574bf851)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.9.0 ([#​6729](https://redirect.github.com/googleapis/java-cloud-bom/issues/6729)) ([406333e](https://redirect.github.com/googleapis/java-cloud-bom/commit/406333e7870405673e014f6871a31ac9c8822866)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.43.0 ([#​6723](https://redirect.github.com/googleapis/java-cloud-bom/issues/6723)) ([0754a10](https://redirect.github.com/googleapis/java-cloud-bom/commit/0754a10b89b628179d4f115e162e326765de33b3)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.2 ([#​6725](https://redirect.github.com/googleapis/java-cloud-bom/issues/6725)) ([6d96ff4](https://redirect.github.com/googleapis/java-cloud-bom/commit/6d96ff40b279c73700cf85633445880721739d1e)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.25.1 ([#​6705](https://redirect.github.com/googleapis/java-cloud-bom/issues/6705)) ([b0440a8](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0440a82a5b1f66f123b3014ccc5ecdfa783285a)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.20.1 ([#​6720](https://redirect.github.com/googleapis/java-cloud-bom/issues/6720)) ([479182a](https://redirect.github.com/googleapis/java-cloud-bom/commit/479182af6afc7db95fac0bfafc3aaa587a23ff7c)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.131.11-alpha ([#​6721](https://redirect.github.com/googleapis/java-cloud-bom/issues/6721)) ([9394259](https://redirect.github.com/googleapis/java-cloud-bom/commit/93942598cc7b42ad66ebad5557aeff795a9a8644)) - update dependency com.google.cloud:google-cloud-nio to v0.127.22 ([#​6713](https://redirect.github.com/googleapis/java-cloud-bom/issues/6713)) ([f7563bd](https://redirect.github.com/googleapis/java-cloud-bom/commit/f7563bd2822dff72ec01a148b14774bc641b3678)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.1 ([#​6714](https://redirect.github.com/googleapis/java-cloud-bom/issues/6714)) ([439460a](https://redirect.github.com/googleapis/java-cloud-bom/commit/439460a340a4954117ba1f0c49e0f7ab99c0cf73)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.1 ([#​6715](https://redirect.github.com/googleapis/java-cloud-bom/issues/6715)) ([27a374b](https://redirect.github.com/googleapis/java-cloud-bom/commit/27a374b7a8318d5a8b100d3c1edfd420d8cf3cd4)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.73.0 ([#​6722](https://redirect.github.com/googleapis/java-cloud-bom/issues/6722)) ([b93b322](https://redirect.github.com/googleapis/java-cloud-bom/commit/b93b3222f36b8701ed59cb42ddb7636b822a8ece)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.74.0 ([#​6728](https://redirect.github.com/googleapis/java-cloud-bom/issues/6728)) ([9ca5a25](https://redirect.github.com/googleapis/java-cloud-bom/commit/9ca5a25c1772f8283598b4a8fbb64c08d0346557)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.21.0 ([#​6724](https://redirect.github.com/googleapis/java-cloud-bom/issues/6724)) ([4e32a3d](https://redirect.github.com/googleapis/java-cloud-bom/commit/4e32a3d0a5598c3f2a09bbd2155d7c589c81c796)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.42.0 ([#​6717](https://redirect.github.com/googleapis/java-cloud-bom/issues/6717)) ([8302476](https://redirect.github.com/googleapis/java-cloud-bom/commit/8302476bac2908beeb0be2ac4f3a7b766bb9c011)) - update dependency commons-cli:commons-cli to v1.9.0 ([#​6706](https://redirect.github.com/googleapis/java-cloud-bom/issues/6706)) ([539f86c](https://redirect.github.com/googleapis/java-cloud-bom/commit/539f86cf0fab014d0c306bf230253569fab8494f)) ### [`v26.44.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26440-2024-08-08) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.43.0...v26.44.0) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.33.0 ([#​6687](https://redirect.github.com/googleapis/java-cloud-bom/issues/6687)) ([d93c7c1](https://redirect.github.com/googleapis/java-cloud-bom/commit/d93c7c1e5c8cfea5f0bb3b570282af1d17ac9992)) - update dependency com.google.cloud:gapic-libraries-bom to v1.41.0 ([#​6689](https://redirect.github.com/googleapis/java-cloud-bom/issues/6689)) ([e5afcc8](https://redirect.github.com/googleapis/java-cloud-bom/commit/e5afcc8a5afd362f7cdb6d19f446c99db7832fb9)) - update dependency com.google.cloud:google-cloud-bigquery to v2.42.0 ([#​6688](https://redirect.github.com/googleapis/java-cloud-bom/issues/6688)) ([58ed9ce](https://redirect.github.com/googleapis/java-cloud-bom/commit/58ed9cef18361489756bafdf9b6159077f498608)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.8.0 ([#​6685](https://redirect.github.com/googleapis/java-cloud-bom/issues/6685)) ([c6968cb](https://redirect.github.com/googleapis/java-cloud-bom/commit/c6968cb3315c37d21539daa5001c6b297f600ba4)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.41.0 ([#​6686](https://redirect.github.com/googleapis/java-cloud-bom/issues/6686)) ([256f1b0](https://redirect.github.com/googleapis/java-cloud-bom/commit/256f1b0e97dc1c28453fd0c302e5ecc6958a5a55)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.42.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.0 ([#​6697](https://redirect.github.com/googleapis/java-cloud-bom/issues/6697)) ([046ad04](https://redirect.github.com/googleapis/java-cloud-bom/commit/046ad04177bca0cfd2aecce6bc1170617939bfbb)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.21.1 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.2 ([#​6681](https://redirect.github.com/googleapis/java-cloud-bom/issues/6681)) ([91673de](https://redirect.github.com/googleapis/java-cloud-bom/commit/91673debfaec89f2c6b49249966f9ed772acc3bd)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.24.3 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.20.0 ([#​6694](https://redirect.github.com/googleapis/java-cloud-bom/issues/6694)) ([780736c](https://redirect.github.com/googleapis/java-cloud-bom/commit/780736c2b35f8f657b686bd1f4e61946835736ec)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.131.10-alpha ([#​6695](https://redirect.github.com/googleapis/java-cloud-bom/issues/6695)) ([6ecff38](https://redirect.github.com/googleapis/java-cloud-bom/commit/6ecff38a39d0bbc2516ffcba64507afc9b4ac027)) - update dependency com.google.cloud:google-cloud-nio to v0.127.21 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.132.0 ([#​6693](https://redirect.github.com/googleapis/java-cloud-bom/issues/6693)) ([b0483b9](https://redirect.github.com/googleapis/java-cloud-bom/commit/b0483b95065ae38522547c736a753c751279f014)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.14.0 ([#​6696](https://redirect.github.com/googleapis/java-cloud-bom/issues/6696)) ([ad905cc](https://redirect.github.com/googleapis/java-cloud-bom/commit/ad905ccb7d41bd64cc519bd855dabb0523bd7fa8)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.72.0 ([9e666cf](https://redirect.github.com/googleapis/java-cloud-bom/commit/9e666cf1efb8ba694a945814060df0ccdb26f363)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.20.2 ([4534296](https://redirect.github.com/googleapis/java-cloud-bom/commit/4534296641ba101fae87219bbabc7efdd86f3fbc)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.41.0 ([#​6690](https://redirect.github.com/googleapis/java-cloud-bom/issues/6690)) ([43aef8e](https://redirect.github.com/googleapis/java-cloud-bom/commit/43aef8e9bf082ce98afd0c34163b016b8f315ee0)) - update dependency com.google.googlejavaformat:google-java-format to v1.23.0 ([#​6692](https://redirect.github.com/googleapis/java-cloud-bom/issues/6692)) ([b403c50](https://redirect.github.com/googleapis/java-cloud-bom/commit/b403c5040d47ba87dd32162e3be71ded6fdd127c))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 (#1561) * deps: update dependency com.google.guava:guava-testlib to v33.3.0-jre (#1548) * deps: update dependency com.google.errorprone:error_prone_core to v2.31.0 (#1523) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.errorprone:error_prone_core](https://errorprone.info) ([source](https://redirect.github.com/google/error-prone)) | `2.28.0` -> `2.31.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_core/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_core/2.28.0/2.31.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
google/error-prone (com.google.errorprone:error_prone_core) ### [`v2.31.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.31.0): Error Prone 2.31.0 This is the last planned minor release of Error Prone that will support running on JDK 11, see [#​3803](https://redirect.github.com/google/error-prone/issues/3803). Using Error Prone to compile code that is deployed to earlier versions will continue to be fully supported, but will require using JDK 17 or newer for compilation and setting `--release` or `-source`/`-target`/`-bootclasspath`. Changes: - Introduce [`@ThreadSafeTypeParameter`](https://redirect.github.com/google/error-prone/blob/2656f48902f6723f3147caa117372309dbc6c15f/type_annotations/src/main/java/com/google/errorprone/annotations/ThreadSafeTypeParameter.java) with enforcement by [ThreadSafe](https://errorprone.info/bugpattern/ThreadSafe) - Improved support for latest JDK 24 EA builds - Error Prone is now distributed as a Multi-Release jar ([#​3756](https://redirect.github.com/google/error-prone/issues/3756)) New checks: - [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): AutoValue instances should not usually contain boxed types that are not Nullable. We recommend removing the unnecessary boxing. Full changelog: https://togithub.com/google/error-prone/compare/v2.30.0...v2.31.0 ### [`v2.30.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.30.0): Error Prone 2.30.0 New checks: - [`AutoValueBoxedValues`](https://errorprone.info/bugpattern/AutoValueBoxedValues): Detects unnecessary boxing in AutoValue classes. - [`DefaultLocale`](https://errorprone.info/bugpattern/DefaultLocale): Detects implicit use of the JVM default locale, which can result in differing behaviour between JVM executions. - [`UnnecessaryBreakInSwitch`](https://errorprone.info/bugpattern/UnnecessaryBreakInSwitch): Remove unnecessary `break` statements in `->` switches. Closed issues: [#​632](https://redirect.github.com/google/error-prone/issues/632), [#​4487](https://redirect.github.com/google/error-prone/issues/4487) Full changelog: https://togithub.com/google/error-prone/compare/v2.29.2...v2.30.0 ### [`v2.29.2`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.2): Error Prone 2.29.2 This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0) and [2.29.1](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1), plus: - a bug fix for a crash in `TraditionalSwitchExpression` ([https://togithub.com/google/error-prone/issues/4479](https://redirect.github.com/google/error-prone/issues/4479)) - restores the `module-info` for the annotations jar, which was accidentally removed ([https://togithub.com/google/error-prone/issues/4480](https://redirect.github.com/google/error-prone/issues/4480)) Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.1...v2.29.2 ### [`v2.29.1`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.1): Error Prone 2.29.1 This release contains all of the changes in [2.29.0](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0), plus: - a bug fix to `UnusedVariable` to handle unnamed `_` variables ([https://togithub.com/google/error-prone/issues/4451](https://redirect.github.com/google/error-prone/issues/4451)) - a bug fix for a crash in `SetUnrecognized` ([https://togithub.com/google/error-prone/issues/4475](https://redirect.github.com/google/error-prone/issues/4475)) Full Changelog: https://togithub.com/google/error-prone/compare/v2.29.0...v2.29.1 ### [`v2.29.0`](https://redirect.github.com/google/error-prone/releases/tag/v2.29.0): Error Prone 2.29.0 New checks: - [`MissingRuntimeRetention`](https://errorprone.info/bugpattern/MissingRuntimeRetention) - [`SetUnrecognized`](https://errorprone.info/bugpattern/SetUnrecognized) - [`StatementSwitchToExpressionSwitch`](https://errorprone.info/bugpattern/StatementSwitchToExpressionSwitch) Closed issues: [#​4318](https://redirect.github.com/google/error-prone/issues/4318), [#​4429](https://redirect.github.com/google/error-prone/issues/4429), [#​4467](https://redirect.github.com/google/error-prone/issues/4467) Full Changelog: https://togithub.com/google/error-prone/compare/v2.28.0...v2.29.0
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore: change if condition in workflow (#1567) * chore: change if condition in workflow * add head_ref * add var * chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 (#1568) * chore: Update generation configuration at Wed Sep 11 15:40:41 UTC 2024 * chore: generate libraries at Wed Sep 11 15:41:06 UTC 2024 * build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 (#1551) * test(deps): update dependency com.google.truth:truth to v1.4.4 (#1520) * deps: update dependency org.easymock:easymock to v5.4.0 (#1482) * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1480) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff)) ### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed)) ### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) ##### Features - Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) ### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) ### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a)) - Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49)) - Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore(main): release 2.21.3 (#1565) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.2 (#1570) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.20.0` -> `2.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.20.0/2.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2212-2024-08-22) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.1...v2.21.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.34.0 ([#​1547](https://redirect.github.com/googleapis/java-datastore/issues/1547)) ([8c5f595](https://redirect.github.com/googleapis/java-datastore/commit/8c5f5954d88732ab929b4477a3f15b0052adc2ff)) ### [`v2.21.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2211-2024-08-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#​1531](https://redirect.github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://redirect.github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed)) ### [`v2.21.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2210-2024-07-31) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) ##### Features - Enable hermetic library generation ([#​1462](https://redirect.github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://redirect.github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff)) ### [`v2.20.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2202-2024-06-28) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#​1492](https://redirect.github.com/googleapis/java-datastore/issues/1492)) ([d940c93](https://redirect.github.com/googleapis/java-datastore/commit/d940c937959942d753f9215e7ce940ab6742be46)) ### [`v2.20.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2201-2024-06-04) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.20.0...v2.20.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.31.0 ([#​1471](https://redirect.github.com/googleapis/java-datastore/issues/1471)) ([42c643d](https://redirect.github.com/googleapis/java-datastore/commit/42c643d78562c5cbd6c17c29a0a124be8d05198a)) - Update dependency com.google.errorprone:error_prone_core to v2.28.0 ([#​1469](https://redirect.github.com/googleapis/java-datastore/issues/1469)) ([e3fac2b](https://redirect.github.com/googleapis/java-datastore/commit/e3fac2bf9992fcb2e91319df0520094865de2d49)) - Update dependency com.google.guava:guava-testlib to v33.2.1-jre ([#​1470](https://redirect.github.com/googleapis/java-datastore/issues/1470)) ([614e930](https://redirect.github.com/googleapis/java-datastore/commit/614e930f2bdccc517d4733e5fb7f3cefad696a20))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.21.3 (#1572) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.21.2` -> `2.21.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.21.2/2.21.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.21.3`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2213-2024-09-11) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.21.2...v2.21.3) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#​1561](https://redirect.github.com/googleapis/java-datastore/issues/1561)) ([5a79fd8](https://redirect.github.com/googleapis/java-datastore/commit/5a79fd8d1202e65c02423fe40402c41af6050efa)) - Update dependency com.google.errorprone:error_prone_core to v2.31.0 ([#​1523](https://redirect.github.com/googleapis/java-datastore/issues/1523)) ([8d3af32](https://redirect.github.com/googleapis/java-datastore/commit/8d3af322fb56032cd7a9d29e60fd93d1f3e7e632)) - Update dependency com.google.guava:guava-testlib to v33.3.0-jre ([#​1548](https://redirect.github.com/googleapis/java-datastore/issues/1548)) ([18ba37f](https://redirect.github.com/googleapis/java-datastore/commit/18ba37f60b5b3e69c95f6e55a28daf8c0de82ba9)) - Update dependency org.easymock:easymock to v5.4.0 ([#​1482](https://redirect.github.com/googleapis/java-datastore/issues/1482)) ([ee788a1](https://redirect.github.com/googleapis/java-datastore/commit/ee788a162841994e09a61bb81b94cbe93353a78e))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). * chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime (#1575) * chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 (#1573) * chore: Update generation configuration at Thu Sep 12 02:19:58 UTC 2024 * chore: generate libraries at Thu Sep 12 02:20:21 UTC 2024 * chore: Update generation configuration at Fri Sep 13 02:20:43 UTC 2024 * chore: Update generation configuration at Sat Sep 14 02:18:54 UTC 2024 * chore: Update generation configuration at Mon Sep 16 02:25:16 UTC 2024 * chore: Update generation configuration at Tue Sep 17 02:08:30 UTC 2024 * chore: Update generation configuration at Wed Sep 18 02:20:33 UTC 2024 * chore: Update generation configuration at Thu Sep 19 02:21:53 UTC 2024 * chore: generate libraries at Thu Sep 19 02:22:20 UTC 2024 * feat: Introducing Tracing with OpenTelemetry API #1537 (#1576) * feat: Adding TraceUtil interface and its implementation to enable Tracing controls via DatastoreOptions (#1431) * Adding EnabledTraceUtil, DisabledTraceUtil and TraceUtilTest * Annotating DatastoreOpenTelemetryOptions to be transient as they're not serializable * Adding google-auth-library-credentials dependency due to https://github.com/googleapis/java-datastore/actions/runs/8944472794/job/24571458116?pr=1431 * feat: Adding Lookup RPC OpenTelemetry Tracing (#1437) * feat: Adding Lookup RPC OpenTelemetry Tracing - Removed OpenCensus Tracing - Added E2E tests with Global and Local OTel SDK - Moved OTel SDK setup to RemoteDatastoreHelper - Fixed pom to depend on BOM for all shared dependencies * feat: Adding Commit RPC Trace Instrumentation (#1440) - Added end-to-end test for Datastore operationsput, add, update and delete. - Updated E2E Test to use the namespace correctly for efficient clean-up of test data * feat: RunQuery trace instrumentation (#1441) * feat: RunQuery trace instrumentation * feat: RunAggregationQuery instrumentation (#1447) * feat: RunQuery trace instrumentation * Formatting * Formatting * Refactor: s/RUNQUERY/RUN_QUERY * feat: RunAggregationQuery Trace Instrumentation * Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java). * Formatting * Fixing @Test annotation missed after merge * Formatting * feat: RunQuery trace instrumentation * Formatting * Formatting * Refactor: s/RUNQUERY/RUN_QUERY * feat: RunAggregationQuery Trace Instrumentation * Build: retiring test assertions for OpenCensus spans - will be replacing this in hermetic integration tests for OpenTelemetry using in-memory span exports (in addition to ITE2ETraceTest.java). * Formatting * Fixing @Test annotation missed after merge * Formatting * feat: Add Transaction tracing test: transactionalLookupTest * test: Transaction test for RunInTransaction - need to fix trace instrumentation for RunIn.. * Adding transaction span names * TransactionLookupTest * feat: support for transactional operations - tested using newTransaction() and runInTransaction() * Revert "feat: support for transactional operations" This reverts commit 10341c0b97cbc2025f9f928ce8cb09d5c036a5b3. * feat: support for transactional operations (#1468) * feat: support for transactional operations - tested using newTransaction() and runInTransaction() * feat: Allocateid tracing (#1488) * feat: Adding tracing for AllocateIds RPC * formatting * 🦉 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 * feat: Add tracing for ReserveIds operation (#1490) - added end-to-end test * fix: Fixed Span nesting for `ReadWriteTransactionCallable` by using parent SpanContext instead of just parent Context (#1495) * fix: Fixed the TraceUtil.startSpan method to use `SpanContext` for linking with the parent ins… * Refactor: refactor grpc query splitter logic (#1674) * Init commit to migrate query splitter * Add query splitter and datastore factory * fix unused dependencies * Fix formatting * Fix copyright * Add initial tests and utilities * Fix dependencies for datastore parent version * Add unit tests * fix non-complying * Fix non-complying errors * Skip native tests * feat: Improve upon the default gRPC Connection Pool size (#1706) * feat: Improve upon the default gRPC Connection Pool size * feat: Improve upon the default gRPC Connection Pool size * fix formatting * add comment * Add test * formatting * Add constants for min, max and init channel count * Fix ci testing environment with java 11 * Revert "Fix ci testing environment with java 11" This reverts commit 00c0d2146c814d428d8ae06f75d4c93b6f826851. * deps: bump org.easymock:easymock from 5.4.0 to 5.5.0 (#1749) Bumps [org.easymock:easymock](https://togithub.com/easymock/easymock) from 5.4.0 to 5.5.0.
Release notes

Sourced from org.easymock:easymock's releases.

5.5.0

OSGi and Java 24 support.

Change log

  • Bump org.codehaus.mojo:versions-maven-plugin from 2.17.1 to 2.18.0 (#700)
  • Bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.5 to 4.8.6.6 (#699)
  • easymock.org unresolvable (#698)
  • Bump com.puppycrawl.tools:checkstyle from 10.20.0 to 10.20.1 (#696)
  • Bump net.bytebuddy:byte-buddy from 1.15.7 to 1.15.10 (#695)
  • Bump org.apache.maven.surefire:surefire-testng from 3.5.1 to 3.5.2 (#694)
  • Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 (#693)
  • Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.1 to 3.5.2 (#692)
  • Bump org.apache.maven.surefire:surefire-junit-platform from 3.5.1 to 3.5.2 (#691)
  • Bump com.puppycrawl.tools:checkstyle from 10.19.0 to 10.20.0 (#690)
  • Bump org.apache.maven.plugins:maven-pmd-plugin from 3.25.0 to 3.26.0 (#689)
  • Bump ch.qos.logback:logback-classic from 1.3.14 to 1.5.12 (#688)
  • Bump com.puppycrawl.tools:checkstyle from 10.18.2 to 10.19.0 (#687)
  • Bump org.apache.maven.plugins:maven-dependency-plugin from 3.8.0 to 3.8.1 (#686)
  • Bump org.apache.maven.plugins:maven-checkstyle-plugin from 3.5.0 to 3.6.0 (#685)
  • Bump actions/setup-java from 4.4.0 to 4.5.0 (#684)
  • Bump actions/checkout from 4.2.1 to 4.2.2 (#683)
  • Bump net.bytebuddy:byte-buddy from 1.15.5 to 1.15.7 (#682)
  • Bump org.codehaus.mojo:exec-maven-plugin from 3.4.1 to 3.5.0 (#681)
  • Bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.7.0 to 3.8.0 (#680)
  • Bump junit.jupiter.version from 5.11.2 to 5.11.3 (#679)
  • Bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.4 to 4.8.6.5 (#678)
  • Bump net.bytebuddy:byte-buddy from 1.15.4 to 1.15.5 (#677)
  • Bump ch.qos.logback:logback-classic from 1.3.14 to 1.5.11 (#676)
  • Bump ch.qos.logback:logback-classic from 1.3.14 to 1.5.10 (#675)
  • Bump net.bytebuddy:byte-buddy from 1.15.2 to 1.15.4 (#674)
  • Support Java 24-ea (#673)
  • Bump ch.qos.logback:logback-classic from 1.3.14 to 1.5.9 (#672)
  • Bump org.ow2.asm:asm from 9.7 to 9.7.1 (#671)
  • Bump actions/checkout from 4.2.0 to 4.2.1 (#669)
  • Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.0 to 3.5.1 (#668)
  • Bump org.apache.maven.surefire:surefire-testng from 3.5.0 to 3.5.1 (#667)
  • Bump org.apache.maven.surefire:surefire-junit-platform from 3.5.0 to 3.5.1 (#666)
  • Bump junit.jupiter.version from 5.11.1 to 5.11.2 (#665)
  • Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.0 to 3.10.1 (#664)
  • Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.6 to 3.2.7 (#663)
  • Bump com.puppycrawl.tools:checkstyle from 10.18.1 to 10.18.2 (#662)
  • Bump net.bytebuddy:byte-buddy from 1.15.2 to 1.15.3 (#661)
  • Bump actions/checkout from 4.1.7 to 4.2.0 (#660)
  • Bump net.bytebuddy:byte-buddy from 1.15.1 to 1.15.2 (#659)
  • Bump com.mycila:license-maven-plugin from 4.5 to 4.6 (#658)
  • Bump junit.jupiter.version from 5.11.0 to 5.11.1 (#657)
  • Bump actions/setup-java from 4.3.0 to 4.4.0 (#656)
  • Bump org.codehaus.mojo:jdepend-maven-plugin from 2.0 to 2.1 (#655)
  • Bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.3 to 4.8.6.4 (#654)

... (truncated)

Commits
  • 028fd28 Move to version 5.5.0
  • e11364d Bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.5 to 4.8.6.6
  • 006f454 Update tool versions
  • 4a61823 Fix OSGi issues occurring since ByteBuddy was added (close #626)
  • 1ce4c19 Tab to space
  • 430b6a7 Bump org.codehaus.mojo:versions-maven-plugin from 2.17.1 to 2.18.0
  • d655e9d Upgrade github pages
  • d4ad6b6 Bump com.puppycrawl.tools:checkstyle from 10.20.0 to 10.20.1
  • 2c3ba98 Bump net.bytebuddy:byte-buddy from 1.15.7 to 1.15.10
  • 964763e Bump org.apache.maven.surefire:surefire-testng from 3.5.1 to 3.5.2
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.easymock:easymock&package-manager=maven&previous-version=5.4.0&new-version=5.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
* resolve conflicts in dependabot * chore: generate libraries at Thu Apr 24 00:49:57 UTC 2025 * fix version * fix version to 2.27.2-SNAPSHOT * fix version to 2.27.2-SNAPSHOT * chore: generate libraries at Tue Apr 29 16:59:41 UTC 2025 * update version to 2.27.3 --------- Co-authored-by: kolea2 <45548808+kolea2@users.noreply.github.com> Co-authored-by: Prateek Co-authored-by: Owl Bot Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mend Renovate Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Lawrence Qiu Co-authored-by: Henry Johnson Co-authored-by: Diego Marquez Co-authored-by: Min Zhu Co-authored-by: Mridula <66699525+mpeddada1@users.noreply.github.com> Co-authored-by: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Co-authored-by: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Co-authored-by: Jimit Shah <57637300+jimit-j-shah@users.noreply.github.com> Co-authored-by: cloud-java-bot Co-authored-by: Joe Wang --- .github/.OwlBot-hermetic.yaml | 4 + .github/dependabot.yml | 3 +- .github/sync-repo-settings.yaml | 16 - .gitignore | 2 +- google-cloud-datastore-utils/pom.xml | 111 + .../com/google/datastore/utils/Datastore.java | 136 + .../datastore/utils/DatastoreException.java | 49 + .../datastore/utils/DatastoreFactory.java | 127 + .../datastore/utils/DatastoreHelper.java | 731 +++++ .../datastore/utils/DatastoreOptions.java | 204 ++ .../google/datastore/utils/QuerySplitter.java | 56 + .../datastore/utils/QuerySplitterImpl.java | 309 ++ .../com/google/datastore/utils/RemoteRpc.java | 239 ++ .../utils/testing/MockCredential.java | 36 + .../utils/testing/MockDatastoreFactory.java | 132 + .../datastore/utils/DatastoreClientTest.java | 407 +++ .../datastore/utils/DatastoreFactoryTest.java | 93 + .../datastore/utils/DatastoreHelperTest.java | 317 +++ .../datastore/utils/QuerySplitterTest.java | 365 +++ .../google/datastore/utils/RemoteRpcTest.java | 341 +++ .../utils/it/ITDatastoreProtoClientTest.java | 90 + .../clirr-ignored-differences.xml | 59 +- google-cloud-datastore/pom.xml | 8 + .../com/google/cloud/datastore/Batch.java | 2 + .../com/google/cloud/datastore/Datastore.java | 30 +- .../cloud/datastore/DatastoreBatchWriter.java | 2 + .../cloud/datastore/DatastoreException.java | 83 +- .../cloud/datastore/DatastoreFactory.java | 2 + .../google/cloud/datastore/DatastoreImpl.java | 17 + .../cloud/datastore/DatastoreOptions.java | 122 +- .../cloud/datastore/DatastoreReader.java | 10 +- .../datastore/DatastoreReaderWriter.java | 3 + .../cloud/datastore/DatastoreUtils.java | 57 + .../cloud/datastore/DatastoreWriter.java | 2 + .../GrpcToDatastoreCodeTranslation.java | 93 + .../google/cloud/datastore/QueryResults.java | 6 +- .../RetryAndTraceDatastoreRpcDecorator.java | 10 + .../cloud/datastore/StructuredQuery.java | 2 + .../google/cloud/datastore/Transaction.java | 6 +- .../google/cloud/datastore/ValueBuilder.java | 2 + .../aggregation/AggregationBuilder.java | 3 + .../datastore/spi/DatastoreRpcFactory.java | 2 + .../cloud/datastore/spi/v1/DatastoreRpc.java | 27 +- .../datastore/spi/v1/GrpcDatastoreRpc.java | 202 ++ .../datastore/spi/v1/HttpDatastoreRpc.java | 13 + .../cloud/datastore/spi/v1/RpcUtils.java | 34 + .../testing/LocalDatastoreHelper.java | 11 +- .../cloud/datastore/v1/DatastoreClient.java | 1087 +++++++ .../cloud/datastore/v1/DatastoreSettings.java | 304 ++ .../cloud/datastore/v1/gapic_metadata.json | 42 + .../cloud/datastore/v1/package-info.java | 49 + .../datastore/v1/stub/DatastoreStub.java | 84 + .../v1/stub/DatastoreStubSettings.java | 535 ++++ .../v1/stub/GrpcDatastoreCallableFactory.java | 113 + .../datastore/v1/stub/GrpcDatastoreStub.java | 429 +++ .../HttpJsonDatastoreCallableFactory.java | 101 + .../v1/stub/HttpJsonDatastoreStub.java | 676 +++++ .../reflect-config.json | 2522 +++++++++++++++++ ...reTest.java => AbstractDatastoreTest.java} | 28 +- .../datastore/DatastoreExceptionTest.java | 2 +- .../cloud/datastore/DatastoreOptionsTest.java | 143 +- .../cloud/datastore/DatastoreTestGrpc.java | 61 + .../cloud/datastore/DatastoreTestHttp.java | 57 + .../cloud/datastore/DatastoreUtilsTest.java | 43 + .../GrpcToDatastoreCodeTranslationTest.java | 53 + ...Test.java => AbstractITDatastoreTest.java} | 156 +- .../datastore/it/ITDatastoreConceptsTest.java | 15 +- .../datastore/it/ITDatastoreTestGrpc.java | 64 + .../datastore/it/ITDatastoreTestHttp.java | 58 + .../datastore/it/MultipleAttemptsRule.java | 2 +- .../cloud/datastore/it/StatementExecutor.java | 7 +- .../cloud/datastore/spi/v1/RpcUtilsTest.java | 57 + .../testing/ITLocalDatastoreHelperTest.java | 23 +- .../testing/RemoteDatastoreHelper.java | 45 +- .../v1/DatastoreClientHttpJsonTest.java | 549 ++++ .../datastore/v1/DatastoreClientTest.java | 528 ++++ .../cloud/datastore/v1/MockDatastore.java | 59 + .../cloud/datastore/v1/MockDatastoreImpl.java | 241 ++ grpc-google-cloud-datastore-v1/pom.xml | 72 + .../google/datastore/v1/DatastoreGrpc.java | 1339 +++++++++ pom.xml | 12 + pull-gapic-grpc.sh | 42 + versions.txt | 1 + 83 files changed, 13945 insertions(+), 230 deletions(-) create mode 100644 google-cloud-datastore-utils/pom.xml create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java create mode 100644 google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java create mode 100644 google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/gapic_metadata.json create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java create mode 100644 google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java create mode 100644 google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.v1/reflect-config.json rename google-cloud-datastore/src/test/java/com/google/cloud/datastore/{DatastoreTest.java => AbstractDatastoreTest.java} (98%) create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java rename google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/{ITDatastoreTest.java => AbstractITDatastoreTest.java} (96%) create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java create mode 100644 google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java create mode 100644 grpc-google-cloud-datastore-v1/pom.xml create mode 100644 grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java create mode 100644 pull-gapic-grpc.sh diff --git a/.github/.OwlBot-hermetic.yaml b/.github/.OwlBot-hermetic.yaml index 02f0dd37b..ef1c310b3 100644 --- a/.github/.OwlBot-hermetic.yaml +++ b/.github/.OwlBot-hermetic.yaml @@ -22,8 +22,12 @@ deep-copy-regex: dest: "/owl-bot-staging/$1/proto-google-cloud-datastore-$1/src" - source: "/google/datastore/admin/(v.*)/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/$1/proto-google-cloud-datastore-admin-$1/src" +- source: "/google/datastore/(v.*)/.*-java/grpc-google-.*/src" + dest: "/owl-bot-staging/$1/grpc-google-cloud-datastore-$1/src" - source: "/google/datastore/admin/(v.*)/.*-java/grpc-google-.*/src" dest: "/owl-bot-staging/$1/grpc-google-cloud-datastore-admin-$1/src" # Admin & Data APIs share the same wrapper library. +- source: "/google/datastore/(v.*)/.*-java/gapic-google-.*/src" + dest: "/owl-bot-staging/$1/google-cloud-datastore/src" - source: "/google/datastore/admin/(v.*)/.*-java/gapic-google-.*/src" dest: "/owl-bot-staging/$1/google-cloud-datastore/src" diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ac8af89e1..18cc9f259 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,8 +17,7 @@ updates: # If a security vulnerability comes in, we will be notified about # it via template in the synthtool repository. ignore: - - dependency-name: "*" - + - dependency-name: "*" # rules for the `grpc-experimental` branch - package-ecosystem: maven directory: "/" diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 6fdb2fb2e..12d6c76d2 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -157,22 +157,6 @@ branchProtectionRules: - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc - - pattern: grpc-experimental - isAdminEnforced: true - requiredApprovingReviewCount: 1 - requiresCodeOwnerReviews: true - requiresStrictStatusChecks: false - requiredStatusCheckContexts: - - dependencies (17) - - lint - - clirr - - units (8) - - units (11) - - 'Kokoro - Test: Integration' - - cla/google - - 'Kokoro - Test: Java GraalVM Native Image' - - 'Kokoro - Test: Java 17 GraalVM Native Image' - - javadoc - pattern: 2.19.x isAdminEnforced: true requiredApprovingReviewCount: 1 diff --git a/.gitignore b/.gitignore index 6f5e4424d..241f84417 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ target/ *.iml __pycache__/ -.flattened-pom.xml \ No newline at end of file +.flattened-pom.xml diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml new file mode 100644 index 000000000..6cb32a8b1 --- /dev/null +++ b/google-cloud-datastore-utils/pom.xml @@ -0,0 +1,111 @@ + + + 4.0.0 + com.google.cloud + google-cloud-datastore-utils + 2.27.3-SNAPSHOT + jar + Google Cloud Datastore Utilities + https://github.com/googleapis/java-datastore + + Java datastore client utility library. + + + com.google.cloud + google-cloud-datastore-parent + 2.27.3-SNAPSHOT + + + google-cloud-datastore-utils + + + + com.google.api-client + google-api-client + + + com.google.http-client + google-http-client-protobuf + + + com.google.http-client + google-http-client-gson + + + com.google.api.grpc + proto-google-cloud-datastore-v1 + + + com.google.api + api-common + + + com.google.protobuf + protobuf-java + + + com.google.guava + guava + + + com.google.api.grpc + proto-google-common-protos + + + com.google.http-client + google-http-client + + + com.google.http-client + google-http-client-jackson2 + + + com.google.oauth-client + google-oauth-client + + + com.google.code.findbugs + jsr305 + + + + junit + junit + test + + + com.google.truth + truth + 1.4.2 + test + + + org.checkerframework + checker-qual + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xmx2048m + + + + + + + + native + + + true + + + + diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java new file mode 100644 index 000000000..d66e9ce60 --- /dev/null +++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/Datastore.java @@ -0,0 +1,136 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import com.google.datastore.v1.*; +import com.google.rpc.Code; +import java.io.IOException; +import java.io.InputStream; + +/** + * Provides access to Cloud Datastore. + * + *

This class is thread-safe. + */ +public class Datastore { + + final RemoteRpc remoteRpc; + + Datastore(RemoteRpc remoteRpc) { + this.remoteRpc = remoteRpc; + } + + /** Reset the RPC count. */ + public void resetRpcCount() { + remoteRpc.resetRpcCount(); + } + + /** + * Returns the number of RPC calls made since the client was created or {@link #resetRpcCount} was + * called. + */ + public int getRpcCount() { + return remoteRpc.getRpcCount(); + } + + private com.google.datastore.utils.DatastoreException invalidResponseException( + String method, IOException exception) { + return RemoteRpc.makeException( + remoteRpc.getUrl(), method, Code.UNAVAILABLE, "Invalid response", exception); + } + + public AllocateIdsResponse allocateIds(AllocateIdsRequest request) + throws com.google.datastore.utils.DatastoreException { + try (InputStream is = + remoteRpc.call("allocateIds", request, request.getProjectId(), request.getDatabaseId())) { + return AllocateIdsResponse.parseFrom(is); + } catch (IOException exception) { + throw invalidResponseException("allocateIds", exception); + } + } + + public BeginTransactionResponse beginTransaction(BeginTransactionRequest request) + throws com.google.datastore.utils.DatastoreException { + try (InputStream is = + remoteRpc.call( + "beginTransaction", request, request.getProjectId(), request.getDatabaseId())) { + return BeginTransactionResponse.parseFrom(is); + } catch (IOException exception) { + throw invalidResponseException("beginTransaction", exception); + } + } + + public CommitResponse commit(CommitRequest request) + throws com.google.datastore.utils.DatastoreException { + try (InputStream is = + remoteRpc.call("commit", request, request.getProjectId(), request.getDatabaseId())) { + return CommitResponse.parseFrom(is); + } catch (IOException exception) { + throw invalidResponseException("commit", exception); + } + } + + public LookupResponse lookup(LookupRequest request) + throws com.google.datastore.utils.DatastoreException { + try (InputStream is = + remoteRpc.call("lookup", request, request.getProjectId(), request.getDatabaseId())) { + return LookupResponse.parseFrom(is); + } catch (IOException exception) { + throw invalidResponseException("lookup", exception); + } + } + + public ReserveIdsResponse reserveIds(ReserveIdsRequest request) + throws com.google.datastore.utils.DatastoreException { + try (InputStream is = + remoteRpc.call("reserveIds", request, request.getProjectId(), request.getDatabaseId())) { + return ReserveIdsResponse.parseFrom(is); + } catch (IOException exception) { + throw invalidResponseException("reserveIds", exception); + } + } + + public RollbackResponse rollback(RollbackRequest request) + throws com.google.datastore.utils.DatastoreException { + try (InputStream is = + remoteRpc.call("rollback", request, request.getProjectId(), request.getDatabaseId())) { + return RollbackResponse.parseFrom(is); + } catch (IOException exception) { + throw invalidResponseException("rollback", exception); + } + } + + public RunQueryResponse runQuery(RunQueryRequest request) + throws com.google.datastore.utils.DatastoreException { + try (InputStream is = + remoteRpc.call("runQuery", request, request.getProjectId(), request.getDatabaseId())) { + return RunQueryResponse.parseFrom(is); + } catch (IOException exception) { + throw invalidResponseException("runQuery", exception); + } + } + + public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) + throws DatastoreException { + try (InputStream is = + remoteRpc.call( + "runAggregationQuery", request, request.getProjectId(), request.getDatabaseId())) { + return RunAggregationQueryResponse.parseFrom(is); + } catch (IOException exception) { + throw invalidResponseException("runAggregationQuery", exception); + } + } +} diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java new file mode 100644 index 000000000..67dbc1f9a --- /dev/null +++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java @@ -0,0 +1,49 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import com.google.rpc.Code; + +/** Indicates an error in a {@link Datastore} call. */ +public class DatastoreException extends Exception { + private final String methodName; + private final Code code; + + public DatastoreException(String methodName, Code code, String message, Throwable cause) { + super(message, cause); + this.methodName = methodName; + this.code = code; + } + + /** + * @return the canonical error code + */ + public Code getCode() { + return code; + } + + /** + * @return the datastore method name + */ + public String getMethodName() { + return methodName; + } + + @Override + public String toString() { + return String.format("%s, code=%s", super.toString(), code); + } +} diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java new file mode 100644 index 000000000..2befe276e --- /dev/null +++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreFactory.java @@ -0,0 +1,127 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.http.HttpRequestFactory; +import com.google.api.client.http.HttpTransport; +import com.google.api.client.http.javanet.NetHttpTransport; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.logging.*; + +/** Client factory for {@link com.google.datastore.utils.Datastore}. */ +public class DatastoreFactory { + + // Lazy load this because we might be running inside App Engine and this + // class isn't on the whitelist. + private static ConsoleHandler methodHandler; + + /** API version. */ + public static final String VERSION = "v1"; + + public static final String DEFAULT_HOST = "https://datastore.googleapis.com"; + + /** Singleton factory instance. */ + private static final DatastoreFactory INSTANCE = new DatastoreFactory(); + + public static DatastoreFactory get() { + return INSTANCE; + } + + /** + * Provides access to a datastore using the provided options. Logs into the application using the + * credentials available via these options. + * + * @throws IllegalArgumentException if the server or credentials weren't provided. + */ + public com.google.datastore.utils.Datastore create( + com.google.datastore.utils.DatastoreOptions options) { + return new com.google.datastore.utils.Datastore(newRemoteRpc(options)); + } + + /** Constructs a Google APIs HTTP client with the associated credentials. */ + public HttpRequestFactory makeClient(com.google.datastore.utils.DatastoreOptions options) { + Credential credential = options.getCredential(); + HttpTransport transport = options.getTransport(); + if (transport == null) { + transport = credential == null ? new NetHttpTransport() : credential.getTransport(); + transport = transport == null ? new NetHttpTransport() : transport; + } + return transport.createRequestFactory(credential); + } + + /** Starts logging datastore method calls to the console. (Useful within tests.) */ + public static void logMethodCalls() { + Logger logger = Logger.getLogger(Datastore.class.getName()); + logger.setLevel(Level.FINE); + if (!Arrays.asList(logger.getHandlers()).contains(getStreamHandler())) { + logger.addHandler(getStreamHandler()); + } + } + + /** Build a valid datastore URL. */ + String buildProjectEndpoint(com.google.datastore.utils.DatastoreOptions options) { + if (options.getProjectEndpoint() != null) { + return options.getProjectEndpoint(); + } + // DatastoreOptions ensures either project endpoint or project ID is set. + String projectId = checkNotNull(options.getProjectId()); + if (options.getHost() != null) { + return validateUrl( + String.format("https://%s/%s/projects/%s", options.getHost(), VERSION, projectId)); + } else if (options.getLocalHost() != null) { + return validateUrl( + String.format("http://%s/%s/projects/%s", options.getLocalHost(), VERSION, projectId)); + } + return validateUrl(String.format("%s/%s/projects/%s", DEFAULT_HOST, VERSION, projectId)); + } + + protected com.google.datastore.utils.RemoteRpc newRemoteRpc(DatastoreOptions options) { + checkNotNull(options); + HttpRequestFactory client = makeClient(options); + return new com.google.datastore.utils.RemoteRpc( + client, options.getInitializer(), buildProjectEndpoint(options)); + } + + private static String validateUrl(String url) { + try { + return new URI(url).toString(); + } catch (URISyntaxException e) { + throw new IllegalArgumentException(e); + } + } + + // TODO: Support something other than console handler for when we're + // running in App Engine + private static synchronized StreamHandler getStreamHandler() { + if (methodHandler == null) { + methodHandler = new ConsoleHandler(); + methodHandler.setFormatter( + new Formatter() { + @Override + public String format(LogRecord record) { + return record.getMessage() + "\n"; + } + }); + methodHandler.setLevel(Level.FINE); + } + return methodHandler; + } +} diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java new file mode 100644 index 000000000..a937dffad --- /dev/null +++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java @@ -0,0 +1,731 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; +import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; +import com.google.api.client.http.GenericUrl; +import com.google.api.client.http.HttpRequest; +import com.google.api.client.http.HttpTransport; +import com.google.api.client.json.JsonFactory; +import com.google.api.client.json.gson.GsonFactory; +import com.google.datastore.v1.ArrayValue; +import com.google.datastore.v1.CompositeFilter; +import com.google.datastore.v1.Entity; +import com.google.datastore.v1.Filter; +import com.google.datastore.v1.Key; +import com.google.datastore.v1.Key.PathElement; +import com.google.datastore.v1.Key.PathElement.IdTypeCase; +import com.google.datastore.v1.Mutation; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.PropertyFilter; +import com.google.datastore.v1.PropertyOrder; +import com.google.datastore.v1.PropertyReference; +import com.google.datastore.v1.Value; +import com.google.datastore.v1.Value.ValueTypeCase; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; +import com.google.protobuf.TimestampOrBuilder; +import com.google.type.LatLng; +import java.io.File; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.PrivateKey; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.annotation.Nullable; + +/** Helper methods for {@link Datastore}. */ +// TODO: Accept OrBuilders when possible. +public final class DatastoreHelper { + private static final Logger logger = + Logger.getLogger(com.google.datastore.utils.DatastoreHelper.class.getName()); + + private static final int MICROSECONDS_PER_SECOND = 1000 * 1000; + private static final int NANOSECONDS_PER_MICROSECOND = 1000; + + /** The property used in the Datastore to give us a random distribution. * */ + public static final String SCATTER_PROPERTY_NAME = "__scatter__"; + + /** The property used in the Datastore to get the key of the entity. * */ + public static final String KEY_PROPERTY_NAME = "__key__"; + + /** Name of the environment variable used to set the project ID. */ + public static final String PROJECT_ID_ENV_VAR = "DATASTORE_PROJECT_ID"; + + /** Name of the environment variable used to set the local host. */ + public static final String LOCAL_HOST_ENV_VAR = "DATASTORE_EMULATOR_HOST"; + + /** Name of the environment variable used to set the service account. */ + public static final String SERVICE_ACCOUNT_ENV_VAR = "DATASTORE_SERVICE_ACCOUNT"; + + /** Name of the environment variable used to set the private key file. */ + public static final String PRIVATE_KEY_FILE_ENV_VAR = "DATASTORE_PRIVATE_KEY_FILE"; + + private static final String URL_OVERRIDE_ENV_VAR = "__DATASTORE_URL_OVERRIDE"; + + private static final AtomicReference projectIdFromComputeEngine = new AtomicReference<>(); + + /** Comparator for Keys */ + private static final class KeyComparator implements Comparator { + + static final com.google.datastore.utils.DatastoreHelper.KeyComparator INSTANCE = + new com.google.datastore.utils.DatastoreHelper.KeyComparator(); + + private int comparePathElement(PathElement thisElement, PathElement otherElement) { + int result = thisElement.getKind().compareTo(otherElement.getKind()); + if (result != 0) { + return result; + } + if (thisElement.getIdTypeCase() == IdTypeCase.ID) { + if (otherElement.getIdTypeCase() != IdTypeCase.ID) { + return -1; + } + return Long.valueOf(thisElement.getId()).compareTo(otherElement.getId()); + } + if (otherElement.getIdTypeCase() == IdTypeCase.ID) { + return 1; + } + + return thisElement.getName().compareTo(otherElement.getName()); + } + + @Override + public int compare(Key thisKey, Key otherKey) { + if (!thisKey.getPartitionId().equals(otherKey.getPartitionId())) { + throw new IllegalArgumentException("Cannot compare keys with different partition ids."); + } + + Iterator thisPath = thisKey.getPathList().iterator(); + Iterator otherPath = otherKey.getPathList().iterator(); + while (thisPath.hasNext()) { + if (!otherPath.hasNext()) { + return 1; + } + int result = comparePathElement(thisPath.next(), otherPath.next()); + if (result != 0) { + return result; + } + } + + return otherPath.hasNext() ? -1 : 0; + } + } + + private DatastoreHelper() {} + + private static HttpTransport newTransport() throws GeneralSecurityException, IOException { + return GoogleNetHttpTransport.newTrustedTransport(); + } + + static JsonFactory newJsonFactory() { + return new GsonFactory(); + } + + /** + * Constructs credentials for the given account and key. + * + * @param serviceAccountId service account ID (typically an e-mail address). + * @param privateKeyFile the file name from which to get the private key. + * @return valid credentials or {@code null} + */ + public static Credential getServiceAccountCredential( + String serviceAccountId, String privateKeyFile) throws GeneralSecurityException, IOException { + return getServiceAccountCredential(serviceAccountId, privateKeyFile, DatastoreOptions.SCOPES); + } + + /** + * Constructs credentials for the given account and key file. + * + * @param serviceAccountId service account ID (typically an e-mail address). + * @param privateKeyFile the file name from which to get the private key. + * @param serviceAccountScopes Collection of OAuth scopes to use with the the service account flow + * or {@code null} if not. + * @return valid credentials or {@code null} + */ + public static Credential getServiceAccountCredential( + String serviceAccountId, String privateKeyFile, Collection serviceAccountScopes) + throws GeneralSecurityException, IOException { + return getCredentialBuilderWithoutPrivateKey(serviceAccountId, serviceAccountScopes) + .setServiceAccountPrivateKeyFromP12File(new File(privateKeyFile)) + .build(); + } + + /** + * Constructs credentials for the given account and key. + * + * @param serviceAccountId service account ID (typically an e-mail address). + * @param privateKey the private key for the given account. + * @param serviceAccountScopes Collection of OAuth scopes to use with the the service account flow + * or {@code null} if not. + * @return valid credentials or {@code null} + */ + public static Credential getServiceAccountCredential( + String serviceAccountId, PrivateKey privateKey, Collection serviceAccountScopes) + throws GeneralSecurityException, IOException { + return getCredentialBuilderWithoutPrivateKey(serviceAccountId, serviceAccountScopes) + .setServiceAccountPrivateKey(privateKey) + .build(); + } + + private static GoogleCredential.Builder getCredentialBuilderWithoutPrivateKey( + String serviceAccountId, Collection serviceAccountScopes) + throws GeneralSecurityException, IOException { + HttpTransport transport = newTransport(); + JsonFactory jsonFactory = newJsonFactory(); + return new GoogleCredential.Builder() + .setTransport(transport) + .setJsonFactory(jsonFactory) + .setServiceAccountId(serviceAccountId) + .setServiceAccountScopes(serviceAccountScopes); + } + + /** + * Constructs a {@link Datastore} from environment variables and/or the Compute Engine metadata + * server. + * + *

The project ID is determined from, in order of preference: + * + *

    + *
  • DATASTORE_PROJECT_ID environment variable + *
  • Compute Engine + *
+ * + *

Credentials are taken from, in order of preference: + * + *

    + *
  1. No credentials (if the DATASTORE_EMULATOR_HOST environment variable is set) + *
  2. Service Account specified by the DATASTORE_SERVICE_ACCOUNT and DATASTORE_PRIVATE_KEY_FILE + * environment variables + *
  3. Google Application Default as described here. + *
+ */ + public static DatastoreOptions.Builder getOptionsFromEnv() + throws GeneralSecurityException, IOException { + DatastoreOptions.Builder options = new DatastoreOptions.Builder(); + setProjectEndpointFromEnv(options); + options.credential(getCredentialFromEnv()); + return options; + } + + private static Credential getCredentialFromEnv() throws GeneralSecurityException, IOException { + if (System.getenv(LOCAL_HOST_ENV_VAR) != null) { + logger.log( + Level.INFO, + "{0} environment variable was set. Not using credentials.", + new Object[] {LOCAL_HOST_ENV_VAR}); + return null; + } + String serviceAccount = System.getenv(SERVICE_ACCOUNT_ENV_VAR); + String privateKeyFile = System.getenv(PRIVATE_KEY_FILE_ENV_VAR); + if (serviceAccount != null && privateKeyFile != null) { + logger.log( + Level.INFO, + "{0} and {1} environment variables were set. " + "Using service account credential.", + new Object[] {SERVICE_ACCOUNT_ENV_VAR, PRIVATE_KEY_FILE_ENV_VAR}); + return getServiceAccountCredential(serviceAccount, privateKeyFile); + } + return GoogleCredential.getApplicationDefault().createScoped(DatastoreOptions.SCOPES); + } + + /** + * Determines the project id from the environment. Uses the following sources in order of + * preference: + * + *
    + *
  1. Value of the DATASTORE_PROJECT_ID environment variable + *
  2. Compute Engine + *
+ * + * @throws IllegalStateException if the project ID cannot be determined + */ + private static String getProjectIdFromEnv() { + if (System.getenv(PROJECT_ID_ENV_VAR) != null) { + return System.getenv(PROJECT_ID_ENV_VAR); + } + String projectIdFromComputeEngine = getProjectIdFromComputeEngine(); + if (projectIdFromComputeEngine != null) { + return projectIdFromComputeEngine; + } + throw new IllegalStateException( + String.format( + "Could not determine project ID." + + " If you are not running on Compute Engine, set the" + + " %s environment variable.", + PROJECT_ID_ENV_VAR)); + } + + /** + * Gets the project ID from the Compute Engine metadata server. Returns {@code null} if the + * project ID cannot be determined (because, for instance, the code is not running on Compute + * Engine). + */ + @Nullable + public static String getProjectIdFromComputeEngine() { + String cachedProjectId = projectIdFromComputeEngine.get(); + return cachedProjectId != null ? cachedProjectId : queryProjectIdFromComputeEngine(); + } + + @Nullable + private static String queryProjectIdFromComputeEngine() { + HttpTransport transport; + + try { + transport = newTransport(); + } catch (GeneralSecurityException | IOException e) { + logger.log(Level.WARNING, "Failed to create HttpTransport.", e); + return null; + } + + try { + GenericUrl projectIdUrl = + new GenericUrl("http://metadata/computeMetadata/v1/project/project-id"); + HttpRequest request = transport.createRequestFactory().buildGetRequest(projectIdUrl); + request.getHeaders().set("Metadata-Flavor", "Google"); + String result = request.execute().parseAsString(); + projectIdFromComputeEngine.set(result); + return result; + } catch (IOException e) { + logger.log(Level.INFO, "Could not determine project ID from Compute Engine.", e); + return null; + } + } + + private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options) { + // DATASTORE_HOST is deprecated. + if (System.getenv("DATASTORE_HOST") != null) { + logger.warning( + String.format( + "Ignoring value of environment variable DATASTORE_HOST. " + + "To point datastore to a host running locally, use " + + "the environment variable %s.", + LOCAL_HOST_ENV_VAR)); + } + String projectId = getProjectIdFromEnv(); + if (System.getenv(URL_OVERRIDE_ENV_VAR) != null) { + options.projectEndpoint( + String.format("%s/projects/%s", System.getenv(URL_OVERRIDE_ENV_VAR), projectId)); + return; + } + if (System.getenv(LOCAL_HOST_ENV_VAR) != null) { + options.projectId(projectId); + options.localHost(System.getenv(LOCAL_HOST_ENV_VAR)); + return; + } + options.projectId(projectId); + return; + } + + /** + * @see #getOptionsFromEnv() + */ + public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException { + return DatastoreFactory.get().create(getOptionsFromEnv().build()); + } + + /** + * Gets a {@link com.google.datastore.utils.QuerySplitter}. + * + *

The returned {@link com.google.datastore.utils.QuerySplitter#getSplits} cannot accept a + * query that contains inequality filters, a sort filter, or a missing kind. + */ + public static QuerySplitter getQuerySplitter() { + return com.google.datastore.utils.QuerySplitterImpl.INSTANCE; + } + + public static Comparator getKeyComparator() { + return com.google.datastore.utils.DatastoreHelper.KeyComparator.INSTANCE; + } + + /** Make a sort order for use in a query. */ + public static PropertyOrder.Builder makeOrder( + String property, PropertyOrder.Direction direction) { + return PropertyOrder.newBuilder() + .setProperty(makePropertyReference(property)) + .setDirection(direction); + } + + /** Makes an ancestor filter. */ + public static Filter.Builder makeAncestorFilter(Key ancestor) { + return makeFilter( + com.google.datastore.utils.DatastoreHelper.KEY_PROPERTY_NAME, + PropertyFilter.Operator.HAS_ANCESTOR, + makeValue(ancestor)); + } + + /** Make a filter on a property for use in a query. */ + public static Filter.Builder makeFilter( + String property, PropertyFilter.Operator operator, Value value) { + return Filter.newBuilder() + .setPropertyFilter( + PropertyFilter.newBuilder() + .setProperty(makePropertyReference(property)) + .setOp(operator) + .setValue(value)); + } + + /** Make a filter on a property for use in a query. */ + public static Filter.Builder makeFilter( + String property, PropertyFilter.Operator operator, Value.Builder value) { + return makeFilter(property, operator, value.build()); + } + + /** Make a composite filter from the given sub-filters using AND to combine filters. */ + public static Filter.Builder makeAndFilter(Filter... subfilters) { + return makeAndFilter(Arrays.asList(subfilters)); + } + + /** Make a composite filter from the given sub-filters using AND to combine filters. */ + public static Filter.Builder makeAndFilter(Iterable subfilters) { + return Filter.newBuilder() + .setCompositeFilter( + CompositeFilter.newBuilder() + .addAllFilters(subfilters) + .setOp(CompositeFilter.Operator.AND)); + } + + /** Make a property reference for use in a query. */ + public static PropertyReference.Builder makePropertyReference(String propertyName) { + return PropertyReference.newBuilder().setName(propertyName); + } + + /** Make an array value containing the specified values. */ + public static Value.Builder makeValue(Iterable values) { + return Value.newBuilder().setArrayValue(ArrayValue.newBuilder().addAllValues(values)); + } + + /** Make a list value containing the specified values. */ + public static Value.Builder makeValue(Value value1, Value value2, Value... rest) { + ArrayValue.Builder arrayValue = ArrayValue.newBuilder(); + arrayValue.addValues(value1); + arrayValue.addValues(value2); + arrayValue.addAllValues(Arrays.asList(rest)); + return Value.newBuilder().setArrayValue(arrayValue); + } + + /** Make an array value containing the specified values. */ + public static Value.Builder makeValue( + Value.Builder value1, Value.Builder value2, Value.Builder... rest) { + ArrayValue.Builder arrayValue = ArrayValue.newBuilder(); + arrayValue.addValues(value1); + arrayValue.addValues(value2); + for (Value.Builder builder : rest) { + arrayValue.addValues(builder); + } + return Value.newBuilder().setArrayValue(arrayValue); + } + + /** Make a key value. */ + public static Value.Builder makeValue(Key key) { + return Value.newBuilder().setKeyValue(key); + } + + /** Make a key value. */ + public static Value.Builder makeValue(Key.Builder key) { + return makeValue(key.build()); + } + + /** Make an integer value. */ + public static Value.Builder makeValue(long key) { + return Value.newBuilder().setIntegerValue(key); + } + + /** Make a floating point value. */ + public static Value.Builder makeValue(double value) { + return Value.newBuilder().setDoubleValue(value); + } + + /** Make a boolean value. */ + public static Value.Builder makeValue(boolean value) { + return Value.newBuilder().setBooleanValue(value); + } + + /** Make a string value. */ + public static Value.Builder makeValue(String value) { + return Value.newBuilder().setStringValue(value); + } + + /** Make an entity value. */ + public static Value.Builder makeValue(Entity entity) { + return Value.newBuilder().setEntityValue(entity); + } + + /** Make a entity value. */ + public static Value.Builder makeValue(Entity.Builder entity) { + return makeValue(entity.build()); + } + + /** Make a ByteString value. */ + public static Value.Builder makeValue(ByteString blob) { + return Value.newBuilder().setBlobValue(blob); + } + + /** Make a timestamp value given a date. */ + public static Value.Builder makeValue(Date date) { + return Value.newBuilder().setTimestampValue(toTimestamp(date.getTime() * 1000L)); + } + + /** Makes a GeoPoint value. */ + public static Value.Builder makeValue(LatLng value) { + return Value.newBuilder().setGeoPointValue(value); + } + + /** Makes a GeoPoint value. */ + public static Value.Builder makeValue(LatLng.Builder value) { + return makeValue(value.build()); + } + + private static Timestamp.Builder toTimestamp(long microseconds) { + long seconds = microseconds / MICROSECONDS_PER_SECOND; + long microsecondsRemainder = microseconds % MICROSECONDS_PER_SECOND; + if (microsecondsRemainder < 0) { + // Nanos must be positive even if microseconds is negative. + // Java modulus doesn't take care of this for us. + microsecondsRemainder += MICROSECONDS_PER_SECOND; + seconds -= 1; + } + return Timestamp.newBuilder() + .setSeconds(seconds) + .setNanos((int) microsecondsRemainder * NANOSECONDS_PER_MICROSECOND); + } + + /** + * Make a key from the specified path of kind/id-or-name pairs and/or Keys. + * + *

The id-or-name values must be either String, Long, Integer or Short. + * + *

The last id-or-name value may be omitted, in which case an entity without an id is created + * (for use with automatic id allocation). + * + *

The PartitionIds of all Keys in the path must be equal. The returned Key.Builder will use + * this PartitionId. + */ + public static Key.Builder makeKey(Object... elements) { + Key.Builder key = Key.newBuilder(); + PartitionId partitionId = null; + for (int pathIndex = 0; pathIndex < elements.length; pathIndex += 2) { + PathElement.Builder pathElement = PathElement.newBuilder(); + Object element = elements[pathIndex]; + if (element instanceof Key) { + Key subKey = (Key) element; + if (partitionId == null) { + partitionId = subKey.getPartitionId(); + } else if (!partitionId.equals(subKey.getPartitionId())) { + throw new IllegalArgumentException( + "Partition IDs did not match, found: " + + partitionId + + " and " + + subKey.getPartitionId()); + } + key.addAllPath(((Key) element).getPathList()); + // We increment by 2, but since we got a Key argument we're only consuming 1 element in this + // iteration of the loop. Decrement the index so that when we jump by 2 we end up in the + // right spot. + pathIndex--; + } else { + String kind; + try { + kind = (String) element; + } catch (ClassCastException e) { + throw new IllegalArgumentException( + "Expected string or Key, got: " + element.getClass(), e); + } + pathElement.setKind(kind); + if (pathIndex + 1 < elements.length) { + Object value = elements[pathIndex + 1]; + if (value instanceof String) { + pathElement.setName((String) value); + } else if (value instanceof Long) { + pathElement.setId((Long) value); + } else if (value instanceof Integer) { + pathElement.setId((Integer) value); + } else if (value instanceof Short) { + pathElement.setId((Short) value); + } else { + throw new IllegalArgumentException( + "Expected string or integer, got: " + value.getClass()); + } + } + key.addPath(pathElement); + } + } + if (partitionId != null && !partitionId.equals(PartitionId.getDefaultInstance())) { + key.setPartitionId(partitionId); + } + return key; + } + + /** + * @return the double contained in value + * @throws IllegalArgumentException if the value does not contain a double. + */ + public static double getDouble(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.DOUBLE_VALUE) { + throw new IllegalArgumentException("Value does not contain a double."); + } + return value.getDoubleValue(); + } + + /** + * @return the key contained in value + * @throws IllegalArgumentException if the value does not contain a key. + */ + public static Key getKey(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.KEY_VALUE) { + throw new IllegalArgumentException("Value does not contain a key."); + } + return value.getKeyValue(); + } + + /** + * @return the blob contained in value + * @throws IllegalArgumentException if the value does not contain a blob. + */ + public static ByteString getByteString(Value value) { + if (value.getMeaning() == 18 && value.getValueTypeCase() == ValueTypeCase.STRING_VALUE) { + return value.getStringValueBytes(); + } else if (value.getValueTypeCase() == ValueTypeCase.BLOB_VALUE) { + return value.getBlobValue(); + } + throw new IllegalArgumentException("Value does not contain a blob."); + } + + /** + * @return the entity contained in value + * @throws IllegalArgumentException if the value does not contain an entity. + */ + public static Entity getEntity(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.ENTITY_VALUE) { + throw new IllegalArgumentException("Value does not contain an Entity."); + } + return value.getEntityValue(); + } + + /** + * @return the string contained in value + * @throws IllegalArgumentException if the value does not contain a string. + */ + public static String getString(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.STRING_VALUE) { + throw new IllegalArgumentException("Value does not contain a string."); + } + return value.getStringValue(); + } + + /** + * @return the boolean contained in value + * @throws IllegalArgumentException if the value does not contain a boolean. + */ + public static boolean getBoolean(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.BOOLEAN_VALUE) { + throw new IllegalArgumentException("Value does not contain a boolean."); + } + return value.getBooleanValue(); + } + + /** + * @return the long contained in value + * @throws IllegalArgumentException if the value does not contain a long. + */ + public static long getLong(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.INTEGER_VALUE) { + throw new IllegalArgumentException("Value does not contain an integer."); + } + return value.getIntegerValue(); + } + + /** + * @return the timestamp in microseconds contained in value + * @throws IllegalArgumentException if the value does not contain a timestamp. + */ + public static long getTimestamp(Value value) { + if (value.getMeaning() == 18 && value.getValueTypeCase() == ValueTypeCase.INTEGER_VALUE) { + return value.getIntegerValue(); + } else if (value.getValueTypeCase() == ValueTypeCase.TIMESTAMP_VALUE) { + return toMicroseconds(value.getTimestampValue()); + } + throw new IllegalArgumentException("Value does not contain a timestamp."); + } + + private static long toMicroseconds(TimestampOrBuilder timestamp) { + // Nanosecond precision is lost. + return timestamp.getSeconds() * MICROSECONDS_PER_SECOND + + timestamp.getNanos() / NANOSECONDS_PER_MICROSECOND; + } + + /** + * @return the array contained in value as a list. + * @throws IllegalArgumentException if the value does not contain an array. + */ + public static List getList(Value value) { + if (value.getValueTypeCase() != ValueTypeCase.ARRAY_VALUE) { + throw new IllegalArgumentException("Value does not contain an array."); + } + return value.getArrayValue().getValuesList(); + } + + /** + * Convert a timestamp value into a {@link Date} clipping off the microseconds. + * + * @param value a timestamp value to convert + * @return the resulting {@link Date} + * @throws IllegalArgumentException if the value does not contain a timestamp. + */ + public static Date toDate(Value value) { + return new Date(getTimestamp(value) / 1000); + } + + /** + * @param entity the entity to insert + * @return a mutation that will insert an entity + */ + public static Mutation.Builder makeInsert(Entity entity) { + return Mutation.newBuilder().setInsert(entity); + } + + /** + * @param entity the entity to update + * @return a mutation that will update an entity + */ + public static Mutation.Builder makeUpdate(Entity entity) { + return Mutation.newBuilder().setUpdate(entity); + } + + /** + * @param entity the entity to upsert + * @return a mutation that will upsert an entity + */ + public static Mutation.Builder makeUpsert(Entity entity) { + return Mutation.newBuilder().setUpsert(entity); + } + + /** + * @param key the key of the entity to delete + * @return a mutation that will delete an entity + */ + public static Mutation.Builder makeDelete(Key key) { + return Mutation.newBuilder().setDelete(key); + } +} diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java new file mode 100644 index 000000000..f6e91a41a --- /dev/null +++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreOptions.java @@ -0,0 +1,204 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import static com.google.common.base.Preconditions.checkArgument; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.http.HttpRequestInitializer; +import com.google.api.client.http.HttpTransport; +import java.util.Arrays; +import java.util.List; + +/** + * An immutable object containing settings for the datastore. + * + *

Example for connecting to a datastore: + * + * 

+ * DatastoreOptions options = new DatastoreOptions.Builder()
+ *     .projectId("my-project-id")
+ *     .credential(DatastoreHelper.getComputeEngineCredential())
+ *     .build();
+ * DatastoreFactory.get().create(options);
+ *
+ * + *

The options should be passed to {@link DatastoreFactory#create}. + */ +public class DatastoreOptions { + private final String projectId; + + private final String projectEndpoint; + private final String host; + private final String localHost; + + private final HttpRequestInitializer initializer; + + private final Credential credential; + private final HttpTransport transport; + public static final List SCOPES = + Arrays.asList("https://www.googleapis.com/auth/datastore"); + + DatastoreOptions(Builder b) { + checkArgument( + b.projectId != null || b.projectEndpoint != null, + "Either project ID or project endpoint must be provided."); + this.projectId = b.projectId; + this.projectEndpoint = b.projectEndpoint; + this.host = b.host; + this.localHost = b.localHost; + this.initializer = b.initializer; + this.credential = b.credential; + this.transport = b.transport; + } + + /** Builder for {@link DatastoreOptions}. */ + public static class Builder { + private static final String PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR = + "Cannot set both project endpoint and project ID."; + private static final String PROJECT_ENDPOINT_AND_HOST_ERROR = + "Can set at most one of project endpoint, host, and local host."; + + private String projectId; + + private String projectEndpoint; + private String host; + private String localHost; + private HttpRequestInitializer initializer; + private Credential credential; + private HttpTransport transport; + + public Builder() {} + + public Builder(DatastoreOptions options) { + this.projectId = options.projectId; + this.projectEndpoint = options.projectEndpoint; + this.host = options.host; + this.localHost = options.localHost; + this.initializer = options.initializer; + this.credential = options.credential; + this.transport = options.transport; + } + + public DatastoreOptions build() { + return new DatastoreOptions(this); + } + + /** Sets the project ID used to access Cloud Datastore. */ + public Builder projectId(String projectId) { + checkArgument(projectEndpoint == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR); + this.projectId = projectId; + return this; + } + + /** + * Sets the host used to access Cloud Datastore. To connect to the Cloud Datastore Emulator, use + * {@link #localHost} instead. + */ + public Builder host(String host) { + checkArgument(projectEndpoint == null && localHost == null, PROJECT_ENDPOINT_AND_HOST_ERROR); + if (includesScheme(host)) { + throw new IllegalArgumentException( + String.format("Host \"%s\" must not include scheme.", host)); + } + this.host = host; + return this; + } + + /** + * Configures the client to access Cloud Datastore on a local host (typically a Cloud Datastore + * Emulator instance). Call this method also configures the client not to attach credentials to + * requests. + */ + public Builder localHost(String localHost) { + checkArgument(projectEndpoint == null && host == null, PROJECT_ENDPOINT_AND_HOST_ERROR); + if (includesScheme(localHost)) { + throw new IllegalArgumentException( + String.format("Local host \"%s\" must not include scheme.", localHost)); + } + this.localHost = localHost; + return this; + } + + /** + * Sets the project endpoint used to access Cloud Datastore. Prefer using {@link #projectId} + * and/or {@link #host}/{@link #localHost} when possible. + * + * @deprecated Use {@link #projectId} and/or {@link #host}/{@link #localHost} instead. + */ + @Deprecated + public Builder projectEndpoint(String projectEndpoint) { + checkArgument(projectId == null, PROJECT_ENDPOINT_AND_PROJECT_ID_ERROR); + checkArgument(localHost == null && host == null, PROJECT_ENDPOINT_AND_HOST_ERROR); + if (!includesScheme(projectEndpoint)) { + throw new IllegalArgumentException( + String.format("Project endpoint \"%s\" must include scheme.", projectEndpoint)); + } + this.projectEndpoint = projectEndpoint; + return this; + } + + /** Sets the (optional) initializer to run on HTTP requests to Cloud Datastore. */ + public Builder initializer(HttpRequestInitializer initializer) { + this.initializer = initializer; + return this; + } + + /** Sets the Google APIs {@link Credential} used to access Cloud Datastore. */ + public Builder credential(Credential credential) { + this.credential = credential; + return this; + } + + /** Sets the transport used to access Cloud Datastore. */ + public Builder transport(HttpTransport transport) { + this.transport = transport; + return this; + } + + private static boolean includesScheme(String url) { + return url.startsWith("http://") || url.startsWith("https://"); + } + } + + public String getProjectId() { + return projectId; + } + + public String getProjectEndpoint() { + return projectEndpoint; + } + + public String getHost() { + return host; + } + + public String getLocalHost() { + return localHost; + } + + public HttpRequestInitializer getInitializer() { + return initializer; + } + + public Credential getCredential() { + return credential; + } + + public HttpTransport getTransport() { + return transport; + } +} diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java new file mode 100644 index 000000000..31d1fd7d5 --- /dev/null +++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitter.java @@ -0,0 +1,56 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import com.google.api.core.BetaApi; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.Query; +import com.google.protobuf.Timestamp; +import java.util.List; + +/** Provides the ability to split a query into multiple shards. */ +public interface QuerySplitter { + + /** + * Returns a list of sharded {@link Query}s for the given query. + * + *

This will create up to the desired number of splits, however it may return less splits if + * the desired number of splits is unavailable. This will happen if the number of split points + * provided by the underlying Datastore is less than the desired number, which will occur if the + * number of results for the query is too small. + * + * @param query the query to split. + * @param partition the partition the query is running in. + * @param numSplits the desired number of splits. + * @param datastore the datastore to run on. + * @throws DatastoreException if there was a datastore error while generating query splits. + * @throws IllegalArgumentException if the given query or numSplits was invalid. + */ + List getSplits(Query query, PartitionId partition, int numSplits, Datastore datastore) + throws DatastoreException; + + /** + * Same as {@link #getSplits(Query, PartitionId, int, Datastore)} but the splits are based on + * {@code readTime}, and the returned sharded {@link Query}s should also be executed with {@code + * readTime}. Reading from a timestamp is currently a private preview feature in Datastore. + */ + @BetaApi + default List getSplits( + Query query, PartitionId partition, int numSplits, Datastore datastore, Timestamp readTime) + throws DatastoreException { + throw new UnsupportedOperationException("Not implemented."); + } +} diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java new file mode 100644 index 000000000..ac2a6557e --- /dev/null +++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/QuerySplitterImpl.java @@ -0,0 +1,309 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import static com.google.datastore.utils.DatastoreHelper.makeAndFilter; + +import com.google.api.core.BetaApi; +import com.google.datastore.v1.EntityResult; +import com.google.datastore.v1.Filter; +import com.google.datastore.v1.Key; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.Projection; +import com.google.datastore.v1.PropertyFilter; +import com.google.datastore.v1.PropertyFilter.Operator; +import com.google.datastore.v1.PropertyOrder.Direction; +import com.google.datastore.v1.PropertyReference; +import com.google.datastore.v1.Query; +import com.google.datastore.v1.QueryResultBatch; +import com.google.datastore.v1.QueryResultBatch.MoreResultsType; +import com.google.datastore.v1.ReadOptions; +import com.google.datastore.v1.RunQueryRequest; +import com.google.protobuf.Timestamp; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import javax.annotation.Nullable; + +/** + * Provides the ability to split a query into multiple shards using Cloud Datastore. + * + *

This implementation of the QuerySplitter uses the __scatter__ property to gather random split + * points for a query. + */ +final class QuerySplitterImpl implements QuerySplitter { + + /** The number of keys to sample for each split. * */ + private static final int KEYS_PER_SPLIT = 32; + + private static final EnumSet UNSUPPORTED_OPERATORS = + EnumSet.of( + Operator.LESS_THAN, + Operator.LESS_THAN_OR_EQUAL, + Operator.GREATER_THAN, + Operator.GREATER_THAN_OR_EQUAL); + + static final QuerySplitter INSTANCE = new QuerySplitterImpl(); + + private QuerySplitterImpl() { + // No initialization required. + } + + @Override + public List getSplits( + Query query, PartitionId partition, int numSplits, Datastore datastore) + throws DatastoreException, IllegalArgumentException { + return getSplitsInternal(query, partition, numSplits, datastore, null); + } + + @BetaApi + @Override + public List getSplits( + Query query, PartitionId partition, int numSplits, Datastore datastore, Timestamp readTime) + throws DatastoreException, IllegalArgumentException { + return getSplitsInternal(query, partition, numSplits, datastore, readTime); + } + + private List getSplitsInternal( + Query query, + PartitionId partition, + int numSplits, + Datastore datastore, + @Nullable Timestamp readTime) + throws DatastoreException, IllegalArgumentException { + List splits = new ArrayList(numSplits); + if (numSplits == 1) { + splits.add(query); + return splits; + } + validateQuery(query); + validateSplitSize(numSplits); + + List scatterKeys = getScatterKeys(numSplits, query, partition, datastore, readTime); + Key lastKey = null; + for (Key nextKey : getSplitKey(scatterKeys, numSplits)) { + splits.add(createSplit(lastKey, nextKey, query)); + lastKey = nextKey; + } + splits.add(createSplit(lastKey, null, query)); + return splits; + } + + /** + * Verify that the given number of splits is not out of bounds. + * + * @param numSplits the number of splits. + * @throws IllegalArgumentException if the split size is invalid. + */ + private void validateSplitSize(int numSplits) throws IllegalArgumentException { + if (numSplits < 1) { + throw new IllegalArgumentException("The number of splits must be greater than 0."); + } + } + + /** + * Validates that we only have allowable filters. + * + *

Note that equality and ancestor filters are allowed, however they may result in inefficient + * sharding. + */ + private void validateFilter(Filter filter) throws IllegalArgumentException { + switch (filter.getFilterTypeCase()) { + case COMPOSITE_FILTER: + for (Filter subFilter : filter.getCompositeFilter().getFiltersList()) { + validateFilter(subFilter); + } + break; + case PROPERTY_FILTER: + if (UNSUPPORTED_OPERATORS.contains(filter.getPropertyFilter().getOp())) { + throw new IllegalArgumentException("Query cannot have any inequality filters."); + } + break; + default: + throw new IllegalArgumentException( + "Unsupported filter type: " + filter.getFilterTypeCase()); + } + } + + /** + * Verifies that the given query can be properly scattered. + * + * @param query the query to verify + * @throws IllegalArgumentException if the query is invalid. + */ + private void validateQuery(Query query) throws IllegalArgumentException { + if (query.getKindCount() != 1) { + throw new IllegalArgumentException("Query must have exactly one kind."); + } + if (query.getOrderCount() != 0) { + throw new IllegalArgumentException("Query cannot have any sort orders."); + } + if (query.hasFilter()) { + validateFilter(query.getFilter()); + } + } + + /** + * Create a new {@link Query} given the query and range. + * + * @param lastKey the previous key. If null then assumed to be the beginning. + * @param nextKey the next key. If null then assumed to be the end. + * @param query the desired query. + */ + private Query createSplit(Key lastKey, Key nextKey, Query query) { + if (lastKey == null && nextKey == null) { + return query; + } + List keyFilters = new ArrayList(); + if (query.hasFilter()) { + keyFilters.add(query.getFilter()); + } + if (lastKey != null) { + Filter lowerBound = + DatastoreHelper.makeFilter( + DatastoreHelper.KEY_PROPERTY_NAME, + PropertyFilter.Operator.GREATER_THAN_OR_EQUAL, + DatastoreHelper.makeValue(lastKey)) + .build(); + keyFilters.add(lowerBound); + } + if (nextKey != null) { + Filter upperBound = + DatastoreHelper.makeFilter( + DatastoreHelper.KEY_PROPERTY_NAME, + PropertyFilter.Operator.LESS_THAN, + DatastoreHelper.makeValue(nextKey)) + .build(); + keyFilters.add(upperBound); + } + return Query.newBuilder(query).setFilter(makeAndFilter(keyFilters)).build(); + } + + /** + * Gets a list of split keys given a desired number of splits. + * + *

This list will contain multiple split keys for each split. Only a single split key will be + * chosen as the split point, however providing multiple keys allows for more uniform sharding. + * + * @param numSplits the number of desired splits. + * @param query the user query. + * @param partition the partition to run the query in. + * @param datastore the datastore containing the data. + * @param readTime read time at which to get the split keys from the datastore. + * @throws com.google.datastore.utils.DatastoreException if there was an error when executing the + * datastore query. + */ + private List getScatterKeys( + int numSplits, + Query query, + PartitionId partition, + Datastore datastore, + @Nullable Timestamp readTime) + throws DatastoreException { + Query.Builder scatterPointQuery = createScatterQuery(query, numSplits); + + List keySplits = new ArrayList(); + + QueryResultBatch batch; + do { + RunQueryRequest.Builder scatterRequest = + RunQueryRequest.newBuilder().setPartitionId(partition).setQuery(scatterPointQuery); + scatterRequest.setProjectId(partition.getProjectId()); + scatterRequest.setDatabaseId(partition.getDatabaseId()); + if (readTime != null) { + scatterRequest.setReadOptions(ReadOptions.newBuilder().setReadTime(readTime).build()); + } + batch = datastore.runQuery(scatterRequest.build()).getBatch(); + for (EntityResult result : batch.getEntityResultsList()) { + keySplits.add(result.getEntity().getKey()); + } + scatterPointQuery.setStartCursor(batch.getEndCursor()); + scatterPointQuery + .getLimitBuilder() + .setValue(scatterPointQuery.getLimit().getValue() - batch.getEntityResultsCount()); + } while (batch.getMoreResults() == MoreResultsType.NOT_FINISHED); + Collections.sort(keySplits, DatastoreHelper.getKeyComparator()); + return keySplits; + } + + /** + * Creates a scatter query from the given user query + * + * @param query the user's query. + * @param numSplits the number of splits to create. + */ + private Query.Builder createScatterQuery(Query query, int numSplits) { + // TODO(pcostello): We can potentially support better splits with equality filters in our query + // if there exists a composite index on property, __scatter__, __key__. Until an API for + // metadata exists, this isn't possible. Note that ancestor and inequality queries fall into + // the same category. + Query.Builder scatterPointQuery = Query.newBuilder(); + scatterPointQuery.addAllKind(query.getKindList()); + scatterPointQuery.addOrder( + DatastoreHelper.makeOrder(DatastoreHelper.SCATTER_PROPERTY_NAME, Direction.ASCENDING)); + // There is a split containing entities before and after each scatter entity: + // ||---*------*------*------*------*------*------*---|| = scatter entity + // If we represent each split as a region before a scatter entity, there is an extra region + // following the last scatter point. Thus, we do not need the scatter entities for the last + // region. + scatterPointQuery.getLimitBuilder().setValue((numSplits - 1) * KEYS_PER_SPLIT); + scatterPointQuery.addProjection( + Projection.newBuilder().setProperty(PropertyReference.newBuilder().setName("__key__"))); + return scatterPointQuery; + } + + /** + * Given a list of keys and a number of splits find the keys to split on. + * + * @param keys the list of keys. + * @param numSplits the number of splits. + */ + private Iterable getSplitKey(List keys, int numSplits) { + // If the number of keys is less than the number of splits, we are limited in the number of + // splits we can make. + if (keys.size() < numSplits - 1) { + return keys; + } + + // Calculate the number of keys per split. This should be KEYS_PER_SPLIT, but may + // be less if there are not KEYS_PER_SPLIT * (numSplits - 1) scatter entities. + // + // Consider the following dataset, where - represents an entity and * represents an entity + // that is returned as a scatter entity: + // ||---*-----*----*-----*-----*------*----*----|| + // If we want 4 splits in this data, the optimal split would look like: + // ||---*-----*----*-----*-----*------*----*----|| + // | | | + // The scatter keys in the last region are not useful to us, so we never request them: + // ||---*-----*----*-----*-----*------*---------|| + // | | | + // With 6 scatter keys we want to set scatter points at indexes: 1, 3, 5. + // + // We keep this as a double so that any "fractional" keys per split get distributed throughout + // the splits and don't make the last split significantly larger than the rest. + double numKeysPerSplit = Math.max(1.0, ((double) keys.size()) / (numSplits - 1)); + + List keysList = new ArrayList(numSplits - 1); + // Grab the last sample for each split, otherwise the first split will be too small. + for (int i = 1; i < numSplits; i++) { + int splitIndex = (int) Math.round(i * numKeysPerSplit) - 1; + keysList.add(keys.get(splitIndex)); + } + + return keysList; + } +} diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java new file mode 100644 index 000000000..492936e15 --- /dev/null +++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/RemoteRpc.java @@ -0,0 +1,239 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import com.google.api.client.http.*; +import com.google.api.client.http.protobuf.ProtoHttpContent; +import com.google.api.client.util.IOUtils; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Strings; +import com.google.protobuf.MessageLite; +import com.google.rpc.Code; +import com.google.rpc.Status; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.SocketTimeoutException; +import java.nio.charset.Charset; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Logger; + +/** + * An RPC transport that sends protocol buffers over HTTP. + * + *

This class is thread-safe. + */ +class RemoteRpc { + private static final Logger logger = Logger.getLogger(RemoteRpc.class.getName()); + + @VisibleForTesting static final String API_FORMAT_VERSION_HEADER = "X-Goog-Api-Format-Version"; + private static final String API_FORMAT_VERSION = "2"; + + @VisibleForTesting static final String X_GOOG_REQUEST_PARAMS_HEADER = "x-goog-request-params"; + + private final HttpRequestFactory client; + private final HttpRequestInitializer initializer; + private final String url; + private final AtomicInteger rpcCount = new AtomicInteger(0); + // Not final - so it can be set/reset in Unittests + private static boolean enableE2EChecksum = + Boolean.parseBoolean(System.getenv("GOOGLE_CLOUD_DATASTORE_HTTP_ENABLE_E2E_CHECKSUM")); + + RemoteRpc(HttpRequestFactory client, HttpRequestInitializer initializer, String url) { + this.client = client; + this.initializer = initializer; + this.url = url; + try { + resolveURL("dummyRpc"); + } catch (Exception e) { + throw new IllegalArgumentException( + "Unable to construct RemoteRpc due to unsupported url: <" + url + ">", e); + } + } + + /** + * Makes an RPC call using the client. Logs how long it took and any exceptions. + * + *

NOTE: The request could be an InputStream too, but the http client will need to find its + * length, which will require buffering it anyways. + * + * @throws com.google.datastore.utils.DatastoreException if the RPC fails. + */ + public InputStream call( + String methodName, MessageLite request, String projectId, String databaseId) + throws com.google.datastore.utils.DatastoreException { + logger.fine("remote datastore call " + methodName); + + long startTime = System.currentTimeMillis(); + try { + HttpResponse httpResponse; + try { + rpcCount.incrementAndGet(); + ProtoHttpContent payload = new ProtoHttpContent(request); + HttpRequest httpRequest = client.buildPostRequest(resolveURL(methodName), payload); + setHeaders(request, httpRequest, projectId, databaseId); + // Don't throw an HTTPResponseException on error. It converts the response to a String and + // throws away the original, whereas we need the raw bytes to parse it as a proto. + httpRequest.setThrowExceptionOnExecuteError(false); + // Datastore requests typically time out after 60s; set the read timeout to slightly longer + // than that by default (can be overridden via the HttpRequestInitializer). + httpRequest.setReadTimeout(65 * 1000); + if (initializer != null) { + initializer.initialize(httpRequest); + } + httpResponse = httpRequest.execute(); + if (!httpResponse.isSuccessStatusCode()) { + try (InputStream content = httpResponse.getContent()) { + throw makeException( + url, + methodName, + content, + httpResponse.getContentType(), + httpResponse.getContentCharset(), + null, + httpResponse.getStatusCode()); + } + } + InputStream inputStream = httpResponse.getContent(); + return inputStream; + } catch (SocketTimeoutException e) { + throw makeException(url, methodName, Code.DEADLINE_EXCEEDED, "Deadline exceeded", e); + } catch (IOException e) { + throw makeException(url, methodName, Code.UNAVAILABLE, "I/O error", e); + } + } finally { + long elapsedTime = System.currentTimeMillis() - startTime; + logger.fine("remote datastore call " + methodName + " took " + elapsedTime + " ms"); + } + } + + @VisibleForTesting + void setHeaders( + MessageLite request, HttpRequest httpRequest, String projectId, String databaseId) { + httpRequest.getHeaders().put(API_FORMAT_VERSION_HEADER, API_FORMAT_VERSION); + StringBuilder builder = new StringBuilder("project_id="); + builder.append(projectId); + if (!Strings.isNullOrEmpty(databaseId)) { + builder.append("&database_id="); + builder.append(databaseId); + } + httpRequest.getHeaders().put(X_GOOG_REQUEST_PARAMS_HEADER, builder.toString()); + } + + @VisibleForTesting + HttpRequestFactory getClient() { + return client; + } + + @VisibleForTesting + static void setSystemEnvE2EChecksum(boolean enableE2EChecksum) { + RemoteRpc.enableE2EChecksum = enableE2EChecksum; + } + + void resetRpcCount() { + rpcCount.set(0); + } + + int getRpcCount() { + return rpcCount.get(); + } + + public String getUrl() { + return url; + } + + GenericUrl resolveURL(String path) { + return new GenericUrl(url + ":" + path); + } + + HttpRequestFactory getHttpRequestFactory() { + return client; + } + + public static com.google.datastore.utils.DatastoreException makeException( + String url, String methodName, Code code, String message, Throwable cause) { + logger.fine("remote datastore call " + methodName + " against " + url + " failed: " + message); + return new com.google.datastore.utils.DatastoreException(methodName, code, message, cause); + } + + static DatastoreException makeException( + String url, + String methodName, + InputStream content, + String contentType, + Charset contentCharset, + Throwable cause, + int httpStatusCode) { + if (!contentType.equals("application/x-protobuf")) { + String responseContent; + try { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + IOUtils.copy(content, out, false); + responseContent = out.toString(contentCharset.name()); + } catch (IOException e) { + responseContent = ""; + } + return makeException( + url, + methodName, + Code.INTERNAL, + String.format( + "Non-protobuf error: %s. HTTP status code was %d.", responseContent, httpStatusCode), + cause); + } + + Status rpcStatus; + try { + rpcStatus = Status.parseFrom(content); + } catch (IOException e) { + return makeException( + url, + methodName, + Code.INTERNAL, + String.format( + "Unable to parse Status protocol buffer: HTTP status code was %s.", httpStatusCode), + e); + } + + Code code = Code.forNumber(rpcStatus.getCode()); + if (code == null) { + return makeException( + url, + methodName, + Code.INTERNAL, + String.format( + "Invalid error code: %d. Message: %s.", rpcStatus.getCode(), rpcStatus.getMessage()), + cause); + } else if (code == Code.OK) { + // We can end up here because there was no response body (and we successfully parsed an + // empty Status message). This may happen for 401s in particular due to special handling + // in low-level HTTP libraries. + if (httpStatusCode == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) { + return makeException(url, methodName, Code.UNAUTHENTICATED, "Unauthenticated.", cause); + } + return makeException( + url, + methodName, + Code.INTERNAL, + String.format( + "Unexpected OK error code with HTTP status code of %d. Message: %s.", + httpStatusCode, rpcStatus.getMessage()), + cause); + } + + return makeException(url, methodName, code, rpcStatus.getMessage(), cause); + } +} diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java new file mode 100644 index 000000000..d5d16bb65 --- /dev/null +++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockCredential.java @@ -0,0 +1,36 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils.testing; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.http.HttpRequest; +import java.io.IOException; + +/** Fake credential used for testing purpose. */ +public class MockCredential extends Credential { + public MockCredential() { + super( + new AccessMethod() { + @Override + public void intercept(HttpRequest request, String accessToken) throws IOException {} + + @Override + public String getAccessTokenFromRequest(HttpRequest request) { + return "MockAccessToken"; + } + }); + } +} diff --git a/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java new file mode 100644 index 000000000..d4dd5caef --- /dev/null +++ b/google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/testing/MockDatastoreFactory.java @@ -0,0 +1,132 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils.testing; + +import static com.google.common.base.Preconditions.checkState; + +import com.google.api.client.auth.oauth2.Credential; +import com.google.api.client.http.*; +import com.google.api.client.testing.http.MockHttpTransport; +import com.google.api.client.testing.http.MockLowLevelHttpRequest; +import com.google.api.client.testing.http.MockLowLevelHttpResponse; +import com.google.api.client.testing.util.TestableByteArrayInputStream; +import com.google.common.collect.Iterables; +import com.google.datastore.utils.DatastoreFactory; +import com.google.datastore.utils.DatastoreOptions; +import com.google.protobuf.Message; +import com.google.rpc.Code; +import com.google.rpc.Status; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.List; + +/** Fake Datastore factory used for testing purposes when a true Datastore service is not needed. */ +public class MockDatastoreFactory extends DatastoreFactory { + private int nextStatus; + private Message nextResponse; + private Status nextError; + private IOException nextException; + + private String lastPath; + private String lastMimeType; + private byte[] lastBody; + private List lastCookies; + private String lastApiFormatHeaderValue; + + public void setNextResponse(Message response) { + nextStatus = HttpStatusCodes.STATUS_CODE_OK; + nextResponse = response; + nextError = null; + nextException = null; + } + + public void setNextError(int status, Code code, String message) { + nextStatus = status; + nextResponse = null; + nextError = makeErrorContent(message, code); + nextException = null; + } + + public void setNextException(IOException exception) { + nextStatus = 0; + nextResponse = null; + nextError = null; + nextException = exception; + } + + @Override + public HttpRequestFactory makeClient(DatastoreOptions options) { + HttpTransport transport = + new MockHttpTransport() { + @Override + public LowLevelHttpRequest buildRequest(String method, String url) { + return new MockLowLevelHttpRequest(url) { + @Override + public LowLevelHttpResponse execute() throws IOException { + lastPath = new GenericUrl(getUrl()).getRawPath(); + lastMimeType = getContentType(); + lastCookies = getHeaderValues("Cookie"); + lastApiFormatHeaderValue = + Iterables.getOnlyElement(getHeaderValues("X-Goog-Api-Format-Version")); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + getStreamingContent().writeTo(out); + lastBody = out.toByteArray(); + if (nextException != null) { + throw nextException; + } + MockLowLevelHttpResponse response = + new MockLowLevelHttpResponse() + .setStatusCode(nextStatus) + .setContentType("application/x-protobuf"); + if (nextError != null) { + checkState(nextResponse == null); + response.setContent(new TestableByteArrayInputStream(nextError.toByteArray())); + } else { + response.setContent(new TestableByteArrayInputStream(nextResponse.toByteArray())); + } + return response; + } + }; + } + }; + Credential credential = options.getCredential(); + return transport.createRequestFactory(credential); + } + + public String getLastPath() { + return lastPath; + } + + public String getLastMimeType() { + return lastMimeType; + } + + public String getLastApiFormatHeaderValue() { + return lastApiFormatHeaderValue; + } + + public byte[] getLastBody() { + return lastBody; + } + + public List getLastCookies() { + return lastCookies; + } + + private static Status makeErrorContent(String message, Code code) { + return Status.newBuilder().setCode(code.getNumber()).setMessage(message).build(); + } +} diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java new file mode 100644 index 000000000..31b0f6440 --- /dev/null +++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreClientTest.java @@ -0,0 +1,407 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.fail; + +import com.google.api.client.http.HttpRequest; +import com.google.api.client.http.HttpRequestInitializer; +import com.google.datastore.utils.testing.MockCredential; +import com.google.datastore.utils.testing.MockDatastoreFactory; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.EntityResult; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.QueryResultBatch; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import com.google.protobuf.ByteString; +import com.google.protobuf.Message; +import com.google.rpc.Code; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.SocketTimeoutException; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Tests for {@link DatastoreFactory} and {@link Datastore}. */ +@RunWith(JUnit4.class) +public class DatastoreClientTest { + private static final String PROJECT_ID = "project-id"; + + private DatastoreFactory factory = new MockDatastoreFactory(); + private DatastoreOptions.Builder options = + new DatastoreOptions.Builder().projectId(PROJECT_ID).credential(new MockCredential()); + + @Test + public void options_NoProjectIdOrProjectEndpoint() { + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> factory.create(new DatastoreOptions.Builder().build())); + assertThat(exception) + .hasMessageThat() + .contains("Either project ID or project endpoint must be provided"); + factory.create(options.build()); + } + + @Test + public void options_ProjectIdAndProjectEndpoint() throws Exception { + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .projectEndpoint( + "http://localhost:1234/datastore/v1beta42/projects/project-id")); + assertThat(exception) + .hasMessageThat() + .contains("Cannot set both project endpoint and project ID"); + } + + @Test + public void options_LocalHostAndProjectEndpoint() throws Exception { + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + new DatastoreOptions.Builder() + .localHost("localhost:8080") + .projectEndpoint( + "http://localhost:1234/datastore/v1beta42/projects/project-id")); + assertThat(exception) + .hasMessageThat() + .contains("Can set at most one of project endpoint, host, and local host"); + } + + @Test + public void options_HostAndProjectEndpoint() throws Exception { + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + new DatastoreOptions.Builder() + .host("foo-datastore.googleapis.com") + .projectEndpoint( + "http://localhost:1234/datastore/v1beta42/projects/project-id")); + assertThat(exception) + .hasMessageThat() + .contains("Can set at most one of project endpoint, host, and local host"); + } + + @Test + public void options_HostAndLocalHost() throws Exception { + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + new DatastoreOptions.Builder() + .host("foo-datastore.googleapis.com") + .localHost("localhost:8080")); + assertThat(exception) + .hasMessageThat() + .contains("Can set at most one of project endpoint, host, and local host"); + } + + @Test + public void options_InvalidLocalHost() throws Exception { + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + factory.create( + new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .localHost("!not a valid url!") + .build())); + assertThat(exception).hasMessageThat().contains("Illegal character"); + } + + @Test + public void options_SchemeInLocalHost() { + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> new DatastoreOptions.Builder().localHost("http://localhost:8080")); + assertThat(exception) + .hasMessageThat() + .contains("Local host \"http://localhost:8080\" must not include scheme"); + } + + @Test + public void options_InvalidHost() { + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + factory.create( + new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .host("!not a valid url!") + .build())); + assertThat(exception).hasMessageThat().contains("Illegal character"); + } + + @Test + public void options_SchemeInHost() { + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> new DatastoreOptions.Builder().host("http://foo-datastore.googleapis.com")); + + assertThat(exception) + .hasMessageThat() + .contains("Host \"http://foo-datastore.googleapis.com\" must not include scheme."); + } + + @Test + public void create_NullOptions() throws Exception { + assertThrows(NullPointerException.class, () -> factory.create(null)); + } + + @Test + public void create_Host() { + Datastore datastore = + factory.create( + new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .host("foo-datastore.googleapis.com") + .build()); + assertThat(datastore.remoteRpc.getUrl()) + .isEqualTo("https://foo-datastore.googleapis.com/v1/projects/project-id"); + } + + @Test + public void create_LocalHost() { + Datastore datastore = + factory.create( + new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .localHost("localhost:8080") + .build()); + assertThat(datastore.remoteRpc.getUrl()) + .isEqualTo("http://localhost:8080/v1/projects/project-id"); + } + + @Test + public void create_LocalHostIp() { + Datastore datastore = + factory.create( + new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .localHost("127.0.0.1:8080") + .build()); + assertThat(datastore.remoteRpc.getUrl()) + .isEqualTo("http://127.0.0.1:8080/v1/projects/project-id"); + } + + @Test + public void create_DefaultHost() { + Datastore datastore = + factory.create(new DatastoreOptions.Builder().projectId(PROJECT_ID).build()); + assertThat(datastore.remoteRpc.getUrl()) + .isEqualTo("https://datastore.googleapis.com/v1/projects/project-id"); + } + + @Test + public void create_ProjectEndpoint() { + Datastore datastore = + factory.create( + new DatastoreOptions.Builder() + .projectEndpoint("http://prom-qa/datastore/v1beta42/projects/project-id") + .build()); + assertThat(datastore.remoteRpc.getUrl()) + .isEqualTo("http://prom-qa/datastore/v1beta42/projects/project-id"); + } + + @Test + public void create_ProjectEndpointNoScheme() { + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + factory.create( + new DatastoreOptions.Builder() + .projectEndpoint("localhost:1234/datastore/v1beta42/projects/project-id") + .build())); + assertThat(exception) + .hasMessageThat() + .contains( + "Project endpoint \"localhost:1234/datastore/v1beta42/projects/project-id\" must" + + " include scheme."); + } + + @Test + public void initializer() throws Exception { + options.initializer( + new HttpRequestInitializer() { + @Override + public void initialize(HttpRequest request) { + request.getHeaders().setCookie("magic"); + } + }); + Datastore datastore = factory.create(options.build()); + MockDatastoreFactory mockClient = (MockDatastoreFactory) factory; + AllocateIdsRequest request = AllocateIdsRequest.newBuilder().build(); + AllocateIdsResponse response = AllocateIdsResponse.newBuilder().build(); + mockClient.setNextResponse(response); + assertEquals(response, datastore.allocateIds(request)); + assertEquals("magic", mockClient.getLastCookies().get(0)); + } + + @Test + public void allocateIds() throws Exception { + AllocateIdsRequest.Builder request = AllocateIdsRequest.newBuilder(); + AllocateIdsResponse.Builder response = AllocateIdsResponse.newBuilder(); + expectRpc("allocateIds", request.build(), response.build()); + } + + @Test + public void lookup() throws Exception { + LookupRequest.Builder request = LookupRequest.newBuilder(); + LookupResponse.Builder response = LookupResponse.newBuilder(); + expectRpc("lookup", request.build(), response.build()); + } + + @Test + public void beginTransaction() throws Exception { + BeginTransactionRequest.Builder request = BeginTransactionRequest.newBuilder(); + BeginTransactionResponse.Builder response = BeginTransactionResponse.newBuilder(); + response.setTransaction(ByteString.copyFromUtf8("project-id")); + expectRpc("beginTransaction", request.build(), response.build()); + } + + @Test + public void commit() throws Exception { + CommitRequest.Builder request = CommitRequest.newBuilder(); + request.setTransaction(ByteString.copyFromUtf8("project-id")); + CommitResponse.Builder response = CommitResponse.newBuilder(); + expectRpc("commit", request.build(), response.build()); + } + + @Test + public void reserveIds() throws Exception { + ReserveIdsRequest.Builder request = ReserveIdsRequest.newBuilder(); + ReserveIdsResponse.Builder response = ReserveIdsResponse.newBuilder(); + expectRpc("reserveIds", request.build(), response.build()); + } + + @Test + public void rollback() throws Exception { + RollbackRequest.Builder request = RollbackRequest.newBuilder(); + request.setTransaction(ByteString.copyFromUtf8("project-id")); + RollbackResponse.Builder response = RollbackResponse.newBuilder(); + expectRpc("rollback", request.build(), response.build()); + } + + @Test + public void runQuery() throws Exception { + RunQueryRequest.Builder request = RunQueryRequest.newBuilder(); + request.getQueryBuilder(); + RunQueryResponse.Builder response = RunQueryResponse.newBuilder(); + response + .getBatchBuilder() + .setEntityResultType(EntityResult.ResultType.FULL) + .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED); + expectRpc("runQuery", request.build(), response.build()); + } + + @Test + public void runAggregationQuery() throws Exception { + RunAggregationQueryRequest.Builder request = RunAggregationQueryRequest.newBuilder(); + RunAggregationQueryResponse.Builder response = RunAggregationQueryResponse.newBuilder(); + expectRpc("runAggregationQuery", request.build(), response.build()); + } + + private void expectRpc(String methodName, Message request, Message response) throws Exception { + Datastore datastore = factory.create(options.build()); + MockDatastoreFactory mockClient = (MockDatastoreFactory) factory; + + mockClient.setNextResponse(response); + @SuppressWarnings("rawtypes") + Class[] methodArgs = {request.getClass()}; + Method call = Datastore.class.getMethod(methodName, methodArgs); + Object[] callArgs = {request}; + assertEquals(response, call.invoke(datastore, callArgs)); + + assertEquals("/v1/projects/project-id:" + methodName, mockClient.getLastPath()); + assertEquals("application/x-protobuf", mockClient.getLastMimeType()); + assertEquals("2", mockClient.getLastApiFormatHeaderValue()); + assertArrayEquals(request.toByteArray(), mockClient.getLastBody()); + assertEquals(1, datastore.getRpcCount()); + + datastore.resetRpcCount(); + assertEquals(0, datastore.getRpcCount()); + + mockClient.setNextError(400, Code.INVALID_ARGUMENT, "oops"); + try { + call.invoke(datastore, callArgs); + fail(); + } catch (InvocationTargetException targetException) { + DatastoreException exception = (DatastoreException) targetException.getCause(); + assertEquals(Code.INVALID_ARGUMENT, exception.getCode()); + assertEquals(methodName, exception.getMethodName()); + assertEquals("oops", exception.getMessage()); + } + + SocketTimeoutException socketTimeoutException = new SocketTimeoutException("ste"); + mockClient.setNextException(socketTimeoutException); + try { + call.invoke(datastore, callArgs); + fail(); + } catch (InvocationTargetException targetException) { + DatastoreException exception = (DatastoreException) targetException.getCause(); + assertEquals(Code.DEADLINE_EXCEEDED, exception.getCode()); + assertEquals(methodName, exception.getMethodName()); + assertEquals("Deadline exceeded", exception.getMessage()); + assertSame(socketTimeoutException, exception.getCause()); + } + + IOException ioException = new IOException("ioe"); + mockClient.setNextException(ioException); + try { + call.invoke(datastore, callArgs); + fail(); + } catch (InvocationTargetException targetException) { + DatastoreException exception = (DatastoreException) targetException.getCause(); + assertEquals(Code.UNAVAILABLE, exception.getCode()); + assertEquals(methodName, exception.getMethodName()); + assertEquals("I/O error", exception.getMessage()); + assertSame(ioException, exception.getCause()); + } + + assertEquals(3, datastore.getRpcCount()); + } +} diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java new file mode 100644 index 000000000..2a3d5a38f --- /dev/null +++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreFactoryTest.java @@ -0,0 +1,93 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + +import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; +import com.google.api.client.http.HttpRequestFactory; +import com.google.api.client.http.javanet.NetHttpTransport; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Test for {@link DatastoreFactory}. */ +@RunWith(JUnit4.class) +public class DatastoreFactoryTest { + private static final String PROJECT_ID = "project-id"; + + private DatastoreFactory factory = DatastoreFactory.get(); + + /** + * Without specifying a credential or transport, the factory will create a default transport on + * its own. + */ + @Test + public void makeClient_Default() { + DatastoreOptions options = new DatastoreOptions.Builder().projectId(PROJECT_ID).build(); + HttpRequestFactory f = factory.makeClient(options); + assertNotNull(f.getTransport()); + assertTrue(f.getTransport() instanceof NetHttpTransport); + } + + /** + * Specifying a credential, but not a transport, the factory will use the transport from the + * credential. + */ + @Test + public void makeClient_WithCredential() { + NetHttpTransport transport = new NetHttpTransport(); + GoogleCredential credential = new GoogleCredential.Builder().setTransport(transport).build(); + DatastoreOptions options = + new DatastoreOptions.Builder().projectId(PROJECT_ID).credential(credential).build(); + HttpRequestFactory f = factory.makeClient(options); + assertEquals(transport, f.getTransport()); + } + + /** Specifying a transport, but not a credential, the factory will use the transport specified. */ + @Test + public void makeClient_WithTransport() { + NetHttpTransport transport = new NetHttpTransport(); + DatastoreOptions options = + new DatastoreOptions.Builder().projectId(PROJECT_ID).transport(transport).build(); + HttpRequestFactory f = factory.makeClient(options); + assertEquals(transport, f.getTransport()); + } + + /** + * Specifying both credential and transport, the factory will use the transport specified and not + * the one in the credential. + */ + @Test + public void makeClient_WithCredentialTransport() { + NetHttpTransport credTransport = new NetHttpTransport(); + NetHttpTransport transport = new NetHttpTransport(); + GoogleCredential credential = + new GoogleCredential.Builder().setTransport(credTransport).build(); + DatastoreOptions options = + new DatastoreOptions.Builder() + .projectId(PROJECT_ID) + .credential(credential) + .transport(transport) + .build(); + HttpRequestFactory f = factory.makeClient(options); + assertNotSame(credTransport, f.getTransport()); + assertEquals(transport, f.getTransport()); + } +} diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java new file mode 100644 index 000000000..246202444 --- /dev/null +++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/DatastoreHelperTest.java @@ -0,0 +1,317 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import static com.google.datastore.utils.DatastoreHelper.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import com.google.datastore.v1.Key; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.Value; +import com.google.datastore.v1.Value.ValueTypeCase; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; +import java.util.Date; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Tests for {@link DatastoreHelper}. */ +@RunWith(JUnit4.class) +public class DatastoreHelperTest { + + private static final Key PARENT = + Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Parent").setId(23L)).build(); + private static final Key GRANDPARENT = + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Grandparent").setId(24L)) + .build(); + private static final Key CHILD = + Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Child").setId(26L)).build(); + + @Test + public void testMakeKey_BadTypeForKind() { + try { + DatastoreHelper.makeKey(new Object()); + fail("Expected IllegalArgumentException"); + } catch (IllegalArgumentException expected) { + } + } + + @Test + public void testMakeKey_BadTypeForNameId() { + try { + DatastoreHelper.makeKey("kind", new Object()); + fail("Expected IllegalArgumentException"); + } catch (IllegalArgumentException expected) { + } + } + + @Test + public void testMakeKey_Empty() { + assertEquals(Key.newBuilder().build(), DatastoreHelper.makeKey().build()); + } + + @Test + public void testMakeKey_Incomplete() { + assertEquals( + Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo")).build(), + makeKey("Foo").build()); + } + + @Test + public void testMakeKey_IdInt() { + assertEquals( + Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)).build(), + makeKey("Foo", 1).build()); + } + + @Test + public void testMakeKey_IdLong() { + assertEquals( + Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)).build(), + makeKey("Foo", 1L).build()); + } + + @Test + public void testMakeKey_IdShort() { + assertEquals( + Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setId(1)).build(), + makeKey("Foo", (short) 1).build()); + } + + @Test + public void testMakeKey_Name() { + assertEquals( + Key.newBuilder().addPath(Key.PathElement.newBuilder().setKind("Foo").setName("hi")).build(), + makeKey("Foo", "hi").build()); + } + + @Test + public void testMakeKey_KindNameKind() { + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Foo").setName("hi")) + .addPath(Key.PathElement.newBuilder().setKind("Bar")) + .build(), + makeKey("Foo", "hi", "Bar").build()); + } + + @Test + public void testMakeKey_KeyKind() { + // 1 key at the beginning of the series + assertEquals( + Key.newBuilder() + .addPath(PARENT.getPath(0)) + .addPath(Key.PathElement.newBuilder().setKind("Child")) + .build(), + makeKey(PARENT, "Child").build()); + } + + @Test + public void testMakeKey_KindIdKeyKind() { + // 1 key in the middle of the series + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Grandparent").setId(24L)) + .addPath(PARENT.getPath(0)) + .addPath(Key.PathElement.newBuilder().setKind("Child")) + .build(), + makeKey("Grandparent", 24L, PARENT, "Child").build()); + } + + @Test + public void testMakeKey_KindIdKey() { + // 1 key at the end of the series + assertEquals( + Key.newBuilder() + .addPath(Key.PathElement.newBuilder().setKind("Grandparent").setId(24L)) + .addPath(PARENT.getPath(0)) + .build(), + makeKey("Grandparent", 24L, PARENT).build()); + } + + @Test + public void testMakeKey_KeyKindIdKey() { + // 1 key at the beginning and 1 key at the end of the series + assertEquals( + Key.newBuilder() + .addPath(GRANDPARENT.getPath(0)) + .addPath(Key.PathElement.newBuilder().setKind("Parent").setId(23L)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(GRANDPARENT, "Parent", 23, CHILD).build()); + } + + @Test + public void testMakeKey_Key() { + // Just 1 key + assertEquals(Key.newBuilder().addPath(CHILD.getPath(0)).build(), makeKey(CHILD).build()); + } + + @Test + public void testMakeKey_KeyKey() { + // Just 2 keys + assertEquals( + Key.newBuilder().addPath(PARENT.getPath(0)).addPath(CHILD.getPath(0)).build(), + makeKey(PARENT, CHILD).build()); + } + + @Test + public void testMakeKey_KeyKeyKey() { + // Just 3 keys + assertEquals( + Key.newBuilder() + .addPath(GRANDPARENT.getPath(0)) + .addPath(PARENT.getPath(0)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(GRANDPARENT, PARENT, CHILD).build()); + } + + @Test + public void testMakeKey_KeyMultiLevelKey() { + // 1 key with 2 elements + assertEquals( + Key.newBuilder() + .addPath(GRANDPARENT.getPath(0)) + .addPath(PARENT.getPath(0)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(GRANDPARENT, makeKey(PARENT, CHILD).build()).build()); + } + + @Test + public void testMakeKey_MultiLevelKeyKey() { + // 1 key with 2 elements + assertEquals( + Key.newBuilder() + .addPath(GRANDPARENT.getPath(0)) + .addPath(PARENT.getPath(0)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(makeKey(GRANDPARENT, PARENT).build(), CHILD).build()); + } + + @Test + public void testMakeKey_MultiLevelKey() { + // 1 key with 3 elements + assertEquals( + Key.newBuilder() + .addPath(GRANDPARENT.getPath(0)) + .addPath(PARENT.getPath(0)) + .addPath(CHILD.getPath(0)) + .build(), + makeKey(makeKey(GRANDPARENT, PARENT, CHILD).build()).build()); + } + + @Test + public void testMakeKey_PartitionId() { + PartitionId partitionId = PartitionId.newBuilder().setNamespaceId("namespace-id").build(); + Key parent = PARENT.toBuilder().setPartitionId(partitionId).build(); + assertEquals( + Key.newBuilder() + .setPartitionId(partitionId) + .addPath(PARENT.getPath(0)) + .addPath(Key.PathElement.newBuilder().setKind("Child")) + .build(), + makeKey(parent, "Child").build()); + } + + @Test + public void testMakeKey_NonMatchingPartitionId2() { + PartitionId partitionId1 = PartitionId.newBuilder().setNamespaceId("namespace-id").build(); + PartitionId partitionId2 = + PartitionId.newBuilder().setNamespaceId("another-namespace-id").build(); + try { + makeKey( + PARENT.toBuilder().setPartitionId(partitionId1).build(), + CHILD.toBuilder().setPartitionId(partitionId2).build()); + fail("expected IllegalArgumentException"); + } catch (IllegalArgumentException expected) { + } + } + + @Test + public void testMakeTimestampValue() throws Exception { + // Test cases with nanos == 0. + assertConversion(-50_000, -50, 0); + assertConversion(-1_000, -1, 0); + assertConversion(0, 0, 0); + assertConversion(1_000, 1, 0); + assertConversion(2_000, 2, 0); + assertConversion(100_000, 100, 0); + + // Test cases with nanos % 1_000_000 == 0 (no loss of precision). + assertConversion(2, 0, 2_000_000); + assertConversion(1_003, 1, 3_000_000); + assertConversion(2_005, 2, 5_000_000); + + // Timestamp specification requires that nanos >= 0 even if the timestamp + // is before the epoch. + assertConversion(0, 0, 0); + assertConversion(-250, -1, 750_000_000); // 1/4 second before epoch + assertConversion(-500, -1, 500_000_000); // 1/2 second before epoch + assertConversion(-750, -1, 250_000_000); // 3/4 second before epoch + + // If nanos % 1_000_000 != 0, precision is lost (via truncation) when + // converting to milliseconds. + assertTimestampToMilliseconds(3_100, 3, 100_000_999); + assertMillisecondsToTimestamp(3_100, 3, 100_000_000); + assertTimestampToMilliseconds(5_999, 5, 999_999_999); + assertMillisecondsToTimestamp(5_999, 5, 999_000_000); + assertTimestampToMilliseconds(7_100, 7, 100_000_001); + assertMillisecondsToTimestamp(7_100, 7, 100_000_000); + } + + private void assertConversion(long millis, long seconds, int nanos) { + assertMillisecondsToTimestamp(millis, seconds, nanos); + assertTimestampToMilliseconds(millis, seconds, nanos); + } + + private void assertMillisecondsToTimestamp(long millis, long seconds, long nanos) { + Value timestampValue = makeValue(new Date(millis)).build(); + assertEquals(ValueTypeCase.TIMESTAMP_VALUE, timestampValue.getValueTypeCase()); + assertEquals(seconds, timestampValue.getTimestampValue().getSeconds()); + assertEquals(nanos, timestampValue.getTimestampValue().getNanos()); + } + + private void assertTimestampToMilliseconds(long millis, long seconds, int nanos) { + Value.Builder value = + Value.newBuilder() + .setTimestampValue(Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos)); + assertEquals(millis, DatastoreHelper.toDate(value.build()).getTime()); + } + + @Test + public void testProjectionHandling() { + assertEquals( + ByteString.copyFromUtf8("hi"), getByteString(makeValue("hi").setMeaning(18).build())); + try { + getByteString(makeValue("hi").build()); + fail("Expected IllegalArgumentException"); + } catch (IllegalArgumentException expected) { + } + + assertEquals(new Date(1), toDate(makeValue(1000).setMeaning(18).build())); + try { + toDate(makeValue(1000).build()); + fail("Expected IllegalArgumentException"); + } catch (IllegalArgumentException expected) { + } + } +} diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java new file mode 100644 index 000000000..cad9502ae --- /dev/null +++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java @@ -0,0 +1,365 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import static com.google.common.truth.Truth.assertThat; +import static com.google.datastore.utils.DatastoreHelper.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertThrows; + +import com.google.datastore.utils.testing.MockCredential; +import com.google.datastore.utils.testing.MockDatastoreFactory; +import com.google.datastore.v1.*; +import com.google.datastore.v1.EntityResult.ResultType; +import com.google.datastore.v1.PropertyFilter.Operator; +import com.google.datastore.v1.PropertyOrder.Direction; +import com.google.datastore.v1.QueryResultBatch.MoreResultsType; +import com.google.protobuf.Int32Value; +import com.google.protobuf.Timestamp; +import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Tests for {@link com.google.datastore.utils.QuerySplitterImpl}. */ +@RunWith(JUnit4.class) +public class QuerySplitterTest { + private static final String PROJECT_ID = "project-id"; + private static final PartitionId PARTITION = + PartitionId.newBuilder().setProjectId(PROJECT_ID).build(); + private static final String KIND = "test-kind"; + + private DatastoreFactory factory = new MockDatastoreFactory(); + private com.google.datastore.utils.DatastoreOptions.Builder options = + new DatastoreOptions.Builder().projectId(PROJECT_ID).credential(new MockCredential()); + + private Filter propertyFilter = makeFilter("foo", Operator.EQUAL, makeValue("value")).build(); + + private Query query = + Query.newBuilder() + .addKind(KindExpression.newBuilder().setName(KIND).build()) + .setFilter(propertyFilter) + .build(); + + private Query splitQuery = + Query.newBuilder() + .addKind(KindExpression.newBuilder().setName(KIND).build()) + .addOrder(makeOrder("__scatter__", Direction.ASCENDING)) + .addProjection(Projection.newBuilder().setProperty(makePropertyReference("__key__"))) + .build(); + + private Key splitKey0 = makeKey(KIND, String.format("%05d", 1)).setPartitionId(PARTITION).build(); + private Key splitKey1 = + makeKey(KIND, String.format("%05d", 101)).setPartitionId(PARTITION).build(); + private Key splitKey2 = + makeKey(KIND, String.format("%05d", 201)).setPartitionId(PARTITION).build(); + private Key splitKey3 = + makeKey(KIND, String.format("%05d", 301)).setPartitionId(PARTITION).build(); + + @Test + public void disallowsSortOrder() { + com.google.datastore.utils.Datastore datastore = factory.create(options.build()); + Query queryWithOrder = + query.toBuilder().addOrder(makeOrder("bar", Direction.ASCENDING)).build(); + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits( + queryWithOrder, PARTITION, 2, datastore)); + assertThat(exception).hasMessageThat().contains("Query cannot have any sort orders."); + } + + @Test + public void disallowsMultipleKinds() { + com.google.datastore.utils.Datastore datastore = factory.create(options.build()); + Query queryWithMultipleKinds = + query.toBuilder() + .addKind(KindExpression.newBuilder().setName("another-kind").build()) + .build(); + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits( + queryWithMultipleKinds, PARTITION, 2, datastore)); + assertThat(exception).hasMessageThat().contains("Query must have exactly one kind."); + } + + @Test + public void disallowsKindlessQuery() { + com.google.datastore.utils.Datastore datastore = factory.create(options.build()); + Query kindlessQuery = query.toBuilder().clearKind().build(); + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits( + kindlessQuery, PARTITION, 2, datastore)); + assertThat(exception).hasMessageThat().contains("Query must have exactly one kind."); + } + + @Test + public void disallowsInequalityFilter() { + com.google.datastore.utils.Datastore datastore = factory.create(options.build()); + Query queryWithInequality = + query.toBuilder() + .setFilter(makeFilter("foo", Operator.GREATER_THAN, makeValue("value"))) + .build(); + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits( + queryWithInequality, PARTITION, 2, datastore)); + assertThat(exception).hasMessageThat().contains("Query cannot have any inequality filters."); + } + + @Test + public void splitsMustBePositive() { + com.google.datastore.utils.Datastore datastore = factory.create(options.build()); + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits( + query, PARTITION, 0, datastore)); + assertThat(exception).hasMessageThat().contains("The number of splits must be greater than 0."); + } + + @Test + public void getSplits() throws Exception { + com.google.datastore.utils.Datastore datastore = factory.create(options.build()); + MockDatastoreFactory mockClient = (MockDatastoreFactory) factory; + + RunQueryResponse splitQueryResponse = + RunQueryResponse.newBuilder() + .setQuery(splitQuery) + .setBatch( + QueryResultBatch.newBuilder() + .setEntityResultType(ResultType.KEY_ONLY) + .setMoreResults(MoreResultsType.NO_MORE_RESULTS) + .addEntityResults(makeKeyOnlyEntity(splitKey0)) + .addEntityResults(makeKeyOnlyEntity(splitKey1)) + .addEntityResults(makeKeyOnlyEntity(splitKey2)) + .addEntityResults(makeKeyOnlyEntity(splitKey3)) + .build()) + .build(); + + mockClient.setNextResponse(splitQueryResponse); + + List splittedQueries = + com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits( + query, PARTITION, 3, datastore); + + assertThat(splittedQueries) + .containsExactly( + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1)) + .build(), + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3)) + .build(), + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null)) + .build()); + + RunQueryRequest expectedSplitQueryRequest = + RunQueryRequest.newBuilder() + .setPartitionId(PARTITION) + .setProjectId(PROJECT_ID) + .setQuery( + splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(2 * 32).build())) + .build(); + + assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody()); + } + + @Test + public void getSplitsWithDatabaseId() throws Exception { + com.google.datastore.utils.Datastore datastore = factory.create(options.build()); + MockDatastoreFactory mockClient = (MockDatastoreFactory) factory; + + PartitionId partition = + PartitionId.newBuilder().setProjectId(PROJECT_ID).setDatabaseId("test-database").build(); + + RunQueryResponse splitQueryResponse = + RunQueryResponse.newBuilder() + .setQuery(splitQuery) + .setBatch( + QueryResultBatch.newBuilder() + .setEntityResultType(ResultType.KEY_ONLY) + .setMoreResults(MoreResultsType.NO_MORE_RESULTS) + .addEntityResults(makeKeyOnlyEntity(splitKey0)) + .addEntityResults(makeKeyOnlyEntity(splitKey1)) + .addEntityResults(makeKeyOnlyEntity(splitKey2)) + .addEntityResults(makeKeyOnlyEntity(splitKey3)) + .build()) + .build(); + + mockClient.setNextResponse(splitQueryResponse); + + List splitQueries = + com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits( + query, partition, 3, datastore); + + assertThat(splitQueries) + .containsExactly( + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1)) + .build(), + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3)) + .build(), + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null)) + .build()); + + RunQueryRequest expectedSplitQueryRequest = + RunQueryRequest.newBuilder() + .setPartitionId(partition) + .setProjectId(PROJECT_ID) + .setDatabaseId("test-database") + .setQuery( + splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(2 * 32).build())) + .build(); + + assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody()); + } + + @Test + public void notEnoughSplits() throws Exception { + com.google.datastore.utils.Datastore datastore = factory.create(options.build()); + MockDatastoreFactory mockClient = (MockDatastoreFactory) factory; + + RunQueryResponse splitQueryResponse = + RunQueryResponse.newBuilder() + .setQuery(splitQuery) + .setBatch( + QueryResultBatch.newBuilder() + .setEntityResultType(ResultType.KEY_ONLY) + .setMoreResults(MoreResultsType.NO_MORE_RESULTS) + .addEntityResults(makeKeyOnlyEntity(splitKey0)) + .build()) + .build(); + + mockClient.setNextResponse(splitQueryResponse); + + List splittedQueries = + com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits( + query, PARTITION, 100, datastore); + + assertThat(splittedQueries) + .containsExactly( + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey0)) + .build(), + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey0, null)) + .build()); + + RunQueryRequest expectedSplitQueryRequest = + RunQueryRequest.newBuilder() + .setPartitionId(PARTITION) + .setProjectId(PROJECT_ID) + .setQuery( + splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(99 * 32).build())) + .build(); + + assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody()); + } + + @Test + public void getSplits_withReadTime() throws Exception { + Datastore datastore = factory.create(options.build()); + MockDatastoreFactory mockClient = (MockDatastoreFactory) factory; + + RunQueryResponse splitQueryResponse = + RunQueryResponse.newBuilder() + .setQuery(splitQuery) + .setBatch( + QueryResultBatch.newBuilder() + .setEntityResultType(ResultType.KEY_ONLY) + .setMoreResults(MoreResultsType.NO_MORE_RESULTS) + .addEntityResults(makeKeyOnlyEntity(splitKey0)) + .addEntityResults(makeKeyOnlyEntity(splitKey1)) + .addEntityResults(makeKeyOnlyEntity(splitKey2)) + .addEntityResults(makeKeyOnlyEntity(splitKey3)) + .build()) + .build(); + + mockClient.setNextResponse(splitQueryResponse); + + Timestamp readTime = Timestamp.newBuilder().setSeconds(1654651341L).build(); + + List splittedQueries = + com.google.datastore.utils.QuerySplitterImpl.INSTANCE.getSplits( + query, PARTITION, 3, datastore, readTime); + + assertThat(splittedQueries) + .containsExactly( + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1)) + .build(), + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3)) + .build(), + query.toBuilder() + .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null)) + .build()); + + RunQueryRequest expectedSplitQueryRequest = + RunQueryRequest.newBuilder() + .setPartitionId(PARTITION) + .setProjectId(PROJECT_ID) + .setQuery( + splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(2 * 32).build())) + .setReadOptions(ReadOptions.newBuilder().setReadTime(readTime)) + .build(); + + assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody()); + } + + private static EntityResult makeKeyOnlyEntity(Key key) { + return EntityResult.newBuilder().setEntity(Entity.newBuilder().setKey(key).build()).build(); + } + + private static Filter makeFilterWithKeyRange(Filter originalFilter, Key startKey, Key endKey) { + Filter startKeyFilter = + startKey == null + ? null + : makeFilter("__key__", Operator.GREATER_THAN_OR_EQUAL, makeValue(startKey)).build(); + + Filter endKeyFilter = + endKey == null + ? null + : makeFilter("__key__", Operator.LESS_THAN, makeValue(endKey)).build(); + + if (startKeyFilter == null && endKeyFilter == null) { + throw new IllegalArgumentException(); + } + + if (startKeyFilter != null && endKeyFilter == null) { + return makeAndFilter(originalFilter, startKeyFilter).build(); + } + + if (startKeyFilter == null && endKeyFilter != null) { + return makeAndFilter(originalFilter, endKeyFilter).build(); + } + + return makeAndFilter(originalFilter, startKeyFilter, endKeyFilter).build(); + } +} diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java new file mode 100644 index 000000000..ae4d7a23e --- /dev/null +++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/RemoteRpcTest.java @@ -0,0 +1,341 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils; + +import static org.junit.Assert.*; + +import com.google.api.client.http.HttpRequest; +import com.google.api.client.http.HttpTransport; +import com.google.api.client.http.LowLevelHttpRequest; +import com.google.api.client.http.LowLevelHttpResponse; +import com.google.api.client.http.protobuf.ProtoHttpContent; +import com.google.api.client.util.Charsets; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.protobuf.ByteString; +import com.google.protobuf.MessageLite; +import com.google.rpc.Code; +import com.google.rpc.Status; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.zip.GZIPOutputStream; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Test for {@link RemoteRpc}. */ +@RunWith(JUnit4.class) +public class RemoteRpcTest { + + private static final String METHOD_NAME = "methodName"; + + @Test + public void testException() { + Status statusProto = + Status.newBuilder() + .setCode(Code.UNAUTHENTICATED_VALUE) + .setMessage("The request does not have valid authentication credentials.") + .build(); + DatastoreException exception = + RemoteRpc.makeException( + "url", + METHOD_NAME, + new ByteArrayInputStream(statusProto.toByteArray()), + "application/x-protobuf", + Charsets.UTF_8, + new RuntimeException(), + 401); + assertEquals(Code.UNAUTHENTICATED, exception.getCode()); + assertEquals( + "The request does not have valid authentication credentials.", exception.getMessage()); + assertEquals(METHOD_NAME, exception.getMethodName()); + } + + @Test + public void testInvalidProtoException() { + DatastoreException exception = + RemoteRpc.makeException( + "url", + METHOD_NAME, + new ByteArrayInputStream("".getBytes()), + "application/x-protobuf", + Charsets.UTF_8, + new RuntimeException(), + 401); + assertEquals(Code.INTERNAL, exception.getCode()); + assertEquals( + "Unable to parse Status protocol buffer: HTTP status code was 401.", + exception.getMessage()); + assertEquals(METHOD_NAME, exception.getMethodName()); + } + + @Test + public void testEmptyProtoException() { + Status statusProto = Status.newBuilder().build(); + DatastoreException exception = + RemoteRpc.makeException( + "url", + METHOD_NAME, + new ByteArrayInputStream(statusProto.toByteArray()), + "application/x-protobuf", + Charsets.UTF_8, + new RuntimeException(), + 404); + assertEquals(Code.INTERNAL, exception.getCode()); + assertEquals( + "Unexpected OK error code with HTTP status code of 404. Message: .", + exception.getMessage()); + assertEquals(METHOD_NAME, exception.getMethodName()); + } + + @Test + public void testEmptyProtoExceptionUnauthenticated() { + Status statusProto = Status.newBuilder().build(); + DatastoreException exception = + RemoteRpc.makeException( + "url", + METHOD_NAME, + new ByteArrayInputStream(statusProto.toByteArray()), + "application/x-protobuf", + Charsets.UTF_8, + new RuntimeException(), + 401); + assertEquals(Code.UNAUTHENTICATED, exception.getCode()); + assertEquals("Unauthenticated.", exception.getMessage()); + assertEquals(METHOD_NAME, exception.getMethodName()); + } + + @Test + public void testPlainTextException() { + DatastoreException exception = + RemoteRpc.makeException( + "url", + METHOD_NAME, + new ByteArrayInputStream("Text Error".getBytes()), + "text/plain", + Charsets.UTF_8, + new RuntimeException(), + 401); + assertEquals(Code.INTERNAL, exception.getCode()); + assertEquals( + "Non-protobuf error: Text Error. HTTP status code was 401.", exception.getMessage()); + assertEquals(METHOD_NAME, exception.getMethodName()); + } + + @Test + public void testGzip() throws IOException, DatastoreException { + BeginTransactionResponse response = newBeginTransactionResponse(); + InjectedTestValues injectedTestValues = + new InjectedTestValues(gzip(response), new byte[1], true); + RemoteRpc rpc = newRemoteRpc(injectedTestValues); + + InputStream is = + rpc.call("beginTransaction", BeginTransactionResponse.getDefaultInstance(), "", ""); + BeginTransactionResponse parsedResponse = BeginTransactionResponse.parseFrom(is); + is.close(); + + assertEquals(response, parsedResponse); + // Check that the underlying stream is exhausted. + assertEquals(-1, injectedTestValues.inputStream.read()); + } + + @Test + public void testHttpHeaders_apiFormat() throws IOException { + String projectId = "project-id"; + MessageLite request = + RollbackRequest.newBuilder().setTransaction(ByteString.copyFromUtf8(projectId)).build(); + RemoteRpc rpc = + newRemoteRpc( + new InjectedTestValues(gzip(newBeginTransactionResponse()), new byte[1], true)); + HttpRequest httpRequest = + rpc.getClient().buildPostRequest(rpc.resolveURL("blah"), new ProtoHttpContent(request)); + rpc.setHeaders(request, httpRequest, projectId, ""); + assertNotNull( + httpRequest.getHeaders().getFirstHeaderStringValue(RemoteRpc.API_FORMAT_VERSION_HEADER)); + } + + @Test + public void testHttpHeaders_prefixHeader() throws IOException { + String projectId = "my-project"; + String databaseId = "my-db"; + MessageLite request = + RollbackRequest.newBuilder() + .setTransaction(ByteString.copyFromUtf8(projectId)) + .setDatabaseId(databaseId) + .build(); + RemoteRpc rpc = + newRemoteRpc( + new InjectedTestValues(gzip(newBeginTransactionResponse()), new byte[1], true)); + HttpRequest httpRequest = + rpc.getClient().buildPostRequest(rpc.resolveURL("blah"), new ProtoHttpContent(request)); + rpc.setHeaders(request, httpRequest, projectId, databaseId); + assertEquals( + "project_id=my-project&database_id=my-db", + httpRequest.getHeaders().get(RemoteRpc.X_GOOG_REQUEST_PARAMS_HEADER)); + + MessageLite request2 = + RollbackRequest.newBuilder().setTransaction(ByteString.copyFromUtf8(projectId)).build(); + RemoteRpc rpc2 = + newRemoteRpc( + new InjectedTestValues(gzip(newBeginTransactionResponse()), new byte[1], true)); + HttpRequest httpRequest2 = + rpc2.getClient().buildPostRequest(rpc2.resolveURL("blah"), new ProtoHttpContent(request2)); + rpc2.setHeaders(request, httpRequest2, projectId, ""); + assertEquals( + "project_id=my-project", + httpRequest2.getHeaders().get(RemoteRpc.X_GOOG_REQUEST_PARAMS_HEADER)); + } + + private static BeginTransactionResponse newBeginTransactionResponse() { + return BeginTransactionResponse.newBuilder() + .setTransaction(ByteString.copyFromUtf8("blah-blah-blah")) + .build(); + } + + private static RemoteRpc newRemoteRpc(InjectedTestValues injectedTestValues) { + return new RemoteRpc( + new MyHttpTransport(injectedTestValues).createRequestFactory(), + null, + "https://www.example.com/v1/projects/p"); + } + + private byte[] gzip(BeginTransactionResponse response) throws IOException { + ByteArrayOutputStream bytesOut = new ByteArrayOutputStream(); + try (GZIPOutputStream gzipOut = new GZIPOutputStream(bytesOut)) { + response.writeTo(gzipOut); + } + return bytesOut.toByteArray(); + } + + private static class InjectedTestValues { + private final InputStream inputStream; + private final int contentLength; + private final boolean isGzip; + + public InjectedTestValues(byte[] messageBytes, byte[] additionalBytes, boolean isGzip) { + byte[] allBytes = concat(messageBytes, additionalBytes); + this.inputStream = new ByteArrayInputStream(allBytes); + this.contentLength = allBytes.length; + this.isGzip = isGzip; + } + + private static byte[] concat(byte[] a, byte[] b) { + byte[] c = new byte[a.length + b.length]; + System.arraycopy(a, 0, c, 0, a.length); + System.arraycopy(b, 0, c, a.length, b.length); + return c; + } + } + + /** {@link HttpTransport} that allows injection of the returned {@link LowLevelHttpRequest}. */ + private static class MyHttpTransport extends HttpTransport { + + private final InjectedTestValues injectedTestValues; + + public MyHttpTransport(InjectedTestValues injectedTestValues) { + this.injectedTestValues = injectedTestValues; + } + + @Override + protected LowLevelHttpRequest buildRequest(String method, String url) throws IOException { + return new MyLowLevelHttpRequest(injectedTestValues); + } + } + + /** + * {@link LowLevelHttpRequest} that allows injection of the returned {@link LowLevelHttpResponse}. + */ + private static class MyLowLevelHttpRequest extends LowLevelHttpRequest { + + private final InjectedTestValues injectedTestValues; + + public MyLowLevelHttpRequest(InjectedTestValues injectedTestValues) { + this.injectedTestValues = injectedTestValues; + } + + @Override + public void addHeader(String name, String value) throws IOException { + // Do nothing. + } + + @Override + public LowLevelHttpResponse execute() throws IOException { + return new MyLowLevelHttpResponse(injectedTestValues); + } + } + + /** {@link LowLevelHttpResponse} that allows injected properties. */ + private static class MyLowLevelHttpResponse extends LowLevelHttpResponse { + + private final InjectedTestValues injectedTestValues; + + public MyLowLevelHttpResponse(InjectedTestValues injectedTestValues) { + this.injectedTestValues = injectedTestValues; + } + + @Override + public InputStream getContent() throws IOException { + return injectedTestValues.inputStream; + } + + @Override + public String getContentEncoding() throws IOException { + return injectedTestValues.isGzip ? "gzip" : ""; + } + + @Override + public long getContentLength() throws IOException { + return injectedTestValues.contentLength; + } + + @Override + public String getContentType() throws IOException { + return "application/x-protobuf"; + } + + @Override + public String getStatusLine() throws IOException { + return null; + } + + @Override + public int getStatusCode() throws IOException { + return 200; + } + + @Override + public String getReasonPhrase() throws IOException { + return null; + } + + @Override + public int getHeaderCount() throws IOException { + return 0; + } + + @Override + public String getHeaderName(int index) throws IOException { + return null; + } + + @Override + public String getHeaderValue(int index) throws IOException { + return null; + } + } +} diff --git a/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java new file mode 100644 index 000000000..d30c1cbdc --- /dev/null +++ b/google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/it/ITDatastoreProtoClientTest.java @@ -0,0 +1,90 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.utils.it; + +import static com.google.datastore.utils.DatastoreHelper.makeFilter; +import static com.google.datastore.utils.DatastoreHelper.makeValue; + +import com.google.common.truth.Truth; +import com.google.datastore.utils.Datastore; +import com.google.datastore.utils.DatastoreException; +import com.google.datastore.utils.DatastoreHelper; +import com.google.datastore.v1.*; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.List; +import org.junit.Before; +import org.junit.Test; + +public class ITDatastoreProtoClientTest { + + private static Datastore DATASTORE; + + private static PartitionId PARTITION; + + private static final String KIND = "test-kind"; + private static final String PROJECT_ID = System.getenv(DatastoreHelper.PROJECT_ID_ENV_VAR); + + @Before + public void setUp() throws GeneralSecurityException, IOException { + DATASTORE = DatastoreHelper.getDatastoreFromEnv(); + } + + @Test + public void testQuerySplitterWithDefaultDb() throws DatastoreException { + Filter propertyFilter = + makeFilter("foo", PropertyFilter.Operator.EQUAL, makeValue("value")).build(); + Query query = + Query.newBuilder() + .addKind(KindExpression.newBuilder().setName(KIND).build()) + .setFilter(propertyFilter) + .build(); + + PARTITION = PartitionId.newBuilder().setProjectId(PROJECT_ID).build(); + + List splits = + DatastoreHelper.getQuerySplitter().getSplits(query, PARTITION, 2, DATASTORE); + Truth.assertThat(splits).isNotEmpty(); + splits.forEach( + split -> { + Truth.assertThat(split.getKind(0).getName()).isEqualTo(KIND); + Truth.assertThat(split.getFilter()).isEqualTo(propertyFilter); + }); + } + + @Test + public void testQuerySplitterWithDb() throws DatastoreException { + Filter propertyFilter = + makeFilter("foo", PropertyFilter.Operator.EQUAL, makeValue("value")).build(); + Query query = + Query.newBuilder() + .addKind(KindExpression.newBuilder().setName(KIND).build()) + .setFilter(propertyFilter) + .build(); + + PARTITION = PartitionId.newBuilder().setProjectId(PROJECT_ID).setDatabaseId("test-db").build(); + + List splits = + DatastoreHelper.getQuerySplitter().getSplits(query, PARTITION, 2, DATASTORE); + + Truth.assertThat(splits).isNotEmpty(); + splits.forEach( + split -> { + Truth.assertThat(split.getKind(0).getName()).isEqualTo(KIND); + Truth.assertThat(split.getFilter()).isEqualTo(propertyFilter); + }); + } +} diff --git a/google-cloud-datastore/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml index 6275f05c6..d1e3a4ff4 100644 --- a/google-cloud-datastore/clirr-ignored-differences.xml +++ b/google-cloud-datastore/clirr-ignored-differences.xml @@ -1,7 +1,50 @@ - + + + com/google/cloud/datastore/ReadOption$QueryAndReadOptions + * + 8001 + + + com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer + *QueryAndReadOptions* + *QueryConfig* + 7005 + + + + com/google/cloud/datastore/DatastoreException + 5000 + com/google/cloud/grpc/BaseGrpcServiceException + + + + com/google/cloud/datastore/DatastoreException + 5001 + com/google/cloud/http/BaseHttpServiceException + + + com/google/cloud/datastore/Datastore + void close() + 7012 + + + com/google/cloud/datastore/spi/v1/DatastoreRpc + void close() + 7012 + + + com/google/cloud/datastore/Datastore + boolean isClosed() + 7012 + + + com/google/cloud/datastore/spi/v1/DatastoreRpc + boolean isClosed() + 7012 + com/google/cloud/datastore/Datastore com.google.cloud.datastore.QueryResults run(com.google.cloud.datastore.Query, com.google.cloud.datastore.models.ExplainOptions, com.google.cloud.datastore.ReadOption[]) @@ -14,7 +57,7 @@ com/google/cloud/datastore/DatastoreReader - com.google.cloud.datastore.AggregationResults runAggregation(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.models.ExplainOptions) + com.google.cloud.datastore.AggregationResults runAggregation(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.models.ExplainOptions) 7012 @@ -28,18 +71,6 @@ 7012 - - - com/google/cloud/datastore/ReadOption$QueryConfig - com.google.cloud.datastore.ReadOption$QueryConfig create(com.google.cloud.datastore.Query, java.util.List) - *com.google.datastore.v1.ExplainOptions* - 7005 - - - com/google/cloud/datastore/ReadOption$QueryConfig - com.google.cloud.datastore.ReadOption$QueryConfig create(com.google.cloud.datastore.Query) - 7004 - com/google/cloud/datastore/execution/AggregationQueryExecutor com.google.cloud.datastore.AggregationResults execute(com.google.cloud.datastore.AggregationQuery, com.google.cloud.datastore.ReadOption[]) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 397d98c1d..32c6caf15 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -31,6 +31,10 @@ + + com.google.api.grpc + grpc-google-cloud-datastore-v1 + com.google.api.grpc grpc-google-cloud-datastore-admin-v1 @@ -39,6 +43,10 @@ com.google.cloud google-cloud-core-http + + com.google.cloud + google-cloud-core-grpc + com.google.api.grpc proto-google-cloud-datastore-v1 diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java index 882a4db25..bb162af33 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java @@ -16,6 +16,7 @@ package com.google.cloud.datastore; +import com.google.api.core.InternalExtensionOnly; import java.util.List; import javax.annotation.concurrent.NotThreadSafe; @@ -42,6 +43,7 @@ * This class too should not be treated as a thread safe class. */ @NotThreadSafe +@InternalExtensionOnly public interface Batch extends DatastoreBatchWriter { interface Response { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java index 45cecbf25..0e769a109 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java @@ -17,6 +17,7 @@ package com.google.cloud.datastore; import com.google.api.core.BetaApi; +import com.google.api.core.InternalExtensionOnly; import com.google.cloud.Service; import com.google.cloud.datastore.models.ExplainOptions; import com.google.datastore.v1.TransactionOptions; @@ -24,7 +25,8 @@ import java.util.List; /** An interface for Google Cloud Datastore. */ -public interface Datastore extends Service, DatastoreReaderWriter { +@InternalExtensionOnly +public interface Datastore extends Service, DatastoreReaderWriter, AutoCloseable { /** * Returns a new Datastore transaction. @@ -488,10 +490,7 @@ interface TransactionCallable { * @throws DatastoreException upon failure */ @BetaApi - default QueryResults run( - Query query, ExplainOptions explainOptions, ReadOption... options) { - throw new UnsupportedOperationException("Not implemented."); - } + QueryResults run(Query query, ExplainOptions explainOptions, ReadOption... options); /** * Submits a {@link AggregationQuery} and returns {@link AggregationResults}. {@link ReadOption}s @@ -536,9 +535,7 @@ default QueryResults run( * @throws DatastoreException upon failure * @return {@link AggregationResults} */ - default AggregationResults runAggregation(AggregationQuery query, ReadOption... options) { - throw new UnsupportedOperationException("Not implemented."); - } + AggregationResults runAggregation(AggregationQuery query, ReadOption... options); /** * Submits a {@link AggregationQuery} with specified {@link @@ -564,8 +561,17 @@ default AggregationResults runAggregation(AggregationQuery query, ReadOption... * @return {@link AggregationResults} */ @BetaApi - default AggregationResults runAggregation( - AggregationQuery query, ExplainOptions explainOptions, ReadOption... options) { - throw new UnsupportedOperationException("Not implemented."); - } + AggregationResults runAggregation( + AggregationQuery query, ExplainOptions explainOptions, ReadOption... options); + + /** + * Closes the gRPC channels associated with this instance and frees up their resources. This + * method blocks until all channels are closed. Once this method is called, this Datastore client + * is no longer usable. + */ + @Override + void close() throws Exception; + + /** Returns true if this background resource has been shut down. */ + boolean isClosed(); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java index db4bd3179..28d2569b6 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java @@ -16,6 +16,7 @@ package com.google.cloud.datastore; +import com.google.api.core.InternalExtensionOnly; import java.util.List; import javax.annotation.concurrent.NotThreadSafe; @@ -31,6 +32,7 @@ * This class too should not be treated as a thread safe class. */ @NotThreadSafe +@InternalExtensionOnly public interface DatastoreBatchWriter extends DatastoreWriter { /** diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java index 512d0a3dc..44bde2c10 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java @@ -16,10 +16,16 @@ package com.google.cloud.datastore; +import com.google.api.gax.grpc.GrpcStatusCode; +import com.google.api.gax.rpc.ApiException; +import com.google.api.gax.rpc.StatusCode; import com.google.cloud.BaseServiceException; import com.google.cloud.RetryHelper.RetryHelperException; import com.google.cloud.http.BaseHttpServiceException; +import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; +import io.grpc.StatusException; +import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.Set; @@ -31,7 +37,7 @@ */ public final class DatastoreException extends BaseHttpServiceException { - // see https://cloud.google.com/datastore/docs/concepts/errors#Error_Codes" + // see https://cloud.google.com/datastore/docs/concepts/errors#Error_Codes private static final Set RETRYABLE_ERRORS = ImmutableSet.of( new Error(10, "ABORTED", false), @@ -43,6 +49,10 @@ public DatastoreException(int code, String message, String reason) { this(code, message, reason, true, null); } + public DatastoreException(int code, String message, Throwable cause) { + super(code, message, null, true, RETRYABLE_ERRORS, cause); + } + public DatastoreException(int code, String message, String reason, Throwable cause) { super(code, message, reason, true, RETRYABLE_ERRORS, cause); } @@ -64,7 +74,76 @@ public DatastoreException(IOException exception) { */ static DatastoreException translateAndThrow(RetryHelperException ex) { BaseServiceException.translate(ex); - throw new DatastoreException(UNKNOWN_CODE, ex.getMessage(), null, ex.getCause()); + throw transformThrowable(ex); + } + + static BaseServiceException transformThrowable(Throwable t) { + if (t instanceof BaseServiceException) { + return (BaseServiceException) t; + } + if (t.getCause() instanceof BaseServiceException) { + return (BaseServiceException) t.getCause(); + } + if (t instanceof ApiException) { + return asDatastoreException((ApiException) t); + } + if (t.getCause() instanceof ApiException) { + return asDatastoreException((ApiException) t.getCause()); + } + return getDatastoreException(t); + } + + private static DatastoreException getDatastoreException(Throwable t) { + // unwrap a RetryHelperException if that is what is being translated + if (t instanceof RetryHelperException) { + return new DatastoreException(UNKNOWN_CODE, t.getMessage(), null, t.getCause()); + } + return new DatastoreException(UNKNOWN_CODE, t.getMessage(), t); + } + + static DatastoreException asDatastoreException(ApiException apiEx) { + int datastoreStatusCode = 0; + StatusCode statusCode = apiEx.getStatusCode(); + if (statusCode instanceof GrpcStatusCode) { + GrpcStatusCode gsc = (GrpcStatusCode) statusCode; + datastoreStatusCode = + GrpcToDatastoreCodeTranslation.grpcCodeToDatastoreStatusCode(gsc.getTransportCode()); + } + + // If there is a gRPC exception in our cause, pull its error message up to be our + // message otherwise, create a generic error message with the status code. + String statusCodeName = statusCode.getCode().name(); + String statusExceptionMessage = getStatusExceptionMessage(apiEx); + + String message; + if (statusExceptionMessage != null) { + message = statusCodeName + ": " + statusExceptionMessage; + } else { + message = "Error: " + statusCodeName; + } + + String reason = ""; + if (Strings.isNullOrEmpty(apiEx.getReason())) { + if (apiEx.getStatusCode() != null) { + reason = apiEx.getStatusCode().getCode().name(); + } + } + // It'd be better to use ExceptionData and BaseServiceException#(ExceptionData) but, + // BaseHttpServiceException does not pass that through so we're stuck using this for now. + // TODO: When we can break the coupling to BaseHttpServiceException replace this + return new DatastoreException(datastoreStatusCode, message, reason, apiEx); + } + + private static String getStatusExceptionMessage(Exception apiEx) { + if (apiEx.getMessage() != null) { + return apiEx.getMessage(); + } else { + Throwable cause = apiEx.getCause(); + if (cause instanceof StatusRuntimeException || cause instanceof StatusException) { + return cause.getMessage(); + } + return null; + } } /** diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java index 1b443066d..54274e7bb 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java @@ -16,7 +16,9 @@ package com.google.cloud.datastore; +import com.google.api.core.InternalExtensionOnly; import com.google.cloud.ServiceFactory; /** An interface for Datastore factories. */ +@InternalExtensionOnly public interface DatastoreFactory extends ServiceFactory {} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java index 42bc1a093..c64474fa8 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java @@ -73,10 +73,13 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.Callable; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.annotation.Nullable; final class DatastoreImpl extends BaseService implements Datastore { + Logger logger = Logger.getLogger(Datastore.class.getName()); private final DatastoreRpc datastoreRpc; private final RetrySettings retrySettings; private static final ExceptionHandler TRANSACTION_EXCEPTION_HANDLER = @@ -180,6 +183,20 @@ public T call() throws DatastoreException { } } + @Override + public void close() throws Exception { + try { + datastoreRpc.close(); + } catch (Exception e) { + logger.log(Level.WARNING, "Failed to close channels", e); + } + } + + @Override + public boolean isClosed() { + return datastoreRpc.isClosed(); + } + static class ReadWriteTransactionCallable implements Callable { private final Datastore datastore; private final TransactionCallable callable; diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java index cef40eedd..1ea79298c 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java @@ -19,16 +19,23 @@ import static com.google.cloud.datastore.Validator.validateNamespace; import com.google.api.core.BetaApi; +import com.google.api.gax.grpc.ChannelPoolSettings; +import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; +import com.google.api.gax.rpc.TransportChannelProvider; import com.google.cloud.ServiceDefaults; import com.google.cloud.ServiceOptions; import com.google.cloud.ServiceRpc; import com.google.cloud.TransportOptions; import com.google.cloud.datastore.spi.DatastoreRpcFactory; import com.google.cloud.datastore.spi.v1.DatastoreRpc; +import com.google.cloud.datastore.spi.v1.GrpcDatastoreRpc; import com.google.cloud.datastore.spi.v1.HttpDatastoreRpc; +import com.google.cloud.datastore.v1.DatastoreSettings; +import com.google.cloud.grpc.GrpcTransportOptions; import com.google.cloud.http.HttpTransportOptions; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; +import java.io.IOException; import java.lang.reflect.Method; import java.util.Objects; import java.util.Set; @@ -42,6 +49,13 @@ public class DatastoreOptions extends ServiceOptions SCOPES = ImmutableSet.of(DATASTORE_SCOPE); private static final String DEFAULT_DATABASE_ID = ""; + public static final String PROJECT_ID_ENV_VAR = "DATASTORE_PROJECT_ID"; + public static final String LOCAL_HOST_ENV_VAR = "DATASTORE_EMULATOR_HOST"; + public static final int INIT_CHANNEL_COUNT = 1; + public static final int MIN_CHANNEL_COUNT = 1; + public static final int MAX_CHANNEL_COUNT = 4; + + private transient TransportChannelProvider channelProvider = null; private final String namespace; private final String databaseId; @@ -65,7 +79,15 @@ public static class DefaultDatastoreRpcFactory implements DatastoreRpcFactory { @Override public ServiceRpc create(DatastoreOptions options) { - return new HttpDatastoreRpc(options); + try { + if (options.getTransportOptions() instanceof GrpcTransportOptions) { + return new GrpcDatastoreRpc(options); + } else { + return new HttpDatastoreRpc(options); + } + } catch (IOException e) { + throw new RuntimeException(e); + } } } @@ -84,6 +106,9 @@ public static class Builder extends ServiceOptions.BuilderThis is only compatible with clients using a gRPC transport (see {@code + * DatastoreOptions#setTransportOptions(GrpcTransportOptions)} for more details). + * + *

This functionality is experimental and subject to change. + * + * @param channelProvider A InstantiatingGrpcChannelProvider object that defines the transport + * provider for this client. + */ + @BetaApi + public Builder setChannelProvider(TransportChannelProvider channelProvider) { + this.channelProvider = validateChannelProvider(channelProvider); + return this; + } + @Override public DatastoreOptions build() { + if (this.host == null && this.transportOptions instanceof GrpcTransportOptions) { + this.setHost(DatastoreSettings.getDefaultEndpoint()); + } return new DatastoreOptions(this); } @@ -135,6 +197,15 @@ public Builder setOpenTelemetryOptions( } } + private static TransportChannelProvider validateChannelProvider( + TransportChannelProvider channelProvider) { + if (channelProvider != null && !(channelProvider instanceof InstantiatingGrpcChannelProvider)) { + throw new IllegalArgumentException( + "Only GRPC channels are allowed for " + API_SHORT_NAME + "."); + } + return channelProvider; + } + private DatastoreOptions(Builder builder) { super(DatastoreFactory.class, DatastoreRpcFactory.class, builder, new DatastoreDefaults()); @@ -146,27 +217,46 @@ private DatastoreOptions(Builder builder) { namespace = MoreObjects.firstNonNull(builder.namespace, defaultNamespace()); databaseId = MoreObjects.firstNonNull(builder.databaseId, DEFAULT_DATABASE_ID); + + if (getTransportOptions() instanceof HttpTransportOptions && builder.channelProvider != null) { + throw new IllegalArgumentException( + "Only gRPC transport allows setting of channel provider or credentials provider"); + } else if (getTransportOptions() instanceof GrpcTransportOptions) { + // For grpc transport options, configure default gRPC Connection pool with minChannelCount = 1 + // and maxChannelCount = 4 + this.channelProvider = + builder.channelProvider != null + ? builder.channelProvider + : GrpcTransportOptions.setUpChannelProvider( + DatastoreSettings.defaultGrpcTransportProviderBuilder() + .setChannelPoolSettings( + ChannelPoolSettings.builder() + .setInitialChannelCount(INIT_CHANNEL_COUNT) + .setMinChannelCount(MIN_CHANNEL_COUNT) + .setMaxChannelCount(MAX_CHANNEL_COUNT) + .build()), + this); + } + } + + public TransportChannelProvider getTransportChannelProvider() { + return channelProvider; } @Override protected String getDefaultHost() { - String host = - System.getProperty( - com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR, - System.getenv(com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR)); + String host = System.getProperty(LOCAL_HOST_ENV_VAR, System.getenv(LOCAL_HOST_ENV_VAR)); return host != null ? host : com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST; } @Override protected String getDefaultProject() { - String projectId = - System.getProperty( - com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR, - System.getenv(com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR)); + String projectId = System.getProperty(PROJECT_ID_ENV_VAR, System.getenv(PROJECT_ID_ENV_VAR)); return projectId != null ? projectId : super.getDefaultProject(); } private static class DatastoreDefaults implements ServiceDefaults { + private final TransportOptions TRANSPORT_OPTIONS = getDefaultTransportOptionsBuilder().build(); @Override public DatastoreFactory getDefaultServiceFactory() { @@ -180,7 +270,11 @@ public DatastoreRpcFactory getDefaultRpcFactory() { @Override public TransportOptions getDefaultTransportOptions() { - return getDefaultHttpTransportOptions(); + return TRANSPORT_OPTIONS; + } + + public static HttpTransportOptions.Builder getDefaultTransportOptionsBuilder() { + return HttpTransportOptions.newBuilder(); } } @@ -188,6 +282,10 @@ public static HttpTransportOptions getDefaultHttpTransportOptions() { return HttpTransportOptions.newBuilder().build(); } + public static GrpcTransportOptions getDefaultGrpcTransportOptions() { + return GrpcTransportOptions.newBuilder().build(); + } + /** Returns the default namespace to be used by the datastore service. */ public String getNamespace() { return namespace; diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java index 8aef7f5c0..c3137a9a7 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java @@ -17,11 +17,13 @@ package com.google.cloud.datastore; import com.google.api.core.BetaApi; +import com.google.api.core.InternalExtensionOnly; import com.google.cloud.datastore.models.ExplainOptions; import java.util.Iterator; import java.util.List; /** An interface to represent Google Cloud Datastore read operations. */ +@InternalExtensionOnly public interface DatastoreReader { /** @@ -61,9 +63,7 @@ public interface DatastoreReader { * * @throws DatastoreException upon failure */ - default AggregationResults runAggregation(AggregationQuery query) { - throw new UnsupportedOperationException("Not implemented."); - } + AggregationResults runAggregation(AggregationQuery query); /** * Submits a {@link AggregationQuery} with a specified {@link @@ -72,7 +72,5 @@ default AggregationResults runAggregation(AggregationQuery query) { * @throws DatastoreException upon failure */ @BetaApi - default AggregationResults runAggregation(AggregationQuery query, ExplainOptions explainOptions) { - throw new UnsupportedOperationException("Not implemented."); - } + AggregationResults runAggregation(AggregationQuery query, ExplainOptions explainOptions); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java index a51a5aa77..bc8700c70 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java @@ -16,5 +16,8 @@ package com.google.cloud.datastore; +import com.google.api.core.InternalExtensionOnly; + /** An interface that combines both Google Cloud Datastore read and write operations. */ +@InternalExtensionOnly public interface DatastoreReaderWriter extends DatastoreReader, DatastoreWriter {} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java new file mode 100644 index 000000000..e991fd51d --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreUtils.java @@ -0,0 +1,57 @@ +/* + * Copyright 2023 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore; + +import com.google.api.core.InternalApi; +import com.google.cloud.NoCredentials; +import com.google.common.base.Strings; +import java.net.InetAddress; +import java.net.URL; + +@InternalApi +public class DatastoreUtils { + + public static boolean isEmulator(DatastoreOptions datastoreOptions) { + return isLocalHost(datastoreOptions.getHost()) + || NoCredentials.getInstance().equals(datastoreOptions.getCredentials()); + } + + public static boolean isLocalHost(String host) { + if (Strings.isNullOrEmpty(host)) { + return false; + } + try { + String normalizedHost = "http://" + removeScheme(host); + InetAddress hostAddr = InetAddress.getByName(new URL(normalizedHost).getHost()); + return hostAddr.isAnyLocalAddress() || hostAddr.isLoopbackAddress(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public static String removeScheme(String url) { + if (url != null) { + url = url.toLowerCase(); + if (url.startsWith("https://")) { + return url.substring("https://".length()); + } else if (url.startsWith("http://")) { + return url.substring("http://".length()); + } + } + return url; + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java index 6c1d6fdbc..b414995e6 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java @@ -16,9 +16,11 @@ package com.google.cloud.datastore; +import com.google.api.core.InternalExtensionOnly; import java.util.List; /** An interface to represent Google Cloud Datastore write operations. */ +@InternalExtensionOnly public interface DatastoreWriter { /** diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java new file mode 100644 index 000000000..1d63fb19a --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslation.java @@ -0,0 +1,93 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.datastore; + +import com.google.api.gax.grpc.GrpcStatusCode; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.rpc.Code; +import io.grpc.Status; +import java.util.Map; +import java.util.function.Function; + +final class GrpcToDatastoreCodeTranslation { + /** Mappings between gRPC status codes and their corresponding code numbers. */ + private static final ImmutableList STATUS_CODE_MAPPINGS = + ImmutableList.of( + StatusCodeMapping.of(Code.OK.getNumber(), Status.Code.OK), + StatusCodeMapping.of(Code.DATA_LOSS.getNumber(), Status.Code.DATA_LOSS), + StatusCodeMapping.of(Code.INVALID_ARGUMENT.getNumber(), Status.Code.INVALID_ARGUMENT), + StatusCodeMapping.of(Code.OUT_OF_RANGE.getNumber(), Status.Code.OUT_OF_RANGE), + StatusCodeMapping.of(Code.UNAUTHENTICATED.getNumber(), Status.Code.UNAUTHENTICATED), + StatusCodeMapping.of(Code.PERMISSION_DENIED.getNumber(), Status.Code.PERMISSION_DENIED), + StatusCodeMapping.of(Code.NOT_FOUND.getNumber(), Status.Code.NOT_FOUND), + StatusCodeMapping.of(Code.ALREADY_EXISTS.getNumber(), Status.Code.ALREADY_EXISTS), + StatusCodeMapping.of( + Code.FAILED_PRECONDITION.getNumber(), Status.Code.FAILED_PRECONDITION), + StatusCodeMapping.of(Code.RESOURCE_EXHAUSTED.getNumber(), Status.Code.RESOURCE_EXHAUSTED), + StatusCodeMapping.of(Code.INTERNAL.getNumber(), Status.Code.INTERNAL), + StatusCodeMapping.of(Code.UNIMPLEMENTED.getNumber(), Status.Code.UNIMPLEMENTED), + StatusCodeMapping.of(Code.UNAVAILABLE.getNumber(), Status.Code.UNAVAILABLE), + StatusCodeMapping.of(Code.DEADLINE_EXCEEDED.getNumber(), Status.Code.DEADLINE_EXCEEDED), + StatusCodeMapping.of(Code.ABORTED.getNumber(), Status.Code.ABORTED), + StatusCodeMapping.of(Code.CANCELLED.getNumber(), Status.Code.CANCELLED), + StatusCodeMapping.of(Code.UNKNOWN.getNumber(), Status.Code.UNKNOWN)); + + /** Index our {@link StatusCodeMapping} for constant time lookup by {@link Status.Code} */ + private static final Map GRPC_CODE_INDEX = + STATUS_CODE_MAPPINGS.stream() + .collect( + ImmutableMap.toImmutableMap(StatusCodeMapping::getGrpcCode, Function.identity())); + + static int grpcCodeToDatastoreStatusCode(Status.Code code) { + StatusCodeMapping found = GRPC_CODE_INDEX.get(code); + // theoretically it's possible for gRPC to add a new code we haven't mapped here, if this + // happens fall through to our default of 0 + if (found != null) { + return found.getDatastoreCode(); + } else { + return 0; + } + } + + /** + * Simple tuple class to bind together our corresponding http status code and {@link Status.Code} + * while providing easy access to the correct {@link GrpcStatusCode} where necessary. + */ + private static final class StatusCodeMapping { + + private final int datastoreCode; + + private final Status.Code grpcCode; + + private StatusCodeMapping(int datastoreCode, Status.Code grpcCode) { + this.datastoreCode = datastoreCode; + this.grpcCode = grpcCode; + } + + public int getDatastoreCode() { + return datastoreCode; + } + + public Status.Code getGrpcCode() { + return grpcCode; + } + + static StatusCodeMapping of(int datastoreCode, Status.Code grpcCode) { + return new StatusCodeMapping(datastoreCode, grpcCode); + } + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java index 50433a6a9..ca5b240ad 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java @@ -17,6 +17,7 @@ package com.google.cloud.datastore; import com.google.api.core.BetaApi; +import com.google.api.core.InternalExtensionOnly; import com.google.cloud.datastore.models.ExplainMetrics; import com.google.datastore.v1.QueryResultBatch; import java.util.Iterator; @@ -31,6 +32,7 @@ * * @param the type of the results value. */ +@InternalExtensionOnly public interface QueryResults extends Iterator { /** Returns the actual class of the result's values. */ @@ -75,7 +77,5 @@ public interface QueryResults extends Iterator { QueryResultBatch.MoreResultsType getMoreResults(); @BetaApi - default Optional getExplainMetrics() { - throw new UnsupportedOperationException("Not implemented."); - } + Optional getExplainMetrics(); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java index e1ea6e8dd..630ddd225 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RetryAndTraceDatastoreRpcDecorator.java @@ -113,6 +113,16 @@ public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryReques return invokeRpc(() -> datastoreRpc.runAggregationQuery(request), spanName); } + @Override + public void close() throws Exception { + datastoreRpc.close(); + } + + @Override + public boolean isClosed() { + return datastoreRpc.isClosed(); + } + public O invokeRpc(Callable block, String startSpan) { com.google.cloud.datastore.telemetry.TraceUtil.Span span = otelTraceUtil.startSpan(startSpan); try (com.google.cloud.datastore.telemetry.TraceUtil.Scope ignored = span.makeCurrent()) { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java index 30cd05759..5bde80ed6 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java @@ -27,6 +27,7 @@ import com.google.api.core.ApiFunction; import com.google.api.core.InternalApi; +import com.google.api.core.InternalExtensionOnly; import com.google.cloud.StringEnumType; import com.google.cloud.StringEnumValue; import com.google.cloud.Timestamp; @@ -700,6 +701,7 @@ public String toString() { * * @param the type of result the query returns. */ + @InternalExtensionOnly public interface Builder { /** Sets the namespace for the query. */ diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java index 7b6a67a2d..697e7a6ff 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java @@ -17,6 +17,7 @@ package com.google.cloud.datastore; import com.google.api.core.BetaApi; +import com.google.api.core.InternalExtensionOnly; import com.google.cloud.datastore.models.ExplainOptions; import com.google.protobuf.ByteString; import java.util.Iterator; @@ -63,6 +64,7 @@ * This class too should not be treated as a thread safe class. */ @NotThreadSafe +@InternalExtensionOnly public interface Transaction extends DatastoreBatchWriter, DatastoreReaderWriter { interface Response { @@ -179,9 +181,7 @@ interface Response { QueryResults run(Query query); @BetaApi - default QueryResults run(Query query, ExplainOptions explainOptions) { - throw new UnsupportedOperationException("Not implemented."); - } + QueryResults run(Query query, ExplainOptions explainOptions); /** * Datastore add operation. This method will also allocate id for any entity with an incomplete diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java index 3c60ef409..315728147 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java @@ -16,6 +16,7 @@ package com.google.cloud.datastore; +import com.google.api.core.InternalExtensionOnly; import com.google.cloud.GcpLaunchStage; /** @@ -25,6 +26,7 @@ * @param

the value type. * @param the value type's associated builder. */ +@InternalExtensionOnly public interface ValueBuilder, B extends ValueBuilder> { ValueType getValueType(); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java index ce23edcf0..632f44393 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java @@ -16,6 +16,8 @@ package com.google.cloud.datastore.aggregation; +import com.google.api.core.InternalExtensionOnly; + /** * An interface to represent the builders which build and customize {@link Aggregation} for {@link * com.google.cloud.datastore.AggregationQuery}. @@ -23,6 +25,7 @@ *

Used by {@link * com.google.cloud.datastore.AggregationQuery.Builder#addAggregation(AggregationBuilder)}. */ +@InternalExtensionOnly public interface AggregationBuilder { A build(); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java index 0b7f9094b..acb85a61d 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java @@ -16,6 +16,7 @@ package com.google.cloud.datastore.spi; +import com.google.api.core.InternalExtensionOnly; import com.google.cloud.datastore.DatastoreOptions; import com.google.cloud.spi.ServiceRpcFactory; @@ -23,4 +24,5 @@ * An interface for Datastore RPC factory. Implementation will be loaded via {@link * java.util.ServiceLoader}. */ +@InternalExtensionOnly public interface DatastoreRpcFactory extends ServiceRpcFactory {} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java index 33b8e11ea..f13e3873b 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java @@ -16,8 +16,11 @@ package com.google.cloud.datastore.spi.v1; +import com.google.api.core.InternalExtensionOnly; +import com.google.api.gax.rpc.HeaderProvider; import com.google.cloud.ServiceRpc; import com.google.cloud.datastore.DatastoreException; +import com.google.cloud.datastore.v1.DatastoreSettings; import com.google.datastore.v1.AllocateIdsRequest; import com.google.datastore.v1.AllocateIdsResponse; import com.google.datastore.v1.BeginTransactionRequest; @@ -36,7 +39,8 @@ import com.google.datastore.v1.RunQueryResponse; /** Provides access to the remote Datastore service. */ -public interface DatastoreRpc extends ServiceRpc { +@InternalExtensionOnly +public interface DatastoreRpc extends ServiceRpc, AutoCloseable { /** * Sends an allocate IDs request. @@ -93,7 +97,24 @@ BeginTransactionResponse beginTransaction(BeginTransactionRequest request) * * @throws DatastoreException upon failure */ - default RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) { - throw new UnsupportedOperationException("Not implemented."); + RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request); + + @Override + void close() throws Exception; + + /** Returns true if this background resource has been shut down. */ + boolean isClosed(); + + // This class is needed solely to get access to protected method setInternalHeaderProvider() + class DatastoreSettingsBuilder extends DatastoreSettings.Builder { + DatastoreSettingsBuilder(DatastoreSettings settings) { + super(settings); + } + + @Override + protected DatastoreSettings.Builder setInternalHeaderProvider( + HeaderProvider internalHeaderProvider) { + return super.setInternalHeaderProvider(internalHeaderProvider); + } } } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java new file mode 100644 index 000000000..ea9043bb9 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java @@ -0,0 +1,202 @@ +/* + * Copyright 2023 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.spi.v1; + +import static com.google.cloud.datastore.DatastoreUtils.isEmulator; +import static com.google.cloud.datastore.DatastoreUtils.removeScheme; +import static com.google.cloud.datastore.spi.v1.RpcUtils.retrySettingSetter; +import static java.util.concurrent.TimeUnit.SECONDS; + +import com.google.api.core.InternalApi; +import com.google.api.gax.core.BackgroundResource; +import com.google.api.gax.core.GaxProperties; +import com.google.api.gax.grpc.ChannelPoolSettings; +import com.google.api.gax.grpc.GrpcCallContext; +import com.google.api.gax.grpc.GrpcTransportChannel; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.HeaderProvider; +import com.google.api.gax.rpc.NoHeaderProvider; +import com.google.api.gax.rpc.TransportChannel; +import com.google.cloud.ServiceOptions; +import com.google.cloud.datastore.DatastoreException; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.v1.DatastoreSettings; +import com.google.cloud.datastore.v1.stub.DatastoreStubSettings; +import com.google.cloud.datastore.v1.stub.GrpcDatastoreStub; +import com.google.cloud.grpc.GrpcTransportOptions; +import com.google.common.base.Strings; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import io.grpc.CallOptions; +import io.grpc.ManagedChannel; +import io.grpc.ManagedChannelBuilder; +import java.io.IOException; +import java.util.Collections; + +@InternalApi +public class GrpcDatastoreRpc implements DatastoreRpc { + + private final GrpcDatastoreStub datastoreStub; + private final ClientContext clientContext; + private boolean closed; + + public GrpcDatastoreRpc(DatastoreOptions datastoreOptions) throws IOException { + try { + clientContext = + isEmulator(datastoreOptions) + ? getClientContextForEmulator(datastoreOptions) + : getClientContext(datastoreOptions); + + /* For grpc transport options, configure default gRPC Connection pool with minChannelCount = 1 and maxChannelCount = 4 */ + DatastoreStubSettings datastoreStubSettings = + DatastoreStubSettings.newBuilder(clientContext) + .applyToAllUnaryMethods(retrySettingSetter(datastoreOptions)) + .setTransportChannelProvider( + DatastoreSettings.defaultGrpcTransportProviderBuilder() + .setChannelPoolSettings( + ChannelPoolSettings.builder() + .setInitialChannelCount(DatastoreOptions.INIT_CHANNEL_COUNT) + .setMinChannelCount(DatastoreOptions.MIN_CHANNEL_COUNT) + .setMaxChannelCount(DatastoreOptions.MAX_CHANNEL_COUNT) + .build()) + .build()) + .build(); + datastoreStub = GrpcDatastoreStub.create(datastoreStubSettings); + } catch (IOException e) { + throw new IOException(e); + } + } + + @Override + public void close() throws Exception { + if (!closed) { + datastoreStub.close(); + for (BackgroundResource resource : clientContext.getBackgroundResources()) { + resource.close(); + } + closed = true; + } + for (BackgroundResource resource : clientContext.getBackgroundResources()) { + resource.awaitTermination(1, SECONDS); + } + } + + @Override + public AllocateIdsResponse allocateIds(AllocateIdsRequest request) { + return datastoreStub.allocateIdsCallable().call(request); + } + + @Override + public BeginTransactionResponse beginTransaction(BeginTransactionRequest request) + throws DatastoreException { + return datastoreStub.beginTransactionCallable().call(request); + } + + @Override + public CommitResponse commit(CommitRequest request) { + return datastoreStub.commitCallable().call(request); + } + + @Override + public LookupResponse lookup(LookupRequest request) { + return datastoreStub.lookupCallable().call(request); + } + + @Override + public ReserveIdsResponse reserveIds(ReserveIdsRequest request) { + return datastoreStub.reserveIdsCallable().call(request); + } + + @Override + public RollbackResponse rollback(RollbackRequest request) { + return datastoreStub.rollbackCallable().call(request); + } + + @Override + public RunQueryResponse runQuery(RunQueryRequest request) { + return datastoreStub.runQueryCallable().call(request); + } + + @Override + public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) { + return datastoreStub.runAggregationQueryCallable().call(request); + } + + @Override + public boolean isClosed() { + return closed && datastoreStub.isShutdown(); + } + + private ClientContext getClientContextForEmulator(DatastoreOptions datastoreOptions) + throws IOException { + ManagedChannel managedChannel = + ManagedChannelBuilder.forTarget(removeScheme(datastoreOptions.getHost())) + .usePlaintext() + .build(); + TransportChannel transportChannel = GrpcTransportChannel.create(managedChannel); + return ClientContext.newBuilder() + .setCredentials(null) + .setTransportChannel(transportChannel) + .setDefaultCallContext(GrpcCallContext.of(managedChannel, CallOptions.DEFAULT)) + .setBackgroundResources(Collections.singletonList(transportChannel)) + .build(); + } + + private ClientContext getClientContext(DatastoreOptions datastoreOptions) throws IOException { + HeaderProvider internalHeaderProvider = + DatastoreSettings.defaultApiClientHeaderProviderBuilder() + .setClientLibToken( + ServiceOptions.getGoogApiClientLibName(), + GaxProperties.getLibraryVersion(datastoreOptions.getClass())) + .setResourceToken(getResourceToken(datastoreOptions)) + .build(); + + DatastoreSettingsBuilder settingsBuilder = + new DatastoreSettingsBuilder(DatastoreSettings.newBuilder().build()); + settingsBuilder.setCredentialsProvider( + GrpcTransportOptions.setUpCredentialsProvider(datastoreOptions)); + settingsBuilder.setTransportChannelProvider(datastoreOptions.getTransportChannelProvider()); + settingsBuilder.setInternalHeaderProvider(internalHeaderProvider); + settingsBuilder.setHeaderProvider( + datastoreOptions.getMergedHeaderProvider(new NoHeaderProvider())); + return ClientContext.create(settingsBuilder.build()); + } + + private String getResourceToken(DatastoreOptions datastoreOptions) { + StringBuilder builder = new StringBuilder("project_id="); + builder.append(datastoreOptions.getProjectId()); + if (!Strings.isNullOrEmpty(datastoreOptions.getDatabaseId())) { + builder.append("&database_id="); + builder.append(datastoreOptions.getDatabaseId()); + } + return builder.toString(); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java index d927a2d7f..ac39ad5ba 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java @@ -19,6 +19,7 @@ import com.google.api.client.http.HttpRequest; import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpTransport; +import com.google.api.core.InternalApi; import com.google.cloud.datastore.DatastoreException; import com.google.cloud.datastore.DatastoreOptions; import com.google.cloud.http.CensusHttpModule; @@ -44,6 +45,7 @@ import java.net.InetAddress; import java.net.URL; +@InternalApi public class HttpDatastoreRpc implements DatastoreRpc { private final com.google.datastore.v1.client.Datastore client; @@ -58,6 +60,7 @@ public HttpDatastoreRpc(DatastoreOptions options) { .initializer(getHttpRequestInitializer(options, httpTransportOptions)) .transport(transport); String normalizedHost = options.getHost() != null ? options.getHost().toLowerCase() : ""; + if (isLocalHost(normalizedHost)) { clientBuilder = clientBuilder.localHost(removeScheme(normalizedHost)); } else if (!removeScheme(com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST) @@ -210,4 +213,14 @@ public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryReques throw translate(ex); } } + + @Override + public void close() throws Exception { + throw new UnsupportedOperationException("Not implemented."); + } + + @Override + public boolean isClosed() { + throw new UnsupportedOperationException("Not implemented."); + } } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java new file mode 100644 index 000000000..dee8d6920 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/RpcUtils.java @@ -0,0 +1,34 @@ +/* + * Copyright 2023 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.spi.v1; + +import com.google.api.core.ApiFunction; +import com.google.api.core.InternalApi; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.cloud.datastore.DatastoreOptions; + +@InternalApi +public class RpcUtils { + @InternalApi + static ApiFunction, Void> retrySettingSetter( + DatastoreOptions datastoreOptions) { + return builder -> { + builder.setRetrySettings(datastoreOptions.getRetrySettings()); + return null; + }; + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java index 20321f812..9f5555d0f 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ import com.google.cloud.NoCredentials; import com.google.cloud.ServiceOptions; import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.grpc.GrpcTransportOptions; import com.google.cloud.testing.BaseEmulatorHelper; import com.google.common.collect.ImmutableList; import java.io.IOException; @@ -241,6 +242,14 @@ public DatastoreOptions getOptions(String namespace) { return optionsBuilder.setNamespace(namespace).build(); } + /** + * Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator on + * localhost. The transportOptions is set to {@code grpcTransportOptions}. + */ + public DatastoreOptions getGrpcTransportOptions(GrpcTransportOptions grpcTransportOptions) { + return optionsBuilder.setTransportOptions(grpcTransportOptions).build(); + } + public DatastoreOptions.Builder setNamespace(String namespace) { return optionsBuilder.setNamespace(namespace); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java new file mode 100644 index 000000000..e8bea055f --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreClient.java @@ -0,0 +1,1087 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1; + +import com.google.api.gax.core.BackgroundResource; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.cloud.datastore.v1.stub.DatastoreStub; +import com.google.cloud.datastore.v1.stub.DatastoreStubSettings; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.Key; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.Mutation; +import com.google.datastore.v1.ReadOptions; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import com.google.protobuf.ByteString; +import java.io.IOException; +import java.util.List; +import java.util.concurrent.TimeUnit; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * Service Description: Each RPC normalizes the partition IDs of the keys in its input entities, and + * always returns entities with keys with normalized partition IDs. This applies to all keys and + * entities, including those in values, except keys with both an empty path and an empty or unset + * partition ID. Normalization of input keys sets the project ID (if not already set) to the project + * ID from the request. + * + *

This class provides the ability to make remote calls to the backing service through method + * calls that map to API methods. Sample code to get started: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+ *   String projectId = "projectId-894832108";
+ *   ReadOptions readOptions = ReadOptions.newBuilder().build();
+ *   List keys = new ArrayList<>();
+ *   LookupResponse response = datastoreClient.lookup(projectId, readOptions, keys);
+ * }
+ * }
+ * + *

Note: close() needs to be called on the DatastoreClient object to clean up resources such as + * threads. In the example above, try-with-resources is used, which automatically calls close(). + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
Methods
MethodDescriptionMethod Variants

Lookup

Looks up entities by key.

 + *

Request object method variants only take one parameter, a request object, which must be constructed before the call.

+ *
    + *

  • lookup(LookupRequest request) + *

+ *

"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.

+ *
    + *

  • lookup(String projectId, ReadOptions readOptions, List<Key> keys) + *

+ *

Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.

+ *
    + *

  • lookupCallable() + *

+ *

RunQuery

Queries for entities.

 + *

Request object method variants only take one parameter, a request object, which must be constructed before the call.

+ *
    + *

  • runQuery(RunQueryRequest request) + *

+ *

Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.

+ *
    + *

  • runQueryCallable() + *

+ *

RunAggregationQuery

Runs an aggregation query.

 + *

Request object method variants only take one parameter, a request object, which must be constructed before the call.

+ *
    + *

  • runAggregationQuery(RunAggregationQueryRequest request) + *

+ *

Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.

+ *
    + *

  • runAggregationQueryCallable() + *

+ *

BeginTransaction

Begins a new transaction.

 + *

Request object method variants only take one parameter, a request object, which must be constructed before the call.

+ *
    + *

  • beginTransaction(BeginTransactionRequest request) + *

+ *

"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.

+ *
    + *

  • beginTransaction(String projectId) + *

+ *

Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.

+ *
    + *

  • beginTransactionCallable() + *

+ *

Commit

Commits a transaction, optionally creating, deleting or modifying some entities.

 + *

Request object method variants only take one parameter, a request object, which must be constructed before the call.

+ *
    + *

  • commit(CommitRequest request) + *

+ *

"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.

+ *
    + *

  • commit(String projectId, CommitRequest.Mode mode, List<Mutation> mutations) + *

  • commit(String projectId, CommitRequest.Mode mode, ByteString transaction, List<Mutation> mutations) + *

+ *

Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.

+ *
    + *

  • commitCallable() + *

+ *

Rollback

Rolls back a transaction.

 + *

Request object method variants only take one parameter, a request object, which must be constructed before the call.

+ *
    + *

  • rollback(RollbackRequest request) + *

+ *

"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.

+ *
    + *

  • rollback(String projectId, ByteString transaction) + *

+ *

Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.

+ *
    + *

  • rollbackCallable() + *

+ *

AllocateIds

Allocates IDs for the given keys, which is useful for referencing an entity before it is inserted.

 + *

Request object method variants only take one parameter, a request object, which must be constructed before the call.

+ *
    + *

  • allocateIds(AllocateIdsRequest request) + *

+ *

"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.

+ *
    + *

  • allocateIds(String projectId, List<Key> keys) + *

+ *

Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.

+ *
    + *

  • allocateIdsCallable() + *

+ *

ReserveIds

Prevents the supplied keys' IDs from being auto-allocated by Cloud Datastore.

 + *

Request object method variants only take one parameter, a request object, which must be constructed before the call.

+ *
    + *

  • reserveIds(ReserveIdsRequest request) + *

+ *

"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.

+ *
    + *

  • reserveIds(String projectId, List<Key> keys) + *

+ *

Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.

+ *
    + *

  • reserveIdsCallable() + *

+ *
+ * + *

See the individual methods for example code. + * + *

Many parameters require resource names to be formatted in a particular way. To assist with + * these names, this class includes a format method for each type of name, and additionally a parse + * method to extract the individual identifiers contained within names that are returned. + * + *

This class can be customized by passing in a custom instance of DatastoreSettings to create(). + * For example: + * + *

To customize credentials: + * + * 

{@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
+ * DatastoreSettings datastoreSettings =
+ *     DatastoreSettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .build();
+ * DatastoreClient datastoreClient = DatastoreClient.create(datastoreSettings);
+ * }
+ * + *

To customize the endpoint: + * + * 

{@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
+ * DatastoreSettings datastoreSettings =
+ *     DatastoreSettings.newBuilder().setEndpoint(myEndpoint).build();
+ * DatastoreClient datastoreClient = DatastoreClient.create(datastoreSettings);
+ * }
+ * + *

To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over + * the wire: + * + * 

{@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
+ * DatastoreSettings datastoreSettings = DatastoreSettings.newHttpJsonBuilder().build();
+ * DatastoreClient datastoreClient = DatastoreClient.create(datastoreSettings);
+ * }
+ * + *

Please refer to the GitHub repository's samples for more quickstart code snippets. + */ +@Generated("by gapic-generator-java") +public class DatastoreClient implements BackgroundResource { + private final DatastoreSettings settings; + private final DatastoreStub stub; + + /** Constructs an instance of DatastoreClient with default settings. */ + public static final DatastoreClient create() throws IOException { + return create(DatastoreSettings.newBuilder().build()); + } + + /** + * Constructs an instance of DatastoreClient, using the given settings. The channels are created + * based on the settings passed in, or defaults for any settings that are not set. + */ + public static final DatastoreClient create(DatastoreSettings settings) throws IOException { + return new DatastoreClient(settings); + } + + /** + * Constructs an instance of DatastoreClient, using the given stub for making calls. This is for + * advanced usage - prefer using create(DatastoreSettings). + */ + public static final DatastoreClient create(DatastoreStub stub) { + return new DatastoreClient(stub); + } + + /** + * Constructs an instance of DatastoreClient, using the given settings. This is protected so that + * it is easy to make a subclass, but otherwise, the static factory methods should be preferred. + */ + protected DatastoreClient(DatastoreSettings settings) throws IOException { + this.settings = settings; + this.stub = ((DatastoreStubSettings) settings.getStubSettings()).createStub(); + } + + protected DatastoreClient(DatastoreStub stub) { + this.settings = null; + this.stub = stub; + } + + public final DatastoreSettings getSettings() { + return settings; + } + + public DatastoreStub getStub() { + return stub; + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Looks up entities by key. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   ReadOptions readOptions = ReadOptions.newBuilder().build();
+   *   List keys = new ArrayList<>();
+   *   LookupResponse response = datastoreClient.lookup(projectId, readOptions, keys);
+   * }
+   * }
+ * + * @param projectId Required. The ID of the project against which to make the request. + * @param readOptions The options for this lookup request. + * @param keys Required. Keys of entities to look up. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final LookupResponse lookup(String projectId, ReadOptions readOptions, List keys) { + LookupRequest request = + LookupRequest.newBuilder() + .setProjectId(projectId) + .setReadOptions(readOptions) + .addAllKeys(keys) + .build(); + return lookup(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Looks up entities by key. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   LookupRequest request =
+   *       LookupRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .addAllKeys(new ArrayList())
+   *           .setPropertyMask(PropertyMask.newBuilder().build())
+   *           .build();
+   *   LookupResponse response = datastoreClient.lookup(request);
+   * }
+   * }
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final LookupResponse lookup(LookupRequest request) { + return lookupCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Looks up entities by key. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   LookupRequest request =
+   *       LookupRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .addAllKeys(new ArrayList())
+   *           .setPropertyMask(PropertyMask.newBuilder().build())
+   *           .build();
+   *   ApiFuture future = datastoreClient.lookupCallable().futureCall(request);
+   *   // Do something.
+   *   LookupResponse response = future.get();
+   * }
+   * }
+ */ + public final UnaryCallable lookupCallable() { + return stub.lookupCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Queries for entities. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RunQueryRequest request =
+   *       RunQueryRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setPartitionId(PartitionId.newBuilder().build())
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .setPropertyMask(PropertyMask.newBuilder().build())
+   *           .setExplainOptions(ExplainOptions.newBuilder().build())
+   *           .build();
+   *   RunQueryResponse response = datastoreClient.runQuery(request);
+   * }
+   * }
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final RunQueryResponse runQuery(RunQueryRequest request) { + return runQueryCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Queries for entities. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RunQueryRequest request =
+   *       RunQueryRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setPartitionId(PartitionId.newBuilder().build())
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .setPropertyMask(PropertyMask.newBuilder().build())
+   *           .setExplainOptions(ExplainOptions.newBuilder().build())
+   *           .build();
+   *   ApiFuture future = datastoreClient.runQueryCallable().futureCall(request);
+   *   // Do something.
+   *   RunQueryResponse response = future.get();
+   * }
+   * }
+ */ + public final UnaryCallable runQueryCallable() { + return stub.runQueryCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Runs an aggregation query. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RunAggregationQueryRequest request =
+   *       RunAggregationQueryRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setPartitionId(PartitionId.newBuilder().build())
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .setExplainOptions(ExplainOptions.newBuilder().build())
+   *           .build();
+   *   RunAggregationQueryResponse response = datastoreClient.runAggregationQuery(request);
+   * }
+   * }
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request) { + return runAggregationQueryCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Runs an aggregation query. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RunAggregationQueryRequest request =
+   *       RunAggregationQueryRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setPartitionId(PartitionId.newBuilder().build())
+   *           .setReadOptions(ReadOptions.newBuilder().build())
+   *           .setExplainOptions(ExplainOptions.newBuilder().build())
+   *           .build();
+   *   ApiFuture future =
+   *       datastoreClient.runAggregationQueryCallable().futureCall(request);
+   *   // Do something.
+   *   RunAggregationQueryResponse response = future.get();
+   * }
+   * }
+ */ + public final UnaryCallable + runAggregationQueryCallable() { + return stub.runAggregationQueryCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Begins a new transaction. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   BeginTransactionResponse response = datastoreClient.beginTransaction(projectId);
+   * }
+   * }
+ * + * @param projectId Required. The ID of the project against which to make the request. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final BeginTransactionResponse beginTransaction(String projectId) { + BeginTransactionRequest request = + BeginTransactionRequest.newBuilder().setProjectId(projectId).build(); + return beginTransaction(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Begins a new transaction. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   BeginTransactionRequest request =
+   *       BeginTransactionRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setTransactionOptions(TransactionOptions.newBuilder().build())
+   *           .build();
+   *   BeginTransactionResponse response = datastoreClient.beginTransaction(request);
+   * }
+   * }
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final BeginTransactionResponse beginTransaction(BeginTransactionRequest request) { + return beginTransactionCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Begins a new transaction. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   BeginTransactionRequest request =
+   *       BeginTransactionRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setTransactionOptions(TransactionOptions.newBuilder().build())
+   *           .build();
+   *   ApiFuture future =
+   *       datastoreClient.beginTransactionCallable().futureCall(request);
+   *   // Do something.
+   *   BeginTransactionResponse response = future.get();
+   * }
+   * }
+ */ + public final UnaryCallable + beginTransactionCallable() { + return stub.beginTransactionCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Commits a transaction, optionally creating, deleting or modifying some entities. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+   *   List mutations = new ArrayList<>();
+   *   CommitResponse response = datastoreClient.commit(projectId, mode, mutations);
+   * }
+   * }
+ * + * @param projectId Required. The ID of the project against which to make the request. + * @param mode The type of commit to perform. Defaults to `TRANSACTIONAL`. + * @param mutations The mutations to perform. + *

When mode is `TRANSACTIONAL`, mutations affecting a single entity are applied in order. + * The following sequences of mutations affecting a single entity are not permitted in a + * single `Commit` request: + *

- `insert` followed by `insert` - `update` followed by `insert` - `upsert` followed by + * `insert` - `delete` followed by `update` + *

When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single entity. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final CommitResponse commit( + String projectId, CommitRequest.Mode mode, List mutations) { + CommitRequest request = + CommitRequest.newBuilder() + .setProjectId(projectId) + .setMode(mode) + .addAllMutations(mutations) + .build(); + return commit(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Commits a transaction, optionally creating, deleting or modifying some entities. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0);
+   *   ByteString transaction = ByteString.EMPTY;
+   *   List mutations = new ArrayList<>();
+   *   CommitResponse response = datastoreClient.commit(projectId, mode, transaction, mutations);
+   * }
+   * }
+ * + * @param projectId Required. The ID of the project against which to make the request. + * @param mode The type of commit to perform. Defaults to `TRANSACTIONAL`. + * @param transaction The identifier of the transaction associated with the commit. A transaction + * identifier is returned by a call to + * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. + * @param mutations The mutations to perform. + *

When mode is `TRANSACTIONAL`, mutations affecting a single entity are applied in order. + * The following sequences of mutations affecting a single entity are not permitted in a + * single `Commit` request: + *

- `insert` followed by `insert` - `update` followed by `insert` - `upsert` followed by + * `insert` - `delete` followed by `update` + *

When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single entity. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final CommitResponse commit( + String projectId, CommitRequest.Mode mode, ByteString transaction, List mutations) { + CommitRequest request = + CommitRequest.newBuilder() + .setProjectId(projectId) + .setMode(mode) + .setTransaction(transaction) + .addAllMutations(mutations) + .build(); + return commit(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Commits a transaction, optionally creating, deleting or modifying some entities. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   CommitRequest request =
+   *       CommitRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllMutations(new ArrayList())
+   *           .build();
+   *   CommitResponse response = datastoreClient.commit(request);
+   * }
+   * }
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final CommitResponse commit(CommitRequest request) { + return commitCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Commits a transaction, optionally creating, deleting or modifying some entities. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   CommitRequest request =
+   *       CommitRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllMutations(new ArrayList())
+   *           .build();
+   *   ApiFuture future = datastoreClient.commitCallable().futureCall(request);
+   *   // Do something.
+   *   CommitResponse response = future.get();
+   * }
+   * }
+ */ + public final UnaryCallable commitCallable() { + return stub.commitCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Rolls back a transaction. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   ByteString transaction = ByteString.EMPTY;
+   *   RollbackResponse response = datastoreClient.rollback(projectId, transaction);
+   * }
+   * }
+ * + * @param projectId Required. The ID of the project against which to make the request. + * @param transaction Required. The transaction identifier, returned by a call to + * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final RollbackResponse rollback(String projectId, ByteString transaction) { + RollbackRequest request = + RollbackRequest.newBuilder().setProjectId(projectId).setTransaction(transaction).build(); + return rollback(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Rolls back a transaction. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RollbackRequest request =
+   *       RollbackRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setTransaction(ByteString.EMPTY)
+   *           .build();
+   *   RollbackResponse response = datastoreClient.rollback(request);
+   * }
+   * }
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final RollbackResponse rollback(RollbackRequest request) { + return rollbackCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Rolls back a transaction. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   RollbackRequest request =
+   *       RollbackRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .setTransaction(ByteString.EMPTY)
+   *           .build();
+   *   ApiFuture future = datastoreClient.rollbackCallable().futureCall(request);
+   *   // Do something.
+   *   RollbackResponse response = future.get();
+   * }
+   * }
+ */ + public final UnaryCallable rollbackCallable() { + return stub.rollbackCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Allocates IDs for the given keys, which is useful for referencing an entity before it is + * inserted. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   List keys = new ArrayList<>();
+   *   AllocateIdsResponse response = datastoreClient.allocateIds(projectId, keys);
+   * }
+   * }
+ * + * @param projectId Required. The ID of the project against which to make the request. + * @param keys Required. A list of keys with incomplete key paths for which to allocate IDs. No + * key may be reserved/read-only. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final AllocateIdsResponse allocateIds(String projectId, List keys) { + AllocateIdsRequest request = + AllocateIdsRequest.newBuilder().setProjectId(projectId).addAllKeys(keys).build(); + return allocateIds(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Allocates IDs for the given keys, which is useful for referencing an entity before it is + * inserted. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   AllocateIdsRequest request =
+   *       AllocateIdsRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllKeys(new ArrayList())
+   *           .build();
+   *   AllocateIdsResponse response = datastoreClient.allocateIds(request);
+   * }
+   * }
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final AllocateIdsResponse allocateIds(AllocateIdsRequest request) { + return allocateIdsCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Allocates IDs for the given keys, which is useful for referencing an entity before it is + * inserted. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   AllocateIdsRequest request =
+   *       AllocateIdsRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllKeys(new ArrayList())
+   *           .build();
+   *   ApiFuture future =
+   *       datastoreClient.allocateIdsCallable().futureCall(request);
+   *   // Do something.
+   *   AllocateIdsResponse response = future.get();
+   * }
+   * }
+ */ + public final UnaryCallable allocateIdsCallable() { + return stub.allocateIdsCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Prevents the supplied keys' IDs from being auto-allocated by Cloud Datastore. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   String projectId = "projectId-894832108";
+   *   List keys = new ArrayList<>();
+   *   ReserveIdsResponse response = datastoreClient.reserveIds(projectId, keys);
+   * }
+   * }
+ * + * @param projectId Required. The ID of the project against which to make the request. + * @param keys Required. A list of keys with complete key paths whose numeric IDs should not be + * auto-allocated. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final ReserveIdsResponse reserveIds(String projectId, List keys) { + ReserveIdsRequest request = + ReserveIdsRequest.newBuilder().setProjectId(projectId).addAllKeys(keys).build(); + return reserveIds(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Prevents the supplied keys' IDs from being auto-allocated by Cloud Datastore. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   ReserveIdsRequest request =
+   *       ReserveIdsRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllKeys(new ArrayList())
+   *           .build();
+   *   ReserveIdsResponse response = datastoreClient.reserveIds(request);
+   * }
+   * }
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final ReserveIdsResponse reserveIds(ReserveIdsRequest request) { + return reserveIdsCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Prevents the supplied keys' IDs from being auto-allocated by Cloud Datastore. + * + *

Sample code: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+   *   ReserveIdsRequest request =
+   *       ReserveIdsRequest.newBuilder()
+   *           .setProjectId("projectId-894832108")
+   *           .setDatabaseId("databaseId1688905718")
+   *           .addAllKeys(new ArrayList())
+   *           .build();
+   *   ApiFuture future =
+   *       datastoreClient.reserveIdsCallable().futureCall(request);
+   *   // Do something.
+   *   ReserveIdsResponse response = future.get();
+   * }
+   * }
+ */ + public final UnaryCallable reserveIdsCallable() { + return stub.reserveIdsCallable(); + } + + @Override + public final void close() { + stub.close(); + } + + @Override + public void shutdown() { + stub.shutdown(); + } + + @Override + public boolean isShutdown() { + return stub.isShutdown(); + } + + @Override + public boolean isTerminated() { + return stub.isTerminated(); + } + + @Override + public void shutdownNow() { + stub.shutdownNow(); + } + + @Override + public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException { + return stub.awaitTermination(duration, unit); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java new file mode 100644 index 000000000..74054341e --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/DatastoreSettings.java @@ -0,0 +1,304 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1; + +import com.google.api.core.ApiFunction; +import com.google.api.core.BetaApi; +import com.google.api.gax.core.GoogleCredentialsProvider; +import com.google.api.gax.core.InstantiatingExecutorProvider; +import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; +import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; +import com.google.api.gax.rpc.ApiClientHeaderProvider; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.ClientSettings; +import com.google.api.gax.rpc.TransportChannelProvider; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.cloud.datastore.v1.stub.DatastoreStubSettings; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import java.io.IOException; +import java.util.List; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * Settings class to configure an instance of {@link DatastoreClient}. + * + *

The default instance has everything set to sensible defaults: + * + *

    + *
  • The default service address (datastore.googleapis.com) and default port (443) are used. + *
  • Credentials are acquired automatically through Application Default Credentials. + *
  • Retries are configured for idempotent methods but not for non-idempotent methods. + *
+ * + *

The builder of this class is recursive, so contained classes are themselves builders. When + * build() is called, the tree of builders is called to create the complete settings object. + * + *

For example, to set the + * [RetrySettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.retrying.RetrySettings) + * of lookup: + * + * 

{@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
+ * DatastoreSettings.Builder datastoreSettingsBuilder = DatastoreSettings.newBuilder();
+ * datastoreSettingsBuilder
+ *     .lookupSettings()
+ *     .setRetrySettings(
+ *         datastoreSettingsBuilder
+ *             .lookupSettings()
+ *             .getRetrySettings()
+ *             .toBuilder()
+ *             .setInitialRetryDelayDuration(Duration.ofSeconds(1))
+ *             .setInitialRpcTimeoutDuration(Duration.ofSeconds(5))
+ *             .setMaxAttempts(5)
+ *             .setMaxRetryDelayDuration(Duration.ofSeconds(30))
+ *             .setMaxRpcTimeoutDuration(Duration.ofSeconds(60))
+ *             .setRetryDelayMultiplier(1.3)
+ *             .setRpcTimeoutMultiplier(1.5)
+ *             .setTotalTimeoutDuration(Duration.ofSeconds(300))
+ *             .build());
+ * DatastoreSettings datastoreSettings = datastoreSettingsBuilder.build();
+ * }
+ * + * Please refer to the [Client Side Retry + * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for + * additional support in setting retries. + */ +@Generated("by gapic-generator-java") +public class DatastoreSettings extends ClientSettings { + + /** Returns the object with the settings used for calls to lookup. */ + public UnaryCallSettings lookupSettings() { + return ((DatastoreStubSettings) getStubSettings()).lookupSettings(); + } + + /** Returns the object with the settings used for calls to runQuery. */ + public UnaryCallSettings runQuerySettings() { + return ((DatastoreStubSettings) getStubSettings()).runQuerySettings(); + } + + /** Returns the object with the settings used for calls to runAggregationQuery. */ + public UnaryCallSettings + runAggregationQuerySettings() { + return ((DatastoreStubSettings) getStubSettings()).runAggregationQuerySettings(); + } + + /** Returns the object with the settings used for calls to beginTransaction. */ + public UnaryCallSettings + beginTransactionSettings() { + return ((DatastoreStubSettings) getStubSettings()).beginTransactionSettings(); + } + + /** Returns the object with the settings used for calls to commit. */ + public UnaryCallSettings commitSettings() { + return ((DatastoreStubSettings) getStubSettings()).commitSettings(); + } + + /** Returns the object with the settings used for calls to rollback. */ + public UnaryCallSettings rollbackSettings() { + return ((DatastoreStubSettings) getStubSettings()).rollbackSettings(); + } + + /** Returns the object with the settings used for calls to allocateIds. */ + public UnaryCallSettings allocateIdsSettings() { + return ((DatastoreStubSettings) getStubSettings()).allocateIdsSettings(); + } + + /** Returns the object with the settings used for calls to reserveIds. */ + public UnaryCallSettings reserveIdsSettings() { + return ((DatastoreStubSettings) getStubSettings()).reserveIdsSettings(); + } + + public static final DatastoreSettings create(DatastoreStubSettings stub) throws IOException { + return new DatastoreSettings.Builder(stub.toBuilder()).build(); + } + + /** Returns a builder for the default ExecutorProvider for this service. */ + public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() { + return DatastoreStubSettings.defaultExecutorProviderBuilder(); + } + + /** Returns the default service endpoint. */ + public static String getDefaultEndpoint() { + return DatastoreStubSettings.getDefaultEndpoint(); + } + + /** Returns the default service scopes. */ + public static List getDefaultServiceScopes() { + return DatastoreStubSettings.getDefaultServiceScopes(); + } + + /** Returns a builder for the default credentials for this service. */ + public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { + return DatastoreStubSettings.defaultCredentialsProviderBuilder(); + } + + /** Returns a builder for the default gRPC ChannelProvider for this service. */ + public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() { + return DatastoreStubSettings.defaultGrpcTransportProviderBuilder(); + } + + /** Returns a builder for the default REST ChannelProvider for this service. */ + @BetaApi + public static InstantiatingHttpJsonChannelProvider.Builder + defaultHttpJsonTransportProviderBuilder() { + return DatastoreStubSettings.defaultHttpJsonTransportProviderBuilder(); + } + + public static TransportChannelProvider defaultTransportChannelProvider() { + return DatastoreStubSettings.defaultTransportChannelProvider(); + } + + public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() { + return DatastoreStubSettings.defaultApiClientHeaderProviderBuilder(); + } + + /** Returns a new gRPC builder for this class. */ + public static Builder newBuilder() { + return Builder.createDefault(); + } + + /** Returns a new REST builder for this class. */ + public static Builder newHttpJsonBuilder() { + return Builder.createHttpJsonDefault(); + } + + /** Returns a new builder for this class. */ + public static Builder newBuilder(ClientContext clientContext) { + return new Builder(clientContext); + } + + /** Returns a builder containing all the values of this settings class. */ + public Builder toBuilder() { + return new Builder(this); + } + + protected DatastoreSettings(Builder settingsBuilder) throws IOException { + super(settingsBuilder); + } + + /** Builder for DatastoreSettings. */ + public static class Builder extends ClientSettings.Builder { + + protected Builder() throws IOException { + this(((ClientContext) null)); + } + + protected Builder(ClientContext clientContext) { + super(DatastoreStubSettings.newBuilder(clientContext)); + } + + protected Builder(DatastoreSettings settings) { + super(settings.getStubSettings().toBuilder()); + } + + protected Builder(DatastoreStubSettings.Builder stubSettings) { + super(stubSettings); + } + + private static Builder createDefault() { + return new Builder(DatastoreStubSettings.newBuilder()); + } + + private static Builder createHttpJsonDefault() { + return new Builder(DatastoreStubSettings.newHttpJsonBuilder()); + } + + public DatastoreStubSettings.Builder getStubSettingsBuilder() { + return ((DatastoreStubSettings.Builder) getStubSettings()); + } + + /** + * Applies the given settings updater function to all of the unary API methods in this service. + * + *

Note: This method does not support applying settings to streaming methods. + */ + public Builder applyToAllUnaryMethods( + ApiFunction, Void> settingsUpdater) { + super.applyToAllUnaryMethods( + getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); + return this; + } + + /** Returns the builder for the settings used for calls to lookup. */ + public UnaryCallSettings.Builder lookupSettings() { + return getStubSettingsBuilder().lookupSettings(); + } + + /** Returns the builder for the settings used for calls to runQuery. */ + public UnaryCallSettings.Builder runQuerySettings() { + return getStubSettingsBuilder().runQuerySettings(); + } + + /** Returns the builder for the settings used for calls to runAggregationQuery. */ + public UnaryCallSettings.Builder + runAggregationQuerySettings() { + return getStubSettingsBuilder().runAggregationQuerySettings(); + } + + /** Returns the builder for the settings used for calls to beginTransaction. */ + public UnaryCallSettings.Builder + beginTransactionSettings() { + return getStubSettingsBuilder().beginTransactionSettings(); + } + + /** Returns the builder for the settings used for calls to commit. */ + public UnaryCallSettings.Builder commitSettings() { + return getStubSettingsBuilder().commitSettings(); + } + + /** Returns the builder for the settings used for calls to rollback. */ + public UnaryCallSettings.Builder rollbackSettings() { + return getStubSettingsBuilder().rollbackSettings(); + } + + /** Returns the builder for the settings used for calls to allocateIds. */ + public UnaryCallSettings.Builder + allocateIdsSettings() { + return getStubSettingsBuilder().allocateIdsSettings(); + } + + /** Returns the builder for the settings used for calls to reserveIds. */ + public UnaryCallSettings.Builder reserveIdsSettings() { + return getStubSettingsBuilder().reserveIdsSettings(); + } + + @Override + public DatastoreSettings build() throws IOException { + return new DatastoreSettings(this); + } + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/gapic_metadata.json b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/gapic_metadata.json new file mode 100644 index 000000000..02196d36e --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/gapic_metadata.json @@ -0,0 +1,42 @@ +{ + "schema": "1.0", + "comment": "This file maps proto services/RPCs to the corresponding library clients/methods", + "language": "java", + "protoPackage": "google.datastore.v1", + "libraryPackage": "com.google.cloud.datastore.v1", + "services": { + "Datastore": { + "clients": { + "grpc": { + "libraryClient": "DatastoreClient", + "rpcs": { + "AllocateIds": { + "methods": ["allocateIds", "allocateIds", "allocateIdsCallable"] + }, + "BeginTransaction": { + "methods": ["beginTransaction", "beginTransaction", "beginTransactionCallable"] + }, + "Commit": { + "methods": ["commit", "commit", "commit", "commitCallable"] + }, + "Lookup": { + "methods": ["lookup", "lookup", "lookupCallable"] + }, + "ReserveIds": { + "methods": ["reserveIds", "reserveIds", "reserveIdsCallable"] + }, + "Rollback": { + "methods": ["rollback", "rollback", "rollbackCallable"] + }, + "RunAggregationQuery": { + "methods": ["runAggregationQuery", "runAggregationQueryCallable"] + }, + "RunQuery": { + "methods": ["runQuery", "runQueryCallable"] + } + } + } + } + } + } +} \ No newline at end of file diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java new file mode 100644 index 000000000..0484a7c04 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/package-info.java @@ -0,0 +1,49 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * A client to Cloud Datastore API + * + *

The interfaces provided are listed below, along with usage samples. + * + *

======================= DatastoreClient ======================= + * + *

Service Description: Each RPC normalizes the partition IDs of the keys in its input entities, + * and always returns entities with keys with normalized partition IDs. This applies to all keys and + * entities, including those in values, except keys with both an empty path and an empty or unset + * partition ID. Normalization of input keys sets the project ID (if not already set) to the project + * ID from the request. + * + *

Sample for DatastoreClient: + * + * 

{@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 (DatastoreClient datastoreClient = DatastoreClient.create()) {
+ *   String projectId = "projectId-894832108";
+ *   ReadOptions readOptions = ReadOptions.newBuilder().build();
+ *   List keys = new ArrayList<>();
+ *   LookupResponse response = datastoreClient.lookup(projectId, readOptions, keys);
+ * }
+ * }
+ */ +@Generated("by gapic-generator-java") +package com.google.cloud.datastore.v1; + +import javax.annotation.Generated; diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java new file mode 100644 index 000000000..231289f18 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStub.java @@ -0,0 +1,84 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1.stub; + +import com.google.api.gax.core.BackgroundResource; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * Base stub class for the Datastore service API. + * + *

This class is for advanced usage and reflects the underlying API directly. + */ +@Generated("by gapic-generator-java") +public abstract class DatastoreStub implements BackgroundResource { + + public UnaryCallable lookupCallable() { + throw new UnsupportedOperationException("Not implemented: lookupCallable()"); + } + + public UnaryCallable runQueryCallable() { + throw new UnsupportedOperationException("Not implemented: runQueryCallable()"); + } + + public UnaryCallable + runAggregationQueryCallable() { + throw new UnsupportedOperationException("Not implemented: runAggregationQueryCallable()"); + } + + public UnaryCallable + beginTransactionCallable() { + throw new UnsupportedOperationException("Not implemented: beginTransactionCallable()"); + } + + public UnaryCallable commitCallable() { + throw new UnsupportedOperationException("Not implemented: commitCallable()"); + } + + public UnaryCallable rollbackCallable() { + throw new UnsupportedOperationException("Not implemented: rollbackCallable()"); + } + + public UnaryCallable allocateIdsCallable() { + throw new UnsupportedOperationException("Not implemented: allocateIdsCallable()"); + } + + public UnaryCallable reserveIdsCallable() { + throw new UnsupportedOperationException("Not implemented: reserveIdsCallable()"); + } + + @Override + public abstract void close(); +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java new file mode 100644 index 000000000..a4554339d --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/DatastoreStubSettings.java @@ -0,0 +1,535 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1.stub; + +import com.google.api.core.ApiFunction; +import com.google.api.core.BetaApi; +import com.google.api.core.ObsoleteApi; +import com.google.api.gax.core.GaxProperties; +import com.google.api.gax.core.GoogleCredentialsProvider; +import com.google.api.gax.core.InstantiatingExecutorProvider; +import com.google.api.gax.grpc.GaxGrpcProperties; +import com.google.api.gax.grpc.GrpcTransportChannel; +import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; +import com.google.api.gax.httpjson.GaxHttpJsonProperties; +import com.google.api.gax.httpjson.HttpJsonTransportChannel; +import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; +import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.ApiClientHeaderProvider; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.StatusCode; +import com.google.api.gax.rpc.StubSettings; +import com.google.api.gax.rpc.TransportChannelProvider; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import java.io.IOException; +import java.time.Duration; +import java.util.List; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * Settings class to configure an instance of {@link DatastoreStub}. + * + *

The default instance has everything set to sensible defaults: + * + *

    + *
  • The default service address (datastore.googleapis.com) and default port (443) are used. + *
  • Credentials are acquired automatically through Application Default Credentials. + *
  • Retries are configured for idempotent methods but not for non-idempotent methods. + *
+ * + *

The builder of this class is recursive, so contained classes are themselves builders. When + * build() is called, the tree of builders is called to create the complete settings object. + * + *

For example, to set the + * [RetrySettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.retrying.RetrySettings) + * of lookup: + * + * 

{@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
+ * DatastoreStubSettings.Builder datastoreSettingsBuilder = DatastoreStubSettings.newBuilder();
+ * datastoreSettingsBuilder
+ *     .lookupSettings()
+ *     .setRetrySettings(
+ *         datastoreSettingsBuilder
+ *             .lookupSettings()
+ *             .getRetrySettings()
+ *             .toBuilder()
+ *             .setInitialRetryDelayDuration(Duration.ofSeconds(1))
+ *             .setInitialRpcTimeoutDuration(Duration.ofSeconds(5))
+ *             .setMaxAttempts(5)
+ *             .setMaxRetryDelayDuration(Duration.ofSeconds(30))
+ *             .setMaxRpcTimeoutDuration(Duration.ofSeconds(60))
+ *             .setRetryDelayMultiplier(1.3)
+ *             .setRpcTimeoutMultiplier(1.5)
+ *             .setTotalTimeoutDuration(Duration.ofSeconds(300))
+ *             .build());
+ * DatastoreStubSettings datastoreSettings = datastoreSettingsBuilder.build();
+ * }
+ * + * Please refer to the [Client Side Retry + * Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for + * additional support in setting retries. + */ +@Generated("by gapic-generator-java") +public class DatastoreStubSettings extends StubSettings { + /** The default scopes of the service. */ + private static final ImmutableList DEFAULT_SERVICE_SCOPES = + ImmutableList.builder() + .add("https://www.googleapis.com/auth/cloud-platform") + .add("https://www.googleapis.com/auth/datastore") + .build(); + + private final UnaryCallSettings lookupSettings; + private final UnaryCallSettings runQuerySettings; + private final UnaryCallSettings + runAggregationQuerySettings; + private final UnaryCallSettings + beginTransactionSettings; + private final UnaryCallSettings commitSettings; + private final UnaryCallSettings rollbackSettings; + private final UnaryCallSettings allocateIdsSettings; + private final UnaryCallSettings reserveIdsSettings; + + /** Returns the object with the settings used for calls to lookup. */ + public UnaryCallSettings lookupSettings() { + return lookupSettings; + } + + /** Returns the object with the settings used for calls to runQuery. */ + public UnaryCallSettings runQuerySettings() { + return runQuerySettings; + } + + /** Returns the object with the settings used for calls to runAggregationQuery. */ + public UnaryCallSettings + runAggregationQuerySettings() { + return runAggregationQuerySettings; + } + + /** Returns the object with the settings used for calls to beginTransaction. */ + public UnaryCallSettings + beginTransactionSettings() { + return beginTransactionSettings; + } + + /** Returns the object with the settings used for calls to commit. */ + public UnaryCallSettings commitSettings() { + return commitSettings; + } + + /** Returns the object with the settings used for calls to rollback. */ + public UnaryCallSettings rollbackSettings() { + return rollbackSettings; + } + + /** Returns the object with the settings used for calls to allocateIds. */ + public UnaryCallSettings allocateIdsSettings() { + return allocateIdsSettings; + } + + /** Returns the object with the settings used for calls to reserveIds. */ + public UnaryCallSettings reserveIdsSettings() { + return reserveIdsSettings; + } + + public DatastoreStub createStub() throws IOException { + if (getTransportChannelProvider() + .getTransportName() + .equals(GrpcTransportChannel.getGrpcTransportName())) { + return GrpcDatastoreStub.create(this); + } + if (getTransportChannelProvider() + .getTransportName() + .equals(HttpJsonTransportChannel.getHttpJsonTransportName())) { + return HttpJsonDatastoreStub.create(this); + } + throw new UnsupportedOperationException( + String.format( + "Transport not supported: %s", getTransportChannelProvider().getTransportName())); + } + + /** Returns the default service name. */ + @Override + public String getServiceName() { + return "datastore"; + } + + /** Returns a builder for the default ExecutorProvider for this service. */ + public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() { + return InstantiatingExecutorProvider.newBuilder(); + } + + /** Returns the default service endpoint. */ + @ObsoleteApi("Use getEndpoint() instead") + public static String getDefaultEndpoint() { + return "datastore.googleapis.com:443"; + } + + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "datastore.mtls.googleapis.com:443"; + } + + /** Returns the default service scopes. */ + public static List getDefaultServiceScopes() { + return DEFAULT_SERVICE_SCOPES; + } + + /** Returns a builder for the default credentials for this service. */ + public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); + } + + /** Returns a builder for the default gRPC ChannelProvider for this service. */ + public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() { + return InstantiatingGrpcChannelProvider.newBuilder() + .setMaxInboundMessageSize(Integer.MAX_VALUE); + } + + /** Returns a builder for the default REST ChannelProvider for this service. */ + @BetaApi + public static InstantiatingHttpJsonChannelProvider.Builder + defaultHttpJsonTransportProviderBuilder() { + return InstantiatingHttpJsonChannelProvider.newBuilder(); + } + + public static TransportChannelProvider defaultTransportChannelProvider() { + return defaultGrpcTransportProviderBuilder().build(); + } + + public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() { + return ApiClientHeaderProvider.newBuilder() + .setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(DatastoreStubSettings.class)) + .setTransportToken( + GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion()); + } + + public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() { + return ApiClientHeaderProvider.newBuilder() + .setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(DatastoreStubSettings.class)) + .setTransportToken( + GaxHttpJsonProperties.getHttpJsonTokenName(), + GaxHttpJsonProperties.getHttpJsonVersion()); + } + + public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() { + return DatastoreStubSettings.defaultGrpcApiClientHeaderProviderBuilder(); + } + + /** Returns a new gRPC builder for this class. */ + public static Builder newBuilder() { + return Builder.createDefault(); + } + + /** Returns a new REST builder for this class. */ + public static Builder newHttpJsonBuilder() { + return Builder.createHttpJsonDefault(); + } + + /** Returns a new builder for this class. */ + public static Builder newBuilder(ClientContext clientContext) { + return new Builder(clientContext); + } + + /** Returns a builder containing all the values of this settings class. */ + public Builder toBuilder() { + return new Builder(this); + } + + protected DatastoreStubSettings(Builder settingsBuilder) throws IOException { + super(settingsBuilder); + + lookupSettings = settingsBuilder.lookupSettings().build(); + runQuerySettings = settingsBuilder.runQuerySettings().build(); + runAggregationQuerySettings = settingsBuilder.runAggregationQuerySettings().build(); + beginTransactionSettings = settingsBuilder.beginTransactionSettings().build(); + commitSettings = settingsBuilder.commitSettings().build(); + rollbackSettings = settingsBuilder.rollbackSettings().build(); + allocateIdsSettings = settingsBuilder.allocateIdsSettings().build(); + reserveIdsSettings = settingsBuilder.reserveIdsSettings().build(); + } + + /** Builder for DatastoreStubSettings. */ + public static class Builder extends StubSettings.Builder { + private final ImmutableList> unaryMethodSettingsBuilders; + private final UnaryCallSettings.Builder lookupSettings; + private final UnaryCallSettings.Builder runQuerySettings; + private final UnaryCallSettings.Builder + runAggregationQuerySettings; + private final UnaryCallSettings.Builder + beginTransactionSettings; + private final UnaryCallSettings.Builder commitSettings; + private final UnaryCallSettings.Builder rollbackSettings; + private final UnaryCallSettings.Builder + allocateIdsSettings; + private final UnaryCallSettings.Builder + reserveIdsSettings; + private static final ImmutableMap> + RETRYABLE_CODE_DEFINITIONS; + + static { + ImmutableMap.Builder> definitions = + ImmutableMap.builder(); + definitions.put( + "retry_policy_0_codes", + ImmutableSet.copyOf( + Lists.newArrayList( + StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED))); + definitions.put( + "no_retry_1_codes", ImmutableSet.copyOf(Lists.newArrayList())); + RETRYABLE_CODE_DEFINITIONS = definitions.build(); + } + + private static final ImmutableMap RETRY_PARAM_DEFINITIONS; + + static { + ImmutableMap.Builder definitions = ImmutableMap.builder(); + RetrySettings settings = null; + settings = + RetrySettings.newBuilder() + .setInitialRetryDelayDuration(Duration.ofMillis(100L)) + .setRetryDelayMultiplier(1.3) + .setMaxRetryDelayDuration(Duration.ofMillis(60000L)) + .setInitialRpcTimeoutDuration(Duration.ofMillis(60000L)) + .setRpcTimeoutMultiplier(1.0) + .setMaxRpcTimeoutDuration(Duration.ofMillis(60000L)) + .setTotalTimeoutDuration(Duration.ofMillis(60000L)) + .build(); + definitions.put("retry_policy_0_params", settings); + settings = + RetrySettings.newBuilder() + .setInitialRpcTimeoutDuration(Duration.ofMillis(60000L)) + .setRpcTimeoutMultiplier(1.0) + .setMaxRpcTimeoutDuration(Duration.ofMillis(60000L)) + .setTotalTimeoutDuration(Duration.ofMillis(60000L)) + .build(); + definitions.put("no_retry_1_params", settings); + RETRY_PARAM_DEFINITIONS = definitions.build(); + } + + protected Builder() { + this(((ClientContext) null)); + } + + protected Builder(ClientContext clientContext) { + super(clientContext); + + lookupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + runQuerySettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + runAggregationQuerySettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + beginTransactionSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + commitSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + rollbackSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + allocateIdsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + reserveIdsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + + unaryMethodSettingsBuilders = + ImmutableList.>of( + lookupSettings, + runQuerySettings, + runAggregationQuerySettings, + beginTransactionSettings, + commitSettings, + rollbackSettings, + allocateIdsSettings, + reserveIdsSettings); + initDefaults(this); + } + + protected Builder(DatastoreStubSettings settings) { + super(settings); + + lookupSettings = settings.lookupSettings.toBuilder(); + runQuerySettings = settings.runQuerySettings.toBuilder(); + runAggregationQuerySettings = settings.runAggregationQuerySettings.toBuilder(); + beginTransactionSettings = settings.beginTransactionSettings.toBuilder(); + commitSettings = settings.commitSettings.toBuilder(); + rollbackSettings = settings.rollbackSettings.toBuilder(); + allocateIdsSettings = settings.allocateIdsSettings.toBuilder(); + reserveIdsSettings = settings.reserveIdsSettings.toBuilder(); + + unaryMethodSettingsBuilders = + ImmutableList.>of( + lookupSettings, + runQuerySettings, + runAggregationQuerySettings, + beginTransactionSettings, + commitSettings, + rollbackSettings, + allocateIdsSettings, + reserveIdsSettings); + } + + private static Builder createDefault() { + Builder builder = new Builder(((ClientContext) null)); + + builder.setTransportChannelProvider(defaultTransportChannelProvider()); + builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); + builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); + + return initDefaults(builder); + } + + private static Builder createHttpJsonDefault() { + Builder builder = new Builder(((ClientContext) null)); + + builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build()); + builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); + builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); + + return initDefaults(builder); + } + + private static Builder initDefaults(Builder builder) { + builder + .lookupSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params")); + + builder + .runQuerySettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params")); + + builder + .runAggregationQuerySettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params")); + + builder + .beginTransactionSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); + + builder + .commitSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); + + builder + .rollbackSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); + + builder + .allocateIdsSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); + + builder + .reserveIdsSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params")); + + return builder; + } + + /** + * Applies the given settings updater function to all of the unary API methods in this service. + * + *

Note: This method does not support applying settings to streaming methods. + */ + public Builder applyToAllUnaryMethods( + ApiFunction, Void> settingsUpdater) { + super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); + return this; + } + + public ImmutableList> unaryMethodSettingsBuilders() { + return unaryMethodSettingsBuilders; + } + + /** Returns the builder for the settings used for calls to lookup. */ + public UnaryCallSettings.Builder lookupSettings() { + return lookupSettings; + } + + /** Returns the builder for the settings used for calls to runQuery. */ + public UnaryCallSettings.Builder runQuerySettings() { + return runQuerySettings; + } + + /** Returns the builder for the settings used for calls to runAggregationQuery. */ + public UnaryCallSettings.Builder + runAggregationQuerySettings() { + return runAggregationQuerySettings; + } + + /** Returns the builder for the settings used for calls to beginTransaction. */ + public UnaryCallSettings.Builder + beginTransactionSettings() { + return beginTransactionSettings; + } + + /** Returns the builder for the settings used for calls to commit. */ + public UnaryCallSettings.Builder commitSettings() { + return commitSettings; + } + + /** Returns the builder for the settings used for calls to rollback. */ + public UnaryCallSettings.Builder rollbackSettings() { + return rollbackSettings; + } + + /** Returns the builder for the settings used for calls to allocateIds. */ + public UnaryCallSettings.Builder + allocateIdsSettings() { + return allocateIdsSettings; + } + + /** Returns the builder for the settings used for calls to reserveIds. */ + public UnaryCallSettings.Builder reserveIdsSettings() { + return reserveIdsSettings; + } + + @Override + public DatastoreStubSettings build() throws IOException { + return new DatastoreStubSettings(this); + } + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java new file mode 100644 index 000000000..ffe225259 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreCallableFactory.java @@ -0,0 +1,113 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1.stub; + +import com.google.api.gax.grpc.GrpcCallSettings; +import com.google.api.gax.grpc.GrpcCallableFactory; +import com.google.api.gax.grpc.GrpcStubCallableFactory; +import com.google.api.gax.rpc.BatchingCallSettings; +import com.google.api.gax.rpc.BidiStreamingCallable; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.ClientStreamingCallable; +import com.google.api.gax.rpc.OperationCallSettings; +import com.google.api.gax.rpc.OperationCallable; +import com.google.api.gax.rpc.PagedCallSettings; +import com.google.api.gax.rpc.ServerStreamingCallSettings; +import com.google.api.gax.rpc.ServerStreamingCallable; +import com.google.api.gax.rpc.StreamingCallSettings; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.longrunning.Operation; +import com.google.longrunning.stub.OperationsStub; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * gRPC callable factory implementation for the Datastore service API. + * + *

This class is for advanced usage. + */ +@Generated("by gapic-generator-java") +public class GrpcDatastoreCallableFactory implements GrpcStubCallableFactory { + + @Override + public UnaryCallable createUnaryCallable( + GrpcCallSettings grpcCallSettings, + UnaryCallSettings callSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createUnaryCallable(grpcCallSettings, callSettings, clientContext); + } + + @Override + public + UnaryCallable createPagedCallable( + GrpcCallSettings grpcCallSettings, + PagedCallSettings callSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createPagedCallable(grpcCallSettings, callSettings, clientContext); + } + + @Override + public UnaryCallable createBatchingCallable( + GrpcCallSettings grpcCallSettings, + BatchingCallSettings callSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createBatchingCallable( + grpcCallSettings, callSettings, clientContext); + } + + @Override + public + OperationCallable createOperationCallable( + GrpcCallSettings grpcCallSettings, + OperationCallSettings callSettings, + ClientContext clientContext, + OperationsStub operationsStub) { + return GrpcCallableFactory.createOperationCallable( + grpcCallSettings, callSettings, clientContext, operationsStub); + } + + @Override + public + BidiStreamingCallable createBidiStreamingCallable( + GrpcCallSettings grpcCallSettings, + StreamingCallSettings callSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createBidiStreamingCallable( + grpcCallSettings, callSettings, clientContext); + } + + @Override + public + ServerStreamingCallable createServerStreamingCallable( + GrpcCallSettings grpcCallSettings, + ServerStreamingCallSettings callSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createServerStreamingCallable( + grpcCallSettings, callSettings, clientContext); + } + + @Override + public + ClientStreamingCallable createClientStreamingCallable( + GrpcCallSettings grpcCallSettings, + StreamingCallSettings callSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createClientStreamingCallable( + grpcCallSettings, callSettings, clientContext); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java new file mode 100644 index 000000000..487413816 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/GrpcDatastoreStub.java @@ -0,0 +1,429 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1.stub; + +import com.google.api.gax.core.BackgroundResource; +import com.google.api.gax.core.BackgroundResourceAggregation; +import com.google.api.gax.grpc.GrpcCallSettings; +import com.google.api.gax.grpc.GrpcStubCallableFactory; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.RequestParamsBuilder; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import com.google.longrunning.stub.GrpcOperationsStub; +import io.grpc.MethodDescriptor; +import io.grpc.protobuf.ProtoUtils; +import java.io.IOException; +import java.util.concurrent.TimeUnit; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * gRPC stub implementation for the Datastore service API. + * + *

This class is for advanced usage and reflects the underlying API directly. + */ +@Generated("by gapic-generator-java") +public class GrpcDatastoreStub extends DatastoreStub { + private static final MethodDescriptor lookupMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.datastore.v1.Datastore/Lookup") + .setRequestMarshaller(ProtoUtils.marshaller(LookupRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(LookupResponse.getDefaultInstance())) + .build(); + + private static final MethodDescriptor + runQueryMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.datastore.v1.Datastore/RunQuery") + .setRequestMarshaller(ProtoUtils.marshaller(RunQueryRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(RunQueryResponse.getDefaultInstance())) + .build(); + + private static final MethodDescriptor + runAggregationQueryMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.datastore.v1.Datastore/RunAggregationQuery") + .setRequestMarshaller( + ProtoUtils.marshaller(RunAggregationQueryRequest.getDefaultInstance())) + .setResponseMarshaller( + ProtoUtils.marshaller(RunAggregationQueryResponse.getDefaultInstance())) + .build(); + + private static final MethodDescriptor + beginTransactionMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.datastore.v1.Datastore/BeginTransaction") + .setRequestMarshaller( + ProtoUtils.marshaller(BeginTransactionRequest.getDefaultInstance())) + .setResponseMarshaller( + ProtoUtils.marshaller(BeginTransactionResponse.getDefaultInstance())) + .build(); + + private static final MethodDescriptor commitMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.datastore.v1.Datastore/Commit") + .setRequestMarshaller(ProtoUtils.marshaller(CommitRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(CommitResponse.getDefaultInstance())) + .build(); + + private static final MethodDescriptor + rollbackMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.datastore.v1.Datastore/Rollback") + .setRequestMarshaller(ProtoUtils.marshaller(RollbackRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(RollbackResponse.getDefaultInstance())) + .build(); + + private static final MethodDescriptor + allocateIdsMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.datastore.v1.Datastore/AllocateIds") + .setRequestMarshaller(ProtoUtils.marshaller(AllocateIdsRequest.getDefaultInstance())) + .setResponseMarshaller( + ProtoUtils.marshaller(AllocateIdsResponse.getDefaultInstance())) + .build(); + + private static final MethodDescriptor + reserveIdsMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.datastore.v1.Datastore/ReserveIds") + .setRequestMarshaller(ProtoUtils.marshaller(ReserveIdsRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(ReserveIdsResponse.getDefaultInstance())) + .build(); + + private final UnaryCallable lookupCallable; + private final UnaryCallable runQueryCallable; + private final UnaryCallable + runAggregationQueryCallable; + private final UnaryCallable + beginTransactionCallable; + private final UnaryCallable commitCallable; + private final UnaryCallable rollbackCallable; + private final UnaryCallable allocateIdsCallable; + private final UnaryCallable reserveIdsCallable; + + private final BackgroundResource backgroundResources; + private final GrpcOperationsStub operationsStub; + private final GrpcStubCallableFactory callableFactory; + + private static final PathTemplate LOOKUP_0_PATH_TEMPLATE = PathTemplate.create("{project_id=**}"); + private static final PathTemplate LOOKUP_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate RUN_QUERY_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate RUN_QUERY_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate RUN_AGGREGATION_QUERY_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate RUN_AGGREGATION_QUERY_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate BEGIN_TRANSACTION_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate BEGIN_TRANSACTION_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate COMMIT_0_PATH_TEMPLATE = PathTemplate.create("{project_id=**}"); + private static final PathTemplate COMMIT_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate ROLLBACK_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate ROLLBACK_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate ALLOCATE_IDS_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate ALLOCATE_IDS_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate RESERVE_IDS_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate RESERVE_IDS_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + + public static final GrpcDatastoreStub create(DatastoreStubSettings settings) throws IOException { + return new GrpcDatastoreStub(settings, ClientContext.create(settings)); + } + + public static final GrpcDatastoreStub create(ClientContext clientContext) throws IOException { + return new GrpcDatastoreStub(DatastoreStubSettings.newBuilder().build(), clientContext); + } + + public static final GrpcDatastoreStub create( + ClientContext clientContext, GrpcStubCallableFactory callableFactory) throws IOException { + return new GrpcDatastoreStub( + DatastoreStubSettings.newBuilder().build(), clientContext, callableFactory); + } + + /** + * Constructs an instance of GrpcDatastoreStub, using the given settings. This is protected so + * that it is easy to make a subclass, but otherwise, the static factory methods should be + * preferred. + */ + protected GrpcDatastoreStub(DatastoreStubSettings settings, ClientContext clientContext) + throws IOException { + this(settings, clientContext, new GrpcDatastoreCallableFactory()); + } + + /** + * Constructs an instance of GrpcDatastoreStub, using the given settings. This is protected so + * that it is easy to make a subclass, but otherwise, the static factory methods should be + * preferred. + */ + protected GrpcDatastoreStub( + DatastoreStubSettings settings, + ClientContext clientContext, + GrpcStubCallableFactory callableFactory) + throws IOException { + this.callableFactory = callableFactory; + this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory); + + GrpcCallSettings lookupTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(lookupMethodDescriptor) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", LOOKUP_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", LOOKUP_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + GrpcCallSettings runQueryTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(runQueryMethodDescriptor) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", RUN_QUERY_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", RUN_QUERY_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + GrpcCallSettings + runAggregationQueryTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(runAggregationQueryMethodDescriptor) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add( + request.getProjectId(), + "project_id", + RUN_AGGREGATION_QUERY_0_PATH_TEMPLATE); + builder.add( + request.getDatabaseId(), + "database_id", + RUN_AGGREGATION_QUERY_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + GrpcCallSettings + beginTransactionTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(beginTransactionMethodDescriptor) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add( + request.getProjectId(), "project_id", BEGIN_TRANSACTION_0_PATH_TEMPLATE); + builder.add( + request.getDatabaseId(), + "database_id", + BEGIN_TRANSACTION_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + GrpcCallSettings commitTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(commitMethodDescriptor) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", COMMIT_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", COMMIT_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + GrpcCallSettings rollbackTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(rollbackMethodDescriptor) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", ROLLBACK_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", ROLLBACK_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + GrpcCallSettings allocateIdsTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(allocateIdsMethodDescriptor) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", ALLOCATE_IDS_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", ALLOCATE_IDS_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + GrpcCallSettings reserveIdsTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(reserveIdsMethodDescriptor) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", RESERVE_IDS_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", RESERVE_IDS_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + + this.lookupCallable = + callableFactory.createUnaryCallable( + lookupTransportSettings, settings.lookupSettings(), clientContext); + this.runQueryCallable = + callableFactory.createUnaryCallable( + runQueryTransportSettings, settings.runQuerySettings(), clientContext); + this.runAggregationQueryCallable = + callableFactory.createUnaryCallable( + runAggregationQueryTransportSettings, + settings.runAggregationQuerySettings(), + clientContext); + this.beginTransactionCallable = + callableFactory.createUnaryCallable( + beginTransactionTransportSettings, settings.beginTransactionSettings(), clientContext); + this.commitCallable = + callableFactory.createUnaryCallable( + commitTransportSettings, settings.commitSettings(), clientContext); + this.rollbackCallable = + callableFactory.createUnaryCallable( + rollbackTransportSettings, settings.rollbackSettings(), clientContext); + this.allocateIdsCallable = + callableFactory.createUnaryCallable( + allocateIdsTransportSettings, settings.allocateIdsSettings(), clientContext); + this.reserveIdsCallable = + callableFactory.createUnaryCallable( + reserveIdsTransportSettings, settings.reserveIdsSettings(), clientContext); + + this.backgroundResources = + new BackgroundResourceAggregation(clientContext.getBackgroundResources()); + } + + public GrpcOperationsStub getOperationsStub() { + return operationsStub; + } + + @Override + public UnaryCallable lookupCallable() { + return lookupCallable; + } + + @Override + public UnaryCallable runQueryCallable() { + return runQueryCallable; + } + + @Override + public UnaryCallable + runAggregationQueryCallable() { + return runAggregationQueryCallable; + } + + @Override + public UnaryCallable + beginTransactionCallable() { + return beginTransactionCallable; + } + + @Override + public UnaryCallable commitCallable() { + return commitCallable; + } + + @Override + public UnaryCallable rollbackCallable() { + return rollbackCallable; + } + + @Override + public UnaryCallable allocateIdsCallable() { + return allocateIdsCallable; + } + + @Override + public UnaryCallable reserveIdsCallable() { + return reserveIdsCallable; + } + + @Override + public final void close() { + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } + } + + @Override + public void shutdown() { + backgroundResources.shutdown(); + } + + @Override + public boolean isShutdown() { + return backgroundResources.isShutdown(); + } + + @Override + public boolean isTerminated() { + return backgroundResources.isTerminated(); + } + + @Override + public void shutdownNow() { + backgroundResources.shutdownNow(); + } + + @Override + public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException { + return backgroundResources.awaitTermination(duration, unit); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java new file mode 100644 index 000000000..b12560ab1 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreCallableFactory.java @@ -0,0 +1,101 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1.stub; + +import com.google.api.gax.httpjson.HttpJsonCallSettings; +import com.google.api.gax.httpjson.HttpJsonCallableFactory; +import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable; +import com.google.api.gax.httpjson.HttpJsonStubCallableFactory; +import com.google.api.gax.httpjson.longrunning.stub.OperationsStub; +import com.google.api.gax.rpc.BatchingCallSettings; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.OperationCallSettings; +import com.google.api.gax.rpc.OperationCallable; +import com.google.api.gax.rpc.PagedCallSettings; +import com.google.api.gax.rpc.ServerStreamingCallSettings; +import com.google.api.gax.rpc.ServerStreamingCallable; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.longrunning.Operation; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * REST callable factory implementation for the Datastore service API. + * + *

This class is for advanced usage. + */ +@Generated("by gapic-generator-java") +public class HttpJsonDatastoreCallableFactory + implements HttpJsonStubCallableFactory { + + @Override + public UnaryCallable createUnaryCallable( + HttpJsonCallSettings httpJsonCallSettings, + UnaryCallSettings callSettings, + ClientContext clientContext) { + return HttpJsonCallableFactory.createUnaryCallable( + httpJsonCallSettings, callSettings, clientContext); + } + + @Override + public + UnaryCallable createPagedCallable( + HttpJsonCallSettings httpJsonCallSettings, + PagedCallSettings callSettings, + ClientContext clientContext) { + return HttpJsonCallableFactory.createPagedCallable( + httpJsonCallSettings, callSettings, clientContext); + } + + @Override + public UnaryCallable createBatchingCallable( + HttpJsonCallSettings httpJsonCallSettings, + BatchingCallSettings callSettings, + ClientContext clientContext) { + return HttpJsonCallableFactory.createBatchingCallable( + httpJsonCallSettings, callSettings, clientContext); + } + + @Override + public + OperationCallable createOperationCallable( + HttpJsonCallSettings httpJsonCallSettings, + OperationCallSettings callSettings, + ClientContext clientContext, + OperationsStub operationsStub) { + UnaryCallable innerCallable = + HttpJsonCallableFactory.createBaseUnaryCallable( + httpJsonCallSettings, callSettings.getInitialCallSettings(), clientContext); + HttpJsonOperationSnapshotCallable initialCallable = + new HttpJsonOperationSnapshotCallable( + innerCallable, + httpJsonCallSettings.getMethodDescriptor().getOperationSnapshotFactory()); + return HttpJsonCallableFactory.createOperationCallable( + callSettings, clientContext, operationsStub.longRunningClient(), initialCallable); + } + + @Override + public + ServerStreamingCallable createServerStreamingCallable( + HttpJsonCallSettings httpJsonCallSettings, + ServerStreamingCallSettings callSettings, + ClientContext clientContext) { + return HttpJsonCallableFactory.createServerStreamingCallable( + httpJsonCallSettings, callSettings, clientContext); + } +} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java new file mode 100644 index 000000000..4d77fcac2 --- /dev/null +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/HttpJsonDatastoreStub.java @@ -0,0 +1,676 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1.stub; + +import com.google.api.core.InternalApi; +import com.google.api.gax.core.BackgroundResource; +import com.google.api.gax.core.BackgroundResourceAggregation; +import com.google.api.gax.httpjson.ApiMethodDescriptor; +import com.google.api.gax.httpjson.HttpJsonCallSettings; +import com.google.api.gax.httpjson.HttpJsonStubCallableFactory; +import com.google.api.gax.httpjson.ProtoMessageRequestFormatter; +import com.google.api.gax.httpjson.ProtoMessageResponseParser; +import com.google.api.gax.httpjson.ProtoRestSerializer; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.RequestParamsBuilder; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import com.google.protobuf.TypeRegistry; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * REST stub implementation for the Datastore service API. + * + *

This class is for advanced usage and reflects the underlying API directly. + */ +@Generated("by gapic-generator-java") +public class HttpJsonDatastoreStub extends DatastoreStub { + private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); + + private static final ApiMethodDescriptor lookupMethodDescriptor = + ApiMethodDescriptor.newBuilder() + .setFullMethodName("google.datastore.v1.Datastore/Lookup") + .setHttpMethod("POST") + .setType(ApiMethodDescriptor.MethodType.UNARY) + .setRequestFormatter( + ProtoMessageRequestFormatter.newBuilder() + .setPath( + "/v1/projects/{projectId}:lookup", + request -> { + Map fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putPathParam(fields, "projectId", request.getProjectId()); + return fields; + }) + .setQueryParamsExtractor( + request -> { + Map> fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); + return fields; + }) + .setRequestBodyExtractor( + request -> + ProtoRestSerializer.create() + .toBody("*", request.toBuilder().clearProjectId().build(), true)) + .build()) + .setResponseParser( + ProtoMessageResponseParser.newBuilder() + .setDefaultInstance(LookupResponse.getDefaultInstance()) + .setDefaultTypeRegistry(typeRegistry) + .build()) + .build(); + + private static final ApiMethodDescriptor + runQueryMethodDescriptor = + ApiMethodDescriptor.newBuilder() + .setFullMethodName("google.datastore.v1.Datastore/RunQuery") + .setHttpMethod("POST") + .setType(ApiMethodDescriptor.MethodType.UNARY) + .setRequestFormatter( + ProtoMessageRequestFormatter.newBuilder() + .setPath( + "/v1/projects/{projectId}:runQuery", + request -> { + Map fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putPathParam(fields, "projectId", request.getProjectId()); + return fields; + }) + .setQueryParamsExtractor( + request -> { + Map> fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); + return fields; + }) + .setRequestBodyExtractor( + request -> + ProtoRestSerializer.create() + .toBody("*", request.toBuilder().clearProjectId().build(), true)) + .build()) + .setResponseParser( + ProtoMessageResponseParser.newBuilder() + .setDefaultInstance(RunQueryResponse.getDefaultInstance()) + .setDefaultTypeRegistry(typeRegistry) + .build()) + .build(); + + private static final ApiMethodDescriptor + runAggregationQueryMethodDescriptor = + ApiMethodDescriptor.newBuilder() + .setFullMethodName("google.datastore.v1.Datastore/RunAggregationQuery") + .setHttpMethod("POST") + .setType(ApiMethodDescriptor.MethodType.UNARY) + .setRequestFormatter( + ProtoMessageRequestFormatter.newBuilder() + .setPath( + "/v1/projects/{projectId}:runAggregationQuery", + request -> { + Map fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putPathParam(fields, "projectId", request.getProjectId()); + return fields; + }) + .setQueryParamsExtractor( + request -> { + Map> fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); + return fields; + }) + .setRequestBodyExtractor( + request -> + ProtoRestSerializer.create() + .toBody("*", request.toBuilder().clearProjectId().build(), true)) + .build()) + .setResponseParser( + ProtoMessageResponseParser.newBuilder() + .setDefaultInstance(RunAggregationQueryResponse.getDefaultInstance()) + .setDefaultTypeRegistry(typeRegistry) + .build()) + .build(); + + private static final ApiMethodDescriptor + beginTransactionMethodDescriptor = + ApiMethodDescriptor.newBuilder() + .setFullMethodName("google.datastore.v1.Datastore/BeginTransaction") + .setHttpMethod("POST") + .setType(ApiMethodDescriptor.MethodType.UNARY) + .setRequestFormatter( + ProtoMessageRequestFormatter.newBuilder() + .setPath( + "/v1/projects/{projectId}:beginTransaction", + request -> { + Map fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putPathParam(fields, "projectId", request.getProjectId()); + return fields; + }) + .setQueryParamsExtractor( + request -> { + Map> fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); + return fields; + }) + .setRequestBodyExtractor( + request -> + ProtoRestSerializer.create() + .toBody("*", request.toBuilder().clearProjectId().build(), true)) + .build()) + .setResponseParser( + ProtoMessageResponseParser.newBuilder() + .setDefaultInstance(BeginTransactionResponse.getDefaultInstance()) + .setDefaultTypeRegistry(typeRegistry) + .build()) + .build(); + + private static final ApiMethodDescriptor commitMethodDescriptor = + ApiMethodDescriptor.newBuilder() + .setFullMethodName("google.datastore.v1.Datastore/Commit") + .setHttpMethod("POST") + .setType(ApiMethodDescriptor.MethodType.UNARY) + .setRequestFormatter( + ProtoMessageRequestFormatter.newBuilder() + .setPath( + "/v1/projects/{projectId}:commit", + request -> { + Map fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putPathParam(fields, "projectId", request.getProjectId()); + return fields; + }) + .setQueryParamsExtractor( + request -> { + Map> fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); + return fields; + }) + .setRequestBodyExtractor( + request -> + ProtoRestSerializer.create() + .toBody("*", request.toBuilder().clearProjectId().build(), true)) + .build()) + .setResponseParser( + ProtoMessageResponseParser.newBuilder() + .setDefaultInstance(CommitResponse.getDefaultInstance()) + .setDefaultTypeRegistry(typeRegistry) + .build()) + .build(); + + private static final ApiMethodDescriptor + rollbackMethodDescriptor = + ApiMethodDescriptor.newBuilder() + .setFullMethodName("google.datastore.v1.Datastore/Rollback") + .setHttpMethod("POST") + .setType(ApiMethodDescriptor.MethodType.UNARY) + .setRequestFormatter( + ProtoMessageRequestFormatter.newBuilder() + .setPath( + "/v1/projects/{projectId}:rollback", + request -> { + Map fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putPathParam(fields, "projectId", request.getProjectId()); + return fields; + }) + .setQueryParamsExtractor( + request -> { + Map> fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); + return fields; + }) + .setRequestBodyExtractor( + request -> + ProtoRestSerializer.create() + .toBody("*", request.toBuilder().clearProjectId().build(), true)) + .build()) + .setResponseParser( + ProtoMessageResponseParser.newBuilder() + .setDefaultInstance(RollbackResponse.getDefaultInstance()) + .setDefaultTypeRegistry(typeRegistry) + .build()) + .build(); + + private static final ApiMethodDescriptor + allocateIdsMethodDescriptor = + ApiMethodDescriptor.newBuilder() + .setFullMethodName("google.datastore.v1.Datastore/AllocateIds") + .setHttpMethod("POST") + .setType(ApiMethodDescriptor.MethodType.UNARY) + .setRequestFormatter( + ProtoMessageRequestFormatter.newBuilder() + .setPath( + "/v1/projects/{projectId}:allocateIds", + request -> { + Map fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putPathParam(fields, "projectId", request.getProjectId()); + return fields; + }) + .setQueryParamsExtractor( + request -> { + Map> fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); + return fields; + }) + .setRequestBodyExtractor( + request -> + ProtoRestSerializer.create() + .toBody("*", request.toBuilder().clearProjectId().build(), true)) + .build()) + .setResponseParser( + ProtoMessageResponseParser.newBuilder() + .setDefaultInstance(AllocateIdsResponse.getDefaultInstance()) + .setDefaultTypeRegistry(typeRegistry) + .build()) + .build(); + + private static final ApiMethodDescriptor + reserveIdsMethodDescriptor = + ApiMethodDescriptor.newBuilder() + .setFullMethodName("google.datastore.v1.Datastore/ReserveIds") + .setHttpMethod("POST") + .setType(ApiMethodDescriptor.MethodType.UNARY) + .setRequestFormatter( + ProtoMessageRequestFormatter.newBuilder() + .setPath( + "/v1/projects/{projectId}:reserveIds", + request -> { + Map fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putPathParam(fields, "projectId", request.getProjectId()); + return fields; + }) + .setQueryParamsExtractor( + request -> { + Map> fields = new HashMap<>(); + ProtoRestSerializer serializer = + ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); + return fields; + }) + .setRequestBodyExtractor( + request -> + ProtoRestSerializer.create() + .toBody("*", request.toBuilder().clearProjectId().build(), true)) + .build()) + .setResponseParser( + ProtoMessageResponseParser.newBuilder() + .setDefaultInstance(ReserveIdsResponse.getDefaultInstance()) + .setDefaultTypeRegistry(typeRegistry) + .build()) + .build(); + + private final UnaryCallable lookupCallable; + private final UnaryCallable runQueryCallable; + private final UnaryCallable + runAggregationQueryCallable; + private final UnaryCallable + beginTransactionCallable; + private final UnaryCallable commitCallable; + private final UnaryCallable rollbackCallable; + private final UnaryCallable allocateIdsCallable; + private final UnaryCallable reserveIdsCallable; + + private final BackgroundResource backgroundResources; + private final HttpJsonStubCallableFactory callableFactory; + + private static final PathTemplate LOOKUP_0_PATH_TEMPLATE = PathTemplate.create("{project_id=**}"); + private static final PathTemplate LOOKUP_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate RUN_QUERY_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate RUN_QUERY_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate RUN_AGGREGATION_QUERY_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate RUN_AGGREGATION_QUERY_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate BEGIN_TRANSACTION_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate BEGIN_TRANSACTION_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate COMMIT_0_PATH_TEMPLATE = PathTemplate.create("{project_id=**}"); + private static final PathTemplate COMMIT_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate ROLLBACK_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate ROLLBACK_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate ALLOCATE_IDS_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate ALLOCATE_IDS_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + private static final PathTemplate RESERVE_IDS_0_PATH_TEMPLATE = + PathTemplate.create("{project_id=**}"); + private static final PathTemplate RESERVE_IDS_1_PATH_TEMPLATE = + PathTemplate.create("{database_id=**}"); + + public static final HttpJsonDatastoreStub create(DatastoreStubSettings settings) + throws IOException { + return new HttpJsonDatastoreStub(settings, ClientContext.create(settings)); + } + + public static final HttpJsonDatastoreStub create(ClientContext clientContext) throws IOException { + return new HttpJsonDatastoreStub( + DatastoreStubSettings.newHttpJsonBuilder().build(), clientContext); + } + + public static final HttpJsonDatastoreStub create( + ClientContext clientContext, HttpJsonStubCallableFactory callableFactory) throws IOException { + return new HttpJsonDatastoreStub( + DatastoreStubSettings.newHttpJsonBuilder().build(), clientContext, callableFactory); + } + + /** + * Constructs an instance of HttpJsonDatastoreStub, using the given settings. This is protected so + * that it is easy to make a subclass, but otherwise, the static factory methods should be + * preferred. + */ + protected HttpJsonDatastoreStub(DatastoreStubSettings settings, ClientContext clientContext) + throws IOException { + this(settings, clientContext, new HttpJsonDatastoreCallableFactory()); + } + + /** + * Constructs an instance of HttpJsonDatastoreStub, using the given settings. This is protected so + * that it is easy to make a subclass, but otherwise, the static factory methods should be + * preferred. + */ + protected HttpJsonDatastoreStub( + DatastoreStubSettings settings, + ClientContext clientContext, + HttpJsonStubCallableFactory callableFactory) + throws IOException { + this.callableFactory = callableFactory; + + HttpJsonCallSettings lookupTransportSettings = + HttpJsonCallSettings.newBuilder() + .setMethodDescriptor(lookupMethodDescriptor) + .setTypeRegistry(typeRegistry) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", LOOKUP_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", LOOKUP_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + HttpJsonCallSettings runQueryTransportSettings = + HttpJsonCallSettings.newBuilder() + .setMethodDescriptor(runQueryMethodDescriptor) + .setTypeRegistry(typeRegistry) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", RUN_QUERY_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", RUN_QUERY_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + HttpJsonCallSettings + runAggregationQueryTransportSettings = + HttpJsonCallSettings + .newBuilder() + .setMethodDescriptor(runAggregationQueryMethodDescriptor) + .setTypeRegistry(typeRegistry) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add( + request.getProjectId(), + "project_id", + RUN_AGGREGATION_QUERY_0_PATH_TEMPLATE); + builder.add( + request.getDatabaseId(), + "database_id", + RUN_AGGREGATION_QUERY_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + HttpJsonCallSettings + beginTransactionTransportSettings = + HttpJsonCallSettings.newBuilder() + .setMethodDescriptor(beginTransactionMethodDescriptor) + .setTypeRegistry(typeRegistry) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add( + request.getProjectId(), "project_id", BEGIN_TRANSACTION_0_PATH_TEMPLATE); + builder.add( + request.getDatabaseId(), + "database_id", + BEGIN_TRANSACTION_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + HttpJsonCallSettings commitTransportSettings = + HttpJsonCallSettings.newBuilder() + .setMethodDescriptor(commitMethodDescriptor) + .setTypeRegistry(typeRegistry) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", COMMIT_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", COMMIT_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + HttpJsonCallSettings rollbackTransportSettings = + HttpJsonCallSettings.newBuilder() + .setMethodDescriptor(rollbackMethodDescriptor) + .setTypeRegistry(typeRegistry) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", ROLLBACK_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", ROLLBACK_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + HttpJsonCallSettings allocateIdsTransportSettings = + HttpJsonCallSettings.newBuilder() + .setMethodDescriptor(allocateIdsMethodDescriptor) + .setTypeRegistry(typeRegistry) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", ALLOCATE_IDS_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", ALLOCATE_IDS_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + HttpJsonCallSettings reserveIdsTransportSettings = + HttpJsonCallSettings.newBuilder() + .setMethodDescriptor(reserveIdsMethodDescriptor) + .setTypeRegistry(typeRegistry) + .setParamsExtractor( + request -> { + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getProjectId(), "project_id", RESERVE_IDS_0_PATH_TEMPLATE); + builder.add(request.getDatabaseId(), "database_id", RESERVE_IDS_1_PATH_TEMPLATE); + return builder.build(); + }) + .build(); + + this.lookupCallable = + callableFactory.createUnaryCallable( + lookupTransportSettings, settings.lookupSettings(), clientContext); + this.runQueryCallable = + callableFactory.createUnaryCallable( + runQueryTransportSettings, settings.runQuerySettings(), clientContext); + this.runAggregationQueryCallable = + callableFactory.createUnaryCallable( + runAggregationQueryTransportSettings, + settings.runAggregationQuerySettings(), + clientContext); + this.beginTransactionCallable = + callableFactory.createUnaryCallable( + beginTransactionTransportSettings, settings.beginTransactionSettings(), clientContext); + this.commitCallable = + callableFactory.createUnaryCallable( + commitTransportSettings, settings.commitSettings(), clientContext); + this.rollbackCallable = + callableFactory.createUnaryCallable( + rollbackTransportSettings, settings.rollbackSettings(), clientContext); + this.allocateIdsCallable = + callableFactory.createUnaryCallable( + allocateIdsTransportSettings, settings.allocateIdsSettings(), clientContext); + this.reserveIdsCallable = + callableFactory.createUnaryCallable( + reserveIdsTransportSettings, settings.reserveIdsSettings(), clientContext); + + this.backgroundResources = + new BackgroundResourceAggregation(clientContext.getBackgroundResources()); + } + + @InternalApi + public static List getMethodDescriptors() { + List methodDescriptors = new ArrayList<>(); + methodDescriptors.add(lookupMethodDescriptor); + methodDescriptors.add(runQueryMethodDescriptor); + methodDescriptors.add(runAggregationQueryMethodDescriptor); + methodDescriptors.add(beginTransactionMethodDescriptor); + methodDescriptors.add(commitMethodDescriptor); + methodDescriptors.add(rollbackMethodDescriptor); + methodDescriptors.add(allocateIdsMethodDescriptor); + methodDescriptors.add(reserveIdsMethodDescriptor); + return methodDescriptors; + } + + @Override + public UnaryCallable lookupCallable() { + return lookupCallable; + } + + @Override + public UnaryCallable runQueryCallable() { + return runQueryCallable; + } + + @Override + public UnaryCallable + runAggregationQueryCallable() { + return runAggregationQueryCallable; + } + + @Override + public UnaryCallable + beginTransactionCallable() { + return beginTransactionCallable; + } + + @Override + public UnaryCallable commitCallable() { + return commitCallable; + } + + @Override + public UnaryCallable rollbackCallable() { + return rollbackCallable; + } + + @Override + public UnaryCallable allocateIdsCallable() { + return allocateIdsCallable; + } + + @Override + public UnaryCallable reserveIdsCallable() { + return reserveIdsCallable; + } + + @Override + public final void close() { + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } + } + + @Override + public void shutdown() { + backgroundResources.shutdown(); + } + + @Override + public boolean isShutdown() { + return backgroundResources.isShutdown(); + } + + @Override + public boolean isTerminated() { + return backgroundResources.isTerminated(); + } + + @Override + public void shutdownNow() { + backgroundResources.shutdownNow(); + } + + @Override + public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException { + return backgroundResources.awaitTermination(duration, unit); + } +} diff --git a/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.v1/reflect-config.json b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.v1/reflect-config.json new file mode 100644 index 000000000..475f7690c --- /dev/null +++ b/google-cloud-datastore/src/main/resources/META-INF/native-image/com.google.cloud.datastore.v1/reflect-config.json @@ -0,0 +1,2522 @@ +[ + { + "name": "com.google.api.ClientLibraryDestination", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.ClientLibraryOrganization", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.ClientLibrarySettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.ClientLibrarySettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.CommonLanguageSettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.CommonLanguageSettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.CppSettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.CppSettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.CustomHttpPattern", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.CustomHttpPattern$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.DotnetSettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.DotnetSettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.FieldBehavior", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.GoSettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.GoSettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.Http", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.Http$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.HttpRule", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.HttpRule$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.JavaSettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.JavaSettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.LaunchStage", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.MethodSettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.MethodSettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.MethodSettings$LongRunning", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.MethodSettings$LongRunning$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.NodeSettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.NodeSettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.PhpSettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.PhpSettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.Publishing", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.Publishing$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.PythonSettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.PythonSettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.PythonSettings$ExperimentalFeatures", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.PythonSettings$ExperimentalFeatures$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.ResourceDescriptor", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.ResourceDescriptor$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.ResourceDescriptor$History", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.ResourceDescriptor$Style", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.ResourceReference", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.ResourceReference$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.RoutingParameter", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.RoutingParameter$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.RoutingRule", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.RoutingRule$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.RubySettings", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.RubySettings$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.SelectiveGapicGeneration", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.api.SelectiveGapicGeneration$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationQuery", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationQuery$Aggregation", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Avg", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Avg$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Count", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Count$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Sum", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationQuery$Aggregation$Sum$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationQuery$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationResult", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationResult$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationResultBatch", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AggregationResultBatch$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AllocateIdsRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AllocateIdsRequest$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AllocateIdsResponse", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.AllocateIdsResponse$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ArrayValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ArrayValue$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.BeginTransactionRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.BeginTransactionRequest$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.BeginTransactionResponse", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.BeginTransactionResponse$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.CommitRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.CommitRequest$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.CommitRequest$Mode", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.CommitResponse", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.CommitResponse$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.CompositeFilter", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.CompositeFilter$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.CompositeFilter$Operator", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Entity", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Entity$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.EntityResult", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.EntityResult$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.EntityResult$ResultType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ExecutionStats", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ExecutionStats$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ExplainMetrics", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ExplainMetrics$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ExplainOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ExplainOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Filter", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Filter$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.FindNearest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.FindNearest$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.FindNearest$DistanceMeasure", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.GqlQuery", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.GqlQuery$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.GqlQueryParameter", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.GqlQueryParameter$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Key", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Key$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Key$PathElement", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Key$PathElement$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.KindExpression", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.KindExpression$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.LookupRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.LookupRequest$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.LookupResponse", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.LookupResponse$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Mutation", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Mutation$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Mutation$ConflictResolutionStrategy", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.MutationResult", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.MutationResult$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PartitionId", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PartitionId$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PlanSummary", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PlanSummary$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Projection", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Projection$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyFilter", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyFilter$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyFilter$Operator", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyMask", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyMask$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyOrder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyOrder$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyOrder$Direction", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyReference", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyReference$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyTransform", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyTransform$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.PropertyTransform$ServerValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Query", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Query$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.QueryResultBatch", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.QueryResultBatch$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.QueryResultBatch$MoreResultsType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ReadOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ReadOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ReadOptions$ReadConsistency", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ReserveIdsRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ReserveIdsRequest$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ReserveIdsResponse", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.ReserveIdsResponse$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RollbackRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RollbackRequest$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RollbackResponse", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RollbackResponse$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RunAggregationQueryRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RunAggregationQueryRequest$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RunAggregationQueryResponse", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RunAggregationQueryResponse$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RunQueryRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RunQueryRequest$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RunQueryResponse", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.RunQueryResponse$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.TransactionOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.TransactionOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.TransactionOptions$ReadOnly", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.TransactionOptions$ReadOnly$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.TransactionOptions$ReadWrite", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.TransactionOptions$ReadWrite$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Value", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.datastore.v1.Value$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.BoolValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.BoolValue$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.BytesValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.BytesValue$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$DescriptorProto", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$DescriptorProto$ReservedRange$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$Edition", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto$EnumReservedRange$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$EnumOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$EnumOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$EnumValueOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$EnumValueOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Declaration", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Declaration$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$VerificationState", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSet", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Utf8Validation", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Label", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldOptions$CType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldOptions$OptionRetention", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FieldOptions$OptionTargetType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FileDescriptorProto", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FileDescriptorProto$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FileDescriptorSet", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FileDescriptorSet$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FileOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FileOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Annotation", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Annotation$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Annotation$Semantic", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$MessageOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$MessageOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$MethodDescriptorProto", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$MethodDescriptorProto$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$MethodOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$MethodOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$MethodOptions$IdempotencyLevel", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$OneofDescriptorProto", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$OneofDescriptorProto$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$OneofOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$OneofOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$ServiceDescriptorProto", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$ServiceDescriptorProto$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$ServiceOptions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$ServiceOptions$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DoubleValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.DoubleValue$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Duration", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Duration$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.FloatValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.FloatValue$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Int32Value", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Int32Value$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Int64Value", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Int64Value$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.ListValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.ListValue$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.NullValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.StringValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.StringValue$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Struct", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Struct$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Timestamp", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Timestamp$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.UInt32Value", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.UInt32Value$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.UInt64Value", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.UInt64Value$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Value", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.protobuf.Value$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.type.LatLng", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.type.LatLng$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + } +] \ No newline at end of file diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AbstractDatastoreTest.java similarity index 98% rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java rename to google-cloud-datastore/src/test/java/com/google/cloud/datastore/AbstractDatastoreTest.java index ca84ab35a..9d4ecac57 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AbstractDatastoreTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -67,8 +67,6 @@ import com.google.datastore.v1.RunQueryResponse; import com.google.datastore.v1.TransactionOptions; import com.google.protobuf.ByteString; -import java.io.IOException; -import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -78,23 +76,20 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.TimeoutException; import java.util.function.Predicate; import org.easymock.EasyMock; -import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @RunWith(JUnit4.class) -public class DatastoreTest { +public abstract class AbstractDatastoreTest { - private static LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0); - private static final DatastoreOptions options = helper.getOptions(); - private static final Datastore datastore = options.getService(); + private static final LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0, 9090); + protected static DatastoreOptions options = helper.getOptions(); + protected static Datastore datastore; private static final String PROJECT_ID = options.getProjectId(); private static final String KIND1 = "kind1"; private static final String KIND2 = "kind2"; @@ -167,9 +162,9 @@ public class DatastoreTest { private DatastoreRpcFactory rpcFactoryMock; private DatastoreRpc rpcMock; - @BeforeClass - public static void beforeClass() throws IOException, InterruptedException { - helper.start(); + public AbstractDatastoreTest(DatastoreOptions options, Datastore datastore) { + this.options = options; + this.datastore = datastore; } @Before @@ -190,11 +185,6 @@ public void setUp() { datastore.add(ENTITY1, ENTITY2); } - @AfterClass - public static void afterClass() throws IOException, InterruptedException, TimeoutException { - helper.stopDuration(Duration.ofMinutes(1)); - } - @Test public void testGetOptions() { assertSame(options, datastore.getOptions()); @@ -649,6 +639,7 @@ private List buildResponsesForQueryPagination() { List responses = new ArrayList<>(); RecordQuery query = Query.newKeyQueryBuilder().build(); RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder(); + requestPb.setProjectId(PROJECT_ID); query.populatePb(requestPb); QueryResultBatch queryResultBatchPb = RunQueryResponse.newBuilder() @@ -758,6 +749,7 @@ private List buildResponsesForQueryPaginationWithLimit() { List responses = new ArrayList<>(); RecordQuery query = Query.newEntityQueryBuilder().build(); RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder(); + requestPb.setProjectId(PROJECT_ID); query.populatePb(requestPb); QueryResultBatch queryResultBatchPb = RunQueryResponse.newBuilder() diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java index 12b99c966..8c52b5519 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java @@ -97,7 +97,7 @@ public void testTranslateAndThrow() { cause = new IllegalArgumentException("message"); exceptionMock = createMock(RetryHelper.RetryHelperException.class); expect(exceptionMock.getMessage()).andReturn("message").times(1); - expect(exceptionMock.getCause()).andReturn(cause).times(2); + expect(exceptionMock.getCause()).andReturn(cause).times(4); replay(exceptionMock); try { DatastoreException.translateAndThrow(exceptionMock); diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java index 85703f739..c6a26d05d 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,21 @@ package com.google.cloud.datastore; +import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import com.google.cloud.TransportOptions; +import com.google.api.gax.grpc.ChannelPoolSettings; +import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; +import com.google.cloud.NoCredentials; import com.google.cloud.datastore.spi.DatastoreRpcFactory; import com.google.cloud.datastore.spi.v1.DatastoreRpc; +import com.google.cloud.datastore.v1.DatastoreSettings; +import com.google.cloud.grpc.GrpcTransportOptions; +import com.google.cloud.http.HttpTransportOptions; +import com.google.datastore.v1.client.DatastoreFactory; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; @@ -48,7 +54,9 @@ public void setUp() { .setServiceRpcFactory(datastoreRpcFactory) .setProjectId(PROJECT_ID) .setDatabaseId(DATABASE_ID) + .setCredentials(NoCredentials.getInstance()) .setHost("http://localhost:" + PORT); + EasyMock.expect(datastoreRpcFactory.create(EasyMock.anyObject(DatastoreOptions.class))) .andReturn(datastoreRpc) .anyTimes(); @@ -95,12 +103,130 @@ public void testDatastore() { assertSame(datastoreRpc, options.build().getRpc()); } + @Test + public void testGrpcDefaultChannelConfigurations() { + DatastoreOptions datastoreOptions = + DatastoreOptions.newBuilder() + .setServiceRpcFactory(datastoreRpcFactory) + .setProjectId(PROJECT_ID) + .setDatabaseId(DATABASE_ID) + .setTransportOptions(GrpcTransportOptions.newBuilder().build()) + .setCredentials(NoCredentials.getInstance()) + .setHost("http://localhost:" + PORT) + .build(); + ChannelPoolSettings channelPoolSettings = + ((InstantiatingGrpcChannelProvider) datastoreOptions.getTransportChannelProvider()) + .getChannelPoolSettings(); + assertEquals(channelPoolSettings.getInitialChannelCount(), DatastoreOptions.INIT_CHANNEL_COUNT); + assertEquals(channelPoolSettings.getMinChannelCount(), DatastoreOptions.MIN_CHANNEL_COUNT); + assertEquals(channelPoolSettings.getMaxChannelCount(), DatastoreOptions.MAX_CHANNEL_COUNT); + } + + @Test + public void testCustomChannelAndCredentials() { + InstantiatingGrpcChannelProvider channelProvider = + DatastoreSettings.defaultGrpcTransportProviderBuilder() + .setChannelPoolSettings( + ChannelPoolSettings.builder() + .setInitialChannelCount(10) + .setMaxChannelCount(20) + .build()) + .build(); + DatastoreOptions datastoreOptions = + DatastoreOptions.newBuilder() + .setServiceRpcFactory(datastoreRpcFactory) + .setProjectId(PROJECT_ID) + .setDatabaseId(DATABASE_ID) + .setTransportOptions(GrpcTransportOptions.newBuilder().build()) + .setChannelProvider(channelProvider) + .setCredentials(NoCredentials.getInstance()) + .setHost("http://localhost:" + PORT) + .build(); + assertEquals(datastoreOptions.getTransportChannelProvider(), channelProvider); + } + + @Test + public void testInvalidConfigForHttp() { + DatastoreOptions.Builder options = + DatastoreOptions.newBuilder() + .setServiceRpcFactory(datastoreRpcFactory) + .setProjectId(PROJECT_ID) + .setDatabaseId(DATABASE_ID) + .setTransportOptions(HttpTransportOptions.newBuilder().build()) + .setChannelProvider( + DatastoreSettings.defaultGrpcTransportProviderBuilder() + .setChannelPoolSettings( + ChannelPoolSettings.builder() + .setInitialChannelCount(10) + .setMaxChannelCount(20) + .build()) + .build()) + .setCredentials(NoCredentials.getInstance()) + .setHost("http://localhost:" + PORT); + Assert.assertThrows(IllegalArgumentException.class, options::build); + } + + @Test + public void testTransport() { + // default http transport + assertThat(options.build().getTransportOptions()).isInstanceOf(HttpTransportOptions.class); + + // custom grpc transport + DatastoreOptions grpcTransportOptions = + DatastoreOptions.newBuilder() + .setTransportOptions(GrpcTransportOptions.newBuilder().build()) + .setProjectId(PROJECT_ID) + .setCredentials(NoCredentials.getInstance()) + .build(); + assertThat(grpcTransportOptions.getTransportOptions()).isInstanceOf(GrpcTransportOptions.class); + assertThat(grpcTransportOptions.getTransportChannelProvider()) + .isInstanceOf(InstantiatingGrpcChannelProvider.class); + } + + @Test + public void testHostWithGrpcAndHttp() { + DatastoreOptions grpcTransportOptions = + DatastoreOptions.newBuilder() + .setTransportOptions(GrpcTransportOptions.newBuilder().build()) + .setProjectId(PROJECT_ID) + .setCredentials(NoCredentials.getInstance()) + .build(); + assertThat(grpcTransportOptions.getHost()).isEqualTo(DatastoreSettings.getDefaultEndpoint()); + assertThat(grpcTransportOptions.getHost()).isEqualTo("datastore.googleapis.com:443"); + + String customHost = "http://localhost:" + PORT; + DatastoreOptions grpcTransportOptionsCustomHost = + DatastoreOptions.newBuilder() + .setTransportOptions(GrpcTransportOptions.newBuilder().build()) + .setHost(customHost) + .setProjectId(PROJECT_ID) + .setCredentials(NoCredentials.getInstance()) + .build(); + assertThat(grpcTransportOptionsCustomHost.getHost()).isEqualTo(customHost); + + DatastoreOptions httpTransportOptions = + DatastoreOptions.newBuilder() + .setProjectId(PROJECT_ID) + .setCredentials(NoCredentials.getInstance()) + .build(); + assertThat(httpTransportOptions.getHost()).isEqualTo(DatastoreFactory.DEFAULT_HOST); + + DatastoreOptions httpTransportOptionsCustomHost = + DatastoreOptions.newBuilder() + .setHost(customHost) + .setProjectId(PROJECT_ID) + .setCredentials(NoCredentials.getInstance()) + .build(); + assertThat(httpTransportOptionsCustomHost.getHost()).isEqualTo(customHost); + } + @Test public void testToBuilder() { DatastoreOptions original = options.setNamespace("ns1").build(); DatastoreOptions copy = original.toBuilder().build(); assertEquals(original.getProjectId(), copy.getProjectId()); assertEquals(original.getNamespace(), copy.getNamespace()); + assertEquals(original.getDatabaseId(), copy.getDatabaseId()); assertEquals(original.getHost(), copy.getHost()); assertEquals(original.getRetrySettings(), copy.getRetrySettings()); assertEquals(original.getCredentials(), copy.getCredentials()); @@ -111,15 +237,4 @@ public void testToBuilder() { assertNotEquals(original, newOptions); assertNotEquals(original.hashCode(), newOptions.hashCode()); } - - @Test - public void testInvalidTransport() { - try { - DatastoreOptions.newBuilder() - .setTransportOptions(EasyMock.createMock(TransportOptions.class)); - Assert.fail(); - } catch (IllegalArgumentException ex) { - assertNotNull(ex.getMessage()); - } - } } diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java new file mode 100644 index 000000000..cb242f2af --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java @@ -0,0 +1,61 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore; + +import com.google.cloud.datastore.testing.LocalDatastoreHelper; +import com.google.cloud.grpc.GrpcTransportOptions; +import com.google.common.truth.Truth; +import java.io.IOException; +import java.time.Duration; +import java.util.Arrays; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +@RunWith(Parameterized.class) +public class DatastoreTestGrpc extends AbstractDatastoreTest { + + private static final LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0, 9090); + + private static DatastoreOptions options = + helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build()); + private static Datastore datastore = options.getService(); + + public DatastoreTestGrpc(DatastoreOptions options, Datastore datastore) { + super(options, datastore); + } + + @Parameterized.Parameters(name = "data options: {0}") + public static Iterable data() { + return Arrays.asList(new Object[][] {{options, datastore}}); + } + + @BeforeClass + public static void beforeClass() throws IOException, InterruptedException { + helper.start(); + options = helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build()); + datastore = options.getService(); + } + + @AfterClass + public static void afterClass() throws Exception { + datastore.close(); + Truth.assertThat(datastore.isClosed()).isTrue(); + helper.stopDuration(Duration.ofMinutes(1)); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java new file mode 100644 index 000000000..a73cae8e4 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java @@ -0,0 +1,57 @@ +/* + * Copyright 2015 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore; + +import com.google.cloud.datastore.testing.LocalDatastoreHelper; +import com.google.cloud.grpc.GrpcTransportOptions; +import java.io.IOException; +import java.time.Duration; +import java.util.Arrays; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +@RunWith(Parameterized.class) +public class DatastoreTestHttp extends AbstractDatastoreTest { + + private static final LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0, 9090); + + private static DatastoreOptions options = helper.getOptions(); + private static Datastore datastore = options.getService(); + + public DatastoreTestHttp(DatastoreOptions options, Datastore datastore) { + super(options, datastore); + } + + @Parameterized.Parameters(name = "data options: {0}") + public static Iterable data() { + return Arrays.asList(new Object[][] {{options, datastore}}); + } + + @BeforeClass + public static void beforeClass() throws IOException, InterruptedException { + helper.start(); + options = helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build()); + datastore = options.getService(); + } + + @AfterClass + public static void afterClass() throws Exception { + helper.stopDuration(Duration.ofMinutes(1)); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java new file mode 100644 index 000000000..74d7e9d28 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreUtilsTest.java @@ -0,0 +1,43 @@ +/* + * Copyright 2023 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore; + +import static com.google.cloud.datastore.DatastoreUtils.isLocalHost; +import static com.google.cloud.datastore.DatastoreUtils.removeScheme; +import static com.google.common.truth.Truth.assertThat; + +import org.junit.Test; + +public class DatastoreUtilsTest { + + @Test + public void testIsLocalHost() { + assertThat(isLocalHost(null)).isFalse(); + assertThat(isLocalHost("")).isFalse(); + assertThat(isLocalHost("http://localhost:9090")).isTrue(); + assertThat(isLocalHost("https://localhost:9090")).isTrue(); + assertThat(isLocalHost("10.10.10.10:9090")).isFalse(); + } + + @Test + public void testRemoveScheme() { + assertThat(removeScheme("http://localhost:9090")).isEqualTo("localhost:9090"); + assertThat(removeScheme("https://localhost:9090")).isEqualTo("localhost:9090"); + assertThat(removeScheme("https://localhost:9090")).isEqualTo("localhost:9090"); + assertThat(removeScheme("Https://localhost:9090")).isEqualTo("localhost:9090"); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java new file mode 100644 index 000000000..3f297989f --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/GrpcToDatastoreCodeTranslationTest.java @@ -0,0 +1,53 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.datastore; + +import static com.google.common.truth.Truth.assertThat; + +import io.grpc.Status.Code; +import java.util.EnumMap; +import org.junit.Test; + +public class GrpcToDatastoreCodeTranslationTest { + @Test + public void grpcCodeToDatastoreCode_expectedMapping() { + EnumMap expected = new EnumMap<>(Code.class); + expected.put(Code.OK, com.google.rpc.Code.OK.getNumber()); + expected.put(Code.INVALID_ARGUMENT, com.google.rpc.Code.INVALID_ARGUMENT.getNumber()); + expected.put(Code.OUT_OF_RANGE, com.google.rpc.Code.OUT_OF_RANGE.getNumber()); + expected.put(Code.UNAUTHENTICATED, com.google.rpc.Code.UNAUTHENTICATED.getNumber()); + expected.put(Code.PERMISSION_DENIED, com.google.rpc.Code.PERMISSION_DENIED.getNumber()); + expected.put(Code.NOT_FOUND, com.google.rpc.Code.NOT_FOUND.getNumber()); + expected.put(Code.FAILED_PRECONDITION, com.google.rpc.Code.FAILED_PRECONDITION.getNumber()); + expected.put(Code.ALREADY_EXISTS, com.google.rpc.Code.ALREADY_EXISTS.getNumber()); + expected.put(Code.RESOURCE_EXHAUSTED, com.google.rpc.Code.RESOURCE_EXHAUSTED.getNumber()); + expected.put(Code.INTERNAL, com.google.rpc.Code.INTERNAL.getNumber()); + expected.put(Code.UNIMPLEMENTED, com.google.rpc.Code.UNIMPLEMENTED.getNumber()); + expected.put(Code.UNAVAILABLE, com.google.rpc.Code.UNAVAILABLE.getNumber()); + expected.put(Code.ABORTED, com.google.rpc.Code.ABORTED.getNumber()); + expected.put(Code.CANCELLED, com.google.rpc.Code.CANCELLED.getNumber()); + expected.put(Code.UNKNOWN, com.google.rpc.Code.UNKNOWN.getNumber()); + expected.put(Code.DEADLINE_EXCEEDED, com.google.rpc.Code.DEADLINE_EXCEEDED.getNumber()); + expected.put(Code.DATA_LOSS, com.google.rpc.Code.DATA_LOSS.getNumber()); + + EnumMap actual = new EnumMap<>(Code.class); + for (Code c : Code.values()) { + actual.put(c, GrpcToDatastoreCodeTranslation.grpcCodeToDatastoreStatusCode(c)); + } + + assertThat(actual).isEqualTo(expected); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/AbstractITDatastoreTest.java similarity index 96% rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java rename to google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/AbstractITDatastoreTest.java index bf0c20dce..53a858cae 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/AbstractITDatastoreTest.java @@ -16,6 +16,11 @@ package com.google.cloud.datastore.it; +import static com.google.api.gax.rpc.StatusCode.Code.ALREADY_EXISTS; +import static com.google.api.gax.rpc.StatusCode.Code.DEADLINE_EXCEEDED; +import static com.google.api.gax.rpc.StatusCode.Code.FAILED_PRECONDITION; +import static com.google.api.gax.rpc.StatusCode.Code.INVALID_ARGUMENT; +import static com.google.api.gax.rpc.StatusCode.Code.NOT_FOUND; import static com.google.cloud.datastore.aggregation.Aggregation.avg; import static com.google.cloud.datastore.aggregation.Aggregation.count; import static com.google.cloud.datastore.aggregation.Aggregation.sum; @@ -27,8 +32,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import com.google.cloud.Timestamp; import com.google.cloud.Tuple; @@ -74,7 +79,6 @@ import com.google.cloud.datastore.models.ExplainMetrics; import com.google.cloud.datastore.models.ExplainOptions; import com.google.cloud.datastore.models.PlanSummary; -import com.google.cloud.datastore.testing.RemoteDatastoreHelper; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Range; @@ -83,7 +87,6 @@ import com.google.datastore.v1.TransactionOptions.ReadOnly; import java.time.Duration; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; @@ -97,7 +100,6 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -106,19 +108,11 @@ import org.junit.runners.Parameterized; @RunWith(Parameterized.class) -public class ITDatastoreTest { +public abstract class AbstractITDatastoreTest { + protected static final String CUSTOM_DB_ID = "test-db"; - private static final RemoteDatastoreHelper HELPER = RemoteDatastoreHelper.create(); - private static final DatastoreOptions OPTIONS_1 = HELPER.getOptions(); - private static final Datastore DATASTORE_1 = OPTIONS_1.getService(); - - private static final String CUSTOM_DB_ID = "test-db"; - private static final RemoteDatastoreHelper HELPER2 = RemoteDatastoreHelper.create(CUSTOM_DB_ID); - private static final DatastoreOptions OPTIONS_2 = HELPER2.getOptions(); - private static final Datastore DATASTORE_2 = OPTIONS_2.getService(); - - private final DatastoreOptions options; - private final Datastore datastore; + protected DatastoreOptions options; + protected Datastore datastore; private static String PROJECT_ID; private static String NAMESPACE; @@ -161,12 +155,21 @@ public class ITDatastoreTest { @Rule public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3); - @AfterClass - public static void afterClass() { - HELPER.deleteNamespace(); + @Before + public void setUp() { + datastore.put(ENTITY1, ENTITY2); } - public ITDatastoreTest( + @After + public void tearDown() { + EntityQuery allEntitiesQuery = Query.newEntityQueryBuilder().build(); + QueryResults allEntities = datastore.run(allEntitiesQuery); + Key[] keysToDelete = + ImmutableList.copyOf(allEntities).stream().map(Entity::getKey).toArray(Key[]::new); + datastore.delete(keysToDelete); + } + + public AbstractITDatastoreTest( DatastoreOptions options, Datastore datastore, // databaseType is unused as a variable, but used as a parameterized label when running tests @@ -272,26 +275,6 @@ public ITDatastoreTest( .build(); } - @Before - public void setUp() { - datastore.put(ENTITY1, ENTITY2); - } - - @After - public void tearDown() { - EntityQuery allEntitiesQuery = Query.newEntityQueryBuilder().build(); - QueryResults allEntities = datastore.run(allEntitiesQuery); - Key[] keysToDelete = - ImmutableList.copyOf(allEntities).stream().map(Entity::getKey).toArray(Key[]::new); - datastore.delete(keysToDelete); - } - - @Parameterized.Parameters(name = "database: {2}") - public static Iterable data() { - return Arrays.asList( - new Object[][] {{OPTIONS_1, DATASTORE_1, "default"}, {OPTIONS_2, DATASTORE_2, "test-db"}}); - } - private Iterator getStronglyConsistentResults(Query scQuery, Query query) throws InterruptedException { // scQuery is equivalent to query, but with an ancestor filter in it @@ -496,19 +479,11 @@ public void testNewTransactionCommit() { assertEquals(ENTITY3, list.get(2)); assertEquals(3, list.size()); - try { - transaction.commit(); - fail("Expecting a failure"); - } catch (DatastoreException expected) { - assertDatastoreException(expected, "FAILED_PRECONDITION", 0); - } + DatastoreException expected = assertThrows(DatastoreException.class, transaction::commit); + assertDatastoreException(expected, FAILED_PRECONDITION.name(), 0); - try { - transaction.rollback(); - fail("Expecting a failure"); - } catch (DatastoreException expected) { - assertDatastoreException(expected, "FAILED_PRECONDITION", 0); - } + DatastoreException expected2 = assertThrows(DatastoreException.class, transaction::rollback); + assertDatastoreException(expected2, FAILED_PRECONDITION.name(), 0); } @Test @@ -699,12 +674,8 @@ public void testNewTransactionRollback() { transaction.rollback(); transaction.rollback(); // should be safe to repeat rollback calls - try { - transaction.commit(); - fail("Expecting a failure"); - } catch (DatastoreException expected) { - assertDatastoreException(expected, "FAILED_PRECONDITION", 0); - } + DatastoreException expected = assertThrows(DatastoreException.class, transaction::commit); + assertDatastoreException(expected, FAILED_PRECONDITION.name(), 0); List list = datastore.fetch(KEY1, KEY2, KEY3); assertEquals(ENTITY1, list.get(0)); @@ -751,12 +722,8 @@ public void testNewBatch() { assertEquals(PARTIAL_ENTITY3.getNames(), datastore.get(generatedKeys.get(0)).getNames()); assertEquals(PARTIAL_ENTITY3.getKey(), IncompleteKey.newBuilder(generatedKeys.get(0)).build()); - try { - batch.submit(); - fail("Expecting a failure"); - } catch (DatastoreException expected) { - assertDatastoreException(expected, "FAILED_PRECONDITION", 0); - } + DatastoreException expected = assertThrows(DatastoreException.class, batch::submit); + assertDatastoreException(expected, FAILED_PRECONDITION.name(), 0); batch = datastore.newBatch(); batch.delete(entity4.getKey(), entity5.getKey(), entity6.getKey()); @@ -1857,12 +1824,11 @@ public void testGetArrayNoDeferredResults() { assertEquals(EMPTY_LIST_VALUE, entity3.getValue("emptyList")); assertEquals(8, entity3.getNames().size()); assertFalse(entity3.contains("bla")); - try { - entity3.getString("str"); - fail("Expecting a failure"); - } catch (DatastoreException expected) { - assertDatastoreException(expected, "FAILED_PRECONDITION", 0); - } + + DatastoreException expected = + assertThrows(DatastoreException.class, () -> entity3.getString("str")); + assertDatastoreException(expected, FAILED_PRECONDITION.name(), 0); + assertFalse(result.hasNext()); datastore.delete(ENTITY3.getKey()); } @@ -1874,12 +1840,9 @@ public void testAddEntity() { assertNull(keys.get(1)); assertEquals(2, keys.size()); - try { - datastore.add(ENTITY1); - fail("Expecting a failure"); - } catch (DatastoreException expected) { - assertDatastoreException(expected, "ALREADY_EXISTS", 6); - } + DatastoreException expected = + assertThrows(DatastoreException.class, () -> datastore.add(ENTITY1)); + assertDatastoreException(expected, ALREADY_EXISTS.name(), 6); List entities = datastore.add(ENTITY3, PARTIAL_ENTITY1, PARTIAL_ENTITY2); assertEquals(ENTITY3, datastore.get(ENTITY3.getKey())); @@ -1902,12 +1865,10 @@ public void testUpdate() { assertNull(keys.get(1)); assertEquals(2, keys.size()); - try { - datastore.update(ENTITY3); - fail("Expecting a failure"); - } catch (DatastoreException expected) { - assertDatastoreException(expected, "NOT_FOUND", 5); - } + DatastoreException expected = + assertThrows(DatastoreException.class, () -> datastore.update(ENTITY3)); + assertDatastoreException(expected, NOT_FOUND.name(), 5); + datastore.add(ENTITY3); assertEquals(ENTITY3, datastore.get(ENTITY3.getKey())); Entity entity3 = Entity.newBuilder(ENTITY3).clear().set("bla", new NullValue()).build(); @@ -1917,6 +1878,12 @@ public void testUpdate() { datastore.delete(ENTITY3.getKey()); } + private void assertDatastoreException( + DatastoreException expected, String reason, int datastoreStatusCode) { + Truth.assertThat(expected.getReason()).isEqualTo(reason); + Truth.assertThat(expected.getCode()).isEqualTo(datastoreStatusCode); + } + @Test public void testPut() { Entity updatedEntity = Entity.newBuilder(ENTITY1).set("new_property", 42L).build(); @@ -1993,12 +1960,9 @@ public Integer run(DatastoreReaderWriter transaction) { } }; - try { - datastore.runInTransaction(callable2); - fail("Expecting a failure"); - } catch (DatastoreException expected) { - assertDatastoreException((DatastoreException) expected.getCause(), "DEADLINE_EXCEEDED", 4); - } + DatastoreException expected = + assertThrows(DatastoreException.class, () -> datastore.runInTransaction(callable2)); + assertDatastoreException((DatastoreException) expected.getCause(), DEADLINE_EXCEEDED.name(), 4); } @Test @@ -2047,12 +2011,10 @@ public Integer run(DatastoreReaderWriter transaction) { .setReadOnly(TransactionOptions.ReadOnly.getDefaultInstance()) .build(); - try { - datastore.runInTransaction(callable2, readOnlyOptions); - fail("Expecting a failure"); - } catch (DatastoreException expected) { - assertDatastoreException((DatastoreException) expected.getCause(), "INVALID_ARGUMENT", 3); - } + DatastoreException expected = + assertThrows( + DatastoreException.class, () -> datastore.runInTransaction(callable2, readOnlyOptions)); + assertDatastoreException((DatastoreException) expected.getCause(), INVALID_ARGUMENT.name(), 3); } @Test @@ -2167,10 +2129,4 @@ public void testQueryWithReadTime() throws InterruptedException { datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey()); } } - - private void assertDatastoreException( - DatastoreException expected, String reason, int statusCode) { - assertEquals(reason, expected.getReason()); - assertEquals(statusCode, expected.getCode()); - } } diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java index 770065778..1d6b2f838 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreConceptsTest.java @@ -68,6 +68,7 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; /* @@ -77,7 +78,7 @@ public class ITDatastoreConceptsTest { private static final RemoteDatastoreHelper HELPER = RemoteDatastoreHelper.create(); private static final DatastoreOptions OPTIONS = HELPER.getOptions(); private static final FullEntity TEST_FULL_ENTITY = FullEntity.newBuilder().build(); - private Datastore datastore; + private static Datastore datastore; private KeyFactory keyFactory; private Key taskKey; private Entity testEntity; @@ -87,13 +88,15 @@ public class ITDatastoreConceptsTest { private static final String TASK_CONCEPTS = "TaskConcepts"; - /** - * Initializes Datastore and cleans out any residual values. Also initializes global variables - * used for testing. - */ + /** Initializes Datastore for testing. */ + @BeforeClass + public static void beforeClass() throws Exception { + datastore = OPTIONS.getService(); + } + + /** Cleans out any residual values. Also initializes global variables used for testing. */ @Before public void setUp() { - datastore = OPTIONS.getService(); StructuredQuery query = Query.newKeyQueryBuilder().build(); QueryResults result = datastore.run(query); datastore.delete(Iterators.toArray(result, Key.class)); diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java new file mode 100644 index 000000000..7bb809997 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestGrpc.java @@ -0,0 +1,64 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.datastore.it; + +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.testing.RemoteDatastoreHelper; +import com.google.cloud.grpc.GrpcTransportOptions; +import com.google.common.truth.Truth; +import java.util.Arrays; +import org.junit.AfterClass; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +@RunWith(Parameterized.class) +public class ITDatastoreTestGrpc extends AbstractITDatastoreTest { + // setup for default db, grpc transport + protected static final RemoteDatastoreHelper HELPER_DEFAULT_GRPC = + RemoteDatastoreHelper.create(GrpcTransportOptions.newBuilder().build()); + private static final DatastoreOptions OPTIONS_DEFAULT_GRPC = HELPER_DEFAULT_GRPC.getOptions(); + private static final Datastore DATASTORE_DEFAULT_GRPC = OPTIONS_DEFAULT_GRPC.getService(); + + // setup for custom db, grpc transport + private static final RemoteDatastoreHelper HELPER_CUSTOM_DB_GRPC = + RemoteDatastoreHelper.create(CUSTOM_DB_ID, GrpcTransportOptions.newBuilder().build()); + private static final DatastoreOptions OPTIONS_CUSTOM_DB_GRPC = HELPER_CUSTOM_DB_GRPC.getOptions(); + private static final Datastore DATASTORE_CUSTOM_DB_GRPC = OPTIONS_CUSTOM_DB_GRPC.getService(); + + public ITDatastoreTestGrpc(DatastoreOptions options, Datastore datastore, String databaseType) { + super(options, datastore, databaseType); + } + + @Parameterized.Parameters(name = "database: {2}") + public static Iterable data() { + return Arrays.asList( + new Object[][] { + {OPTIONS_DEFAULT_GRPC, DATASTORE_DEFAULT_GRPC, "default"}, + {OPTIONS_CUSTOM_DB_GRPC, DATASTORE_CUSTOM_DB_GRPC, CUSTOM_DB_ID}, + }); + } + + @AfterClass + public static void afterClass() throws Exception { + HELPER_DEFAULT_GRPC.deleteNamespace(); + HELPER_CUSTOM_DB_GRPC.deleteNamespace(); + DATASTORE_DEFAULT_GRPC.close(); + DATASTORE_CUSTOM_DB_GRPC.close(); + Truth.assertThat(DATASTORE_DEFAULT_GRPC.isClosed()).isTrue(); + Truth.assertThat(DATASTORE_CUSTOM_DB_GRPC.isClosed()).isTrue(); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java new file mode 100644 index 000000000..3546bfcaf --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTestHttp.java @@ -0,0 +1,58 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.datastore.it; + +import com.google.cloud.datastore.Datastore; +import com.google.cloud.datastore.DatastoreOptions; +import com.google.cloud.datastore.testing.RemoteDatastoreHelper; +import java.util.Arrays; +import org.junit.AfterClass; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +@RunWith(Parameterized.class) +public class ITDatastoreTestHttp extends AbstractITDatastoreTest { + // setup for default db, http transport + private static final RemoteDatastoreHelper HELPER_DEFAULT_HTTP = RemoteDatastoreHelper.create(); + + private static final DatastoreOptions OPTIONS_DEFAULT_HTTP = HELPER_DEFAULT_HTTP.getOptions(); + private static final Datastore DATASTORE_DEFAULT_HTTP = OPTIONS_DEFAULT_HTTP.getService(); + + // setup for custom db, http transport + private static final RemoteDatastoreHelper HELPER_CUSTOM_DB_HTTP = + RemoteDatastoreHelper.create(CUSTOM_DB_ID); + private static final DatastoreOptions OPTIONS_CUSTOM_DB_HTTP = HELPER_CUSTOM_DB_HTTP.getOptions(); + private static final Datastore DATASTORE_CUSTOM_DB_HTTP = OPTIONS_CUSTOM_DB_HTTP.getService(); + + public ITDatastoreTestHttp(DatastoreOptions options, Datastore datastore, String databaseType) { + super(options, datastore, databaseType); + } + + @Parameterized.Parameters(name = "database: {2}") + public static Iterable data() { + return Arrays.asList( + new Object[][] { + {OPTIONS_DEFAULT_HTTP, DATASTORE_DEFAULT_HTTP, "default"}, + {OPTIONS_CUSTOM_DB_HTTP, DATASTORE_CUSTOM_DB_HTTP, CUSTOM_DB_ID}, + }); + } + + @AfterClass + public static void afterClass() throws Exception { + HELPER_DEFAULT_HTTP.deleteNamespace(); + HELPER_CUSTOM_DB_HTTP.deleteNamespace(); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java index 8472f3131..ce9a226a6 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/MultipleAttemptsRule.java @@ -37,7 +37,7 @@ public final class MultipleAttemptsRule implements TestRule { this(attemptCount, 1000L); } - MultipleAttemptsRule(int attemptCount, long initialBackoffMillis) { + public MultipleAttemptsRule(int attemptCount, long initialBackoffMillis) { checkState(attemptCount > 0, "attemptCount must be > 0"); checkState(initialBackoffMillis > 0, "initialBackoffMillis must be > 0"); this.initialBackoffMillis = initialBackoffMillis; diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java index c8ded3d89..f2209be9c 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/StatementExecutor.java @@ -80,9 +80,10 @@ private boolean transactionConflict(Exception exception) { } return exception instanceof ExecutionException && exception.getCause().getClass() == DatastoreException.class - && exception - .getMessage() - .contains("contention"); // exception raise coz of optimistic concurrency + && (exception.getMessage().contains("contention") + || exception + .getMessage() + .contains("Conflict")); // exception raise coz of optimistic concurrency } interface Statement { diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java new file mode 100644 index 000000000..f81348257 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java @@ -0,0 +1,57 @@ +/* + * Copyright 2023 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.spi.v1; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.cloud.datastore.DatastoreOptions; +import java.time.Duration; +import org.junit.Test; + +public class RpcUtilsTest { + + @Test + public void testRetrySettingSetter() { + UnaryCallSettings.Builder builder = + UnaryCallSettings.newUnaryCallSettingsBuilder(); + + // datastoreOptions with default retry settings + DatastoreOptions datastoreOptions = + DatastoreOptions.newBuilder().setProjectId("project-id").build(); + RpcUtils.retrySettingSetter(datastoreOptions).apply(builder); + assertThat(builder.getRetrySettings()).isEqualTo(datastoreOptions.getRetrySettings()); + + // datastoreOptions with custom retry settings + RetrySettings customRetrySettings = + RetrySettings.newBuilder() + .setTotalTimeoutDuration(Duration.ofMinutes(2)) + .setInitialRpcTimeoutDuration(Duration.ofSeconds(5)) + .setMaxRpcTimeoutDuration(Duration.ofSeconds(10)) + .setRetryDelayMultiplier(1.5) + .setMaxAttempts(5) + .build(); + DatastoreOptions datastoreOptionsWithCustomRetrySettings = + DatastoreOptions.newBuilder() + .setProjectId("project-id") + .setRetrySettings(customRetrySettings) + .build(); + RpcUtils.retrySettingSetter(datastoreOptionsWithCustomRetrySettings).apply(builder); + assertThat(builder.getRetrySettings()).isEqualTo(customRetrySettings); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java index d5be6b9e6..3b07254d7 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package com.google.cloud.datastore.testing; +import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -23,12 +24,15 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; import com.google.cloud.NoCredentials; import com.google.cloud.datastore.Datastore; import com.google.cloud.datastore.DatastoreException; import com.google.cloud.datastore.DatastoreOptions; import com.google.cloud.datastore.Entity; import com.google.cloud.datastore.Key; +import com.google.cloud.grpc.GrpcTransportOptions; +import com.google.cloud.http.HttpTransportOptions; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -172,6 +176,23 @@ public void testOptions() { assertEquals(NAMESPACE, options.getNamespace()); } + @Test + public void testDefaultHttpTransportOptions() { + LocalDatastoreHelper helper = LocalDatastoreHelper.create(); + DatastoreOptions options = helper.getOptions(); + assertThat(options.getTransportOptions()).isInstanceOf(HttpTransportOptions.class); + } + + @Test + public void testSetGrpcTransportOptions() { + LocalDatastoreHelper helper = LocalDatastoreHelper.create(); + DatastoreOptions options = + helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build()); + assertThat(options.getTransportOptions()).isInstanceOf(GrpcTransportOptions.class); + assertThat(options.getTransportChannelProvider()) + .isInstanceOf(InstantiatingGrpcChannelProvider.class); + } + @Test public void testStartStopReset() throws IOException, InterruptedException, TimeoutException { try { diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java index cc30ace71..412af667a 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java @@ -18,6 +18,7 @@ import com.google.api.core.InternalApi; import com.google.api.gax.retrying.RetrySettings; +import com.google.cloud.TransportOptions; import com.google.cloud.datastore.Datastore; import com.google.cloud.datastore.DatastoreOpenTelemetryOptions; import com.google.cloud.datastore.DatastoreOptions; @@ -25,6 +26,7 @@ import com.google.cloud.datastore.Query; import com.google.cloud.datastore.QueryResults; import com.google.cloud.datastore.StructuredQuery; +import com.google.cloud.grpc.GrpcTransportOptions; import com.google.cloud.http.HttpTransportOptions; import io.opentelemetry.sdk.OpenTelemetrySdk; import java.time.Duration; @@ -77,21 +79,46 @@ public void deleteNamespace() { /** Creates a {@code RemoteStorageHelper} object. */ public static RemoteDatastoreHelper create() { - return create(""); + return create( + "", DatastoreOptions.getDefaultHttpTransportOptions(), /* openTelemetrySdk= */ null); + } + + public static RemoteDatastoreHelper create(String databaseId) { + return create( + databaseId, + DatastoreOptions.getDefaultHttpTransportOptions(), + /* openTelemetrySdk= */ null); + } + + public static RemoteDatastoreHelper create(TransportOptions transportOptions) { + return create("", transportOptions, /* openTelemetrySdk= */ null); } - /** Creates a {@code RemoteStorageHelper} object. */ public static RemoteDatastoreHelper create( String databaseId, @Nullable OpenTelemetrySdk openTelemetrySdk) { - HttpTransportOptions transportOptions = DatastoreOptions.getDefaultHttpTransportOptions(); - transportOptions = - transportOptions.toBuilder().setConnectTimeout(60000).setReadTimeout(60000).build(); + return create(databaseId, DatastoreOptions.getDefaultHttpTransportOptions(), openTelemetrySdk); + } + + public static RemoteDatastoreHelper create(String databaseId, TransportOptions transportOptions) { + return create(databaseId, transportOptions, /* openTelemetrySdk= */ null); + } + + /** Creates a {@code RemoteStorageHelper} object. */ + public static RemoteDatastoreHelper create( + String databaseId, + TransportOptions transportOptions, + @Nullable OpenTelemetrySdk openTelemetrySdk) { DatastoreOptions.Builder datastoreOptionBuilder = DatastoreOptions.newBuilder() .setDatabaseId(databaseId) .setNamespace(UUID.randomUUID().toString()) - .setRetrySettings(retrySettings()) - .setTransportOptions(transportOptions); + .setRetrySettings(retrySettings()); + if (transportOptions instanceof GrpcTransportOptions) { + datastoreOptionBuilder = + datastoreOptionBuilder.setTransportOptions((GrpcTransportOptions) transportOptions); + } else { + datastoreOptionBuilder = datastoreOptionBuilder.setTransportOptions(transportOptions); + } if (openTelemetrySdk != null) { datastoreOptionBuilder.setOpenTelemetryOptions( @@ -103,10 +130,6 @@ public static RemoteDatastoreHelper create( return new RemoteDatastoreHelper(datastoreOptionBuilder.build()); } - public static RemoteDatastoreHelper create(String databaseId) { - return create(databaseId, /* openTelemetrySdk= */ null); - } - private static RetrySettings retrySettings() { return RetrySettings.newBuilder() .setMaxAttempts(10) diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java new file mode 100644 index 000000000..293c904b9 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientHttpJsonTest.java @@ -0,0 +1,549 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1; + +import com.google.api.gax.core.NoCredentialsProvider; +import com.google.api.gax.httpjson.GaxHttpJsonProperties; +import com.google.api.gax.httpjson.testing.MockHttpService; +import com.google.api.gax.rpc.ApiClientHeaderProvider; +import com.google.api.gax.rpc.ApiException; +import com.google.api.gax.rpc.ApiExceptionFactory; +import com.google.api.gax.rpc.InvalidArgumentException; +import com.google.api.gax.rpc.StatusCode; +import com.google.api.gax.rpc.testing.FakeStatusCode; +import com.google.cloud.datastore.v1.stub.HttpJsonDatastoreStub; +import com.google.datastore.v1.AggregationQuery; +import com.google.datastore.v1.AggregationResultBatch; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.EntityResult; +import com.google.datastore.v1.ExplainMetrics; +import com.google.datastore.v1.ExplainOptions; +import com.google.datastore.v1.Key; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.Mutation; +import com.google.datastore.v1.MutationResult; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.PropertyMask; +import com.google.datastore.v1.Query; +import com.google.datastore.v1.QueryResultBatch; +import com.google.datastore.v1.ReadOptions; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import javax.annotation.Generated; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +@Generated("by gapic-generator-java") +public class DatastoreClientHttpJsonTest { + private static MockHttpService mockService; + private static DatastoreClient client; + + @BeforeClass + public static void startStaticServer() throws IOException { + mockService = + new MockHttpService( + HttpJsonDatastoreStub.getMethodDescriptors(), DatastoreSettings.getDefaultEndpoint()); + DatastoreSettings settings = + DatastoreSettings.newHttpJsonBuilder() + .setTransportChannelProvider( + DatastoreSettings.defaultHttpJsonTransportProviderBuilder() + .setHttpTransport(mockService) + .build()) + .setCredentialsProvider(NoCredentialsProvider.create()) + .build(); + client = DatastoreClient.create(settings); + } + + @AfterClass + public static void stopServer() { + client.close(); + } + + @Before + public void setUp() {} + + @After + public void tearDown() throws Exception { + mockService.reset(); + } + + @Test + public void lookupTest() throws Exception { + LookupResponse expectedResponse = + LookupResponse.newBuilder() + .addAllFound(new ArrayList()) + .addAllMissing(new ArrayList()) + .addAllDeferred(new ArrayList()) + .setTransaction(ByteString.EMPTY) + .setReadTime(Timestamp.newBuilder().build()) + .build(); + mockService.addResponse(expectedResponse); + + String projectId = "projectId-1530"; + ReadOptions readOptions = ReadOptions.newBuilder().build(); + List keys = new ArrayList<>(); + + LookupResponse actualResponse = client.lookup(projectId, readOptions, keys); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void lookupExceptionTest() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + String projectId = "projectId-1530"; + ReadOptions readOptions = ReadOptions.newBuilder().build(); + List keys = new ArrayList<>(); + client.lookup(projectId, readOptions, keys); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void runQueryTest() throws Exception { + RunQueryResponse expectedResponse = + RunQueryResponse.newBuilder() + .setBatch(QueryResultBatch.newBuilder().build()) + .setQuery(Query.newBuilder().build()) + .setTransaction(ByteString.EMPTY) + .setExplainMetrics(ExplainMetrics.newBuilder().build()) + .build(); + mockService.addResponse(expectedResponse); + + RunQueryRequest request = + RunQueryRequest.newBuilder() + .setProjectId("projectId-1530") + .setDatabaseId("databaseId1688905718") + .setPartitionId(PartitionId.newBuilder().build()) + .setReadOptions(ReadOptions.newBuilder().build()) + .setPropertyMask(PropertyMask.newBuilder().build()) + .setExplainOptions(ExplainOptions.newBuilder().build()) + .build(); + + RunQueryResponse actualResponse = client.runQuery(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void runQueryExceptionTest() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + RunQueryRequest request = + RunQueryRequest.newBuilder() + .setProjectId("projectId-1530") + .setDatabaseId("databaseId1688905718") + .setPartitionId(PartitionId.newBuilder().build()) + .setReadOptions(ReadOptions.newBuilder().build()) + .setPropertyMask(PropertyMask.newBuilder().build()) + .setExplainOptions(ExplainOptions.newBuilder().build()) + .build(); + client.runQuery(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void runAggregationQueryTest() throws Exception { + RunAggregationQueryResponse expectedResponse = + RunAggregationQueryResponse.newBuilder() + .setBatch(AggregationResultBatch.newBuilder().build()) + .setQuery(AggregationQuery.newBuilder().build()) + .setTransaction(ByteString.EMPTY) + .setExplainMetrics(ExplainMetrics.newBuilder().build()) + .build(); + mockService.addResponse(expectedResponse); + + RunAggregationQueryRequest request = + RunAggregationQueryRequest.newBuilder() + .setProjectId("projectId-1530") + .setDatabaseId("databaseId1688905718") + .setPartitionId(PartitionId.newBuilder().build()) + .setReadOptions(ReadOptions.newBuilder().build()) + .setExplainOptions(ExplainOptions.newBuilder().build()) + .build(); + + RunAggregationQueryResponse actualResponse = client.runAggregationQuery(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void runAggregationQueryExceptionTest() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + RunAggregationQueryRequest request = + RunAggregationQueryRequest.newBuilder() + .setProjectId("projectId-1530") + .setDatabaseId("databaseId1688905718") + .setPartitionId(PartitionId.newBuilder().build()) + .setReadOptions(ReadOptions.newBuilder().build()) + .setExplainOptions(ExplainOptions.newBuilder().build()) + .build(); + client.runAggregationQuery(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void beginTransactionTest() throws Exception { + BeginTransactionResponse expectedResponse = + BeginTransactionResponse.newBuilder().setTransaction(ByteString.EMPTY).build(); + mockService.addResponse(expectedResponse); + + String projectId = "projectId-1530"; + + BeginTransactionResponse actualResponse = client.beginTransaction(projectId); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void beginTransactionExceptionTest() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + String projectId = "projectId-1530"; + client.beginTransaction(projectId); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void commitTest() throws Exception { + CommitResponse expectedResponse = + CommitResponse.newBuilder() + .addAllMutationResults(new ArrayList()) + .setIndexUpdates(-1425228195) + .setCommitTime(Timestamp.newBuilder().build()) + .build(); + mockService.addResponse(expectedResponse); + + String projectId = "projectId-1530"; + CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0); + List mutations = new ArrayList<>(); + + CommitResponse actualResponse = client.commit(projectId, mode, mutations); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void commitExceptionTest() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + String projectId = "projectId-1530"; + CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0); + List mutations = new ArrayList<>(); + client.commit(projectId, mode, mutations); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void commitTest2() throws Exception { + CommitResponse expectedResponse = + CommitResponse.newBuilder() + .addAllMutationResults(new ArrayList()) + .setIndexUpdates(-1425228195) + .setCommitTime(Timestamp.newBuilder().build()) + .build(); + mockService.addResponse(expectedResponse); + + String projectId = "projectId-1530"; + CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0); + ByteString transaction = ByteString.EMPTY; + List mutations = new ArrayList<>(); + + CommitResponse actualResponse = client.commit(projectId, mode, transaction, mutations); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void commitExceptionTest2() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + String projectId = "projectId-1530"; + CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0); + ByteString transaction = ByteString.EMPTY; + List mutations = new ArrayList<>(); + client.commit(projectId, mode, transaction, mutations); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void rollbackTest() throws Exception { + RollbackResponse expectedResponse = RollbackResponse.newBuilder().build(); + mockService.addResponse(expectedResponse); + + String projectId = "projectId-1530"; + ByteString transaction = ByteString.EMPTY; + + RollbackResponse actualResponse = client.rollback(projectId, transaction); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void rollbackExceptionTest() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + String projectId = "projectId-1530"; + ByteString transaction = ByteString.EMPTY; + client.rollback(projectId, transaction); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void allocateIdsTest() throws Exception { + AllocateIdsResponse expectedResponse = + AllocateIdsResponse.newBuilder().addAllKeys(new ArrayList()).build(); + mockService.addResponse(expectedResponse); + + String projectId = "projectId-1530"; + List keys = new ArrayList<>(); + + AllocateIdsResponse actualResponse = client.allocateIds(projectId, keys); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void allocateIdsExceptionTest() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + String projectId = "projectId-1530"; + List keys = new ArrayList<>(); + client.allocateIds(projectId, keys); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void reserveIdsTest() throws Exception { + ReserveIdsResponse expectedResponse = ReserveIdsResponse.newBuilder().build(); + mockService.addResponse(expectedResponse); + + String projectId = "projectId-1530"; + List keys = new ArrayList<>(); + + ReserveIdsResponse actualResponse = client.reserveIds(projectId, keys); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void reserveIdsExceptionTest() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + String projectId = "projectId-1530"; + List keys = new ArrayList<>(); + client.reserveIds(projectId, keys); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java new file mode 100644 index 000000000..909330b51 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/DatastoreClientTest.java @@ -0,0 +1,528 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1; + +import com.google.api.gax.core.NoCredentialsProvider; +import com.google.api.gax.grpc.GaxGrpcProperties; +import com.google.api.gax.grpc.testing.LocalChannelProvider; +import com.google.api.gax.grpc.testing.MockGrpcService; +import com.google.api.gax.grpc.testing.MockServiceHelper; +import com.google.api.gax.rpc.ApiClientHeaderProvider; +import com.google.api.gax.rpc.InvalidArgumentException; +import com.google.datastore.v1.AggregationQuery; +import com.google.datastore.v1.AggregationResultBatch; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.EntityResult; +import com.google.datastore.v1.ExplainMetrics; +import com.google.datastore.v1.ExplainOptions; +import com.google.datastore.v1.Key; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.Mutation; +import com.google.datastore.v1.MutationResult; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.PropertyMask; +import com.google.datastore.v1.Query; +import com.google.datastore.v1.QueryResultBatch; +import com.google.datastore.v1.ReadOptions; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import com.google.protobuf.AbstractMessage; +import com.google.protobuf.ByteString; +import com.google.protobuf.Timestamp; +import io.grpc.StatusRuntimeException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import javax.annotation.Generated; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +@Generated("by gapic-generator-java") +public class DatastoreClientTest { + private static MockDatastore mockDatastore; + private static MockServiceHelper mockServiceHelper; + private LocalChannelProvider channelProvider; + private DatastoreClient client; + + @BeforeClass + public static void startStaticServer() { + mockDatastore = new MockDatastore(); + mockServiceHelper = + new MockServiceHelper( + UUID.randomUUID().toString(), Arrays.asList(mockDatastore)); + mockServiceHelper.start(); + } + + @AfterClass + public static void stopServer() { + mockServiceHelper.stop(); + } + + @Before + public void setUp() throws IOException { + mockServiceHelper.reset(); + channelProvider = mockServiceHelper.createChannelProvider(); + DatastoreSettings settings = + DatastoreSettings.newBuilder() + .setTransportChannelProvider(channelProvider) + .setCredentialsProvider(NoCredentialsProvider.create()) + .build(); + client = DatastoreClient.create(settings); + } + + @After + public void tearDown() throws Exception { + client.close(); + } + + @Test + public void lookupTest() throws Exception { + LookupResponse expectedResponse = + LookupResponse.newBuilder() + .addAllFound(new ArrayList()) + .addAllMissing(new ArrayList()) + .addAllDeferred(new ArrayList()) + .setTransaction(ByteString.EMPTY) + .setReadTime(Timestamp.newBuilder().build()) + .build(); + mockDatastore.addResponse(expectedResponse); + + String projectId = "projectId-894832108"; + ReadOptions readOptions = ReadOptions.newBuilder().build(); + List keys = new ArrayList<>(); + + LookupResponse actualResponse = client.lookup(projectId, readOptions, keys); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockDatastore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + LookupRequest actualRequest = ((LookupRequest) actualRequests.get(0)); + + Assert.assertEquals(projectId, actualRequest.getProjectId()); + Assert.assertEquals(readOptions, actualRequest.getReadOptions()); + Assert.assertEquals(keys, actualRequest.getKeysList()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void lookupExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockDatastore.addException(exception); + + try { + String projectId = "projectId-894832108"; + ReadOptions readOptions = ReadOptions.newBuilder().build(); + List keys = new ArrayList<>(); + client.lookup(projectId, readOptions, keys); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void runQueryTest() throws Exception { + RunQueryResponse expectedResponse = + RunQueryResponse.newBuilder() + .setBatch(QueryResultBatch.newBuilder().build()) + .setQuery(Query.newBuilder().build()) + .setTransaction(ByteString.EMPTY) + .setExplainMetrics(ExplainMetrics.newBuilder().build()) + .build(); + mockDatastore.addResponse(expectedResponse); + + RunQueryRequest request = + RunQueryRequest.newBuilder() + .setProjectId("projectId-894832108") + .setDatabaseId("databaseId1688905718") + .setPartitionId(PartitionId.newBuilder().build()) + .setReadOptions(ReadOptions.newBuilder().build()) + .setPropertyMask(PropertyMask.newBuilder().build()) + .setExplainOptions(ExplainOptions.newBuilder().build()) + .build(); + + RunQueryResponse actualResponse = client.runQuery(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockDatastore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + RunQueryRequest actualRequest = ((RunQueryRequest) actualRequests.get(0)); + + Assert.assertEquals(request.getProjectId(), actualRequest.getProjectId()); + Assert.assertEquals(request.getDatabaseId(), actualRequest.getDatabaseId()); + Assert.assertEquals(request.getPartitionId(), actualRequest.getPartitionId()); + Assert.assertEquals(request.getReadOptions(), actualRequest.getReadOptions()); + Assert.assertEquals(request.getQuery(), actualRequest.getQuery()); + Assert.assertEquals(request.getGqlQuery(), actualRequest.getGqlQuery()); + Assert.assertEquals(request.getPropertyMask(), actualRequest.getPropertyMask()); + Assert.assertEquals(request.getExplainOptions(), actualRequest.getExplainOptions()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void runQueryExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockDatastore.addException(exception); + + try { + RunQueryRequest request = + RunQueryRequest.newBuilder() + .setProjectId("projectId-894832108") + .setDatabaseId("databaseId1688905718") + .setPartitionId(PartitionId.newBuilder().build()) + .setReadOptions(ReadOptions.newBuilder().build()) + .setPropertyMask(PropertyMask.newBuilder().build()) + .setExplainOptions(ExplainOptions.newBuilder().build()) + .build(); + client.runQuery(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void runAggregationQueryTest() throws Exception { + RunAggregationQueryResponse expectedResponse = + RunAggregationQueryResponse.newBuilder() + .setBatch(AggregationResultBatch.newBuilder().build()) + .setQuery(AggregationQuery.newBuilder().build()) + .setTransaction(ByteString.EMPTY) + .setExplainMetrics(ExplainMetrics.newBuilder().build()) + .build(); + mockDatastore.addResponse(expectedResponse); + + RunAggregationQueryRequest request = + RunAggregationQueryRequest.newBuilder() + .setProjectId("projectId-894832108") + .setDatabaseId("databaseId1688905718") + .setPartitionId(PartitionId.newBuilder().build()) + .setReadOptions(ReadOptions.newBuilder().build()) + .setExplainOptions(ExplainOptions.newBuilder().build()) + .build(); + + RunAggregationQueryResponse actualResponse = client.runAggregationQuery(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockDatastore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + RunAggregationQueryRequest actualRequest = ((RunAggregationQueryRequest) actualRequests.get(0)); + + Assert.assertEquals(request.getProjectId(), actualRequest.getProjectId()); + Assert.assertEquals(request.getDatabaseId(), actualRequest.getDatabaseId()); + Assert.assertEquals(request.getPartitionId(), actualRequest.getPartitionId()); + Assert.assertEquals(request.getReadOptions(), actualRequest.getReadOptions()); + Assert.assertEquals(request.getAggregationQuery(), actualRequest.getAggregationQuery()); + Assert.assertEquals(request.getGqlQuery(), actualRequest.getGqlQuery()); + Assert.assertEquals(request.getExplainOptions(), actualRequest.getExplainOptions()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void runAggregationQueryExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockDatastore.addException(exception); + + try { + RunAggregationQueryRequest request = + RunAggregationQueryRequest.newBuilder() + .setProjectId("projectId-894832108") + .setDatabaseId("databaseId1688905718") + .setPartitionId(PartitionId.newBuilder().build()) + .setReadOptions(ReadOptions.newBuilder().build()) + .setExplainOptions(ExplainOptions.newBuilder().build()) + .build(); + client.runAggregationQuery(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void beginTransactionTest() throws Exception { + BeginTransactionResponse expectedResponse = + BeginTransactionResponse.newBuilder().setTransaction(ByteString.EMPTY).build(); + mockDatastore.addResponse(expectedResponse); + + String projectId = "projectId-894832108"; + + BeginTransactionResponse actualResponse = client.beginTransaction(projectId); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockDatastore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + BeginTransactionRequest actualRequest = ((BeginTransactionRequest) actualRequests.get(0)); + + Assert.assertEquals(projectId, actualRequest.getProjectId()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void beginTransactionExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockDatastore.addException(exception); + + try { + String projectId = "projectId-894832108"; + client.beginTransaction(projectId); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void commitTest() throws Exception { + CommitResponse expectedResponse = + CommitResponse.newBuilder() + .addAllMutationResults(new ArrayList()) + .setIndexUpdates(-1425228195) + .setCommitTime(Timestamp.newBuilder().build()) + .build(); + mockDatastore.addResponse(expectedResponse); + + String projectId = "projectId-894832108"; + CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0); + List mutations = new ArrayList<>(); + + CommitResponse actualResponse = client.commit(projectId, mode, mutations); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockDatastore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + CommitRequest actualRequest = ((CommitRequest) actualRequests.get(0)); + + Assert.assertEquals(projectId, actualRequest.getProjectId()); + Assert.assertEquals(mode, actualRequest.getMode()); + Assert.assertEquals(mutations, actualRequest.getMutationsList()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void commitExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockDatastore.addException(exception); + + try { + String projectId = "projectId-894832108"; + CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0); + List mutations = new ArrayList<>(); + client.commit(projectId, mode, mutations); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void commitTest2() throws Exception { + CommitResponse expectedResponse = + CommitResponse.newBuilder() + .addAllMutationResults(new ArrayList()) + .setIndexUpdates(-1425228195) + .setCommitTime(Timestamp.newBuilder().build()) + .build(); + mockDatastore.addResponse(expectedResponse); + + String projectId = "projectId-894832108"; + CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0); + ByteString transaction = ByteString.EMPTY; + List mutations = new ArrayList<>(); + + CommitResponse actualResponse = client.commit(projectId, mode, transaction, mutations); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockDatastore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + CommitRequest actualRequest = ((CommitRequest) actualRequests.get(0)); + + Assert.assertEquals(projectId, actualRequest.getProjectId()); + Assert.assertEquals(mode, actualRequest.getMode()); + Assert.assertEquals(transaction, actualRequest.getTransaction()); + Assert.assertEquals(mutations, actualRequest.getMutationsList()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void commitExceptionTest2() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockDatastore.addException(exception); + + try { + String projectId = "projectId-894832108"; + CommitRequest.Mode mode = CommitRequest.Mode.forNumber(0); + ByteString transaction = ByteString.EMPTY; + List mutations = new ArrayList<>(); + client.commit(projectId, mode, transaction, mutations); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void rollbackTest() throws Exception { + RollbackResponse expectedResponse = RollbackResponse.newBuilder().build(); + mockDatastore.addResponse(expectedResponse); + + String projectId = "projectId-894832108"; + ByteString transaction = ByteString.EMPTY; + + RollbackResponse actualResponse = client.rollback(projectId, transaction); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockDatastore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + RollbackRequest actualRequest = ((RollbackRequest) actualRequests.get(0)); + + Assert.assertEquals(projectId, actualRequest.getProjectId()); + Assert.assertEquals(transaction, actualRequest.getTransaction()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void rollbackExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockDatastore.addException(exception); + + try { + String projectId = "projectId-894832108"; + ByteString transaction = ByteString.EMPTY; + client.rollback(projectId, transaction); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void allocateIdsTest() throws Exception { + AllocateIdsResponse expectedResponse = + AllocateIdsResponse.newBuilder().addAllKeys(new ArrayList()).build(); + mockDatastore.addResponse(expectedResponse); + + String projectId = "projectId-894832108"; + List keys = new ArrayList<>(); + + AllocateIdsResponse actualResponse = client.allocateIds(projectId, keys); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockDatastore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + AllocateIdsRequest actualRequest = ((AllocateIdsRequest) actualRequests.get(0)); + + Assert.assertEquals(projectId, actualRequest.getProjectId()); + Assert.assertEquals(keys, actualRequest.getKeysList()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void allocateIdsExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockDatastore.addException(exception); + + try { + String projectId = "projectId-894832108"; + List keys = new ArrayList<>(); + client.allocateIds(projectId, keys); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void reserveIdsTest() throws Exception { + ReserveIdsResponse expectedResponse = ReserveIdsResponse.newBuilder().build(); + mockDatastore.addResponse(expectedResponse); + + String projectId = "projectId-894832108"; + List keys = new ArrayList<>(); + + ReserveIdsResponse actualResponse = client.reserveIds(projectId, keys); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockDatastore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + ReserveIdsRequest actualRequest = ((ReserveIdsRequest) actualRequests.get(0)); + + Assert.assertEquals(projectId, actualRequest.getProjectId()); + Assert.assertEquals(keys, actualRequest.getKeysList()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void reserveIdsExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockDatastore.addException(exception); + + try { + String projectId = "projectId-894832108"; + List keys = new ArrayList<>(); + client.reserveIds(projectId, keys); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java new file mode 100644 index 000000000..e64c68018 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastore.java @@ -0,0 +1,59 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1; + +import com.google.api.core.BetaApi; +import com.google.api.gax.grpc.testing.MockGrpcService; +import com.google.protobuf.AbstractMessage; +import io.grpc.ServerServiceDefinition; +import java.util.List; +import javax.annotation.Generated; + +@BetaApi +@Generated("by gapic-generator-java") +public class MockDatastore implements MockGrpcService { + private final MockDatastoreImpl serviceImpl; + + public MockDatastore() { + serviceImpl = new MockDatastoreImpl(); + } + + @Override + public List getRequests() { + return serviceImpl.getRequests(); + } + + @Override + public void addResponse(AbstractMessage response) { + serviceImpl.addResponse(response); + } + + @Override + public void addException(Exception exception) { + serviceImpl.addException(exception); + } + + @Override + public ServerServiceDefinition getServiceDefinition() { + return serviceImpl.bindService(); + } + + @Override + public void reset() { + serviceImpl.reset(); + } +} diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java new file mode 100644 index 000000000..e37eac6c0 --- /dev/null +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/v1/MockDatastoreImpl.java @@ -0,0 +1,241 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.datastore.v1; + +import com.google.api.core.BetaApi; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.DatastoreGrpc.DatastoreImplBase; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.ReserveIdsRequest; +import com.google.datastore.v1.ReserveIdsResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunAggregationQueryRequest; +import com.google.datastore.v1.RunAggregationQueryResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; +import com.google.protobuf.AbstractMessage; +import io.grpc.stub.StreamObserver; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Queue; +import javax.annotation.Generated; + +@BetaApi +@Generated("by gapic-generator-java") +public class MockDatastoreImpl extends DatastoreImplBase { + private List requests; + private Queue responses; + + public MockDatastoreImpl() { + requests = new ArrayList<>(); + responses = new LinkedList<>(); + } + + public List getRequests() { + return requests; + } + + public void addResponse(AbstractMessage response) { + responses.add(response); + } + + public void setResponses(List responses) { + this.responses = new LinkedList(responses); + } + + public void addException(Exception exception) { + responses.add(exception); + } + + public void reset() { + requests = new ArrayList<>(); + responses = new LinkedList<>(); + } + + @Override + public void lookup(LookupRequest request, StreamObserver responseObserver) { + Object response = responses.poll(); + if (response instanceof LookupResponse) { + requests.add(request); + responseObserver.onNext(((LookupResponse) response)); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError(((Exception) response)); + } else { + responseObserver.onError( + new IllegalArgumentException( + String.format( + "Unrecognized response type %s for method Lookup, expected %s or %s", + response == null ? "null" : response.getClass().getName(), + LookupResponse.class.getName(), + Exception.class.getName()))); + } + } + + @Override + public void runQuery(RunQueryRequest request, StreamObserver responseObserver) { + Object response = responses.poll(); + if (response instanceof RunQueryResponse) { + requests.add(request); + responseObserver.onNext(((RunQueryResponse) response)); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError(((Exception) response)); + } else { + responseObserver.onError( + new IllegalArgumentException( + String.format( + "Unrecognized response type %s for method RunQuery, expected %s or %s", + response == null ? "null" : response.getClass().getName(), + RunQueryResponse.class.getName(), + Exception.class.getName()))); + } + } + + @Override + public void runAggregationQuery( + RunAggregationQueryRequest request, + StreamObserver responseObserver) { + Object response = responses.poll(); + if (response instanceof RunAggregationQueryResponse) { + requests.add(request); + responseObserver.onNext(((RunAggregationQueryResponse) response)); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError(((Exception) response)); + } else { + responseObserver.onError( + new IllegalArgumentException( + String.format( + "Unrecognized response type %s for method RunAggregationQuery, expected %s or %s", + response == null ? "null" : response.getClass().getName(), + RunAggregationQueryResponse.class.getName(), + Exception.class.getName()))); + } + } + + @Override + public void beginTransaction( + BeginTransactionRequest request, StreamObserver responseObserver) { + Object response = responses.poll(); + if (response instanceof BeginTransactionResponse) { + requests.add(request); + responseObserver.onNext(((BeginTransactionResponse) response)); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError(((Exception) response)); + } else { + responseObserver.onError( + new IllegalArgumentException( + String.format( + "Unrecognized response type %s for method BeginTransaction, expected %s or %s", + response == null ? "null" : response.getClass().getName(), + BeginTransactionResponse.class.getName(), + Exception.class.getName()))); + } + } + + @Override + public void commit(CommitRequest request, StreamObserver responseObserver) { + Object response = responses.poll(); + if (response instanceof CommitResponse) { + requests.add(request); + responseObserver.onNext(((CommitResponse) response)); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError(((Exception) response)); + } else { + responseObserver.onError( + new IllegalArgumentException( + String.format( + "Unrecognized response type %s for method Commit, expected %s or %s", + response == null ? "null" : response.getClass().getName(), + CommitResponse.class.getName(), + Exception.class.getName()))); + } + } + + @Override + public void rollback(RollbackRequest request, StreamObserver responseObserver) { + Object response = responses.poll(); + if (response instanceof RollbackResponse) { + requests.add(request); + responseObserver.onNext(((RollbackResponse) response)); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError(((Exception) response)); + } else { + responseObserver.onError( + new IllegalArgumentException( + String.format( + "Unrecognized response type %s for method Rollback, expected %s or %s", + response == null ? "null" : response.getClass().getName(), + RollbackResponse.class.getName(), + Exception.class.getName()))); + } + } + + @Override + public void allocateIds( + AllocateIdsRequest request, StreamObserver responseObserver) { + Object response = responses.poll(); + if (response instanceof AllocateIdsResponse) { + requests.add(request); + responseObserver.onNext(((AllocateIdsResponse) response)); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError(((Exception) response)); + } else { + responseObserver.onError( + new IllegalArgumentException( + String.format( + "Unrecognized response type %s for method AllocateIds, expected %s or %s", + response == null ? "null" : response.getClass().getName(), + AllocateIdsResponse.class.getName(), + Exception.class.getName()))); + } + } + + @Override + public void reserveIds( + ReserveIdsRequest request, StreamObserver responseObserver) { + Object response = responses.poll(); + if (response instanceof ReserveIdsResponse) { + requests.add(request); + responseObserver.onNext(((ReserveIdsResponse) response)); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError(((Exception) response)); + } else { + responseObserver.onError( + new IllegalArgumentException( + String.format( + "Unrecognized response type %s for method ReserveIds, expected %s or %s", + response == null ? "null" : response.getClass().getName(), + ReserveIdsResponse.class.getName(), + Exception.class.getName()))); + } + } +} diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml new file mode 100644 index 000000000..8a4396f4f --- /dev/null +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -0,0 +1,72 @@ + + 4.0.0 + com.google.api.grpc + grpc-google-cloud-datastore-v1 + 2.27.3-SNAPSHOT + grpc-google-cloud-datastore-v1 + GRPC library for google-cloud-datastore + + com.google.cloud + google-cloud-datastore-parent + 2.27.3-SNAPSHOT + + + + io.grpc + grpc-api + + + io.grpc + grpc-stub + + + io.grpc + grpc-protobuf + + + com.google.protobuf + protobuf-java + + + com.google.api.grpc + proto-google-cloud-datastore-v1 + + + com.google.guava + guava + + + + + + java9 + + [9,) + + + + javax.annotation + javax.annotation-api + + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + org.codehaus.mojo + clirr-maven-plugin + + true + + + + + \ No newline at end of file diff --git a/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java b/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java new file mode 100644 index 000000000..8feee8ad9 --- /dev/null +++ b/grpc-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreGrpc.java @@ -0,0 +1,1339 @@ +/* + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.datastore.v1; + +import static io.grpc.MethodDescriptor.generateFullMethodName; + +/** + * + * + * 
+ * Each RPC normalizes the partition IDs of the keys in its input entities,
+ * and always returns entities with keys with normalized partition IDs.
+ * This applies to all keys and entities, including those in values, except keys
+ * with both an empty path and an empty or unset partition ID. Normalization of
+ * input keys sets the project ID (if not already set) to the project ID from
+ * the request.
+ *
+ */ +@javax.annotation.Generated( + value = "by gRPC proto compiler", + comments = "Source: google/datastore/v1/datastore.proto") +@io.grpc.stub.annotations.GrpcGenerated +public final class DatastoreGrpc { + + private DatastoreGrpc() {} + + public static final java.lang.String SERVICE_NAME = "google.datastore.v1.Datastore"; + + // Static method descriptors that strictly reflect the proto. + private static volatile io.grpc.MethodDescriptor< + com.google.datastore.v1.LookupRequest, com.google.datastore.v1.LookupResponse> + getLookupMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "Lookup", + requestType = com.google.datastore.v1.LookupRequest.class, + responseType = com.google.datastore.v1.LookupResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor< + com.google.datastore.v1.LookupRequest, com.google.datastore.v1.LookupResponse> + getLookupMethod() { + io.grpc.MethodDescriptor< + com.google.datastore.v1.LookupRequest, com.google.datastore.v1.LookupResponse> + getLookupMethod; + if ((getLookupMethod = DatastoreGrpc.getLookupMethod) == null) { + synchronized (DatastoreGrpc.class) { + if ((getLookupMethod = DatastoreGrpc.getLookupMethod) == null) { + DatastoreGrpc.getLookupMethod = + getLookupMethod = + io.grpc.MethodDescriptor + . + newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Lookup")) + .setSampledToLocalTracing(true) + .setRequestMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.LookupRequest.getDefaultInstance())) + .setResponseMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.LookupResponse.getDefaultInstance())) + .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("Lookup")) + .build(); + } + } + } + return getLookupMethod; + } + + private static volatile io.grpc.MethodDescriptor< + com.google.datastore.v1.RunQueryRequest, com.google.datastore.v1.RunQueryResponse> + getRunQueryMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "RunQuery", + requestType = com.google.datastore.v1.RunQueryRequest.class, + responseType = com.google.datastore.v1.RunQueryResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor< + com.google.datastore.v1.RunQueryRequest, com.google.datastore.v1.RunQueryResponse> + getRunQueryMethod() { + io.grpc.MethodDescriptor< + com.google.datastore.v1.RunQueryRequest, com.google.datastore.v1.RunQueryResponse> + getRunQueryMethod; + if ((getRunQueryMethod = DatastoreGrpc.getRunQueryMethod) == null) { + synchronized (DatastoreGrpc.class) { + if ((getRunQueryMethod = DatastoreGrpc.getRunQueryMethod) == null) { + DatastoreGrpc.getRunQueryMethod = + getRunQueryMethod = + io.grpc.MethodDescriptor + . + newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "RunQuery")) + .setSampledToLocalTracing(true) + .setRequestMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.RunQueryRequest.getDefaultInstance())) + .setResponseMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.RunQueryResponse.getDefaultInstance())) + .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("RunQuery")) + .build(); + } + } + } + return getRunQueryMethod; + } + + private static volatile io.grpc.MethodDescriptor< + com.google.datastore.v1.RunAggregationQueryRequest, + com.google.datastore.v1.RunAggregationQueryResponse> + getRunAggregationQueryMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "RunAggregationQuery", + requestType = com.google.datastore.v1.RunAggregationQueryRequest.class, + responseType = com.google.datastore.v1.RunAggregationQueryResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor< + com.google.datastore.v1.RunAggregationQueryRequest, + com.google.datastore.v1.RunAggregationQueryResponse> + getRunAggregationQueryMethod() { + io.grpc.MethodDescriptor< + com.google.datastore.v1.RunAggregationQueryRequest, + com.google.datastore.v1.RunAggregationQueryResponse> + getRunAggregationQueryMethod; + if ((getRunAggregationQueryMethod = DatastoreGrpc.getRunAggregationQueryMethod) == null) { + synchronized (DatastoreGrpc.class) { + if ((getRunAggregationQueryMethod = DatastoreGrpc.getRunAggregationQueryMethod) == null) { + DatastoreGrpc.getRunAggregationQueryMethod = + getRunAggregationQueryMethod = + io.grpc.MethodDescriptor + . + newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName( + generateFullMethodName(SERVICE_NAME, "RunAggregationQuery")) + .setSampledToLocalTracing(true) + .setRequestMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.RunAggregationQueryRequest + .getDefaultInstance())) + .setResponseMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.RunAggregationQueryResponse + .getDefaultInstance())) + .setSchemaDescriptor( + new DatastoreMethodDescriptorSupplier("RunAggregationQuery")) + .build(); + } + } + } + return getRunAggregationQueryMethod; + } + + private static volatile io.grpc.MethodDescriptor< + com.google.datastore.v1.BeginTransactionRequest, + com.google.datastore.v1.BeginTransactionResponse> + getBeginTransactionMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "BeginTransaction", + requestType = com.google.datastore.v1.BeginTransactionRequest.class, + responseType = com.google.datastore.v1.BeginTransactionResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor< + com.google.datastore.v1.BeginTransactionRequest, + com.google.datastore.v1.BeginTransactionResponse> + getBeginTransactionMethod() { + io.grpc.MethodDescriptor< + com.google.datastore.v1.BeginTransactionRequest, + com.google.datastore.v1.BeginTransactionResponse> + getBeginTransactionMethod; + if ((getBeginTransactionMethod = DatastoreGrpc.getBeginTransactionMethod) == null) { + synchronized (DatastoreGrpc.class) { + if ((getBeginTransactionMethod = DatastoreGrpc.getBeginTransactionMethod) == null) { + DatastoreGrpc.getBeginTransactionMethod = + getBeginTransactionMethod = + io.grpc.MethodDescriptor + . + newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "BeginTransaction")) + .setSampledToLocalTracing(true) + .setRequestMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance())) + .setResponseMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.BeginTransactionResponse + .getDefaultInstance())) + .setSchemaDescriptor( + new DatastoreMethodDescriptorSupplier("BeginTransaction")) + .build(); + } + } + } + return getBeginTransactionMethod; + } + + private static volatile io.grpc.MethodDescriptor< + com.google.datastore.v1.CommitRequest, com.google.datastore.v1.CommitResponse> + getCommitMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "Commit", + requestType = com.google.datastore.v1.CommitRequest.class, + responseType = com.google.datastore.v1.CommitResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor< + com.google.datastore.v1.CommitRequest, com.google.datastore.v1.CommitResponse> + getCommitMethod() { + io.grpc.MethodDescriptor< + com.google.datastore.v1.CommitRequest, com.google.datastore.v1.CommitResponse> + getCommitMethod; + if ((getCommitMethod = DatastoreGrpc.getCommitMethod) == null) { + synchronized (DatastoreGrpc.class) { + if ((getCommitMethod = DatastoreGrpc.getCommitMethod) == null) { + DatastoreGrpc.getCommitMethod = + getCommitMethod = + io.grpc.MethodDescriptor + . + newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Commit")) + .setSampledToLocalTracing(true) + .setRequestMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.CommitRequest.getDefaultInstance())) + .setResponseMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.CommitResponse.getDefaultInstance())) + .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("Commit")) + .build(); + } + } + } + return getCommitMethod; + } + + private static volatile io.grpc.MethodDescriptor< + com.google.datastore.v1.RollbackRequest, com.google.datastore.v1.RollbackResponse> + getRollbackMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "Rollback", + requestType = com.google.datastore.v1.RollbackRequest.class, + responseType = com.google.datastore.v1.RollbackResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor< + com.google.datastore.v1.RollbackRequest, com.google.datastore.v1.RollbackResponse> + getRollbackMethod() { + io.grpc.MethodDescriptor< + com.google.datastore.v1.RollbackRequest, com.google.datastore.v1.RollbackResponse> + getRollbackMethod; + if ((getRollbackMethod = DatastoreGrpc.getRollbackMethod) == null) { + synchronized (DatastoreGrpc.class) { + if ((getRollbackMethod = DatastoreGrpc.getRollbackMethod) == null) { + DatastoreGrpc.getRollbackMethod = + getRollbackMethod = + io.grpc.MethodDescriptor + . + newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Rollback")) + .setSampledToLocalTracing(true) + .setRequestMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.RollbackRequest.getDefaultInstance())) + .setResponseMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.RollbackResponse.getDefaultInstance())) + .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("Rollback")) + .build(); + } + } + } + return getRollbackMethod; + } + + private static volatile io.grpc.MethodDescriptor< + com.google.datastore.v1.AllocateIdsRequest, com.google.datastore.v1.AllocateIdsResponse> + getAllocateIdsMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "AllocateIds", + requestType = com.google.datastore.v1.AllocateIdsRequest.class, + responseType = com.google.datastore.v1.AllocateIdsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor< + com.google.datastore.v1.AllocateIdsRequest, com.google.datastore.v1.AllocateIdsResponse> + getAllocateIdsMethod() { + io.grpc.MethodDescriptor< + com.google.datastore.v1.AllocateIdsRequest, com.google.datastore.v1.AllocateIdsResponse> + getAllocateIdsMethod; + if ((getAllocateIdsMethod = DatastoreGrpc.getAllocateIdsMethod) == null) { + synchronized (DatastoreGrpc.class) { + if ((getAllocateIdsMethod = DatastoreGrpc.getAllocateIdsMethod) == null) { + DatastoreGrpc.getAllocateIdsMethod = + getAllocateIdsMethod = + io.grpc.MethodDescriptor + . + newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "AllocateIds")) + .setSampledToLocalTracing(true) + .setRequestMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.AllocateIdsRequest.getDefaultInstance())) + .setResponseMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.AllocateIdsResponse.getDefaultInstance())) + .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("AllocateIds")) + .build(); + } + } + } + return getAllocateIdsMethod; + } + + private static volatile io.grpc.MethodDescriptor< + com.google.datastore.v1.ReserveIdsRequest, com.google.datastore.v1.ReserveIdsResponse> + getReserveIdsMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ReserveIds", + requestType = com.google.datastore.v1.ReserveIdsRequest.class, + responseType = com.google.datastore.v1.ReserveIdsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor< + com.google.datastore.v1.ReserveIdsRequest, com.google.datastore.v1.ReserveIdsResponse> + getReserveIdsMethod() { + io.grpc.MethodDescriptor< + com.google.datastore.v1.ReserveIdsRequest, com.google.datastore.v1.ReserveIdsResponse> + getReserveIdsMethod; + if ((getReserveIdsMethod = DatastoreGrpc.getReserveIdsMethod) == null) { + synchronized (DatastoreGrpc.class) { + if ((getReserveIdsMethod = DatastoreGrpc.getReserveIdsMethod) == null) { + DatastoreGrpc.getReserveIdsMethod = + getReserveIdsMethod = + io.grpc.MethodDescriptor + . + newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ReserveIds")) + .setSampledToLocalTracing(true) + .setRequestMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.ReserveIdsRequest.getDefaultInstance())) + .setResponseMarshaller( + io.grpc.protobuf.ProtoUtils.marshaller( + com.google.datastore.v1.ReserveIdsResponse.getDefaultInstance())) + .setSchemaDescriptor(new DatastoreMethodDescriptorSupplier("ReserveIds")) + .build(); + } + } + } + return getReserveIdsMethod; + } + + /** Creates a new async stub that supports all call types for the service */ + public static DatastoreStub newStub(io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public DatastoreStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DatastoreStub(channel, callOptions); + } + }; + return DatastoreStub.newStub(factory, channel); + } + + /** Creates a new blocking-style stub that supports all types of calls on the service */ + public static DatastoreBlockingV2Stub newBlockingV2Stub(io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public DatastoreBlockingV2Stub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DatastoreBlockingV2Stub(channel, callOptions); + } + }; + return DatastoreBlockingV2Stub.newStub(factory, channel); + } + + /** + * Creates a new blocking-style stub that supports unary and streaming output calls on the service + */ + public static DatastoreBlockingStub newBlockingStub(io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public DatastoreBlockingStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DatastoreBlockingStub(channel, callOptions); + } + }; + return DatastoreBlockingStub.newStub(factory, channel); + } + + /** Creates a new ListenableFuture-style stub that supports unary calls on the service */ + public static DatastoreFutureStub newFutureStub(io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public DatastoreFutureStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DatastoreFutureStub(channel, callOptions); + } + }; + return DatastoreFutureStub.newStub(factory, channel); + } + + /** + * + * + * 
+   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   *
+ */ + public interface AsyncService { + + /** + * + * + * 
+     * Looks up entities by key.
+     *
+ */ + default void lookup( + com.google.datastore.v1.LookupRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getLookupMethod(), responseObserver); + } + + /** + * + * + * 
+     * Queries for entities.
+     *
+ */ + default void runQuery( + com.google.datastore.v1.RunQueryRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getRunQueryMethod(), responseObserver); + } + + /** + * + * + * 
+     * Runs an aggregation query.
+     *
+ */ + default void runAggregationQuery( + com.google.datastore.v1.RunAggregationQueryRequest request, + io.grpc.stub.StreamObserver + responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( + getRunAggregationQueryMethod(), responseObserver); + } + + /** + * + * + * 
+     * Begins a new transaction.
+     *
+ */ + default void beginTransaction( + com.google.datastore.v1.BeginTransactionRequest request, + io.grpc.stub.StreamObserver + responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( + getBeginTransactionMethod(), responseObserver); + } + + /** + * + * + * 
+     * Commits a transaction, optionally creating, deleting or modifying some
+     * entities.
+     *
+ */ + default void commit( + com.google.datastore.v1.CommitRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCommitMethod(), responseObserver); + } + + /** + * + * + * 
+     * Rolls back a transaction.
+     *
+ */ + default void rollback( + com.google.datastore.v1.RollbackRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getRollbackMethod(), responseObserver); + } + + /** + * + * + * 
+     * Allocates IDs for the given keys, which is useful for referencing an entity
+     * before it is inserted.
+     *
+ */ + default void allocateIds( + com.google.datastore.v1.AllocateIdsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( + getAllocateIdsMethod(), responseObserver); + } + + /** + * + * + * 
+     * Prevents the supplied keys' IDs from being auto-allocated by Cloud
+     * Datastore.
+     *
+ */ + default void reserveIds( + com.google.datastore.v1.ReserveIdsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getReserveIdsMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service Datastore. + * + * 
+   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   *
+ */ + public abstract static class DatastoreImplBase implements io.grpc.BindableService, AsyncService { + + @java.lang.Override + public final io.grpc.ServerServiceDefinition bindService() { + return DatastoreGrpc.bindService(this); + } + } + + /** + * A stub to allow clients to do asynchronous rpc calls to service Datastore. + * + * 
+   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   *
+ */ + public static final class DatastoreStub extends io.grpc.stub.AbstractAsyncStub { + private DatastoreStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @java.lang.Override + protected DatastoreStub build(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DatastoreStub(channel, callOptions); + } + + /** + * + * + * 
+     * Looks up entities by key.
+     *
+ */ + public void lookup( + com.google.datastore.v1.LookupRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getLookupMethod(), getCallOptions()), request, responseObserver); + } + + /** + * + * + * 
+     * Queries for entities.
+     *
+ */ + public void runQuery( + com.google.datastore.v1.RunQueryRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getRunQueryMethod(), getCallOptions()), request, responseObserver); + } + + /** + * + * + * 
+     * Runs an aggregation query.
+     *
+ */ + public void runAggregationQuery( + com.google.datastore.v1.RunAggregationQueryRequest request, + io.grpc.stub.StreamObserver + responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getRunAggregationQueryMethod(), getCallOptions()), + request, + responseObserver); + } + + /** + * + * + * 
+     * Begins a new transaction.
+     *
+ */ + public void beginTransaction( + com.google.datastore.v1.BeginTransactionRequest request, + io.grpc.stub.StreamObserver + responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getBeginTransactionMethod(), getCallOptions()), + request, + responseObserver); + } + + /** + * + * + * 
+     * Commits a transaction, optionally creating, deleting or modifying some
+     * entities.
+     *
+ */ + public void commit( + com.google.datastore.v1.CommitRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getCommitMethod(), getCallOptions()), request, responseObserver); + } + + /** + * + * + * 
+     * Rolls back a transaction.
+     *
+ */ + public void rollback( + com.google.datastore.v1.RollbackRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getRollbackMethod(), getCallOptions()), request, responseObserver); + } + + /** + * + * + * 
+     * Allocates IDs for the given keys, which is useful for referencing an entity
+     * before it is inserted.
+     *
+ */ + public void allocateIds( + com.google.datastore.v1.AllocateIdsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getAllocateIdsMethod(), getCallOptions()), + request, + responseObserver); + } + + /** + * + * + * 
+     * Prevents the supplied keys' IDs from being auto-allocated by Cloud
+     * Datastore.
+     *
+ */ + public void reserveIds( + com.google.datastore.v1.ReserveIdsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getReserveIdsMethod(), getCallOptions()), request, responseObserver); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service Datastore. + * + * 
+   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   *
+ */ + public static final class DatastoreBlockingV2Stub + extends io.grpc.stub.AbstractBlockingStub { + private DatastoreBlockingV2Stub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @java.lang.Override + protected DatastoreBlockingV2Stub build( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DatastoreBlockingV2Stub(channel, callOptions); + } + + /** + * + * + * 
+     * Looks up entities by key.
+     *
+ */ + public com.google.datastore.v1.LookupResponse lookup( + com.google.datastore.v1.LookupRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getLookupMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Queries for entities.
+     *
+ */ + public com.google.datastore.v1.RunQueryResponse runQuery( + com.google.datastore.v1.RunQueryRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getRunQueryMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Runs an aggregation query.
+     *
+ */ + public com.google.datastore.v1.RunAggregationQueryResponse runAggregationQuery( + com.google.datastore.v1.RunAggregationQueryRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getRunAggregationQueryMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Begins a new transaction.
+     *
+ */ + public com.google.datastore.v1.BeginTransactionResponse beginTransaction( + com.google.datastore.v1.BeginTransactionRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getBeginTransactionMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Commits a transaction, optionally creating, deleting or modifying some
+     * entities.
+     *
+ */ + public com.google.datastore.v1.CommitResponse commit( + com.google.datastore.v1.CommitRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getCommitMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Rolls back a transaction.
+     *
+ */ + public com.google.datastore.v1.RollbackResponse rollback( + com.google.datastore.v1.RollbackRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getRollbackMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Allocates IDs for the given keys, which is useful for referencing an entity
+     * before it is inserted.
+     *
+ */ + public com.google.datastore.v1.AllocateIdsResponse allocateIds( + com.google.datastore.v1.AllocateIdsRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getAllocateIdsMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Prevents the supplied keys' IDs from being auto-allocated by Cloud
+     * Datastore.
+     *
+ */ + public com.google.datastore.v1.ReserveIdsResponse reserveIds( + com.google.datastore.v1.ReserveIdsRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getReserveIdsMethod(), getCallOptions(), request); + } + } + + /** + * A stub to allow clients to do limited synchronous rpc calls to service Datastore. + * + * 
+   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   *
+ */ + public static final class DatastoreBlockingStub + extends io.grpc.stub.AbstractBlockingStub { + private DatastoreBlockingStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @java.lang.Override + protected DatastoreBlockingStub build( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DatastoreBlockingStub(channel, callOptions); + } + + /** + * + * + * 
+     * Looks up entities by key.
+     *
+ */ + public com.google.datastore.v1.LookupResponse lookup( + com.google.datastore.v1.LookupRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getLookupMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Queries for entities.
+     *
+ */ + public com.google.datastore.v1.RunQueryResponse runQuery( + com.google.datastore.v1.RunQueryRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getRunQueryMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Runs an aggregation query.
+     *
+ */ + public com.google.datastore.v1.RunAggregationQueryResponse runAggregationQuery( + com.google.datastore.v1.RunAggregationQueryRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getRunAggregationQueryMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Begins a new transaction.
+     *
+ */ + public com.google.datastore.v1.BeginTransactionResponse beginTransaction( + com.google.datastore.v1.BeginTransactionRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getBeginTransactionMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Commits a transaction, optionally creating, deleting or modifying some
+     * entities.
+     *
+ */ + public com.google.datastore.v1.CommitResponse commit( + com.google.datastore.v1.CommitRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getCommitMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Rolls back a transaction.
+     *
+ */ + public com.google.datastore.v1.RollbackResponse rollback( + com.google.datastore.v1.RollbackRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getRollbackMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Allocates IDs for the given keys, which is useful for referencing an entity
+     * before it is inserted.
+     *
+ */ + public com.google.datastore.v1.AllocateIdsResponse allocateIds( + com.google.datastore.v1.AllocateIdsRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getAllocateIdsMethod(), getCallOptions(), request); + } + + /** + * + * + * 
+     * Prevents the supplied keys' IDs from being auto-allocated by Cloud
+     * Datastore.
+     *
+ */ + public com.google.datastore.v1.ReserveIdsResponse reserveIds( + com.google.datastore.v1.ReserveIdsRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getReserveIdsMethod(), getCallOptions(), request); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service Datastore. + * + * 
+   * Each RPC normalizes the partition IDs of the keys in its input entities,
+   * and always returns entities with keys with normalized partition IDs.
+   * This applies to all keys and entities, including those in values, except keys
+   * with both an empty path and an empty or unset partition ID. Normalization of
+   * input keys sets the project ID (if not already set) to the project ID from
+   * the request.
+   *
+ */ + public static final class DatastoreFutureStub + extends io.grpc.stub.AbstractFutureStub { + private DatastoreFutureStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @java.lang.Override + protected DatastoreFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new DatastoreFutureStub(channel, callOptions); + } + + /** + * + * + * 
+     * Looks up entities by key.
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture< + com.google.datastore.v1.LookupResponse> + lookup(com.google.datastore.v1.LookupRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getLookupMethod(), getCallOptions()), request); + } + + /** + * + * + * 
+     * Queries for entities.
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture< + com.google.datastore.v1.RunQueryResponse> + runQuery(com.google.datastore.v1.RunQueryRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getRunQueryMethod(), getCallOptions()), request); + } + + /** + * + * + * 
+     * Runs an aggregation query.
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture< + com.google.datastore.v1.RunAggregationQueryResponse> + runAggregationQuery(com.google.datastore.v1.RunAggregationQueryRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getRunAggregationQueryMethod(), getCallOptions()), request); + } + + /** + * + * + * 
+     * Begins a new transaction.
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture< + com.google.datastore.v1.BeginTransactionResponse> + beginTransaction(com.google.datastore.v1.BeginTransactionRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getBeginTransactionMethod(), getCallOptions()), request); + } + + /** + * + * + * 
+     * Commits a transaction, optionally creating, deleting or modifying some
+     * entities.
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture< + com.google.datastore.v1.CommitResponse> + commit(com.google.datastore.v1.CommitRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getCommitMethod(), getCallOptions()), request); + } + + /** + * + * + * 
+     * Rolls back a transaction.
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture< + com.google.datastore.v1.RollbackResponse> + rollback(com.google.datastore.v1.RollbackRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getRollbackMethod(), getCallOptions()), request); + } + + /** + * + * + * 
+     * Allocates IDs for the given keys, which is useful for referencing an entity
+     * before it is inserted.
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture< + com.google.datastore.v1.AllocateIdsResponse> + allocateIds(com.google.datastore.v1.AllocateIdsRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getAllocateIdsMethod(), getCallOptions()), request); + } + + /** + * + * + * 
+     * Prevents the supplied keys' IDs from being auto-allocated by Cloud
+     * Datastore.
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture< + com.google.datastore.v1.ReserveIdsResponse> + reserveIds(com.google.datastore.v1.ReserveIdsRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getReserveIdsMethod(), getCallOptions()), request); + } + } + + private static final int METHODID_LOOKUP = 0; + private static final int METHODID_RUN_QUERY = 1; + private static final int METHODID_RUN_AGGREGATION_QUERY = 2; + private static final int METHODID_BEGIN_TRANSACTION = 3; + private static final int METHODID_COMMIT = 4; + private static final int METHODID_ROLLBACK = 5; + private static final int METHODID_ALLOCATE_IDS = 6; + private static final int METHODID_RESERVE_IDS = 7; + + private static final class MethodHandlers + implements io.grpc.stub.ServerCalls.UnaryMethod, + io.grpc.stub.ServerCalls.ServerStreamingMethod, + io.grpc.stub.ServerCalls.ClientStreamingMethod, + io.grpc.stub.ServerCalls.BidiStreamingMethod { + private final AsyncService serviceImpl; + private final int methodId; + + MethodHandlers(AsyncService serviceImpl, int methodId) { + this.serviceImpl = serviceImpl; + this.methodId = methodId; + } + + @java.lang.Override + @java.lang.SuppressWarnings("unchecked") + public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { + switch (methodId) { + case METHODID_LOOKUP: + serviceImpl.lookup( + (com.google.datastore.v1.LookupRequest) request, + (io.grpc.stub.StreamObserver) + responseObserver); + break; + case METHODID_RUN_QUERY: + serviceImpl.runQuery( + (com.google.datastore.v1.RunQueryRequest) request, + (io.grpc.stub.StreamObserver) + responseObserver); + break; + case METHODID_RUN_AGGREGATION_QUERY: + serviceImpl.runAggregationQuery( + (com.google.datastore.v1.RunAggregationQueryRequest) request, + (io.grpc.stub.StreamObserver) + responseObserver); + break; + case METHODID_BEGIN_TRANSACTION: + serviceImpl.beginTransaction( + (com.google.datastore.v1.BeginTransactionRequest) request, + (io.grpc.stub.StreamObserver) + responseObserver); + break; + case METHODID_COMMIT: + serviceImpl.commit( + (com.google.datastore.v1.CommitRequest) request, + (io.grpc.stub.StreamObserver) + responseObserver); + break; + case METHODID_ROLLBACK: + serviceImpl.rollback( + (com.google.datastore.v1.RollbackRequest) request, + (io.grpc.stub.StreamObserver) + responseObserver); + break; + case METHODID_ALLOCATE_IDS: + serviceImpl.allocateIds( + (com.google.datastore.v1.AllocateIdsRequest) request, + (io.grpc.stub.StreamObserver) + responseObserver); + break; + case METHODID_RESERVE_IDS: + serviceImpl.reserveIds( + (com.google.datastore.v1.ReserveIdsRequest) request, + (io.grpc.stub.StreamObserver) + responseObserver); + break; + default: + throw new AssertionError(); + } + } + + @java.lang.Override + @java.lang.SuppressWarnings("unchecked") + public io.grpc.stub.StreamObserver invoke( + io.grpc.stub.StreamObserver responseObserver) { + switch (methodId) { + default: + throw new AssertionError(); + } + } + } + + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getLookupMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.datastore.v1.LookupRequest, com.google.datastore.v1.LookupResponse>( + service, METHODID_LOOKUP))) + .addMethod( + getRunQueryMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.datastore.v1.RunQueryRequest, + com.google.datastore.v1.RunQueryResponse>(service, METHODID_RUN_QUERY))) + .addMethod( + getRunAggregationQueryMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.datastore.v1.RunAggregationQueryRequest, + com.google.datastore.v1.RunAggregationQueryResponse>( + service, METHODID_RUN_AGGREGATION_QUERY))) + .addMethod( + getBeginTransactionMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.datastore.v1.BeginTransactionRequest, + com.google.datastore.v1.BeginTransactionResponse>( + service, METHODID_BEGIN_TRANSACTION))) + .addMethod( + getCommitMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.datastore.v1.CommitRequest, com.google.datastore.v1.CommitResponse>( + service, METHODID_COMMIT))) + .addMethod( + getRollbackMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.datastore.v1.RollbackRequest, + com.google.datastore.v1.RollbackResponse>(service, METHODID_ROLLBACK))) + .addMethod( + getAllocateIdsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.datastore.v1.AllocateIdsRequest, + com.google.datastore.v1.AllocateIdsResponse>(service, METHODID_ALLOCATE_IDS))) + .addMethod( + getReserveIdsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.datastore.v1.ReserveIdsRequest, + com.google.datastore.v1.ReserveIdsResponse>(service, METHODID_RESERVE_IDS))) + .build(); + } + + private abstract static class DatastoreBaseDescriptorSupplier + implements io.grpc.protobuf.ProtoFileDescriptorSupplier, + io.grpc.protobuf.ProtoServiceDescriptorSupplier { + DatastoreBaseDescriptorSupplier() {} + + @java.lang.Override + public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() { + return com.google.datastore.v1.DatastoreProto.getDescriptor(); + } + + @java.lang.Override + public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() { + return getFileDescriptor().findServiceByName("Datastore"); + } + } + + private static final class DatastoreFileDescriptorSupplier + extends DatastoreBaseDescriptorSupplier { + DatastoreFileDescriptorSupplier() {} + } + + private static final class DatastoreMethodDescriptorSupplier + extends DatastoreBaseDescriptorSupplier + implements io.grpc.protobuf.ProtoMethodDescriptorSupplier { + private final java.lang.String methodName; + + DatastoreMethodDescriptorSupplier(java.lang.String methodName) { + this.methodName = methodName; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() { + return getServiceDescriptor().findMethodByName(methodName); + } + } + + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; + + public static io.grpc.ServiceDescriptor getServiceDescriptor() { + io.grpc.ServiceDescriptor result = serviceDescriptor; + if (result == null) { + synchronized (DatastoreGrpc.class) { + result = serviceDescriptor; + if (result == null) { + serviceDescriptor = + result = + io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) + .setSchemaDescriptor(new DatastoreFileDescriptorSupplier()) + .addMethod(getLookupMethod()) + .addMethod(getRunQueryMethod()) + .addMethod(getRunAggregationQueryMethod()) + .addMethod(getBeginTransactionMethod()) + .addMethod(getCommitMethod()) + .addMethod(getRollbackMethod()) + .addMethod(getAllocateIdsMethod()) + .addMethod(getReserveIdsMethod()) + .build(); + } + } + } + return result; + } +} diff --git a/pom.xml b/pom.xml index 8a73f4502..e3192a0c2 100644 --- a/pom.xml +++ b/pom.xml @@ -176,6 +176,16 @@ proto-google-cloud-datastore-v1 0.118.3-SNAPSHOT + + com.google.api.grpc + grpc-google-cloud-datastore-v1 + 2.27.3-SNAPSHOT + + + com.google.cloud + google-cloud-datastore-utils + 2.27.3-SNAPSHOT + com.google.cloud.datastore datastore-v1-proto-client @@ -269,8 +279,10 @@ grpc-google-cloud-datastore-admin-v1 proto-google-cloud-datastore-v1 proto-google-cloud-datastore-admin-v1 + grpc-google-cloud-datastore-v1 datastore-v1-proto-client google-cloud-datastore-bom + google-cloud-datastore-utils diff --git a/pull-gapic-grpc.sh b/pull-gapic-grpc.sh new file mode 100644 index 000000000..327d7676c --- /dev/null +++ b/pull-gapic-grpc.sh @@ -0,0 +1,42 @@ +# +# Copyright 2023 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +GENERATED_CODE_DIR=$(pwd)/../googleapis-gen +DATASTORE_DIR=$(pwd) + +echo $GENERATED_CODE_DIR +if [ -d "$GENERATED_CODE_DIR" ]; then + echo "Pulling latest changes in ${GENERATED_CODE_DIR}" + pushd $GENERATED_CODE_DIR || exit + git pull + popd || exit +else + echo "Cloning googleapis-gen" + git clone --depth 1 git@github.com:googleapis/googleapis-gen.git $GENERATED_CODE_DIR +fi + +#Copying the required directories +mkdir -p "$DATASTORE_DIR/grpc-google-cloud-datastore-v1" +cp -r "$GENERATED_CODE_DIR/google/datastore/v1/google-cloud-datastore-v1-java/grpc-google-cloud-datastore-v1-java/." \ +"$DATASTORE_DIR/grpc-google-cloud-datastore-v1/." +cp -r "$GENERATED_CODE_DIR/google/datastore/v1/google-cloud-datastore-v1-java/gapic-google-cloud-datastore-v1-java/." \ +"$DATASTORE_DIR/google-cloud-datastore/." + +#Cleaning up unwanted files +rm grpc-google-cloud-datastore-v1/build.gradle +rm google-cloud-datastore/build.gradle + +echo "Success" diff --git a/versions.txt b/versions.txt index c965ffe8b..5431b08fd 100644 --- a/versions.txt +++ b/versions.txt @@ -7,3 +7,4 @@ proto-google-cloud-datastore-v1:0.118.2:0.118.3-SNAPSHOT datastore-v1-proto-client:2.27.2:2.27.3-SNAPSHOT proto-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT grpc-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT +grpc-google-cloud-datastore-v1:2.27.2:2.27.3-SNAPSHOT From 42188b990719ca3f45633fdeda5714cec54e8faf Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 29 Apr 2025 15:54:53 -0400 Subject: [PATCH 240/292] chore: Update generation configuration at Tue Apr 29 02:28:51 UTC 2025 (#1831) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index ca5a13acf..c7f6ff188 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.56.2 -googleapis_commitish: 2eec62dc7ed836c8d9f73fb313afb8f48c361bef +googleapis_commitish: ce291b3bc967923f89e0e54ed33d18802672b171 libraries_bom_version: 26.59.0 libraries: - api_shortname: datastore From be0236970e2f5d1db46a934f7cc1fbdfd9dfaff9 Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Tue, 29 Apr 2025 13:45:57 -0700 Subject: [PATCH 241/292] doc: modify installation instructions for gapic public preview (#1833) * doc: modify installation instructions for gapic public preview * chore: generate libraries at Tue Apr 29 20:05:06 UTC 2025 --------- Co-authored-by: cloud-java-bot --- .readme-partials.yaml | 29 ++--------------------------- README.md | 29 ++--------------------------- 2 files changed, 4 insertions(+), 54 deletions(-) diff --git a/.readme-partials.yaml b/.readme-partials.yaml index 3e8d3a465..a6afbfd20 100644 --- a/.readme-partials.yaml +++ b/.readme-partials.yaml @@ -108,35 +108,10 @@ custom_content: | gRPC Java Datastore Client User Guide ------- - In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance. + The [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance. #### Installation Instructions - The client can be built from the `grpc-experimental` branch on GitHub. For private preview, you can also download the artifact with the instructions provided below. - - 1. Download the datastore private preview package with dependencies: - ``` - curl -o https://datastore-sdk-feature-release.web.app/google-cloud-datastore-2.20.0-grpc-experimental-1-SNAPSHOT-jar-with-dependencies.jar - ``` - 2. Run the following commands to install JDK locally: - ``` - mvn install:install-file -Dfile= -DgroupId=com.google.cloud -DartifactId=google-cloud-datastore -Dversion=2.20.0-grpc - ``` - 3. Edit your pom.xml to add above package to `` section: - ```xml - - com.google.cloud - google-cloud-datastore - 2.20.0-grpc-experimental-1-SNAPSHOT - - ``` - - And if you have not yet, add below to `` section: - ```xml - - local-repo - file://${user.home}/.m2/repository - - ``` + To use this feature, please upgrade your Java-datastore SDK to version v2.28.0 or a newer release. You can find the latest versions [here](https://github.com/googleapis/java-datastore/releases). #### How to Use To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation. diff --git a/README.md b/README.md index d94fcb890..9fcbdbba3 100644 --- a/README.md +++ b/README.md @@ -206,35 +206,10 @@ display on your webpage. gRPC Java Datastore Client User Guide ------- -In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance. +The [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance. #### Installation Instructions -The client can be built from the `grpc-experimental` branch on GitHub. For private preview, you can also download the artifact with the instructions provided below. - -1. Download the datastore private preview package with dependencies: - ``` - curl -o https://datastore-sdk-feature-release.web.app/google-cloud-datastore-2.20.0-grpc-experimental-1-SNAPSHOT-jar-with-dependencies.jar - ``` -2. Run the following commands to install JDK locally: - ``` - mvn install:install-file -Dfile= -DgroupId=com.google.cloud -DartifactId=google-cloud-datastore -Dversion=2.20.0-grpc - ``` -3. Edit your pom.xml to add above package to `` section: - ```xml - - com.google.cloud - google-cloud-datastore - 2.20.0-grpc-experimental-1-SNAPSHOT - - ``` - -And if you have not yet, add below to `` section: - ```xml - - local-repo - file://${user.home}/.m2/repository - - ``` +To use this feature, please upgrade your Java-datastore SDK to version v2.28.0 or a newer release. You can find the latest versions [here](https://github.com/googleapis/java-datastore/releases). #### How to Use To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation. From 6beb15236b7b276b69686f7d20bc7d935c8acbd6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 30 Apr 2025 06:46:45 -0700 Subject: [PATCH 242/292] chore(main): release 2.28.0 (#1832) * chore(main): release 2.28.0 * chore: generate libraries at Tue Apr 29 19:55:20 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 13 files changed, 44 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6fc874f1..520736da2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.28.0](https://github.com/googleapis/java-datastore/compare/v2.27.2...v2.28.0) (2025-04-29) + + +### Features + +* Java datastore gapic upgrade ([#1824](https://github.com/googleapis/java-datastore/issues/1824)) ([a296d43](https://github.com/googleapis/java-datastore/commit/a296d43724c57aba6a69ebed249261e3d367d625)) + ## [2.27.2](https://github.com/googleapis/java-datastore/compare/v2.27.1...v2.27.2) (2025-04-25) diff --git a/README.md b/README.md index 9fcbdbba3..dcda545d5 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.27.2' +implementation 'com.google.cloud:google-cloud-datastore:2.28.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.27.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.0" ``` ## Authentication @@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.27.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 8bac6a329..a03e00cb9 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.27.3-SNAPSHOT + 2.28.0 com.google.cloud google-cloud-datastore-parent - 2.27.3-SNAPSHOT + 2.28.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 76840bb8b..5cbd6833d 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.27.3-SNAPSHOT + 2.28.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.27.3-SNAPSHOT + 2.28.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.3-SNAPSHOT + 2.28.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.3-SNAPSHOT + 0.119.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.3-SNAPSHOT + 2.28.0 diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 6cb32a8b1..8a5f90af1 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.27.3-SNAPSHOT + 2.28.0 jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.27.3-SNAPSHOT + 2.28.0 google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 32c6caf15..bd4451798 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.27.3-SNAPSHOT + 2.28.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.27.3-SNAPSHOT + 2.28.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 907c878d2..9061da736 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.3-SNAPSHOT + 2.28.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.3-SNAPSHOT + 2.28.0 diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 8a4396f4f..68f2130fb 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.27.3-SNAPSHOT + 2.28.0 grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.3-SNAPSHOT + 2.28.0 diff --git a/pom.xml b/pom.xml index e3192a0c2..924f8de58 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.27.3-SNAPSHOT + 2.28.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.3-SNAPSHOT + 2.28.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.27.3-SNAPSHOT + 2.28.0 com.google.cloud google-cloud-datastore - 2.27.3-SNAPSHOT + 2.28.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.3-SNAPSHOT + 0.119.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.27.3-SNAPSHOT + 2.28.0 com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.27.3-SNAPSHOT + 2.28.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 6684f2fdd..78f760cda 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.27.3-SNAPSHOT + 2.28.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.27.3-SNAPSHOT + 2.28.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 290e29408..23c4117c4 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.118.3-SNAPSHOT + 0.119.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.27.3-SNAPSHOT + 2.28.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index d6ec5f36d..4f57a6709 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.27.3-SNAPSHOT + 2.28.0 diff --git a/versions.txt b/versions.txt index 5431b08fd..82005f39a 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.27.2:2.27.3-SNAPSHOT -google-cloud-datastore-bom:2.27.2:2.27.3-SNAPSHOT -proto-google-cloud-datastore-v1:0.118.2:0.118.3-SNAPSHOT -datastore-v1-proto-client:2.27.2:2.27.3-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.27.2:2.27.3-SNAPSHOT -grpc-google-cloud-datastore-v1:2.27.2:2.27.3-SNAPSHOT +google-cloud-datastore:2.28.0:2.28.0 +google-cloud-datastore-bom:2.28.0:2.28.0 +proto-google-cloud-datastore-v1:0.119.0:0.119.0 +datastore-v1-proto-client:2.28.0:2.28.0 +proto-google-cloud-datastore-admin-v1:2.28.0:2.28.0 +grpc-google-cloud-datastore-admin-v1:2.28.0:2.28.0 +grpc-google-cloud-datastore-v1:2.28.0:2.28.0 From 6a38446fc333c587a1e640e350fd072df4df318c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 12:01:45 -0700 Subject: [PATCH 243/292] chore(main): release 2.28.1-SNAPSHOT (#1837) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index a03e00cb9..2cb36d489 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.28.0 + 2.28.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.28.0 + 2.28.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 5cbd6833d..da8bc293c 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.28.0 + 2.28.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.28.0 + 2.28.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.0 + 2.28.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.0 + 0.119.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.0 + 2.28.1-SNAPSHOT diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 8a5f90af1..e67ac5b98 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.28.0 + 2.28.1-SNAPSHOT jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.0 + 2.28.1-SNAPSHOT google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index bd4451798..f6efd5640 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.28.0 + 2.28.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.0 + 2.28.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 9061da736..81b1299a7 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.0 + 2.28.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.0 + 2.28.1-SNAPSHOT diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 68f2130fb..20c709c01 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.0 + 2.28.1-SNAPSHOT grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.0 + 2.28.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 924f8de58..0ca3d9d51 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.28.0 + 2.28.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.0 + 2.28.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.0 + 2.28.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.28.0 + 2.28.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.0 + 0.119.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.0 + 2.28.1-SNAPSHOT com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.28.0 + 2.28.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 78f760cda..779ca5877 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.0 + 2.28.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.0 + 2.28.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 23c4117c4..619c1cfff 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.0 + 0.119.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.28.0 + 2.28.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 4f57a6709..b8f37263e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.28.0 + 2.28.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 82005f39a..c56217f8d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.28.0:2.28.0 -google-cloud-datastore-bom:2.28.0:2.28.0 -proto-google-cloud-datastore-v1:0.119.0:0.119.0 -datastore-v1-proto-client:2.28.0:2.28.0 -proto-google-cloud-datastore-admin-v1:2.28.0:2.28.0 -grpc-google-cloud-datastore-admin-v1:2.28.0:2.28.0 -grpc-google-cloud-datastore-v1:2.28.0:2.28.0 +google-cloud-datastore:2.28.0:2.28.1-SNAPSHOT +google-cloud-datastore-bom:2.28.0:2.28.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.119.0:0.119.1-SNAPSHOT +datastore-v1-proto-client:2.28.0:2.28.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.28.0:2.28.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.28.0:2.28.1-SNAPSHOT +grpc-google-cloud-datastore-v1:2.28.0:2.28.1-SNAPSHOT From ac393e61e517d30b534be3e99070c210081c4f0b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 6 May 2025 17:00:02 +0200 Subject: [PATCH 244/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.47.0 (#1841) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-a.cfg | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 2 +- .kokoro/presubmit/graalvm-native-c.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 2bb8e4187..c39a53f54 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.46.2 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.47.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index d0c295213..24e5053a5 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index 962c305ff..ae35f6cb2 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index 87b5dff65..660f1ee7e 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index da8bc293c..7fff645a7 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.46.2 + 3.47.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 0ca3d9d51..f0dabca02 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.46.2 + 3.47.0 From 0745906bbdd8819ac2ccaafa301c8f4b4fd20be4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 6 May 2025 18:11:19 +0200 Subject: [PATCH 245/292] deps: update googleapis/sdk-platform-java action to v2.57.0 (#1842) --- .github/workflows/hermetic_library_generation.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 6b856abde..f0b1369c8 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.56.2 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.57.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} From f9a143216cc2a0c9d7343290c8c076809c509b85 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 12:57:23 -0400 Subject: [PATCH 246/292] chore(main): release 2.28.1 (#1843) * chore(main): release 2.28.1 * chore: generate libraries at Tue May 6 16:12:06 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- .kokoro/presubmit/graalvm-native-a.cfg | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 2 +- .kokoro/presubmit/graalvm-native-c.cfg | 2 +- CHANGELOG.md | 8 ++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 16 files changed, 48 insertions(+), 40 deletions(-) diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index 24e5053a5..d0c295213 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -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.47.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index ae35f6cb2..962c305ff 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -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.47.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index 660f1ee7e..87b5dff65 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -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.47.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/CHANGELOG.md b/CHANGELOG.md index 520736da2..eb97ef264 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.28.1](https://github.com/googleapis/java-datastore/compare/v2.28.0...v2.28.1) (2025-05-06) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.47.0 ([#1841](https://github.com/googleapis/java-datastore/issues/1841)) ([ac393e6](https://github.com/googleapis/java-datastore/commit/ac393e61e517d30b534be3e99070c210081c4f0b)) +* Update googleapis/sdk-platform-java action to v2.57.0 ([#1842](https://github.com/googleapis/java-datastore/issues/1842)) ([0745906](https://github.com/googleapis/java-datastore/commit/0745906bbdd8819ac2ccaafa301c8f4b4fd20be4)) + ## [2.28.0](https://github.com/googleapis/java-datastore/compare/v2.27.2...v2.28.0) (2025-04-29) diff --git a/README.md b/README.md index dcda545d5..1c9fdac68 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.28.0' +implementation 'com.google.cloud:google-cloud-datastore:2.28.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.1" ``` ## Authentication @@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.1 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 2cb36d489..19157daa0 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.28.1-SNAPSHOT + 2.28.1 com.google.cloud google-cloud-datastore-parent - 2.28.1-SNAPSHOT + 2.28.1 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 7fff645a7..b5f085a78 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.28.1-SNAPSHOT + 2.28.1 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.28.1-SNAPSHOT + 2.28.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.1-SNAPSHOT + 2.28.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.1-SNAPSHOT + 0.119.1 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.1-SNAPSHOT + 2.28.1 diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index e67ac5b98..a81437be4 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.28.1-SNAPSHOT + 2.28.1 jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.1-SNAPSHOT + 2.28.1 google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index f6efd5640..9732d8da4 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.28.1-SNAPSHOT + 2.28.1 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.1-SNAPSHOT + 2.28.1 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 81b1299a7..33928580f 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.1-SNAPSHOT + 2.28.1 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.1-SNAPSHOT + 2.28.1 diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 20c709c01..c00d8f2ad 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.1-SNAPSHOT + 2.28.1 grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.1-SNAPSHOT + 2.28.1 diff --git a/pom.xml b/pom.xml index f0dabca02..b4cef3dc8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.28.1-SNAPSHOT + 2.28.1 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.1-SNAPSHOT + 2.28.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.1-SNAPSHOT + 2.28.1 com.google.cloud google-cloud-datastore - 2.28.1-SNAPSHOT + 2.28.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.1-SNAPSHOT + 0.119.1 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.1-SNAPSHOT + 2.28.1 com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.28.1-SNAPSHOT + 2.28.1 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 779ca5877..86895276b 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.1-SNAPSHOT + 2.28.1 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.1-SNAPSHOT + 2.28.1 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 619c1cfff..10aef002c 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.1-SNAPSHOT + 0.119.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.28.1-SNAPSHOT + 2.28.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b8f37263e..ab17ca59f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.28.1-SNAPSHOT + 2.28.1 diff --git a/versions.txt b/versions.txt index c56217f8d..2bbdc428d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.28.0:2.28.1-SNAPSHOT -google-cloud-datastore-bom:2.28.0:2.28.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.119.0:0.119.1-SNAPSHOT -datastore-v1-proto-client:2.28.0:2.28.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.28.0:2.28.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.28.0:2.28.1-SNAPSHOT -grpc-google-cloud-datastore-v1:2.28.0:2.28.1-SNAPSHOT +google-cloud-datastore:2.28.1:2.28.1 +google-cloud-datastore-bom:2.28.1:2.28.1 +proto-google-cloud-datastore-v1:0.119.1:0.119.1 +datastore-v1-proto-client:2.28.1:2.28.1 +proto-google-cloud-datastore-admin-v1:2.28.1:2.28.1 +grpc-google-cloud-datastore-admin-v1:2.28.1:2.28.1 +grpc-google-cloud-datastore-v1:2.28.1:2.28.1 From 52741c7bf5263064089042bf4b1764657cd2d1b6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 13:39:20 -0400 Subject: [PATCH 247/292] chore(main): release 2.28.2-SNAPSHOT (#1845) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 19157daa0..32e5dc65c 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.28.1 + 2.28.2-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.28.1 + 2.28.2-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index b5f085a78..6842d693e 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.28.1 + 2.28.2-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.28.1 + 2.28.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.1 + 2.28.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.1 + 0.119.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.1 + 2.28.2-SNAPSHOT diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index a81437be4..0360a44a6 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.28.1 + 2.28.2-SNAPSHOT jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.1 + 2.28.2-SNAPSHOT google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 9732d8da4..ecb5895ae 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.28.1 + 2.28.2-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.1 + 2.28.2-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 33928580f..98b13c80d 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.1 + 2.28.2-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.1 + 2.28.2-SNAPSHOT diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index c00d8f2ad..98832894e 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.1 + 2.28.2-SNAPSHOT grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.1 + 2.28.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index b4cef3dc8..ab5e57249 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.28.1 + 2.28.2-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.1 + 2.28.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.1 + 2.28.2-SNAPSHOT com.google.cloud google-cloud-datastore - 2.28.1 + 2.28.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.1 + 0.119.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.1 + 2.28.2-SNAPSHOT com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.28.1 + 2.28.2-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 86895276b..eeee39bc6 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.1 + 2.28.2-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.1 + 2.28.2-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 10aef002c..f896ecd1f 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.1 + 0.119.2-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.28.1 + 2.28.2-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ab17ca59f..3a513d18c 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.28.1 + 2.28.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index 2bbdc428d..cd6778817 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.28.1:2.28.1 -google-cloud-datastore-bom:2.28.1:2.28.1 -proto-google-cloud-datastore-v1:0.119.1:0.119.1 -datastore-v1-proto-client:2.28.1:2.28.1 -proto-google-cloud-datastore-admin-v1:2.28.1:2.28.1 -grpc-google-cloud-datastore-admin-v1:2.28.1:2.28.1 -grpc-google-cloud-datastore-v1:2.28.1:2.28.1 +google-cloud-datastore:2.28.1:2.28.2-SNAPSHOT +google-cloud-datastore-bom:2.28.1:2.28.2-SNAPSHOT +proto-google-cloud-datastore-v1:0.119.1:0.119.2-SNAPSHOT +datastore-v1-proto-client:2.28.1:2.28.2-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.28.1:2.28.2-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.28.1:2.28.2-SNAPSHOT +grpc-google-cloud-datastore-v1:2.28.1:2.28.2-SNAPSHOT From b8fc73de6974181bc54a5716e08815f804eb8006 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 8 May 2025 00:30:25 +0200 Subject: [PATCH 248/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore-utils to v2.28.1 (#1839) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore-utils](https://redirect.github.com/googleapis/java-datastore) | `2.27.3-SNAPSHOT` -> `2.28.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore-utils/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore-utils/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore-utils/2.27.3-SNAPSHOT/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore-utils/2.27.3-SNAPSHOT/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore-utils) ### [`v2.28.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2281-2025-05-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.0...v2.28.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.47.0 ([#​1841](https://redirect.github.com/googleapis/java-datastore/issues/1841)) ([ac393e6](https://redirect.github.com/googleapis/java-datastore/commit/ac393e61e517d30b534be3e99070c210081c4f0b)) - Update googleapis/sdk-platform-java action to v2.57.0 ([#​1842](https://redirect.github.com/googleapis/java-datastore/issues/1842)) ([0745906](https://redirect.github.com/googleapis/java-datastore/commit/0745906bbdd8819ac2ccaafa301c8f4b4fd20be4))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab5e57249..0d80b0fe4 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ com.google.cloud google-cloud-datastore-utils - 2.27.3-SNAPSHOT + 2.28.1 com.google.cloud.datastore From 0808d9a51f9fcaea622c75d4fc6915afa782dfad Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 8 May 2025 00:30:30 +0200 Subject: [PATCH 249/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.28.1 (#1838) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.27.2` -> `2.28.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.27.2/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.27.2/2.28.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.28.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2281-2025-05-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.0...v2.28.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.47.0 ([#​1841](https://redirect.github.com/googleapis/java-datastore/issues/1841)) ([ac393e6](https://redirect.github.com/googleapis/java-datastore/commit/ac393e61e517d30b534be3e99070c210081c4f0b)) - Update googleapis/sdk-platform-java action to v2.57.0 ([#​1842](https://redirect.github.com/googleapis/java-datastore/issues/1842)) ([0745906](https://redirect.github.com/googleapis/java-datastore/commit/0745906bbdd8819ac2ccaafa301c8f4b4fd20be4)) ### [`v2.28.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2280-2025-04-29) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.27.2...v2.28.0) ##### Features - Java datastore gapic upgrade ([#​1824](https://redirect.github.com/googleapis/java-datastore/issues/1824)) ([a296d43](https://redirect.github.com/googleapis/java-datastore/commit/a296d43724c57aba6a69ebed249261e3d367d625))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index ca5f70689..1cf6cb5f9 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.27.2 + 2.28.1 From 012d5138f3c0e5a87d18f0c63c7ea2c7ce6783fe Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 15 May 2025 20:50:23 +0200 Subject: [PATCH 250/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.60.0 (#1848) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.59.0` -> `26.60.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.60.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.60.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.59.0/26.60.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.59.0/26.60.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-cloud-bom (com.google.cloud:libraries-bom) ### [`v26.60.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26600-2025-05-09) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.47.0 ([#​7016](https://redirect.github.com/googleapis/java-cloud-bom/issues/7016)) ([a40d300](https://redirect.github.com/googleapis/java-cloud-bom/commit/a40d300eb07af6b74db39fe7d8a3e990d0195a36)) - update dependency com.google.cloud:gapic-libraries-bom to v1.55.0 ([#​7015](https://redirect.github.com/googleapis/java-cloud-bom/issues/7015)) ([405c67b](https://redirect.github.com/googleapis/java-cloud-bom/commit/405c67bfcb79cd25aec30476ebcd9a5432348f82)) - update dependency com.google.cloud:gapic-libraries-bom to v1.56.0 ([#​7026](https://redirect.github.com/googleapis/java-cloud-bom/issues/7026)) ([f5732ad](https://redirect.github.com/googleapis/java-cloud-bom/commit/f5732ad9fbb63a5f432def426d13d8b8d18ee43b)) - update dependency com.google.cloud:google-cloud-bigquery to v2.50.0 ([#​7020](https://redirect.github.com/googleapis/java-cloud-bom/issues/7020)) ([52686db](https://redirect.github.com/googleapis/java-cloud-bom/commit/52686dbf1b4d590fda47a3477b3bba3e41834b9e)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.14.0 ([#​7025](https://redirect.github.com/googleapis/java-cloud-bom/issues/7025)) ([ce8f873](https://redirect.github.com/googleapis/java-cloud-bom/commit/ce8f8735cb57d1ac8c0a3c5b42149f0a14d546ec)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.58.1 ([#​7000](https://redirect.github.com/googleapis/java-cloud-bom/issues/7000)) ([4946872](https://redirect.github.com/googleapis/java-cloud-bom/commit/49468728c8b3d272590e1d5a1a7356ab9a0b5063)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.58.2 ([#​7030](https://redirect.github.com/googleapis/java-cloud-bom/issues/7030)) ([7b5548f](https://redirect.github.com/googleapis/java-cloud-bom/commit/7b5548fffacc57b2976a5ec2616e9b5fcfd4a9a7)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.28.1 ([#​7027](https://redirect.github.com/googleapis/java-cloud-bom/issues/7027)) ([663f640](https://redirect.github.com/googleapis/java-cloud-bom/commit/663f64047ff82842744f4507860ee45489620da1)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.31.2 ([#​6999](https://redirect.github.com/googleapis/java-cloud-bom/issues/6999)) ([3a39dcf](https://redirect.github.com/googleapis/java-cloud-bom/commit/3a39dcf7c7939444429fedbbcfaec354df243809)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.31.3 ([#​7031](https://redirect.github.com/googleapis/java-cloud-bom/issues/7031)) ([abed6bd](https://redirect.github.com/googleapis/java-cloud-bom/commit/abed6bdcd0d394f1293d27d732f9743ff76627a5)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.22.3 ([#​7021](https://redirect.github.com/googleapis/java-cloud-bom/issues/7021)) ([115edeb](https://redirect.github.com/googleapis/java-cloud-bom/commit/115edebd8b06ca1c5bac209f5dc5db526c0c1c54)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.132.7-alpha ([#​7022](https://redirect.github.com/googleapis/java-cloud-bom/issues/7022)) ([a4bd532](https://redirect.github.com/googleapis/java-cloud-bom/commit/a4bd53204b722627f1c16be01f395cf030db0d90)) - update dependency com.google.cloud:google-cloud-nio to v0.127.35 ([#​7023](https://redirect.github.com/googleapis/java-cloud-bom/issues/7023)) ([cf8f804](https://redirect.github.com/googleapis/java-cloud-bom/commit/cf8f8046f9b4ad8fe2adc49dbc1a77c1a85f7d4b)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.139.3 ([#​7028](https://redirect.github.com/googleapis/java-cloud-bom/issues/7028)) ([9999747](https://redirect.github.com/googleapis/java-cloud-bom/commit/999974779448eb5de8775bd6e3a1ec89c288cbc3)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.15.7 ([#​7024](https://redirect.github.com/googleapis/java-cloud-bom/issues/7024)) ([b67d320](https://redirect.github.com/googleapis/java-cloud-bom/commit/b67d320b8054bb03be2abc11d260af4361c09116)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.92.0 ([#​7010](https://redirect.github.com/googleapis/java-cloud-bom/issues/7010)) ([e69a50d](https://redirect.github.com/googleapis/java-cloud-bom/commit/e69a50d32347e4d836273b678513f0249602b525)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.93.0 ([#​7033](https://redirect.github.com/googleapis/java-cloud-bom/issues/7033)) ([195fdeb](https://redirect.github.com/googleapis/java-cloud-bom/commit/195fdeb6baff72d12b6a4c62edb4006944371b3e)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.30.0 ([#​7017](https://redirect.github.com/googleapis/java-cloud-bom/issues/7017)) ([2601c4b](https://redirect.github.com/googleapis/java-cloud-bom/commit/2601c4b736e623117c6af7d0569aea0b6abf816a)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.30.1 ([#​7034](https://redirect.github.com/googleapis/java-cloud-bom/issues/7034)) ([efad584](https://redirect.github.com/googleapis/java-cloud-bom/commit/efad584a7e9bd83f08c8808bad25a02d06dc2d96)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.52.2 ([#​7029](https://redirect.github.com/googleapis/java-cloud-bom/issues/7029)) ([0c3d542](https://redirect.github.com/googleapis/java-cloud-bom/commit/0c3d54270254f274b21b09715d651e6bcbff35ee))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 88e93a110..f913a5e02 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.59.0 + 26.60.0 pom import From 7ed32321a5c84c4b2f61094e4c4adb5e36e5bc1b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 15 May 2025 22:03:17 +0200 Subject: [PATCH 251/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.48.0 (#1847) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-a.cfg | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 2 +- .kokoro/presubmit/graalvm-native-c.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index c39a53f54..dac51eeaf 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.47.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.48.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index d0c295213..d72ed3f0e 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index 962c305ff..f2e296b84 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index 87b5dff65..68512fbff 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 6842d693e..8fb5dc56a 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.47.0 + 3.48.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 0d80b0fe4..64588d7a2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.47.0 + 3.48.0 From eef820d017f5e00245924d551abe172a2a39e29f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 16 May 2025 19:12:17 +0200 Subject: [PATCH 252/292] deps: update googleapis/sdk-platform-java action to v2.58.0 (#1853) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- .github/workflows/hermetic_library_generation.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index f0b1369c8..336ac2c8c 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.57.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.58.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} From 055effd30d3c940d4660e98ddde5d0ee726873ff Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 14:02:25 +0000 Subject: [PATCH 253/292] chore(main): release 2.28.2 (#1854) :robot: I have created a release *beep* *boop* --- ## [2.28.2](https://togithub.com/googleapis/java-datastore/compare/v2.28.1...v2.28.2) (2025-05-16) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.48.0 ([#1847](https://togithub.com/googleapis/java-datastore/issues/1847)) ([7ed3232](https://togithub.com/googleapis/java-datastore/commit/7ed32321a5c84c4b2f61094e4c4adb5e36e5bc1b)) * Update googleapis/sdk-platform-java action to v2.58.0 ([#1853](https://togithub.com/googleapis/java-datastore/issues/1853)) ([eef820d](https://togithub.com/googleapis/java-datastore/commit/eef820d017f5e00245924d551abe172a2a39e29f)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- .kokoro/presubmit/graalvm-native-a.cfg | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 2 +- .kokoro/presubmit/graalvm-native-c.cfg | 2 +- CHANGELOG.md | 8 ++++++++ README.md | 10 +++++----- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 16 files changed, 50 insertions(+), 42 deletions(-) diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index d72ed3f0e..d0c295213 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -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.48.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index f2e296b84..962c305ff 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -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.48.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index 68512fbff..87b5dff65 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -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.48.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/CHANGELOG.md b/CHANGELOG.md index eb97ef264..24ecd6b7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.28.2](https://github.com/googleapis/java-datastore/compare/v2.28.1...v2.28.2) (2025-05-16) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.48.0 ([#1847](https://github.com/googleapis/java-datastore/issues/1847)) ([7ed3232](https://github.com/googleapis/java-datastore/commit/7ed32321a5c84c4b2f61094e4c4adb5e36e5bc1b)) +* Update googleapis/sdk-platform-java action to v2.58.0 ([#1853](https://github.com/googleapis/java-datastore/issues/1853)) ([eef820d](https://github.com/googleapis/java-datastore/commit/eef820d017f5e00245924d551abe172a2a39e29f)) + ## [2.28.1](https://github.com/googleapis/java-datastore/compare/v2.28.0...v2.28.1) (2025-05-06) diff --git a/README.md b/README.md index 1c9fdac68..f20c24eaa 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.59.0 + 26.60.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.27.2 + 2.28.1 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.28.1' +implementation 'com.google.cloud:google-cloud-datastore:2.28.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.2" ``` ## Authentication @@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.2 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 32e5dc65c..7adb1d6ad 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.28.2-SNAPSHOT + 2.28.2 com.google.cloud google-cloud-datastore-parent - 2.28.2-SNAPSHOT + 2.28.2 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 8fb5dc56a..230ce6be9 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.28.2-SNAPSHOT + 2.28.2 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.28.2-SNAPSHOT + 2.28.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.2-SNAPSHOT + 2.28.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.2-SNAPSHOT + 0.119.2 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.2-SNAPSHOT + 2.28.2 diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 0360a44a6..7f6f32554 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.28.2-SNAPSHOT + 2.28.2 jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.2-SNAPSHOT + 2.28.2 google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index ecb5895ae..09e414789 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.28.2-SNAPSHOT + 2.28.2 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.2-SNAPSHOT + 2.28.2 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 98b13c80d..9eeb87b2b 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.2-SNAPSHOT + 2.28.2 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.2-SNAPSHOT + 2.28.2 diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 98832894e..9581cd434 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.2-SNAPSHOT + 2.28.2 grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.2-SNAPSHOT + 2.28.2 diff --git a/pom.xml b/pom.xml index 64588d7a2..d89aae850 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.28.2-SNAPSHOT + 2.28.2 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.2-SNAPSHOT + 2.28.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.2-SNAPSHOT + 2.28.2 com.google.cloud google-cloud-datastore - 2.28.2-SNAPSHOT + 2.28.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.2-SNAPSHOT + 0.119.2 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.2-SNAPSHOT + 2.28.2 com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.28.2-SNAPSHOT + 2.28.2 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index eeee39bc6..9ffbeaf9e 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.2-SNAPSHOT + 2.28.2 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.2-SNAPSHOT + 2.28.2 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index f896ecd1f..b3006f3ee 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.2-SNAPSHOT + 0.119.2 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.28.2-SNAPSHOT + 2.28.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 3a513d18c..e3eac4010 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.28.2-SNAPSHOT + 2.28.2 diff --git a/versions.txt b/versions.txt index cd6778817..d8c67509f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.28.1:2.28.2-SNAPSHOT -google-cloud-datastore-bom:2.28.1:2.28.2-SNAPSHOT -proto-google-cloud-datastore-v1:0.119.1:0.119.2-SNAPSHOT -datastore-v1-proto-client:2.28.1:2.28.2-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.28.1:2.28.2-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.28.1:2.28.2-SNAPSHOT -grpc-google-cloud-datastore-v1:2.28.1:2.28.2-SNAPSHOT +google-cloud-datastore:2.28.2:2.28.2 +google-cloud-datastore-bom:2.28.2:2.28.2 +proto-google-cloud-datastore-v1:0.119.2:0.119.2 +datastore-v1-proto-client:2.28.2:2.28.2 +proto-google-cloud-datastore-admin-v1:2.28.2:2.28.2 +grpc-google-cloud-datastore-admin-v1:2.28.2:2.28.2 +grpc-google-cloud-datastore-v1:2.28.2:2.28.2 From b9c2c3ff775f7123d701ccacff9bd2ea3718243b Mon Sep 17 00:00:00 2001 From: Stanislav R Date: Thu, 29 May 2025 21:25:59 +0300 Subject: [PATCH 254/292] feat: add getNumber to AggregationResult (https://github.com/googleapis/java-datastore/issues/1851) (#1861) --- .../cloud/datastore/AggregationResult.java | 20 +++++++++++++++++++ .../datastore/AggregationResultTest.java | 18 +++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java index a5071d8d8..1fdfa5bda 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java @@ -84,6 +84,26 @@ public Double getDouble(String alias) { } } + /** + * Returns a result value for the given alias. + * + * @param alias A custom alias provided in the query or an autogenerated alias in the form of + * 'property_\d' + * @return An aggregation result value as a {@link Number} for the given alias. + */ + public Number getNumber(String alias) { + Value value = properties.get(alias); + switch (value.getType()) { + case LONG: + return (Long) value.get(); + case DOUBLE: + return (Double) value.get(); + default: + throw new RuntimeException( + String.format("Unsupported type %s received for alias '%s'.", value.getType(), alias)); + } + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java index 592bfb368..84341f9d4 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/AggregationResultTest.java @@ -77,5 +77,23 @@ public void shouldThrowRuntimeExceptionOnUnknownTypes() { RuntimeException e2 = assertThrows(RuntimeException.class, () -> aggregationResult.getDouble("qty_avg")); assertThat(e2.getMessage()).isEqualTo("Unsupported type BOOLEAN received for alias 'qty_avg'."); + + RuntimeException e3 = + assertThrows(RuntimeException.class, () -> aggregationResult.getNumber("qty_avg")); + assertThat(e3.getMessage()).isEqualTo("Unsupported type BOOLEAN received for alias 'qty_avg'."); + } + + @Test + public void shouldGetDoubleAggregatedResultValueAsNumber() { + AggregationResult aggregationResult = + new AggregationResult(ImmutableMap.of("qty_avg", DoubleValue.of(45.9322))); + assertThat(aggregationResult.getNumber("qty_avg")).isEqualTo(45.9322); + } + + @Test + public void shouldGetLongAggregatedResultValueAsNumber() { + AggregationResult aggregationResult = + new AggregationResult(ImmutableMap.of("count", LongValue.of(50))); + assertThat(aggregationResult.getNumber("count")).isEqualTo(50); } } From 10971752310d8b1794c8e77041b582707142b328 Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Thu, 5 Jun 2025 14:28:26 -0700 Subject: [PATCH 255/292] fix: remove 500 char path name limit (#1865) Remove path name 500 character limit validation as this is impacting some customers for key retrievals. --- .../src/main/java/com/google/cloud/datastore/PathElement.java | 1 - 1 file changed, 1 deletion(-) diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java index fb72f4f06..d9d61342d 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java @@ -128,7 +128,6 @@ static PathElement of(String kind) { public static PathElement of(String kind, String name) { checkArgument(!Strings.isNullOrEmpty(name), "name must not be empty or null"); - checkArgument(name.length() <= 500, "name must not exceed 500 characters"); return new PathElement(kind, name, null); } From 47e6b2aea2d754d1a8d1926a65ef78862980e105 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 00:38:24 +0000 Subject: [PATCH 256/292] chore(main): release 2.28.3-SNAPSHOT (#1859) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 7adb1d6ad..67d261aa7 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.28.2 + 2.28.3-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.28.2 + 2.28.3-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 230ce6be9..c4cc681e1 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.28.2 + 2.28.3-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.28.2 + 2.28.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.2 + 2.28.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.2 + 0.119.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.2 + 2.28.3-SNAPSHOT diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 7f6f32554..6ed140c61 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.28.2 + 2.28.3-SNAPSHOT jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.2 + 2.28.3-SNAPSHOT google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 09e414789..6f1baf8f8 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.28.2 + 2.28.3-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.2 + 2.28.3-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 9eeb87b2b..7b99e6fe1 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.2 + 2.28.3-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.2 + 2.28.3-SNAPSHOT diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 9581cd434..518ff7266 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.2 + 2.28.3-SNAPSHOT grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.2 + 2.28.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index d89aae850..36eea16ae 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.28.2 + 2.28.3-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.2 + 2.28.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.2 + 2.28.3-SNAPSHOT com.google.cloud google-cloud-datastore - 2.28.2 + 2.28.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.2 + 0.119.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.2 + 2.28.3-SNAPSHOT com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.28.2 + 2.28.3-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 9ffbeaf9e..67a538349 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.2 + 2.28.3-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.2 + 2.28.3-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index b3006f3ee..0f16a6dff 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.2 + 0.119.3-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.28.2 + 2.28.3-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e3eac4010..5b182860a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.28.2 + 2.28.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index d8c67509f..028562d32 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.28.2:2.28.2 -google-cloud-datastore-bom:2.28.2:2.28.2 -proto-google-cloud-datastore-v1:0.119.2:0.119.2 -datastore-v1-proto-client:2.28.2:2.28.2 -proto-google-cloud-datastore-admin-v1:2.28.2:2.28.2 -grpc-google-cloud-datastore-admin-v1:2.28.2:2.28.2 -grpc-google-cloud-datastore-v1:2.28.2:2.28.2 +google-cloud-datastore:2.28.2:2.28.3-SNAPSHOT +google-cloud-datastore-bom:2.28.2:2.28.3-SNAPSHOT +proto-google-cloud-datastore-v1:0.119.2:0.119.3-SNAPSHOT +datastore-v1-proto-client:2.28.2:2.28.3-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.28.2:2.28.3-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.28.2:2.28.3-SNAPSHOT +grpc-google-cloud-datastore-v1:2.28.2:2.28.3-SNAPSHOT From acc1513ad90e8da6743e618322bae075bac4ac46 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 6 Jun 2025 03:37:51 +0200 Subject: [PATCH 257/292] deps: update dependency org.easymock:easymock to v5.6.0 (#1858) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 36eea16ae..12926cce8 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ org.easymock easymock - 5.5.0 + 5.6.0 test From 50ddc6684cb2eb50b684a1a105359602450714d7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 06:22:25 +0000 Subject: [PATCH 258/292] chore(main): release 2.29.0 (#1866) :robot: I have created a release *beep* *boop* --- ## [2.29.0](https://togithub.com/googleapis/java-datastore/compare/v2.28.2...v2.29.0) (2025-06-06) ### Features * Add getNumber to AggregationResult (https://togithub.com/googleapis/java-datastore/issues/1851) ([#1861](https://togithub.com/googleapis/java-datastore/issues/1861)) ([b9c2c3f](https://togithub.com/googleapis/java-datastore/commit/b9c2c3ff775f7123d701ccacff9bd2ea3718243b)) ### Bug Fixes * Remove 500 char path name limit ([#1865](https://togithub.com/googleapis/java-datastore/issues/1865)) ([1097175](https://togithub.com/googleapis/java-datastore/commit/10971752310d8b1794c8e77041b582707142b328)) ### Dependencies * Update dependency org.easymock:easymock to v5.6.0 ([#1858](https://togithub.com/googleapis/java-datastore/issues/1858)) ([acc1513](https://togithub.com/googleapis/java-datastore/commit/acc1513ad90e8da6743e618322bae075bac4ac46)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 17 +++++++++++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 13 files changed, 54 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24ecd6b7f..87fb18df3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [2.29.0](https://github.com/googleapis/java-datastore/compare/v2.28.2...v2.29.0) (2025-06-06) + + +### Features + +* Add getNumber to AggregationResult (https://github.com/googleapis/java-datastore/issues/1851) ([#1861](https://github.com/googleapis/java-datastore/issues/1861)) ([b9c2c3f](https://github.com/googleapis/java-datastore/commit/b9c2c3ff775f7123d701ccacff9bd2ea3718243b)) + + +### Bug Fixes + +* Remove 500 char path name limit ([#1865](https://github.com/googleapis/java-datastore/issues/1865)) ([1097175](https://github.com/googleapis/java-datastore/commit/10971752310d8b1794c8e77041b582707142b328)) + + +### Dependencies + +* Update dependency org.easymock:easymock to v5.6.0 ([#1858](https://github.com/googleapis/java-datastore/issues/1858)) ([acc1513](https://github.com/googleapis/java-datastore/commit/acc1513ad90e8da6743e618322bae075bac4ac46)) + ## [2.28.2](https://github.com/googleapis/java-datastore/compare/v2.28.1...v2.28.2) (2025-05-16) diff --git a/README.md b/README.md index f20c24eaa..48eb23728 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.28.2' +implementation 'com.google.cloud:google-cloud-datastore:2.29.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.28.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.0" ``` ## Authentication @@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.28.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 67d261aa7..209294c71 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.28.3-SNAPSHOT + 2.29.0 com.google.cloud google-cloud-datastore-parent - 2.28.3-SNAPSHOT + 2.29.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index c4cc681e1..8059f7fa0 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.28.3-SNAPSHOT + 2.29.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.28.3-SNAPSHOT + 2.29.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.3-SNAPSHOT + 2.29.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.3-SNAPSHOT + 0.120.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.3-SNAPSHOT + 2.29.0 diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 6ed140c61..3d3b9e8d5 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.28.3-SNAPSHOT + 2.29.0 jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.3-SNAPSHOT + 2.29.0 google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 6f1baf8f8..8c24af2eb 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.28.3-SNAPSHOT + 2.29.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.28.3-SNAPSHOT + 2.29.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 7b99e6fe1..cfc9826e8 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.3-SNAPSHOT + 2.29.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.3-SNAPSHOT + 2.29.0 diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 518ff7266..a05352cc8 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.3-SNAPSHOT + 2.29.0 grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.3-SNAPSHOT + 2.29.0 diff --git a/pom.xml b/pom.xml index 12926cce8..c72faeced 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.28.3-SNAPSHOT + 2.29.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.3-SNAPSHOT + 2.29.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.28.3-SNAPSHOT + 2.29.0 com.google.cloud google-cloud-datastore - 2.28.3-SNAPSHOT + 2.29.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.3-SNAPSHOT + 0.120.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.28.3-SNAPSHOT + 2.29.0 com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.28.3-SNAPSHOT + 2.29.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 67a538349..210188462 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.28.3-SNAPSHOT + 2.29.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.28.3-SNAPSHOT + 2.29.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 0f16a6dff..d4ff5e3b3 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.119.3-SNAPSHOT + 0.120.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.28.3-SNAPSHOT + 2.29.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 5b182860a..ab291cac3 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.28.3-SNAPSHOT + 2.29.0 diff --git a/versions.txt b/versions.txt index 028562d32..f6e73f023 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.28.2:2.28.3-SNAPSHOT -google-cloud-datastore-bom:2.28.2:2.28.3-SNAPSHOT -proto-google-cloud-datastore-v1:0.119.2:0.119.3-SNAPSHOT -datastore-v1-proto-client:2.28.2:2.28.3-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.28.2:2.28.3-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.28.2:2.28.3-SNAPSHOT -grpc-google-cloud-datastore-v1:2.28.2:2.28.3-SNAPSHOT +google-cloud-datastore:2.29.0:2.29.0 +google-cloud-datastore-bom:2.29.0:2.29.0 +proto-google-cloud-datastore-v1:0.120.0:0.120.0 +datastore-v1-proto-client:2.29.0:2.29.0 +proto-google-cloud-datastore-admin-v1:2.29.0:2.29.0 +grpc-google-cloud-datastore-admin-v1:2.29.0:2.29.0 +grpc-google-cloud-datastore-v1:2.29.0:2.29.0 From 0eff0284bf78152341e1692ffc57930f62ec01dc Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sat, 7 Jun 2025 04:23:30 +0200 Subject: [PATCH 259/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.49.0 (#1860) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-a.cfg | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 2 +- .kokoro/presubmit/graalvm-native-c.cfg | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index dac51eeaf..c543c9eb3 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.48.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.49.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index d0c295213..5cc939cf9 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index 962c305ff..fd0015918 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index 87b5dff65..424494b02 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 8059f7fa0..ba0fafd47 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.48.0 + 3.49.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index c72faeced..7d542563c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.48.0 + 3.49.0 From 9b0db92ee123c52974bd61a48d51e482e2f33422 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Sat, 7 Jun 2025 22:10:25 +0000 Subject: [PATCH 260/292] chore(main): release 2.29.1-SNAPSHOT (#1868) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- .kokoro/presubmit/graalvm-native-a.cfg | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 2 +- .kokoro/presubmit/graalvm-native-c.cfg | 2 +- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index 5cc939cf9..d0c295213 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -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.49.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index fd0015918..962c305ff 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -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.49.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index 424494b02..87b5dff65 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -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.49.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 209294c71..3d66f6ae0 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.29.0 + 2.29.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.29.0 + 2.29.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index ba0fafd47..5746da4bf 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.29.0 + 2.29.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.29.0 + 2.29.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.0 + 2.29.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.0 + 0.120.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.0 + 2.29.1-SNAPSHOT diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 3d3b9e8d5..5d178082a 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.29.0 + 2.29.1-SNAPSHOT jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.0 + 2.29.1-SNAPSHOT google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 8c24af2eb..3c23890d3 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.29.0 + 2.29.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.0 + 2.29.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index cfc9826e8..95ba5940e 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.0 + 2.29.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.0 + 2.29.1-SNAPSHOT diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index a05352cc8..a07c55ebe 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.0 + 2.29.1-SNAPSHOT grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.0 + 2.29.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7d542563c..4e51e78eb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.29.0 + 2.29.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.0 + 2.29.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.0 + 2.29.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.29.0 + 2.29.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.0 + 0.120.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.0 + 2.29.1-SNAPSHOT com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.29.0 + 2.29.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 210188462..5b5dfe8d1 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.0 + 2.29.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.0 + 2.29.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index d4ff5e3b3..cd1410bc1 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.0 + 0.120.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.29.0 + 2.29.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ab291cac3..a3160aeb4 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.29.0 + 2.29.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index f6e73f023..7c6bd5f88 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.29.0:2.29.0 -google-cloud-datastore-bom:2.29.0:2.29.0 -proto-google-cloud-datastore-v1:0.120.0:0.120.0 -datastore-v1-proto-client:2.29.0:2.29.0 -proto-google-cloud-datastore-admin-v1:2.29.0:2.29.0 -grpc-google-cloud-datastore-admin-v1:2.29.0:2.29.0 -grpc-google-cloud-datastore-v1:2.29.0:2.29.0 +google-cloud-datastore:2.29.0:2.29.1-SNAPSHOT +google-cloud-datastore-bom:2.29.0:2.29.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.120.0:0.120.1-SNAPSHOT +datastore-v1-proto-client:2.29.0:2.29.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.29.0:2.29.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.29.0:2.29.1-SNAPSHOT +grpc-google-cloud-datastore-v1:2.29.0:2.29.1-SNAPSHOT From 5f31da8352f2fdc54ff5004ad2e127f6d7fa5d13 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Sun, 8 Jun 2025 17:38:23 +0000 Subject: [PATCH 261/292] chore(main): release 2.29.1 (#1870) :robot: I have created a release *beep* *boop* --- ## [2.29.1](https://togithub.com/googleapis/java-datastore/compare/v2.29.0...v2.29.1) (2025-06-07) ### Dependencies * Update dependency com.google.cloud:sdk-platform-java-config to v3.49.0 ([#1860](https://togithub.com/googleapis/java-datastore/issues/1860)) ([0eff028](https://togithub.com/googleapis/java-datastore/commit/0eff0284bf78152341e1692ffc57930f62ec01dc)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 13 files changed, 44 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87fb18df3..fae65118f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.29.1](https://github.com/googleapis/java-datastore/compare/v2.29.0...v2.29.1) (2025-06-07) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.49.0 ([#1860](https://github.com/googleapis/java-datastore/issues/1860)) ([0eff028](https://github.com/googleapis/java-datastore/commit/0eff0284bf78152341e1692ffc57930f62ec01dc)) + ## [2.29.0](https://github.com/googleapis/java-datastore/compare/v2.28.2...v2.29.0) (2025-06-06) diff --git a/README.md b/README.md index 48eb23728..c72333a14 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.29.0' +implementation 'com.google.cloud:google-cloud-datastore:2.29.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.1" ``` ## Authentication @@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.1 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 3d66f6ae0..29486cfc0 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.29.1-SNAPSHOT + 2.29.1 com.google.cloud google-cloud-datastore-parent - 2.29.1-SNAPSHOT + 2.29.1 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 5746da4bf..2624fbf2b 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.29.1-SNAPSHOT + 2.29.1 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.29.1-SNAPSHOT + 2.29.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.1-SNAPSHOT + 2.29.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.1-SNAPSHOT + 0.120.1 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.1-SNAPSHOT + 2.29.1 diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 5d178082a..06e3c55b7 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.29.1-SNAPSHOT + 2.29.1 jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.1-SNAPSHOT + 2.29.1 google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 3c23890d3..479655438 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.29.1-SNAPSHOT + 2.29.1 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.1-SNAPSHOT + 2.29.1 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 95ba5940e..6ad5a8c36 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.1-SNAPSHOT + 2.29.1 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.1-SNAPSHOT + 2.29.1 diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index a07c55ebe..4b62739df 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.1-SNAPSHOT + 2.29.1 grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.1-SNAPSHOT + 2.29.1 diff --git a/pom.xml b/pom.xml index 4e51e78eb..860e9c061 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.29.1-SNAPSHOT + 2.29.1 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.1-SNAPSHOT + 2.29.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.1-SNAPSHOT + 2.29.1 com.google.cloud google-cloud-datastore - 2.29.1-SNAPSHOT + 2.29.1 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.1-SNAPSHOT + 0.120.1 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.1-SNAPSHOT + 2.29.1 com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.29.1-SNAPSHOT + 2.29.1 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 5b5dfe8d1..5284820b8 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.1-SNAPSHOT + 2.29.1 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.1-SNAPSHOT + 2.29.1 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index cd1410bc1..a5ed4e394 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.1-SNAPSHOT + 0.120.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.29.1-SNAPSHOT + 2.29.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index a3160aeb4..469836156 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.29.1-SNAPSHOT + 2.29.1 diff --git a/versions.txt b/versions.txt index 7c6bd5f88..368629776 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.29.0:2.29.1-SNAPSHOT -google-cloud-datastore-bom:2.29.0:2.29.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.120.0:0.120.1-SNAPSHOT -datastore-v1-proto-client:2.29.0:2.29.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.29.0:2.29.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.29.0:2.29.1-SNAPSHOT -grpc-google-cloud-datastore-v1:2.29.0:2.29.1-SNAPSHOT +google-cloud-datastore:2.29.1:2.29.1 +google-cloud-datastore-bom:2.29.1:2.29.1 +proto-google-cloud-datastore-v1:0.120.1:0.120.1 +datastore-v1-proto-client:2.29.1:2.29.1 +proto-google-cloud-datastore-admin-v1:2.29.1:2.29.1 +grpc-google-cloud-datastore-admin-v1:2.29.1:2.29.1 +grpc-google-cloud-datastore-v1:2.29.1:2.29.1 From 910a6c20cb23f441ede5cd75972c65adbb8752e8 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 10 Jun 2025 16:34:16 -0400 Subject: [PATCH 262/292] chore: Update generation configuration at Tue Jun 10 02:31:38 UTC 2025 (#1872) * chore: Update generation configuration at Mon Jun 9 15:20:58 UTC 2025 * chore: generate libraries at Mon Jun 9 15:21:29 UTC 2025 * chore: Update generation configuration at Tue Jun 10 02:31:38 UTC 2025 --- .github/workflows/hermetic_library_generation.yaml | 2 +- .kokoro/presubmit/graalvm-native-a.cfg | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 2 +- .kokoro/presubmit/graalvm-native-c.cfg | 2 +- README.md | 2 +- generation_config.yaml | 6 +++--- .../google/datastore/admin/v1/CommonMetadata.java | 2 +- .../datastore/admin/v1/CommonMetadataOrBuilder.java | 2 +- .../datastore/admin/v1/CreateIndexRequest.java | 2 +- .../admin/v1/CreateIndexRequestOrBuilder.java | 2 +- .../datastore/admin/v1/DatastoreAdminProto.java | 2 +- .../v1/DatastoreFirestoreMigrationMetadata.java | 2 +- ...atastoreFirestoreMigrationMetadataOrBuilder.java | 2 +- .../datastore/admin/v1/DeleteIndexRequest.java | 2 +- .../admin/v1/DeleteIndexRequestOrBuilder.java | 2 +- .../com/google/datastore/admin/v1/EntityFilter.java | 2 +- .../datastore/admin/v1/EntityFilterOrBuilder.java | 2 +- .../datastore/admin/v1/ExportEntitiesMetadata.java | 2 +- .../admin/v1/ExportEntitiesMetadataOrBuilder.java | 2 +- .../datastore/admin/v1/ExportEntitiesRequest.java | 2 +- .../admin/v1/ExportEntitiesRequestOrBuilder.java | 2 +- .../datastore/admin/v1/ExportEntitiesResponse.java | 2 +- .../admin/v1/ExportEntitiesResponseOrBuilder.java | 2 +- .../google/datastore/admin/v1/GetIndexRequest.java | 2 +- .../admin/v1/GetIndexRequestOrBuilder.java | 2 +- .../datastore/admin/v1/ImportEntitiesMetadata.java | 2 +- .../admin/v1/ImportEntitiesMetadataOrBuilder.java | 2 +- .../datastore/admin/v1/ImportEntitiesRequest.java | 2 +- .../admin/v1/ImportEntitiesRequestOrBuilder.java | 2 +- .../java/com/google/datastore/admin/v1/Index.java | 2 +- .../datastore/admin/v1/IndexOperationMetadata.java | 2 +- .../admin/v1/IndexOperationMetadataOrBuilder.java | 2 +- .../google/datastore/admin/v1/IndexOrBuilder.java | 2 +- .../com/google/datastore/admin/v1/IndexProto.java | 2 +- .../datastore/admin/v1/ListIndexesRequest.java | 2 +- .../admin/v1/ListIndexesRequestOrBuilder.java | 2 +- .../datastore/admin/v1/ListIndexesResponse.java | 2 +- .../admin/v1/ListIndexesResponseOrBuilder.java | 2 +- .../datastore/admin/v1/MigrationProgressEvent.java | 2 +- .../admin/v1/MigrationProgressEventOrBuilder.java | 2 +- .../google/datastore/admin/v1/MigrationProto.java | 2 +- .../google/datastore/admin/v1/MigrationState.java | 2 +- .../datastore/admin/v1/MigrationStateEvent.java | 2 +- .../admin/v1/MigrationStateEventOrBuilder.java | 2 +- .../google/datastore/admin/v1/MigrationStep.java | 2 +- .../google/datastore/admin/v1/OperationType.java | 2 +- .../com/google/datastore/admin/v1/Progress.java | 2 +- .../datastore/admin/v1/ProgressOrBuilder.java | 2 +- .../com/google/datastore/v1/AggregationQuery.java | 2 +- .../datastore/v1/AggregationQueryOrBuilder.java | 2 +- .../com/google/datastore/v1/AggregationResult.java | 2 +- .../google/datastore/v1/AggregationResultBatch.java | 2 +- .../v1/AggregationResultBatchOrBuilder.java | 2 +- .../datastore/v1/AggregationResultOrBuilder.java | 2 +- .../google/datastore/v1/AggregationResultProto.java | 2 +- .../com/google/datastore/v1/AllocateIdsRequest.java | 2 +- .../datastore/v1/AllocateIdsRequestOrBuilder.java | 2 +- .../google/datastore/v1/AllocateIdsResponse.java | 2 +- .../datastore/v1/AllocateIdsResponseOrBuilder.java | 2 +- .../java/com/google/datastore/v1/ArrayValue.java | 2 +- .../google/datastore/v1/ArrayValueOrBuilder.java | 2 +- .../datastore/v1/BeginTransactionRequest.java | 2 +- .../v1/BeginTransactionRequestOrBuilder.java | 2 +- .../datastore/v1/BeginTransactionResponse.java | 2 +- .../v1/BeginTransactionResponseOrBuilder.java | 2 +- .../java/com/google/datastore/v1/CommitRequest.java | 2 +- .../google/datastore/v1/CommitRequestOrBuilder.java | 2 +- .../com/google/datastore/v1/CommitResponse.java | 2 +- .../datastore/v1/CommitResponseOrBuilder.java | 2 +- .../com/google/datastore/v1/CompositeFilter.java | 2 +- .../datastore/v1/CompositeFilterOrBuilder.java | 2 +- .../com/google/datastore/v1/DatastoreProto.java | 2 +- .../main/java/com/google/datastore/v1/Entity.java | 2 +- .../com/google/datastore/v1/EntityOrBuilder.java | 2 +- .../java/com/google/datastore/v1/EntityProto.java | 2 +- .../java/com/google/datastore/v1/EntityResult.java | 2 +- .../google/datastore/v1/EntityResultOrBuilder.java | 2 +- .../com/google/datastore/v1/ExecutionStats.java | 2 +- .../datastore/v1/ExecutionStatsOrBuilder.java | 2 +- .../com/google/datastore/v1/ExplainMetrics.java | 2 +- .../datastore/v1/ExplainMetricsOrBuilder.java | 2 +- .../com/google/datastore/v1/ExplainOptions.java | 2 +- .../datastore/v1/ExplainOptionsOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/Filter.java | 2 +- .../com/google/datastore/v1/FilterOrBuilder.java | 2 +- .../java/com/google/datastore/v1/FindNearest.java | 2 +- .../google/datastore/v1/FindNearestOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/GqlQuery.java | 2 +- .../com/google/datastore/v1/GqlQueryOrBuilder.java | 2 +- .../com/google/datastore/v1/GqlQueryParameter.java | 2 +- .../datastore/v1/GqlQueryParameterOrBuilder.java | 2 +- .../src/main/java/com/google/datastore/v1/Key.java | 2 +- .../java/com/google/datastore/v1/KeyOrBuilder.java | 2 +- .../com/google/datastore/v1/KindExpression.java | 2 +- .../datastore/v1/KindExpressionOrBuilder.java | 2 +- .../java/com/google/datastore/v1/LookupRequest.java | 2 +- .../google/datastore/v1/LookupRequestOrBuilder.java | 2 +- .../com/google/datastore/v1/LookupResponse.java | 2 +- .../datastore/v1/LookupResponseOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/Mutation.java | 2 +- .../com/google/datastore/v1/MutationOrBuilder.java | 2 +- .../com/google/datastore/v1/MutationResult.java | 2 +- .../datastore/v1/MutationResultOrBuilder.java | 2 +- .../java/com/google/datastore/v1/PartitionId.java | 2 +- .../google/datastore/v1/PartitionIdOrBuilder.java | 2 +- .../java/com/google/datastore/v1/PlanSummary.java | 2 +- .../google/datastore/v1/PlanSummaryOrBuilder.java | 2 +- .../java/com/google/datastore/v1/Projection.java | 2 +- .../google/datastore/v1/ProjectionOrBuilder.java | 2 +- .../com/google/datastore/v1/PropertyFilter.java | 2 +- .../datastore/v1/PropertyFilterOrBuilder.java | 2 +- .../java/com/google/datastore/v1/PropertyMask.java | 2 +- .../google/datastore/v1/PropertyMaskOrBuilder.java | 2 +- .../java/com/google/datastore/v1/PropertyOrder.java | 2 +- .../google/datastore/v1/PropertyOrderOrBuilder.java | 2 +- .../com/google/datastore/v1/PropertyReference.java | 2 +- .../datastore/v1/PropertyReferenceOrBuilder.java | 2 +- .../com/google/datastore/v1/PropertyTransform.java | 2 +- .../datastore/v1/PropertyTransformOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/Query.java | 2 +- .../com/google/datastore/v1/QueryOrBuilder.java | 2 +- .../com/google/datastore/v1/QueryProfileProto.java | 2 +- .../java/com/google/datastore/v1/QueryProto.java | 2 +- .../com/google/datastore/v1/QueryResultBatch.java | 2 +- .../datastore/v1/QueryResultBatchOrBuilder.java | 2 +- .../java/com/google/datastore/v1/ReadOptions.java | 2 +- .../google/datastore/v1/ReadOptionsOrBuilder.java | 2 +- .../com/google/datastore/v1/ReserveIdsRequest.java | 2 +- .../datastore/v1/ReserveIdsRequestOrBuilder.java | 2 +- .../com/google/datastore/v1/ReserveIdsResponse.java | 2 +- .../datastore/v1/ReserveIdsResponseOrBuilder.java | 2 +- .../com/google/datastore/v1/RollbackRequest.java | 2 +- .../datastore/v1/RollbackRequestOrBuilder.java | 2 +- .../com/google/datastore/v1/RollbackResponse.java | 2 +- .../datastore/v1/RollbackResponseOrBuilder.java | 2 +- .../datastore/v1/RunAggregationQueryRequest.java | 2 +- .../v1/RunAggregationQueryRequestOrBuilder.java | 2 +- .../datastore/v1/RunAggregationQueryResponse.java | 2 +- .../v1/RunAggregationQueryResponseOrBuilder.java | 2 +- .../com/google/datastore/v1/RunQueryRequest.java | 2 +- .../datastore/v1/RunQueryRequestOrBuilder.java | 2 +- .../com/google/datastore/v1/RunQueryResponse.java | 2 +- .../datastore/v1/RunQueryResponseOrBuilder.java | 2 +- .../com/google/datastore/v1/TransactionOptions.java | 2 +- .../datastore/v1/TransactionOptionsOrBuilder.java | 2 +- .../main/java/com/google/datastore/v1/Value.java | 2 +- .../com/google/datastore/v1/ValueOrBuilder.java | 2 +- renovate.json | 13 +------------ 148 files changed, 150 insertions(+), 161 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 336ac2c8c..c01f3faec 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.58.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index d0c295213..5cc939cf9 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index 962c305ff..fd0015918 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index 87b5dff65..424494b02 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -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.46.2" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/README.md b/README.md index c72333a14..a75655f2b 100644 --- a/README.md +++ b/README.md @@ -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.59.0') +implementation platform('com.google.cloud:libraries-bom:26.61.0') implementation 'com.google.cloud:google-cloud-datastore' ``` diff --git a/generation_config.yaml b/generation_config.yaml index c7f6ff188..28b18604f 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ -gapic_generator_version: 2.56.2 -googleapis_commitish: ce291b3bc967923f89e0e54ed33d18802672b171 -libraries_bom_version: 26.59.0 +gapic_generator_version: 2.59.0 +googleapis_commitish: ad56690468e8f6ea87207d054bd6ad6adceaf0d3 +libraries_bom_version: 26.61.0 libraries: - api_shortname: datastore name_pretty: Cloud Datastore diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java index d7c5167a1..d73ecd26c 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java index 29e4383cb..c27c9174d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface CommonMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java index bff6b84a3..87af20988 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java index a3de2d745..c60c9be07 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface CreateIndexRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java index cf104bfb7..6bf22f9d3 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public final class DatastoreAdminProto { diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java index fe3a7cf43..c87056546 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java index dd1e0884d..93572d535 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface DatastoreFirestoreMigrationMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java index e2e7ae6de..708a59ff9 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java index 860bbcc27..9639e7570 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface DeleteIndexRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java index 35db5e1f2..623478375 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java index 381e1e38d..502b42d35 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface EntityFilterOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java index 946dd9d6b..6963c8fd1 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java index d6e626eea..409b713ae 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface ExportEntitiesMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java index ae1047177..5186fbb1a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java index 0b9dae2e6..73549d372 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface ExportEntitiesRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java index 8916b5572..bff44706c 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java index 9d515855d..ed131756b 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface ExportEntitiesResponseOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java index 4d7406fd1..7ce114e14 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java index 2b49cfd61..040281319 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface GetIndexRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java index da2ab3e73..97e2c91e0 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java index f814d500e..bae1dcadd 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface ImportEntitiesMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java index 66d1fdb0b..b7c648983 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java index 6bde8cc3c..c4707c6fa 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface ImportEntitiesRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java index 0f2721672..5f21b5938 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/index.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java index c66aa37d4..90e653e5a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java index ba34cbf02..ba20a55a5 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface IndexOperationMetadataOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java index a786ec0c3..74411b8b4 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/index.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface IndexOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java index e66e42843..fe4ac6f69 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/index.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public final class IndexProto { diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java index ca32a0fa3..2c444f6b5 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java index 1c4c70c35..bf5439d9f 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface ListIndexesRequestOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java index 3aae0bc18..8b08cbfcc 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java index c89b116ed..f44ec108b 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface ListIndexesResponseOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java index 7833fb2a2..dcc9cf35a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java index c23e32fbb..1ef40bfb5 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface MigrationProgressEventOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java index 4da124461..450cebdc4 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public final class MigrationProto { diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java index 5434e3eae..09102a467 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationState.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java index 1e06a1c49..c01f43fcb 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java index 758d5fe00..45e1efc8b 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEventOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface MigrationStateEventOrBuilder diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java index 44f3c4c5e..8fc3a2614 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStep.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/migration.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java index db31a688d..149901038 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/OperationType.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java index 48580643e..04912dba4 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; /** diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java index 0d22c5b2c..0383444f1 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ProgressOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/admin/v1/datastore_admin.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.admin.v1; public interface ProgressOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java index 700120ceb..6e382ea85 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java index 1bced478b..99f400d2c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface AggregationQueryOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java index a8af25d74..5d2c3f62b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java index 2db8614e5..b40e38195 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java index 0c8ebc3fd..1995aae15 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface AggregationResultBatchOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java index 94e573e78..609de95b1 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface AggregationResultOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java index 8c172f409..0274db53c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/aggregation_result.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public final class AggregationResultProto { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java index b3bd50bd5..5fad3328c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java index 13d3009e7..bd87ecd13 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface AllocateIdsRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java index b7e67dcc0..730bda037 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java index 6dbcd866d..e442c3c27 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface AllocateIdsResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java index 0d73c1fa7..67de9d652 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java index c6d447186..0e631b6e2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface ArrayValueOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java index 6fdef6176..90c32dc34 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java index 9441e577d..1ffdcf176 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface BeginTransactionRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java index 839dab467..4c73112a7 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java index 408896255..3f0ad182a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface BeginTransactionResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java index 3189b3fa6..d3af7bbbd 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java index 2602a23f5..64333f04f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface CommitRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java index 51aadd20b..690d9243e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java index 734dab60a..24205c882 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface CommitResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java index 48ce71656..010b4ff2c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java index da11961a0..7ef29d5f9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface CompositeFilterOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java index b7fd2e6b5..97b3ba628 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public final class DatastoreProto { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java index 7a16929fa..67d9354bb 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java index 455c0fe51..61ea8e8ee 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface EntityOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java index fdccb2240..17c1c1a30 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public final class EntityProto { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java index 1d5997ea5..100c9fad4 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java index 85d9d4ce1..6a02b4c08 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface EntityResultOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java index d42944e05..f6f0ae83d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStats.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java index ffbf156bf..6289a7e9f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExecutionStatsOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface ExecutionStatsOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java index 7a4f5361d..abea37234 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetrics.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java index b9463b3e0..cc1c6625f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainMetricsOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface ExplainMetricsOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java index 5d374909f..720f3e85b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptions.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java index f6c779c19..67d6a5156 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ExplainOptionsOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface ExplainOptionsOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java index 7454f23b6..8211ea1f2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java index 1136f49a3..9ef339fa9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface FilterOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java index fd233c99b..08adba246 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java index 4e21ec5c3..631975f60 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FindNearestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface FindNearestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java index 86ae757ad..831a282f5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java index 36d73aa77..a2d5bf0b3 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface GqlQueryOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java index eb6b3850e..5349f046a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java index 7c3e07894..bd2cbfc51 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface GqlQueryParameterOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java index 28314fbb8..45c5cd73c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java index 4c72915d8..612744003 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface KeyOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java index 9b3d26ef9..d3cc4b102 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java index ad9b5f9b6..0545ef4f8 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface KindExpressionOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java index 68b94adaa..b791a5c0f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java index f10219815..a39628e44 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface LookupRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java index 1f02e007c..2e80515e0 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java index ae3bfc36d..892905cf7 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface LookupResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java index be1d7e191..b65d0ca8b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java index 3b01c9ae5..8b433c5ad 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface MutationOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java index 8f82a5c95..71922947d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java index 5df6b9c3a..4f01efbb6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface MutationResultOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java index be1529aca..bd8bb8696 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java index 17e4eb659..c35dfd03f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface PartitionIdOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java index e378ba566..40b1b9444 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummary.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java index b132b1c66..7299584a1 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PlanSummaryOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface PlanSummaryOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java index e3a262b14..796d5225b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java index 0b4cb23d8..4799bba1a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface ProjectionOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java index 2b9946906..8fea5e216 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java index b4efa5d93..02a9da727 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface PropertyFilterOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java index d8fc11dec..9f6e0e540 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMask.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java index ebd49c682..d4038d59f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyMaskOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface PropertyMaskOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java index a4315a539..381e21973 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java index e1f589f07..01b8e22f3 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface PropertyOrderOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java index c301b8518..184e3aa59 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java index 0fb61d2e0..503a1dd24 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface PropertyReferenceOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java index 51bf34d7c..243f31739 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransform.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java index 7371d380a..c9a74555a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyTransformOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface PropertyTransformOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java index 1e8e6ef92..990f78cb9 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java index 7629bf17e..d581848b2 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface QueryOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java index 9bfe380f7..4a6980072 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProfileProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query_profile.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public final class QueryProfileProto { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java index d63999bb5..875844726 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public final class QueryProto { diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java index ecd44fa37..f3634d09d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java index 99483d9d6..d4d2db887 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/query.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface QueryResultBatchOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java index 954270bf8..578c3c132 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java index 7ba3d1fad..97460f1de 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface ReadOptionsOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java index 3a23ce121..4326bd298 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java index 7b26ed5c0..d53ae5cbb 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface ReserveIdsRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java index 7d89c33f3..962388f7a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java index 182dfdc18..7002f2b45 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface ReserveIdsResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java index df1b5a581..e48e88443 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java index 8fc63434d..6c4f2234a 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface RollbackRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java index 22c7c565f..afdb9f900 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java index 69e9ae346..b8c871f53 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface RollbackResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java index 5c4fd8a80..bdae4252d 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java index d29e50071..6cf4dc5b1 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface RunAggregationQueryRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java index 21e58fece..d23698c1e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java index c404a126e..0c10bc354 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface RunAggregationQueryResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java index 39365a38b..9ef7a6e0f 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java index f7f29842a..3a7bd8996 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface RunQueryRequestOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java index 224e9b21d..f8c571c1b 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java index a3316b6ef..0d389b65e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface RunQueryResponseOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java index 256238e25..82d8db4c6 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java index 2fbfe302b..c75d40723 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/datastore.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface TransactionOptionsOrBuilder diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java index b917baaa3..20ddd8bb5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; /** diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java index a133a19b6..53035cd7c 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java @@ -16,7 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/datastore/v1/entity.proto -// Protobuf Java Version: 3.25.5 +// Protobuf Java Version: 3.25.8 package com.google.datastore.v1; public interface ValueOrBuilder diff --git a/renovate.json b/renovate.json index 42538270e..82d917e71 100644 --- a/renovate.json +++ b/renovate.json @@ -20,17 +20,6 @@ ".github/workflows/samples.yaml" ], "customManagers": [ - { - "customType": "regex", - "fileMatch": [ - "^.kokoro/presubmit/graalvm-native.*.cfg$" - ], - "matchStrings": [ - "value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\"" - ], - "depNameTemplate": "com.google.cloud:sdk-platform-java-config", - "datasourceTemplate": "maven" - }, { "customType": "regex", "fileMatch": [ @@ -104,4 +93,4 @@ ], "semanticCommits": true, "dependencyDashboard": true -} \ No newline at end of file +} From 34faa62587cf85021721758d41028ff6164a6016 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 10 Jun 2025 22:50:27 +0200 Subject: [PATCH 263/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.29.1 (#1869) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore](https://redirect.github.com/googleapis/java-datastore) | `2.28.1` -> `2.29.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore/2.28.1/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore/2.28.1/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore) ### [`v2.29.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2291-2025-06-07) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.29.0...v2.29.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.49.0 ([#​1860](https://redirect.github.com/googleapis/java-datastore/issues/1860)) ([0eff028](https://redirect.github.com/googleapis/java-datastore/commit/0eff0284bf78152341e1692ffc57930f62ec01dc)) ### [`v2.29.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2290-2025-06-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.2...v2.29.0) ##### Features - Add getNumber to AggregationResult ([https://togithub.com/googleapis/java-datastore/issues/1851](https://redirect.github.com/googleapis/java-datastore/issues/1851)) ([#​1861](https://redirect.github.com/googleapis/java-datastore/issues/1861)) ([b9c2c3f](https://redirect.github.com/googleapis/java-datastore/commit/b9c2c3ff775f7123d701ccacff9bd2ea3718243b)) ##### Bug Fixes - Remove 500 char path name limit ([#​1865](https://redirect.github.com/googleapis/java-datastore/issues/1865)) ([1097175](https://redirect.github.com/googleapis/java-datastore/commit/10971752310d8b1794c8e77041b582707142b328)) ##### Dependencies - Update dependency org.easymock:easymock to v5.6.0 ([#​1858](https://redirect.github.com/googleapis/java-datastore/issues/1858)) ([acc1513](https://redirect.github.com/googleapis/java-datastore/commit/acc1513ad90e8da6743e618322bae075bac4ac46)) ### [`v2.28.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2282-2025-05-16) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.1...v2.28.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.48.0 ([#​1847](https://redirect.github.com/googleapis/java-datastore/issues/1847)) ([7ed3232](https://redirect.github.com/googleapis/java-datastore/commit/7ed32321a5c84c4b2f61094e4c4adb5e36e5bc1b)) - Update googleapis/sdk-platform-java action to v2.58.0 ([#​1853](https://redirect.github.com/googleapis/java-datastore/issues/1853)) ([eef820d](https://redirect.github.com/googleapis/java-datastore/commit/eef820d017f5e00245924d551abe172a2a39e29f))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 1cf6cb5f9..8d4e863cc 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.28.1 + 2.29.1 From 3bc1a958c7bcd3319759ecf01d8030577bb01806 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:28:34 -0400 Subject: [PATCH 264/292] chore: Update generation configuration at Wed Jun 11 02:31:02 UTC 2025 (#1874) * chore: Update generation configuration at Wed Jun 11 02:31:02 UTC 2025 * chore: generate libraries at Wed Jun 11 02:31:28 UTC 2025 --- README.md | 2 +- generation_config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a75655f2b..9db871f06 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.28.1 + 2.29.1 ``` diff --git a/generation_config.yaml b/generation_config.yaml index 28b18604f..76cd11606 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.59.0 -googleapis_commitish: ad56690468e8f6ea87207d054bd6ad6adceaf0d3 +googleapis_commitish: 111b7383752255d1849a8d3b7259ed735acc4f97 libraries_bom_version: 26.61.0 libraries: - api_shortname: datastore From 7f9c22999a516155c7151d8253f85f7c808d6a20 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 11 Jun 2025 20:44:30 +0200 Subject: [PATCH 265/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore-utils to v2.29.1 (#1873) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-datastore-utils](https://redirect.github.com/googleapis/java-datastore) | `2.28.1` -> `2.29.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-datastore-utils/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-datastore-utils/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-datastore-utils/2.28.1/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-datastore-utils/2.28.1/2.29.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-datastore (com.google.cloud:google-cloud-datastore-utils) ### [`v2.29.1`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2291-2025-06-07) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.29.0...v2.29.1) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.49.0 ([#​1860](https://redirect.github.com/googleapis/java-datastore/issues/1860)) ([0eff028](https://redirect.github.com/googleapis/java-datastore/commit/0eff0284bf78152341e1692ffc57930f62ec01dc)) ### [`v2.29.0`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2290-2025-06-06) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.2...v2.29.0) ##### Features - Add getNumber to AggregationResult ([https://togithub.com/googleapis/java-datastore/issues/1851](https://redirect.github.com/googleapis/java-datastore/issues/1851)) ([#​1861](https://redirect.github.com/googleapis/java-datastore/issues/1861)) ([b9c2c3f](https://redirect.github.com/googleapis/java-datastore/commit/b9c2c3ff775f7123d701ccacff9bd2ea3718243b)) ##### Bug Fixes - Remove 500 char path name limit ([#​1865](https://redirect.github.com/googleapis/java-datastore/issues/1865)) ([1097175](https://redirect.github.com/googleapis/java-datastore/commit/10971752310d8b1794c8e77041b582707142b328)) ##### Dependencies - Update dependency org.easymock:easymock to v5.6.0 ([#​1858](https://redirect.github.com/googleapis/java-datastore/issues/1858)) ([acc1513](https://redirect.github.com/googleapis/java-datastore/commit/acc1513ad90e8da6743e618322bae075bac4ac46)) ### [`v2.28.2`](https://redirect.github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#2282-2025-05-16) [Compare Source](https://redirect.github.com/googleapis/java-datastore/compare/v2.28.1...v2.28.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.48.0 ([#​1847](https://redirect.github.com/googleapis/java-datastore/issues/1847)) ([7ed3232](https://redirect.github.com/googleapis/java-datastore/commit/7ed32321a5c84c4b2f61094e4c4adb5e36e5bc1b)) - Update googleapis/sdk-platform-java action to v2.58.0 ([#​1853](https://redirect.github.com/googleapis/java-datastore/issues/1853)) ([eef820d](https://redirect.github.com/googleapis/java-datastore/commit/eef820d017f5e00245924d551abe172a2a39e29f))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 860e9c061..33778aa3f 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ com.google.cloud google-cloud-datastore-utils - 2.28.1 + 2.29.1 com.google.cloud.datastore From fe7f8a0aeaf62d5d7abf405cd6d14e7153011616 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Thu, 12 Jun 2025 13:18:20 -0400 Subject: [PATCH 266/292] build: disable errorprone for JDK 24+ (#1876) The current errorprone version is not compatible with JDK 24 onwards. While we dont have a long term solution, we will disable the check for JDK 24. --- pom.xml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 33778aa3f..30283fcb9 100644 --- a/pom.xml +++ b/pom.xml @@ -232,10 +232,31 @@ + + + no-errorprone-jdk-24-onwards + + [24,) + + + + + maven-compiler-plugin + + true + + + -XDcompilePolicy=simple + + + + + + java9 - [9,) + [9,24) From 3b37a5e0dbafc39b6de9492d0e2e1012f5ccf347 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Thu, 12 Jun 2025 18:55:30 -0400 Subject: [PATCH 267/292] chore: Update generation configuration at Thu Jun 12 02:30:37 UTC 2025 (#1877) --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index 76cd11606..02af02d4a 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.59.0 -googleapis_commitish: 111b7383752255d1849a8d3b7259ed735acc4f97 +googleapis_commitish: 4cdc2aa1af11046c38ee1a4b1f6f4b20f0d49e2b libraries_bom_version: 26.61.0 libraries: - api_shortname: datastore From b08416d885fb857280559973e5f182789a717481 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 13 Jun 2025 02:04:27 +0200 Subject: [PATCH 268/292] chore(deps): update dependency com.google.cloud:libraries-bom to v26.62.0 (#1875) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://redirect.github.com/googleapis/java-cloud-bom)) | `26.60.0` -> `26.62.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:libraries-bom/26.62.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:libraries-bom/26.62.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:libraries-bom/26.60.0/26.62.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:libraries-bom/26.60.0/26.62.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-cloud-bom (com.google.cloud:libraries-bom) ### [`v26.62.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26620-2025-06-10) [Compare Source](https://redirect.github.com/googleapis/java-cloud-bom/compare/v26.61.0...v26.62.0) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.49.0 ([#​7057](https://redirect.github.com/googleapis/java-cloud-bom/issues/7057)) ([640aca3](https://redirect.github.com/googleapis/java-cloud-bom/commit/640aca31c2045c7424b54729a857ea193fa53ffd)) - update dependency com.google.cloud:gapic-libraries-bom to v1.58.0 ([#​7068](https://redirect.github.com/googleapis/java-cloud-bom/issues/7068)) ([7902ff0](https://redirect.github.com/googleapis/java-cloud-bom/commit/7902ff0c88c9f671027bad439690178dc2b0bdf6)) - update dependency com.google.cloud:google-cloud-bigquery to v2.51.0 ([#​7073](https://redirect.github.com/googleapis/java-cloud-bom/issues/7073)) ([dce1f2a](https://redirect.github.com/googleapis/java-cloud-bom/commit/dce1f2aa8528292440c548bdf2097942db4fc071)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.15.0 ([#​7063](https://redirect.github.com/googleapis/java-cloud-bom/issues/7063)) ([395d4fb](https://redirect.github.com/googleapis/java-cloud-bom/commit/395d4fb39b01eafa1a72e435a2f566b647d65c9e)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.60.0 ([#​7069](https://redirect.github.com/googleapis/java-cloud-bom/issues/7069)) ([d691ec7](https://redirect.github.com/googleapis/java-cloud-bom/commit/d691ec72815eb4f12501387bd8a342cc37ffe174)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.29.1 ([#​7074](https://redirect.github.com/googleapis/java-cloud-bom/issues/7074)) ([479df4c](https://redirect.github.com/googleapis/java-cloud-bom/commit/479df4c9c3700091229433f891022fd90b70f838)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.31.6 ([#​7056](https://redirect.github.com/googleapis/java-cloud-bom/issues/7056)) ([95ec51c](https://redirect.github.com/googleapis/java-cloud-bom/commit/95ec51cf7940c3235b9e2512a28b1dae9a3ea570)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.22.5 ([#​7066](https://redirect.github.com/googleapis/java-cloud-bom/issues/7066)) ([d5ece55](https://redirect.github.com/googleapis/java-cloud-bom/commit/d5ece55fbaa467cda42067c5eff56faf6e7ff2b8)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.132.9-alpha ([#​7070](https://redirect.github.com/googleapis/java-cloud-bom/issues/7070)) ([ee56a61](https://redirect.github.com/googleapis/java-cloud-bom/commit/ee56a61f48f5187b4447aebd8649e88fcd26fd33)) - update dependency com.google.cloud:google-cloud-nio to v0.127.37 ([#​7062](https://redirect.github.com/googleapis/java-cloud-bom/issues/7062)) ([b37ec3b](https://redirect.github.com/googleapis/java-cloud-bom/commit/b37ec3b59e18db9582caa3d99d6358391459f651)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.140.1 ([#​7060](https://redirect.github.com/googleapis/java-cloud-bom/issues/7060)) ([3977d26](https://redirect.github.com/googleapis/java-cloud-bom/commit/3977d2613d21d4b61a1a40651bee0922d29b8e61)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.15.9 ([#​7067](https://redirect.github.com/googleapis/java-cloud-bom/issues/7067)) ([20a2c66](https://redirect.github.com/googleapis/java-cloud-bom/commit/20a2c66f643a1d370394296765746ec0b162eb8e)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.95.1 ([#​7075](https://redirect.github.com/googleapis/java-cloud-bom/issues/7075)) ([046443d](https://redirect.github.com/googleapis/java-cloud-bom/commit/046443d7359bb6a13c1b9b783621c69e92c19acd)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.30.4 ([#​7076](https://redirect.github.com/googleapis/java-cloud-bom/issues/7076)) ([cff29a9](https://redirect.github.com/googleapis/java-cloud-bom/commit/cff29a9da734e94cb712338ec29ccf1e80448a9c)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.53.0 ([#​7061](https://redirect.github.com/googleapis/java-cloud-bom/issues/7061)) ([37f11e3](https://redirect.github.com/googleapis/java-cloud-bom/commit/37f11e30c9eec2ad4c74e2b37d315c4b60ed7044)) - Upgrade Protobuf-Java to v3.25.8 ([#​7058](https://redirect.github.com/googleapis/java-cloud-bom/issues/7058)) ([bd71298](https://redirect.github.com/googleapis/java-cloud-bom/commit/bd71298ffb1e5f362584494384d01a95d7ed9756)) ### [`v26.61.0`](https://redirect.github.com/googleapis/java-cloud-bom/blob/HEAD/CHANGELOG.md#26610-2025-05-22) ##### Dependencies - update dependency com.google.cloud:first-party-dependencies to v3.48.0 ([#​7038](https://redirect.github.com/googleapis/java-cloud-bom/issues/7038)) ([604b292](https://redirect.github.com/googleapis/java-cloud-bom/commit/604b2925ba5f063305abed187e9493382e73f0e2)) - update dependency com.google.cloud:gapic-libraries-bom to v1.57.0 ([#​7040](https://redirect.github.com/googleapis/java-cloud-bom/issues/7040)) ([39c2ffd](https://redirect.github.com/googleapis/java-cloud-bom/commit/39c2ffd5867f908b5d9e5b046ae8eac3931a1d34)) - update dependency com.google.cloud:google-cloud-bigquery to v2.50.1 ([#​7044](https://redirect.github.com/googleapis/java-cloud-bom/issues/7044)) ([59185a6](https://redirect.github.com/googleapis/java-cloud-bom/commit/59185a6ac8385403bb40b9d8d45d7d34a093ad6c)) - update dependency com.google.cloud:google-cloud-bigquerystorage-bom to v3.14.1 ([#​7041](https://redirect.github.com/googleapis/java-cloud-bom/issues/7041)) ([da9e434](https://redirect.github.com/googleapis/java-cloud-bom/commit/da9e4348730b96b2d9730e1dfa79da0eece269c0)) - update dependency com.google.cloud:google-cloud-bigtable-bom to v2.59.0 ([#​7043](https://redirect.github.com/googleapis/java-cloud-bom/issues/7043)) ([2b92099](https://redirect.github.com/googleapis/java-cloud-bom/commit/2b9209944c0c698722b6de9a46cbd296c993a774)) - update dependency com.google.cloud:google-cloud-datastore-bom to v2.28.2 ([#​7045](https://redirect.github.com/googleapis/java-cloud-bom/issues/7045)) ([d7d9253](https://redirect.github.com/googleapis/java-cloud-bom/commit/d7d925386b9ea8c20c36b887a5e146afbc8769bc)) - update dependency com.google.cloud:google-cloud-firestore-bom to v3.31.4 ([#​7039](https://redirect.github.com/googleapis/java-cloud-bom/issues/7039)) ([16f206a](https://redirect.github.com/googleapis/java-cloud-bom/commit/16f206a1a59c0d72ac5778f44c45e40d69131084)) - update dependency com.google.cloud:google-cloud-logging-bom to v3.22.4 ([#​7046](https://redirect.github.com/googleapis/java-cloud-bom/issues/7046)) ([86097e4](https://redirect.github.com/googleapis/java-cloud-bom/commit/86097e41e435cea50d351b13094411e0e3cfbdc4)) - update dependency com.google.cloud:google-cloud-logging-logback to v0.132.8-alpha ([#​7050](https://redirect.github.com/googleapis/java-cloud-bom/issues/7050)) ([b138835](https://redirect.github.com/googleapis/java-cloud-bom/commit/b1388357ae7febc552a8fe84ba82b7eb40de9f97)) - update dependency com.google.cloud:google-cloud-nio to v0.127.36 ([#​7047](https://redirect.github.com/googleapis/java-cloud-bom/issues/7047)) ([84fe21c](https://redirect.github.com/googleapis/java-cloud-bom/commit/84fe21c0906a8d65c955567dc38f8c6c73de48a4)) - update dependency com.google.cloud:google-cloud-pubsub-bom to v1.139.4 ([#​7042](https://redirect.github.com/googleapis/java-cloud-bom/issues/7042)) ([8b7b466](https://redirect.github.com/googleapis/java-cloud-bom/commit/8b7b466ad7f850cd3b3766696a64d56506fda611)) - update dependency com.google.cloud:google-cloud-pubsublite-bom to v1.15.8 ([#​7048](https://redirect.github.com/googleapis/java-cloud-bom/issues/7048)) ([61fa514](https://redirect.github.com/googleapis/java-cloud-bom/commit/61fa5147f66a412ccaa2285d347b7545f69305df)) - update dependency com.google.cloud:google-cloud-spanner-bom to v6.94.0 ([#​7051](https://redirect.github.com/googleapis/java-cloud-bom/issues/7051)) ([9327276](https://redirect.github.com/googleapis/java-cloud-bom/commit/9327276b9b08769309c04d67c18d00c1c62e8f11)) - update dependency com.google.cloud:google-cloud-spanner-jdbc to v2.30.2 ([#​7052](https://redirect.github.com/googleapis/java-cloud-bom/issues/7052)) ([fa7eff7](https://redirect.github.com/googleapis/java-cloud-bom/commit/fa7eff723b87cdc7c4299948912c6d099bc2a453)) - update dependency com.google.cloud:google-cloud-storage-bom to v2.52.3 ([#​7049](https://redirect.github.com/googleapis/java-cloud-bom/issues/7049)) ([0336c8d](https://redirect.github.com/googleapis/java-cloud-bom/commit/0336c8d07f0b04e93300445cd0fd0c0a11878358))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-datastore). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index f913a5e02..8ed08dea5 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.60.0 + 26.62.0 pom import From 09c7df97c16aa661ac87e93e34de2fd01d6c1628 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Fri, 13 Jun 2025 15:38:40 -0400 Subject: [PATCH 269/292] chore: Update generation configuration at Fri Jun 13 02:30:58 UTC 2025 (#1878) * chore: Update generation configuration at Fri Jun 13 02:30:58 UTC 2025 * chore: generate libraries at Fri Jun 13 02:31:28 UTC 2025 --- README.md | 2 +- generation_config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9db871f06..0310487e3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.60.0 + 26.62.0 pom import diff --git a/generation_config.yaml b/generation_config.yaml index 02af02d4a..b4aa948f4 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.59.0 -googleapis_commitish: 4cdc2aa1af11046c38ee1a4b1f6f4b20f0d49e2b +googleapis_commitish: 3a45aa38968f4fe537cd3837c0e95af8c189b11b libraries_bom_version: 26.61.0 libraries: - api_shortname: datastore From b64a35c1e46f757abe5e917f3890c194ea6d97c1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 13 Jun 2025 19:58:25 +0000 Subject: [PATCH 270/292] chore(main): release 2.29.2-SNAPSHOT (#1871) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 29486cfc0..0461a6c53 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.29.1 + 2.29.2-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.29.1 + 2.29.2-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 2624fbf2b..346e7793b 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.29.1 + 2.29.2-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.29.1 + 2.29.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.1 + 2.29.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.1 + 0.120.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.1 + 2.29.2-SNAPSHOT diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 06e3c55b7..2acaa0ee1 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.29.1 + 2.29.2-SNAPSHOT jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.1 + 2.29.2-SNAPSHOT google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 479655438..839f58eaa 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.29.1 + 2.29.2-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.1 + 2.29.2-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 6ad5a8c36..72b5a271a 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.1 + 2.29.2-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.1 + 2.29.2-SNAPSHOT diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 4b62739df..8017b239c 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.1 + 2.29.2-SNAPSHOT grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.1 + 2.29.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 30283fcb9..8b6092e35 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.29.1 + 2.29.2-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.1 + 2.29.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.1 + 2.29.2-SNAPSHOT com.google.cloud google-cloud-datastore - 2.29.1 + 2.29.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.1 + 0.120.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.1 + 2.29.2-SNAPSHOT com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.29.1 + 2.29.2-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 5284820b8..fa7a362de 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.1 + 2.29.2-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.1 + 2.29.2-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index a5ed4e394..e8f00a694 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.1 + 0.120.2-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.29.1 + 2.29.2-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 469836156..92f9e163b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.29.1 + 2.29.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index 368629776..09de55edd 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.29.1:2.29.1 -google-cloud-datastore-bom:2.29.1:2.29.1 -proto-google-cloud-datastore-v1:0.120.1:0.120.1 -datastore-v1-proto-client:2.29.1:2.29.1 -proto-google-cloud-datastore-admin-v1:2.29.1:2.29.1 -grpc-google-cloud-datastore-admin-v1:2.29.1:2.29.1 -grpc-google-cloud-datastore-v1:2.29.1:2.29.1 +google-cloud-datastore:2.29.1:2.29.2-SNAPSHOT +google-cloud-datastore-bom:2.29.1:2.29.2-SNAPSHOT +proto-google-cloud-datastore-v1:0.120.1:0.120.2-SNAPSHOT +datastore-v1-proto-client:2.29.1:2.29.2-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.29.1:2.29.2-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.29.1:2.29.2-SNAPSHOT +grpc-google-cloud-datastore-v1:2.29.1:2.29.2-SNAPSHOT From 4b15ffdff8fcb901df7033938013a4efe53642f7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Sat, 14 Jun 2025 16:48:22 +0000 Subject: [PATCH 271/292] chore(main): release 2.29.2 (#1879) :robot: I have created a release *beep* *boop* --- ## [2.29.2](https://togithub.com/googleapis/java-datastore/compare/v2.29.1...v2.29.2) (2025-06-13) ### Bug Fixes * **deps:** Update the Java code generator (gapic-generator-java) to 2.59.0 ([910a6c2](https://togithub.com/googleapis/java-datastore/commit/910a6c20cb23f441ede5cd75972c65adbb8752e8)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 13 files changed, 44 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fae65118f..b4a858926 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.29.2](https://github.com/googleapis/java-datastore/compare/v2.29.1...v2.29.2) (2025-06-13) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.59.0 ([910a6c2](https://github.com/googleapis/java-datastore/commit/910a6c20cb23f441ede5cd75972c65adbb8752e8)) + ## [2.29.1](https://github.com/googleapis/java-datastore/compare/v2.29.0...v2.29.1) (2025-06-07) diff --git a/README.md b/README.md index 0310487e3..ff607f27c 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.29.1' +implementation 'com.google.cloud:google-cloud-datastore:2.29.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.2" ``` ## Authentication @@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.2 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 0461a6c53..50210ebe9 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.29.2-SNAPSHOT + 2.29.2 com.google.cloud google-cloud-datastore-parent - 2.29.2-SNAPSHOT + 2.29.2 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 346e7793b..edc225e4f 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.29.2-SNAPSHOT + 2.29.2 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.29.2-SNAPSHOT + 2.29.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.2-SNAPSHOT + 2.29.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.2-SNAPSHOT + 0.120.2 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.2-SNAPSHOT + 2.29.2 diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 2acaa0ee1..90af8cfe1 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.29.2-SNAPSHOT + 2.29.2 jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.2-SNAPSHOT + 2.29.2 google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 839f58eaa..19e045ccb 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.29.2-SNAPSHOT + 2.29.2 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.2-SNAPSHOT + 2.29.2 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 72b5a271a..1e218b925 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.2-SNAPSHOT + 2.29.2 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.2-SNAPSHOT + 2.29.2 diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 8017b239c..b29600f42 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.2-SNAPSHOT + 2.29.2 grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.2-SNAPSHOT + 2.29.2 diff --git a/pom.xml b/pom.xml index 8b6092e35..bef877d0a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.29.2-SNAPSHOT + 2.29.2 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.2-SNAPSHOT + 2.29.2 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.2-SNAPSHOT + 2.29.2 com.google.cloud google-cloud-datastore - 2.29.2-SNAPSHOT + 2.29.2 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.2-SNAPSHOT + 0.120.2 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.2-SNAPSHOT + 2.29.2 com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.29.2-SNAPSHOT + 2.29.2 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index fa7a362de..4cf802aa3 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.2-SNAPSHOT + 2.29.2 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.2-SNAPSHOT + 2.29.2 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index e8f00a694..88f6f6883 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.2-SNAPSHOT + 0.120.2 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.29.2-SNAPSHOT + 2.29.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 92f9e163b..9a3a5dffb 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.29.2-SNAPSHOT + 2.29.2 diff --git a/versions.txt b/versions.txt index 09de55edd..d36d84d7b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.29.1:2.29.2-SNAPSHOT -google-cloud-datastore-bom:2.29.1:2.29.2-SNAPSHOT -proto-google-cloud-datastore-v1:0.120.1:0.120.2-SNAPSHOT -datastore-v1-proto-client:2.29.1:2.29.2-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.29.1:2.29.2-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.29.1:2.29.2-SNAPSHOT -grpc-google-cloud-datastore-v1:2.29.1:2.29.2-SNAPSHOT +google-cloud-datastore:2.29.2:2.29.2 +google-cloud-datastore-bom:2.29.2:2.29.2 +proto-google-cloud-datastore-v1:0.120.2:0.120.2 +datastore-v1-proto-client:2.29.2:2.29.2 +proto-google-cloud-datastore-admin-v1:2.29.2:2.29.2 +grpc-google-cloud-datastore-admin-v1:2.29.2:2.29.2 +grpc-google-cloud-datastore-v1:2.29.2:2.29.2 From 5c6eaa50623ded4df16da6bf45682c8d4e89c087 Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Tue, 17 Jun 2025 12:23:16 -0400 Subject: [PATCH 272/292] chore: Update generation configuration at Tue Jun 17 02:31:31 UTC 2025 (#1881) * chore: Update generation configuration at Sat Jun 14 02:29:59 UTC 2025 * chore: Update generation configuration at Tue Jun 17 02:31:31 UTC 2025 --- generation_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generation_config.yaml b/generation_config.yaml index b4aa948f4..ebb31077b 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.59.0 -googleapis_commitish: 3a45aa38968f4fe537cd3837c0e95af8c189b11b +googleapis_commitish: b6b04bf5bdb12d6b223e318ec63aa2ed22cfc0f7 libraries_bom_version: 26.61.0 libraries: - api_shortname: datastore From 8df2620b8ad3fd9df1a1b831e469b5ba15f69f8c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Jun 2025 18:43:41 +0200 Subject: [PATCH 273/292] build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.1 (#1867) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 8d4e863cc..ee4fdd2ff 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -53,7 +53,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.6.0 + 3.6.1 add-snippets-source diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 9a3a5dffb..f771baf74 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -52,7 +52,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.6.0 + 3.6.1 add-snippets-source From 4fb992943152bb4533e0bbd80e373de61f5ec864 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Jun 2025 20:50:32 +0200 Subject: [PATCH 274/292] deps: update googleapis/sdk-platform-java action to v2.59.1 (#1880) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- .github/workflows/hermetic_library_generation.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index c01f3faec..fa6e2ff75 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.1 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} From 599f364493465164e7b242e8edb1acaf5c78ebaf Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 20 Jun 2025 15:51:33 -0400 Subject: [PATCH 275/292] chore(main): release 2.29.3-SNAPSHOT (#1882) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 50210ebe9..d5347e795 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.29.2 + 2.29.3-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.29.2 + 2.29.3-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index edc225e4f..7f954626c 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.29.2 + 2.29.3-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.29.2 + 2.29.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.2 + 2.29.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.2 + 0.120.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.2 + 2.29.3-SNAPSHOT diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 90af8cfe1..95c42e0e6 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.29.2 + 2.29.3-SNAPSHOT jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.2 + 2.29.3-SNAPSHOT google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 19e045ccb..ad7519423 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.29.2 + 2.29.3-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.2 + 2.29.3-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 1e218b925..c6e0e90f1 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.2 + 2.29.3-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.2 + 2.29.3-SNAPSHOT diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index b29600f42..291507cf3 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.2 + 2.29.3-SNAPSHOT grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.2 + 2.29.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index bef877d0a..d274626d2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.29.2 + 2.29.3-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.2 + 2.29.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.2 + 2.29.3-SNAPSHOT com.google.cloud google-cloud-datastore - 2.29.2 + 2.29.3-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.2 + 0.120.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.2 + 2.29.3-SNAPSHOT com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.29.2 + 2.29.3-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 4cf802aa3..802cde576 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.2 + 2.29.3-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.2 + 2.29.3-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 88f6f6883..e5368c00a 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.2 + 0.120.3-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.29.2 + 2.29.3-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index f771baf74..f96f6fc2f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.29.2 + 2.29.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index d36d84d7b..cf2f14cd5 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.29.2:2.29.2 -google-cloud-datastore-bom:2.29.2:2.29.2 -proto-google-cloud-datastore-v1:0.120.2:0.120.2 -datastore-v1-proto-client:2.29.2:2.29.2 -proto-google-cloud-datastore-admin-v1:2.29.2:2.29.2 -grpc-google-cloud-datastore-admin-v1:2.29.2:2.29.2 -grpc-google-cloud-datastore-v1:2.29.2:2.29.2 +google-cloud-datastore:2.29.2:2.29.3-SNAPSHOT +google-cloud-datastore-bom:2.29.2:2.29.3-SNAPSHOT +proto-google-cloud-datastore-v1:0.120.2:0.120.3-SNAPSHOT +datastore-v1-proto-client:2.29.2:2.29.3-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.29.2:2.29.3-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.29.2:2.29.3-SNAPSHOT +grpc-google-cloud-datastore-v1:2.29.2:2.29.3-SNAPSHOT From a9d6155449ee7e159dbbbc4c3b61b804b20da290 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 20 Jun 2025 16:39:25 -0400 Subject: [PATCH 276/292] chore: declare the name element (#1891) The pom.xml doesn't have the name element. --- datastore-v1-proto-client/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index d5347e795..6a573df0e 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -28,6 +28,7 @@ jar + datastore-v1-proto-client Low level client for accessing Google Cloud Datastore v1. From 97004c85d73541ccfc26e0f4212e3a447d3e4ba6 Mon Sep 17 00:00:00 2001 From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> Date: Fri, 20 Jun 2025 15:25:56 -0700 Subject: [PATCH 277/292] feat: enable grpc configurator for client-side tracing (#1886) * "feat: enable grpc configurator for client-side tracing" * chore: generate libraries at Tue Jun 17 22:31:00 UTC 2025 * fix unit tests for max channel number * Remove max channel count configurations to fall back to gax-grpc max channel count * fix clirr difference error --------- Co-authored-by: cloud-java-bot --- google-cloud-datastore/pom.xml | 4 ++ .../cloud/datastore/DatastoreOptions.java | 44 ++++++++++++++----- .../datastore/spi/v1/GrpcDatastoreRpc.java | 3 +- .../datastore/telemetry/EnabledTraceUtil.java | 24 +++++++++- .../cloud/datastore/DatastoreOptionsTest.java | 3 +- .../telemetry/EnabledTraceUtilTest.java | 32 +++++++++++++- 6 files changed, 91 insertions(+), 19 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index ad7519423..ea1dc0e67 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -147,6 +147,10 @@ opentelemetry-context ${opentelemetry.version} + + io.opentelemetry.instrumentation + opentelemetry-grpc-1.6 + diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java index 1ea79298c..242ce3b01 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java @@ -18,6 +18,7 @@ import static com.google.cloud.datastore.Validator.validateNamespace; +import com.google.api.core.ApiFunction; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.ChannelPoolSettings; import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; @@ -35,6 +36,7 @@ import com.google.cloud.http.HttpTransportOptions; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; +import io.grpc.ManagedChannelBuilder; import java.io.IOException; import java.lang.reflect.Method; import java.util.Objects; @@ -222,20 +224,37 @@ private DatastoreOptions(Builder builder) { throw new IllegalArgumentException( "Only gRPC transport allows setting of channel provider or credentials provider"); } else if (getTransportOptions() instanceof GrpcTransportOptions) { - // For grpc transport options, configure default gRPC Connection pool with minChannelCount = 1 - // and maxChannelCount = 4 - this.channelProvider = - builder.channelProvider != null - ? builder.channelProvider - : GrpcTransportOptions.setUpChannelProvider( + if (builder.channelProvider == null) { + /* + The default gRPC connection pool is configured with a minimum of 1 channel. + The maximum channel count automatically defaults to 200 (Defined in gax-grpc). + */ + ChannelPoolSettings datastoreChannelPoolSettings = + ChannelPoolSettings.builder() + .setInitialChannelCount(INIT_CHANNEL_COUNT) + .setMinChannelCount(MIN_CHANNEL_COUNT) + .build(); + + ApiFunction channelConfigurator = + this.traceUtil.getChannelConfigurator(); + if (channelConfigurator == null) { + this.channelProvider = + GrpcTransportOptions.setUpChannelProvider( DatastoreSettings.defaultGrpcTransportProviderBuilder() - .setChannelPoolSettings( - ChannelPoolSettings.builder() - .setInitialChannelCount(INIT_CHANNEL_COUNT) - .setMinChannelCount(MIN_CHANNEL_COUNT) - .setMaxChannelCount(MAX_CHANNEL_COUNT) - .build()), + .setChannelPoolSettings(datastoreChannelPoolSettings), this); + } else { + // Intercept the grpc channel calls to add telemetry info. + this.channelProvider = + GrpcTransportOptions.setUpChannelProvider( + DatastoreSettings.defaultGrpcTransportProviderBuilder() + .setChannelPoolSettings(datastoreChannelPoolSettings) + .setChannelConfigurator(channelConfigurator), + this); + } + } else { + this.channelProvider = builder.channelProvider; + } } } @@ -256,6 +275,7 @@ protected String getDefaultProject() { } private static class DatastoreDefaults implements ServiceDefaults { + private final TransportOptions TRANSPORT_OPTIONS = getDefaultTransportOptionsBuilder().build(); @Override diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java index ea9043bb9..f9e3a34f3 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java @@ -75,7 +75,7 @@ public GrpcDatastoreRpc(DatastoreOptions datastoreOptions) throws IOException { ? getClientContextForEmulator(datastoreOptions) : getClientContext(datastoreOptions); - /* For grpc transport options, configure default gRPC Connection pool with minChannelCount = 1 and maxChannelCount = 4 */ + /* For grpc transport options, configure default gRPC Connection pool with minChannelCount = 1 */ DatastoreStubSettings datastoreStubSettings = DatastoreStubSettings.newBuilder(clientContext) .applyToAllUnaryMethods(retrySettingSetter(datastoreOptions)) @@ -85,7 +85,6 @@ public GrpcDatastoreRpc(DatastoreOptions datastoreOptions) throws IOException { ChannelPoolSettings.builder() .setInitialChannelCount(DatastoreOptions.INIT_CHANNEL_COUNT) .setMinChannelCount(DatastoreOptions.MIN_CHANNEL_COUNT) - .setMaxChannelCount(DatastoreOptions.MAX_CHANNEL_COUNT) .build()) .build()) .build(); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java index 40fc7308e..711e94020 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java @@ -35,6 +35,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.api.trace.StatusCode; import io.opentelemetry.api.trace.Tracer; +import io.opentelemetry.api.trace.TracerProvider; +import io.opentelemetry.instrumentation.grpc.v1_6.GrpcTelemetry; import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -66,14 +68,30 @@ public OpenTelemetry getOpenTelemetry() { return openTelemetry; } + // The gRPC channel configurator that intercepts gRPC calls for tracing purposes. + public class OpenTelemetryGrpcChannelConfigurator + implements ApiFunction { + + @Override + public ManagedChannelBuilder apply(ManagedChannelBuilder managedChannelBuilder) { + GrpcTelemetry grpcTelemetry = GrpcTelemetry.create(getOpenTelemetry()); + return managedChannelBuilder.intercept(grpcTelemetry.newClientInterceptor()); + } + } + @Override @Nullable public ApiFunction getChannelConfigurator() { - // TODO(jimit) Update this to return a gRPC Channel Configurator after gRPC upgrade. - return null; + // Note: using `==` rather than `.equals` since OpenTelemetry has only 1 static instance of + // `TracerProvider.noop`. + if (openTelemetry.getTracerProvider() == TracerProvider.noop()) { + return null; + } + return new OpenTelemetryGrpcChannelConfigurator(); } static class Span implements TraceUtil.Span { + private final io.opentelemetry.api.trace.Span span; private final String spanName; @@ -198,6 +216,7 @@ public Scope makeCurrent() { } static class Scope implements TraceUtil.Scope { + private final io.opentelemetry.context.Scope scope; Scope(io.opentelemetry.context.Scope scope) { @@ -211,6 +230,7 @@ public void close() { } static class Context implements TraceUtil.Context { + private final io.opentelemetry.context.Context context; Context(io.opentelemetry.context.Context context) { diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java index c6a26d05d..0c25c3b6c 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java @@ -41,6 +41,7 @@ public class DatastoreOptionsTest { private static final String PROJECT_ID = "project-id"; private static final String DATABASE_ID = "database-id"; private static final int PORT = 8080; + private static final int DEFAULT_MAX_CHANNEL_COUNT = 200; private DatastoreRpcFactory datastoreRpcFactory; private DatastoreRpc datastoreRpc; private DatastoreOptions.Builder options; @@ -119,7 +120,7 @@ public void testGrpcDefaultChannelConfigurations() { .getChannelPoolSettings(); assertEquals(channelPoolSettings.getInitialChannelCount(), DatastoreOptions.INIT_CHANNEL_COUNT); assertEquals(channelPoolSettings.getMinChannelCount(), DatastoreOptions.MIN_CHANNEL_COUNT); - assertEquals(channelPoolSettings.getMaxChannelCount(), DatastoreOptions.MAX_CHANNEL_COUNT); + assertEquals(channelPoolSettings.getMaxChannelCount(), DEFAULT_MAX_CHANNEL_COUNT); } @Test diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java index 50d7b6820..f076c0966 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java @@ -66,12 +66,12 @@ public void usesOpenTelemetryFromOptions() { @Test public void usesGlobalOpenTelemetryIfOpenTelemetryInstanceNotProvided() { OpenTelemetrySdk ignored = OpenTelemetrySdk.builder().buildAndRegisterGlobal(); - DatastoreOptions firestoreOptions = + DatastoreOptions datastoreOptions = getBaseOptions() .setOpenTelemetryOptions( DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build()) .build(); - EnabledTraceUtil traceUtil = new EnabledTraceUtil(firestoreOptions); + EnabledTraceUtil traceUtil = new EnabledTraceUtil(datastoreOptions); assertThat(traceUtil.getOpenTelemetry()).isEqualTo(GlobalOpenTelemetry.get()); } @@ -80,6 +80,34 @@ public void enabledTraceUtilProvidesChannelConfigurator() { assertThat(newEnabledTraceUtil().getChannelConfigurator()).isNull(); } + @Test + public void openTelemetryInstanceRegistersGrpcChannelConfigurator() { + OpenTelemetrySdk myOpenTelemetrySdk = OpenTelemetrySdk.builder().build(); + DatastoreOptions firestoreOptions = + getBaseOptions() + .setOpenTelemetryOptions( + DatastoreOpenTelemetryOptions.newBuilder() + .setTracingEnabled(true) + .setOpenTelemetry(myOpenTelemetrySdk) + .build()) + .build(); + EnabledTraceUtil traceUtil = new EnabledTraceUtil(firestoreOptions); + assertThat(traceUtil.getChannelConfigurator()).isNotNull(); + } + + @Test + public void globalOpenTelemetryRegistersGrpcChannelConfigurator() { + + OpenTelemetrySdk.builder().buildAndRegisterGlobal(); + DatastoreOptions datastoreOptions = + getBaseOptions() + .setOpenTelemetryOptions( + DatastoreOpenTelemetryOptions.newBuilder().setTracingEnabled(true).build()) + .build(); + EnabledTraceUtil traceUtil = new EnabledTraceUtil(datastoreOptions); + assertThat(traceUtil.getChannelConfigurator()).isNotNull(); + } + @Test public void usesEnabledContext() { assertThat(newEnabledTraceUtil().getCurrentContext() instanceof EnabledTraceUtil.Context) From f1c255a9e09e5c51055334c5b6c870698d07b44e Mon Sep 17 00:00:00 2001 From: cloud-java-bot <122572305+cloud-java-bot@users.noreply.github.com> Date: Wed, 25 Jun 2025 12:41:22 -0400 Subject: [PATCH 278/292] chore: Update generation configuration at Wed Jun 25 02:32:25 UTC 2025 (#1887) * chore: Update generation configuration at Wed Jun 18 02:30:54 UTC 2025 * chore: Update generation configuration at Thu Jun 19 02:31:16 UTC 2025 * chore: Update generation configuration at Fri Jun 20 02:30:59 UTC 2025 * chore: Update generation configuration at Sat Jun 21 02:30:26 UTC 2025 * chore: Update generation configuration at Wed Jun 25 02:32:25 UTC 2025 --- .github/workflows/hermetic_library_generation.yaml | 2 +- generation_config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index fa6e2ff75..c01f3faec 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.1 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/generation_config.yaml b/generation_config.yaml index ebb31077b..8ad800175 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.59.0 -googleapis_commitish: b6b04bf5bdb12d6b223e318ec63aa2ed22cfc0f7 +googleapis_commitish: 8a883235bc76e941ef745a5b5465878dadc9c440 libraries_bom_version: 26.61.0 libraries: - api_shortname: datastore From bf2a33c32a04b978a19fd6dfbe845769c921fa4f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 25 Jun 2025 21:30:17 +0200 Subject: [PATCH 279/292] deps: update dependency com.google.cloud:gapic-libraries-bom to v1.60.0 (#1799) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index ea1dc0e67..d634e44ce 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -24,7 +24,7 @@ com.google.cloud gapic-libraries-bom - 1.53.0 + 1.60.0 pom import From 5a82c115ba1998fd72af207da135fff5efc27f1e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 25 Jun 2025 21:31:20 +0200 Subject: [PATCH 280/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.29.2 (#1883) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index ee4fdd2ff..0f7983be3 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.29.1 + 2.29.2 From 56028d0bae0241ec9c0092b34adc746f569f545f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 25 Jun 2025 21:47:02 +0200 Subject: [PATCH 281/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore-utils to v2.29.2 (#1885) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d274626d2..9ed049b2c 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ com.google.cloud google-cloud-datastore-utils - 2.29.1 + 2.29.2 com.google.cloud.datastore From a8d99cde26c38376b596f44379f4d069b25339b2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Jun 2025 21:22:55 +0200 Subject: [PATCH 282/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.50.0 (#1897) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index c543c9eb3..3b858f551 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.49.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.0 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 7f954626c..0cd0a10d3 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.49.0 + 3.50.0 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 9ed049b2c..0bb5ebfdc 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.49.0 + 3.50.0 From 0921f869ff4a19e7c0fe918aea0896922e9a18af Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Jun 2025 21:32:08 +0200 Subject: [PATCH 283/292] deps: update googleapis/sdk-platform-java action to v2.60.0 (#1898) --- .github/workflows/hermetic_library_generation.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index c01f3faec..7838b82ee 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.60.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} From 77d505076c3babef28b2c17a66093640ab5b3c79 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 26 Jun 2025 15:13:13 -0700 Subject: [PATCH 284/292] chore(main): release 2.30.0 (#1890) * chore(main): release 2.30.0 * chore: generate libraries at Thu Jun 26 19:32:52 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot --- CHANGELOG.md | 15 +++++++++++++++ README.md | 8 ++++---- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 13 files changed, 53 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4a858926..0378423c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [2.30.0](https://github.com/googleapis/java-datastore/compare/v2.29.2...v2.30.0) (2025-06-26) + + +### Features + +* Enable grpc configurator for client-side tracing ([#1886](https://github.com/googleapis/java-datastore/issues/1886)) ([97004c8](https://github.com/googleapis/java-datastore/commit/97004c85d73541ccfc26e0f4212e3a447d3e4ba6)) + + +### Dependencies + +* Update dependency com.google.cloud:gapic-libraries-bom to v1.60.0 ([#1799](https://github.com/googleapis/java-datastore/issues/1799)) ([bf2a33c](https://github.com/googleapis/java-datastore/commit/bf2a33c32a04b978a19fd6dfbe845769c921fa4f)) +* Update dependency com.google.cloud:sdk-platform-java-config to v3.50.0 ([#1897](https://github.com/googleapis/java-datastore/issues/1897)) ([a8d99cd](https://github.com/googleapis/java-datastore/commit/a8d99cde26c38376b596f44379f4d069b25339b2)) +* Update googleapis/sdk-platform-java action to v2.59.1 ([#1880](https://github.com/googleapis/java-datastore/issues/1880)) ([4fb9929](https://github.com/googleapis/java-datastore/commit/4fb992943152bb4533e0bbd80e373de61f5ec864)) +* Update googleapis/sdk-platform-java action to v2.60.0 ([#1898](https://github.com/googleapis/java-datastore/issues/1898)) ([0921f86](https://github.com/googleapis/java-datastore/commit/0921f869ff4a19e7c0fe918aea0896922e9a18af)) + ## [2.29.2](https://github.com/googleapis/java-datastore/compare/v2.29.1...v2.29.2) (2025-06-13) diff --git a/README.md b/README.md index ff607f27c..95d252d9d 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.29.1 + 2.29.2 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.29.2' +implementation 'com.google.cloud:google-cloud-datastore:2.30.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.29.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.30.0" ``` ## Authentication @@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.29.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.30.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 6a573df0e..bbeba8b2b 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.29.3-SNAPSHOT + 2.30.0 com.google.cloud google-cloud-datastore-parent - 2.29.3-SNAPSHOT + 2.30.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 0cd0a10d3..c2f577695 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.29.3-SNAPSHOT + 2.30.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.29.3-SNAPSHOT + 2.30.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.3-SNAPSHOT + 2.30.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.3-SNAPSHOT + 0.121.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.3-SNAPSHOT + 2.30.0 diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 95c42e0e6..5af334b5a 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.29.3-SNAPSHOT + 2.30.0 jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.3-SNAPSHOT + 2.30.0 google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index d634e44ce..14cd3c1e7 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.29.3-SNAPSHOT + 2.30.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.29.3-SNAPSHOT + 2.30.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index c6e0e90f1..630e5ac7a 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.3-SNAPSHOT + 2.30.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.3-SNAPSHOT + 2.30.0 diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 291507cf3..6415f2deb 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.3-SNAPSHOT + 2.30.0 grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.3-SNAPSHOT + 2.30.0 diff --git a/pom.xml b/pom.xml index 0bb5ebfdc..df3804fd3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.29.3-SNAPSHOT + 2.30.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.3-SNAPSHOT + 2.30.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.29.3-SNAPSHOT + 2.30.0 com.google.cloud google-cloud-datastore - 2.29.3-SNAPSHOT + 2.30.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.3-SNAPSHOT + 0.121.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.29.3-SNAPSHOT + 2.30.0 com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.29.3-SNAPSHOT + 2.30.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 802cde576..411b59801 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.29.3-SNAPSHOT + 2.30.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.29.3-SNAPSHOT + 2.30.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index e5368c00a..055ec6d34 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.120.3-SNAPSHOT + 0.121.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.29.3-SNAPSHOT + 2.30.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index f96f6fc2f..e607354c7 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.29.3-SNAPSHOT + 2.30.0 diff --git a/versions.txt b/versions.txt index cf2f14cd5..6659b1fc3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.29.2:2.29.3-SNAPSHOT -google-cloud-datastore-bom:2.29.2:2.29.3-SNAPSHOT -proto-google-cloud-datastore-v1:0.120.2:0.120.3-SNAPSHOT -datastore-v1-proto-client:2.29.2:2.29.3-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.29.2:2.29.3-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.29.2:2.29.3-SNAPSHOT -grpc-google-cloud-datastore-v1:2.29.2:2.29.3-SNAPSHOT +google-cloud-datastore:2.30.0:2.30.0 +google-cloud-datastore-bom:2.30.0:2.30.0 +proto-google-cloud-datastore-v1:0.121.0:0.121.0 +datastore-v1-proto-client:2.30.0:2.30.0 +proto-google-cloud-datastore-admin-v1:2.30.0:2.30.0 +grpc-google-cloud-datastore-admin-v1:2.30.0:2.30.0 +grpc-google-cloud-datastore-v1:2.30.0:2.30.0 From c8f4c0e6ee5c40e83749062a1bba49023d297aad Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 9 Jul 2025 01:37:58 +0200 Subject: [PATCH 285/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore-utils to v2.30.0 (#1904) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df3804fd3..3dab86c1c 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ com.google.cloud google-cloud-datastore-utils - 2.29.2 + 2.30.0 com.google.cloud.datastore From beeb125efc842776facfa67742bdf8b6c167e9f2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 9 Jul 2025 01:48:35 +0200 Subject: [PATCH 286/292] deps: update dependency com.google.cloud:gapic-libraries-bom to v1.61.0 (#1901) --- google-cloud-datastore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 14cd3c1e7..ee2685c7a 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -24,7 +24,7 @@ com.google.cloud gapic-libraries-bom - 1.60.0 + 1.61.0 pom import From 9045160a757b2ffd54c1a3a5e0d0504653546f6d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 9 Jul 2025 01:48:46 +0200 Subject: [PATCH 287/292] chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.30.0 (#1903) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 0f7983be3..58a0953fa 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.29.2 + 2.30.0 From a74c46bfbac8eaf5c97fe653b740e26e7c79f4da Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Thu, 10 Jul 2025 11:40:37 -0700 Subject: [PATCH 288/292] feat: next release from main branch is 2.31.0 (#1912) * feat: next release from main branch is 2.31.0 * chore: generate libraries at Wed Jul 9 21:11:47 UTC 2025 --------- Co-authored-by: cloud-java-bot --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 39 ++++++++++++++++++++++++--------- README.md | 2 +- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 3fd939966..28d9ff930 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -38,3 +38,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 2.26.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.30.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 12d6c76d2..7545f34d8 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -116,16 +116,16 @@ branchProtectionRules: requiresCodeOwnerReviews: true requiresStrictStatusChecks: false requiredStatusCheckContexts: - - dependencies (17) - - lint - - clirr - - units (8) - - units (11) - - 'Kokoro - Test: Integration' - - cla/google - - 'Kokoro - Test: Java GraalVM Native Image' - - 'Kokoro - Test: Java 17 GraalVM Native Image' - - javadoc + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image' + - 'Kokoro - Test: Java 17 GraalVM Native Image' + - javadoc - pattern: 2.15.x isAdminEnforced: true requiredApprovingReviewCount: 1 @@ -191,6 +191,25 @@ branchProtectionRules: - javadoc - library_generation - unmanaged_dependency_check + - pattern: 2.30.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image A' + - 'Kokoro - Test: Java GraalVM Native Image B' + - 'Kokoro - Test: Java GraalVM Native Image C' + - javadoc + - library_generation + - unmanaged_dependency_check permissionRules: - team: yoshi-admins permission: admin diff --git a/README.md b/README.md index 95d252d9d..bbe1e863d 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.29.2 + 2.30.0 ``` From b10e0f0748decf06574fc0eb7ddba33ee5ece1a7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 14 Jul 2025 19:03:46 +0200 Subject: [PATCH 289/292] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.50.1 (#1908) Co-authored-by: Cindy Peng <148148319+cindy-peng@users.noreply.github.com> --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- google-cloud-datastore-bom/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 3b858f551..156af5f33 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.50.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.1 with: bom-path: google-cloud-datastore-bom/pom.xml diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index c2f577695..69737f60a 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud sdk-platform-java-config - 3.50.0 + 3.50.1 Google Cloud datastore BOM diff --git a/pom.xml b/pom.xml index 3dab86c1c..a6e5ff3e2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.50.0 + 3.50.1 From 29d7fe88b670e7230eaaffd0250f32671dee56da Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 14 Jul 2025 18:00:38 +0000 Subject: [PATCH 290/292] chore(main): release 2.30.1-SNAPSHOT (#1902) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index bbeba8b2b..29e5d1e76 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.30.0 + 2.30.1-SNAPSHOT com.google.cloud google-cloud-datastore-parent - 2.30.0 + 2.30.1-SNAPSHOT jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 69737f60a..a897f63bb 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.30.0 + 2.30.1-SNAPSHOT pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.30.0 + 2.30.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.30.0 + 2.30.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.121.0 + 0.121.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.30.0 + 2.30.1-SNAPSHOT diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 5af334b5a..335cbf611 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.30.0 + 2.30.1-SNAPSHOT jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.30.0 + 2.30.1-SNAPSHOT google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index ee2685c7a..630302e4a 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.30.0 + 2.30.1-SNAPSHOT jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.30.0 + 2.30.1-SNAPSHOT google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 630e5ac7a..21b387720 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.30.0 + 2.30.1-SNAPSHOT grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.30.0 + 2.30.1-SNAPSHOT diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 6415f2deb..4669023fc 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.30.0 + 2.30.1-SNAPSHOT grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.30.0 + 2.30.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index a6e5ff3e2..b2141dfbd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.30.0 + 2.30.1-SNAPSHOT Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.30.0 + 2.30.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.30.0 + 2.30.1-SNAPSHOT com.google.cloud google-cloud-datastore - 2.30.0 + 2.30.1-SNAPSHOT com.google.api.grpc proto-google-cloud-datastore-v1 - 0.121.0 + 0.121.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.30.0 + 2.30.1-SNAPSHOT com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.30.0 + 2.30.1-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 411b59801..0f98c0c6d 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.30.0 + 2.30.1-SNAPSHOT proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.30.0 + 2.30.1-SNAPSHOT diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 055ec6d34..af7cb6667 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.121.0 + 0.121.1-SNAPSHOT proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.30.0 + 2.30.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e607354c7..1ae718ba1 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.30.0 + 2.30.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 6659b1fc3..2678a0bef 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.30.0:2.30.0 -google-cloud-datastore-bom:2.30.0:2.30.0 -proto-google-cloud-datastore-v1:0.121.0:0.121.0 -datastore-v1-proto-client:2.30.0:2.30.0 -proto-google-cloud-datastore-admin-v1:2.30.0:2.30.0 -grpc-google-cloud-datastore-admin-v1:2.30.0:2.30.0 -grpc-google-cloud-datastore-v1:2.30.0:2.30.0 +google-cloud-datastore:2.30.0:2.30.1-SNAPSHOT +google-cloud-datastore-bom:2.30.0:2.30.1-SNAPSHOT +proto-google-cloud-datastore-v1:0.121.0:0.121.1-SNAPSHOT +datastore-v1-proto-client:2.30.0:2.30.1-SNAPSHOT +proto-google-cloud-datastore-admin-v1:2.30.0:2.30.1-SNAPSHOT +grpc-google-cloud-datastore-admin-v1:2.30.0:2.30.1-SNAPSHOT +grpc-google-cloud-datastore-v1:2.30.0:2.30.1-SNAPSHOT From 0fd4981f91c008b60977754c0bd067365e27c362 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 15 Jul 2025 01:36:23 +0000 Subject: [PATCH 291/292] chore(main): release 2.31.0 (#1916) :robot: I have created a release *beep* *boop* --- ## [2.31.0](https://togithub.com/googleapis/java-datastore/compare/v2.30.0...v2.31.0) (2025-07-14) ### Features * Next release from main branch is 2.31.0 ([#1912](https://togithub.com/googleapis/java-datastore/issues/1912)) ([a74c46b](https://togithub.com/googleapis/java-datastore/commit/a74c46bfbac8eaf5c97fe653b740e26e7c79f4da)) ### Dependencies * Update dependency com.google.cloud:gapic-libraries-bom to v1.61.0 ([#1901](https://togithub.com/googleapis/java-datastore/issues/1901)) ([beeb125](https://togithub.com/googleapis/java-datastore/commit/beeb125efc842776facfa67742bdf8b6c167e9f2)) * Update dependency com.google.cloud:sdk-platform-java-config to v3.50.1 ([#1908](https://togithub.com/googleapis/java-datastore/issues/1908)) ([b10e0f0](https://togithub.com/googleapis/java-datastore/commit/b10e0f0748decf06574fc0eb7ddba33ee5ece1a7)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 13 +++++++++++++ README.md | 6 +++--- datastore-v1-proto-client/pom.xml | 4 ++-- google-cloud-datastore-bom/pom.xml | 10 +++++----- google-cloud-datastore-utils/pom.xml | 4 ++-- google-cloud-datastore/pom.xml | 4 ++-- grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- grpc-google-cloud-datastore-v1/pom.xml | 4 ++-- pom.xml | 14 +++++++------- proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++-- proto-google-cloud-datastore-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 13 files changed, 50 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0378423c8..708cd5fb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [2.31.0](https://github.com/googleapis/java-datastore/compare/v2.30.0...v2.31.0) (2025-07-14) + + +### Features + +* Next release from main branch is 2.31.0 ([#1912](https://github.com/googleapis/java-datastore/issues/1912)) ([a74c46b](https://github.com/googleapis/java-datastore/commit/a74c46bfbac8eaf5c97fe653b740e26e7c79f4da)) + + +### Dependencies + +* Update dependency com.google.cloud:gapic-libraries-bom to v1.61.0 ([#1901](https://github.com/googleapis/java-datastore/issues/1901)) ([beeb125](https://github.com/googleapis/java-datastore/commit/beeb125efc842776facfa67742bdf8b6c167e9f2)) +* Update dependency com.google.cloud:sdk-platform-java-config to v3.50.1 ([#1908](https://github.com/googleapis/java-datastore/issues/1908)) ([b10e0f0](https://github.com/googleapis/java-datastore/commit/b10e0f0748decf06574fc0eb7ddba33ee5ece1a7)) + ## [2.30.0](https://github.com/googleapis/java-datastore/compare/v2.29.2...v2.30.0) (2025-06-26) diff --git a/README.md b/README.md index bbe1e863d..f737c2cfe 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.30.0' +implementation 'com.google.cloud:google-cloud-datastore:2.31.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.30.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.31.0" ``` ## Authentication @@ -492,7 +492,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.30.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.31.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 29e5d1e76..940a5f672 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.30.1-SNAPSHOT + 2.31.0 com.google.cloud google-cloud-datastore-parent - 2.30.1-SNAPSHOT + 2.31.0 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index a897f63bb..474f3bac6 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.30.1-SNAPSHOT + 2.31.0 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.30.1-SNAPSHOT + 2.31.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.30.1-SNAPSHOT + 2.31.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.121.1-SNAPSHOT + 0.122.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.30.1-SNAPSHOT + 2.31.0 diff --git a/google-cloud-datastore-utils/pom.xml b/google-cloud-datastore-utils/pom.xml index 335cbf611..f9d026e4e 100644 --- a/google-cloud-datastore-utils/pom.xml +++ b/google-cloud-datastore-utils/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-utils - 2.30.1-SNAPSHOT + 2.31.0 jar Google Cloud Datastore Utilities https://github.com/googleapis/java-datastore @@ -13,7 +13,7 @@ com.google.cloud google-cloud-datastore-parent - 2.30.1-SNAPSHOT + 2.31.0 google-cloud-datastore-utils diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 630302e4a..13ab98325 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.30.1-SNAPSHOT + 2.31.0 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.30.1-SNAPSHOT + 2.31.0 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 21b387720..0c281d430 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.30.1-SNAPSHOT + 2.31.0 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.30.1-SNAPSHOT + 2.31.0 diff --git a/grpc-google-cloud-datastore-v1/pom.xml b/grpc-google-cloud-datastore-v1/pom.xml index 4669023fc..c45ee0bb5 100644 --- a/grpc-google-cloud-datastore-v1/pom.xml +++ b/grpc-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.30.1-SNAPSHOT + 2.31.0 grpc-google-cloud-datastore-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.30.1-SNAPSHOT + 2.31.0 diff --git a/pom.xml b/pom.xml index b2141dfbd..e57149915 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.30.1-SNAPSHOT + 2.31.0 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.30.1-SNAPSHOT + 2.31.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.30.1-SNAPSHOT + 2.31.0 com.google.cloud google-cloud-datastore - 2.30.1-SNAPSHOT + 2.31.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.121.1-SNAPSHOT + 0.122.0 com.google.api.grpc grpc-google-cloud-datastore-v1 - 2.30.1-SNAPSHOT + 2.31.0 com.google.cloud @@ -189,7 +189,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.30.1-SNAPSHOT + 2.31.0 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 0f98c0c6d..7cee2b35f 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.30.1-SNAPSHOT + 2.31.0 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.30.1-SNAPSHOT + 2.31.0 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index af7cb6667..0e9379faf 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.121.1-SNAPSHOT + 0.122.0 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.30.1-SNAPSHOT + 2.31.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1ae718ba1..df8e9435e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.30.1-SNAPSHOT + 2.31.0 diff --git a/versions.txt b/versions.txt index 2678a0bef..5c015f915 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.30.0:2.30.1-SNAPSHOT -google-cloud-datastore-bom:2.30.0:2.30.1-SNAPSHOT -proto-google-cloud-datastore-v1:0.121.0:0.121.1-SNAPSHOT -datastore-v1-proto-client:2.30.0:2.30.1-SNAPSHOT -proto-google-cloud-datastore-admin-v1:2.30.0:2.30.1-SNAPSHOT -grpc-google-cloud-datastore-admin-v1:2.30.0:2.30.1-SNAPSHOT -grpc-google-cloud-datastore-v1:2.30.0:2.30.1-SNAPSHOT +google-cloud-datastore:2.31.0:2.31.0 +google-cloud-datastore-bom:2.31.0:2.31.0 +proto-google-cloud-datastore-v1:0.122.0:0.122.0 +datastore-v1-proto-client:2.31.0:2.31.0 +proto-google-cloud-datastore-admin-v1:2.31.0:2.31.0 +grpc-google-cloud-datastore-admin-v1:2.31.0:2.31.0 +grpc-google-cloud-datastore-v1:2.31.0:2.31.0 From 481e26deee9a426ebd7523b6469f98b0ecf69ac9 Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Fri, 18 Jul 2025 13:02:35 -0700 Subject: [PATCH 292/292] chore: create LTS branch 2.29.x (#1922) --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index 28d9ff930..8f934f1ba 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -42,3 +42,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 2.30.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.29.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 7545f34d8..a62e8b083 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -210,6 +210,25 @@ branchProtectionRules: - javadoc - library_generation - unmanaged_dependency_check + - pattern: 2.29.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image A' + - 'Kokoro - Test: Java GraalVM Native Image B' + - 'Kokoro - Test: Java GraalVM Native Image C' + - javadoc + - library_generation + - unmanaged_dependency_check permissionRules: - team: yoshi-admins permission: admin