Skip to content

Commit 26e6733

Browse files
kolea2gcf-owl-bot[bot]jainsahabrenovate-botrelease-please[bot]
authored
chore: sync with main (#941)
* chore: upgrade native image checks to graalvm-22.3.0 (#1718) (#926) chore: upgrade native image checks to graalvm-22.3.0 Source-Link: googleapis/synthtool@5e52896 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:27b1b1884dce60460d7521b23c2a73376cba90c0ef3d9f0d32e4bdb786959cfd Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> * chore: add new branch to sync-repo-settings (#927) * fix: #355 Explicitly passing --project argument when starting emulator (#923) * Running gcloud datastore emulator with --project argument * Allow user to pass a custom project id when creating a new LocalDatastoreHelper instance * Creating a local variable to increase the readability and emphasizing on the fact that project id not nullable now * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> * build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.5.5 (#929) * deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.19 (#931) * deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.19 (#930) * deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.0 (#932) * chore(main): release 2.13.0 (#921) :robot: I have created a release *beep* *boop* --- ## [2.13.0](https://github.com/googleapis/java-datastore/compare/v2.12.5...v2.13.0) (2022-12-06) ### Features * Next release from main branch is 2.13.0 ([#917](https://github.com/googleapis/java-datastore/issues/917)) ([1f12435](https://github.com/googleapis/java-datastore/commit/1f1243577cbdc206b6a0bfcde818411eb1b806ad)) ### Bug Fixes * [#355](https://github.com/googleapis/java-datastore/issues/355) Explicitly passing --project argument when starting emulator ([#923](https://github.com/googleapis/java-datastore/issues/923)) ([ef4065d](https://github.com/googleapis/java-datastore/commit/ef4065d233b968f58a34673aa53d39f60a013e2d)) ### Dependencies * Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.0 ([#932](https://github.com/googleapis/java-datastore/issues/932)) ([1dbcea7](https://github.com/googleapis/java-datastore/commit/1dbcea73827961148800c1ec8e87065dbceb6c88)) * Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.18 ([#924](https://github.com/googleapis/java-datastore/issues/924)) ([625e896](https://github.com/googleapis/java-datastore/commit/625e89685172ae546a813f5f7184223d01fbb0ac)) * Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.19 ([#930](https://github.com/googleapis/java-datastore/issues/930)) ([77285be](https://github.com/googleapis/java-datastore/commit/77285be97fbd6bca1ada35202842238e306dd8dc)) * Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.18 ([#925](https://github.com/googleapis/java-datastore/issues/925)) ([0c7539d](https://github.com/googleapis/java-datastore/commit/0c7539d736ec993d7bb0531d7cd4dab1b08487a0)) * Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.19 ([#931](https://github.com/googleapis/java-datastore/issues/931)) ([40b4011](https://github.com/googleapis/java-datastore/commit/40b4011e3a826a91e33541efdecb05f0e129f87c)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). * chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.13.0 (#935) [![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://github.com/googleapis/java-datastore) | `2.12.5` -> `2.13.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.13.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.13.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.13.0/compatibility-slim/2.12.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-datastore/2.13.0/confidence-slim/2.12.5)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>googleapis/java-datastore</summary> ### [`v2.13.0`](https://github.com/googleapis/java-datastore/blob/HEAD/CHANGELOG.md#&#8203;2130-httpsgithubcomgoogleapisjava-datastorecomparev2125v2130-2022-12-06) [Compare Source](https://github.com/googleapis/java-datastore/compare/v2.12.5...v2.13.0) ##### Features - Next release from main branch is 2.13.0 ([#&#8203;917](https://github.com/googleapis/java-datastore/issues/917)) ([1f12435](https://github.com/googleapis/java-datastore/commit/1f1243577cbdc206b6a0bfcde818411eb1b806ad)) ##### Bug Fixes - [#&#8203;355](https://github.com/googleapis/java-datastore/issues/355) Explicitly passing --project argument when starting emulator ([#&#8203;923](https://github.com/googleapis/java-datastore/issues/923)) ([ef4065d](https://github.com/googleapis/java-datastore/commit/ef4065d233b968f58a34673aa53d39f60a013e2d)) ##### Dependencies - Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.0 ([#&#8203;932](https://github.com/googleapis/java-datastore/issues/932)) ([1dbcea7](https://github.com/googleapis/java-datastore/commit/1dbcea73827961148800c1ec8e87065dbceb6c88)) - Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.18 ([#&#8203;924](https://github.com/googleapis/java-datastore/issues/924)) ([625e896](https://github.com/googleapis/java-datastore/commit/625e89685172ae546a813f5f7184223d01fbb0ac)) - Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.19 ([#&#8203;930](https://github.com/googleapis/java-datastore/issues/930)) ([77285be](https://github.com/googleapis/java-datastore/commit/77285be97fbd6bca1ada35202842238e306dd8dc)) - Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.18 ([#&#8203;925](https://github.com/googleapis/java-datastore/issues/925)) ([0c7539d](https://github.com/googleapis/java-datastore/commit/0c7539d736ec993d7bb0531d7cd4dab1b08487a0)) - Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.19 ([#&#8203;931](https://github.com/googleapis/java-datastore/issues/931)) ([40b4011](https://github.com/googleapis/java-datastore/commit/40b4011e3a826a91e33541efdecb05f0e129f87c)) </details> --- ### 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. --- - [ ] <!-- rebase-check -->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://app.renovatebot.com/dashboard#github/googleapis/java-datastore). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4yNC4wIiwidXBkYXRlZEluVmVyIjoiMzQuMjQuMCJ9--> * chore(main): release 2.13.1-SNAPSHOT (#934) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). * chore: Enable requesting numeric enums in "transport=rest" responses for services supporting this (Java, Go, Python, PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST transport (#933) * chore: Enable requesting numeric enums in "transport=rest" responses for services supporting this (Java, Go, Python, PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST transport chore: disallow "transport=rest" for services where numeric enums are not confirmed to be supported (except in PHP and Java) PiperOrigin-RevId: 493113566 Source-Link: googleapis/googleapis@758f0d1 Source-Link: googleapis/googleapis-gen@78bd8f0 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzhiZDhmMDVlMTI3NjM2M2ViMTRlYWU3MGU5MWZlNGJjMjA3MDNhYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> * build(deps): bump certifi from 2022.9.24 to 2022.12.7 in /synthtool/gcp/templates/java_library/.kokoro (#1732) (#937) build(deps): bump certifi Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.9.24 to 2022.12.7. - [Release notes](https://github.com/certifi/python-certifi/releases) - [Commits](https://github.com/certifi/python-certifi/compare/2022.09.24...2022.12.07) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jeff Ching <[email protected]> Source-Link: https://github.com/googleapis/synthtool/commit/ae0d43e5f17972981fe501ecf5a5d20055128bea Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c * chore(deps): update dependency com.google.cloud:libraries-bom to v26.2.0 (#938) * chore(deps): update dependency com.google.cloud:libraries-bom to v26.2.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 <gcf-owl-bot[bot]@users.noreply.github.com> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Prateek <[email protected]> Co-authored-by: Mend Renovate <[email protected]> Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jeff Ching <[email protected]>
1 parent dee8cb4 commit 26e6733

File tree

23 files changed

+113
-49
lines changed

23 files changed

+113
-49
lines changed

‎.github/.OwlBot.lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
16-
digest: sha256:e76136cc48f90aa19ba29cdfbd4002111467e44a1c9d905867d98dafafbd03bb
16+
digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c

‎.github/sync-repo-settings.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,23 @@ branchProtectionRules:
9595
- OwlBot Post Processor
9696
- 'Kokoro - Test: Java GraalVM Native Image'
9797
- 'Kokoro - Test: Java 17 GraalVM Native Image'
98+
- pattern: multi-db
99+
isAdminEnforced: true
100+
requiredApprovingReviewCount: 1
101+
requiresCodeOwnerReviews: true
102+
requiresStrictStatusChecks: false
103+
requiredStatusCheckContexts:
104+
- dependencies (8)
105+
- dependencies (11)
106+
- lint
107+
- clirr
108+
- units (8)
109+
- units (11)
110+
- 'Kokoro - Test: Integration'
111+
- cla/google
112+
- OwlBot Post Processor
113+
- 'Kokoro - Test: Java GraalVM Native Image'
114+
- 'Kokoro - Test: Java 17 GraalVM Native Image'
98115
permissionRules:
99116
- team: yoshi-admins
100117
permission: admin

‎.kokoro/presubmit/graalvm-native-17.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0"
77
}
88

99
env_vars: {

‎.kokoro/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pycparser==2.21
1717
pyperclip==1.8.2
1818
python-dateutil==2.8.2
1919
requests==2.27.1
20-
certifi==2022.9.24
20+
certifi==2022.12.7
2121
importlib-metadata==4.8.3
2222
zipp==3.6.0
2323
google_api_core==2.8.2

‎.kokoro/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ cachetools==4.2.4 \
1616
# via
1717
# -r requirements.in
1818
# google-auth
19-
certifi==2022.9.24 \
20-
--hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \
21-
--hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382
19+
certifi==2022.12.7 \
20+
--hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \
21+
--hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18
2222
# via
2323
# -r requirements.in
2424
# requests

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Changelog
22

3+
## [2.13.0](https://github.com/googleapis/java-datastore/compare/v2.12.5...v2.13.0) (2022-12-06)
4+
5+
6+
### Features
7+
8+
* Next release from main branch is 2.13.0 ([#917](https://github.com/googleapis/java-datastore/issues/917)) ([1f12435](https://github.com/googleapis/java-datastore/commit/1f1243577cbdc206b6a0bfcde818411eb1b806ad))
9+
10+
11+
### Bug Fixes
12+
13+
* [#355](https://github.com/googleapis/java-datastore/issues/355) Explicitly passing --project argument when starting emulator ([#923](https://github.com/googleapis/java-datastore/issues/923)) ([ef4065d](https://github.com/googleapis/java-datastore/commit/ef4065d233b968f58a34673aa53d39f60a013e2d))
14+
15+
16+
### Dependencies
17+
18+
* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.0 ([#932](https://github.com/googleapis/java-datastore/issues/932)) ([1dbcea7](https://github.com/googleapis/java-datastore/commit/1dbcea73827961148800c1ec8e87065dbceb6c88))
19+
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.18 ([#924](https://github.com/googleapis/java-datastore/issues/924)) ([625e896](https://github.com/googleapis/java-datastore/commit/625e89685172ae546a813f5f7184223d01fbb0ac))
20+
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.19 ([#930](https://github.com/googleapis/java-datastore/issues/930)) ([77285be](https://github.com/googleapis/java-datastore/commit/77285be97fbd6bca1ada35202842238e306dd8dc))
21+
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.18 ([#925](https://github.com/googleapis/java-datastore/issues/925)) ([0c7539d](https://github.com/googleapis/java-datastore/commit/0c7539d736ec993d7bb0531d7cd4dab1b08487a0))
22+
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.19 ([#931](https://github.com/googleapis/java-datastore/issues/931)) ([40b4011](https://github.com/googleapis/java-datastore/commit/40b4011e3a826a91e33541efdecb05f0e129f87c))
23+
324
## [2.12.5](https://github.com/googleapis/java-datastore/compare/v2.12.4...v2.12.5) (2022-11-08)
425

526

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>libraries-bom</artifactId>
22-
<version>26.1.5</version>
22+
<version>26.2.0</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>
@@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies:
4141
<dependency>
4242
<groupId>com.google.cloud</groupId>
4343
<artifactId>google-cloud-datastore</artifactId>
44-
<version>2.12.5</version>
44+
<version>2.13.0</version>
4545
</dependency>
4646

4747
```

‎datastore-v1-proto-client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<groupId>com.google.cloud.datastore</groupId>
2121
<artifactId>datastore-v1-proto-client</artifactId>
22-
<version>2.12.6-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
22+
<version>2.13.1-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
2323

2424
<parent>
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>google-cloud-datastore-parent</artifactId>
27-
<version>2.12.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
27+
<version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
2828
</parent>
2929

3030
<packaging>jar</packaging>

‎google-cloud-datastore-bom/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-datastore-bom</artifactId>
6-
<version>2.12.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore-bom:current} -->
6+
<version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore-bom:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>google-cloud-shared-config</artifactId>
11-
<version>1.5.4</version>
11+
<version>1.5.5</version>
1212
</parent>
1313

1414
<name>Google Cloud datastore BOM</name>
@@ -52,22 +52,22 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-datastore</artifactId>
55-
<version>2.12.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
55+
<version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
5656
</dependency>
5757
<dependency>
5858
<groupId>com.google.api.grpc</groupId>
5959
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
60-
<version>2.12.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
60+
<version>2.13.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
6161
</dependency>
6262
<dependency>
6363
<groupId>com.google.api.grpc</groupId>
6464
<artifactId>proto-google-cloud-datastore-v1</artifactId>
65-
<version>0.103.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
65+
<version>0.104.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
6666
</dependency>
6767
<dependency>
6868
<groupId>com.google.api.grpc</groupId>
6969
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
70-
<version>2.12.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
70+
<version>2.13.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
7171
</dependency>
7272
</dependencies>
7373
</dependencyManagement>

‎google-cloud-datastore/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>google-cloud-datastore</artifactId>
5-
<version>2.12.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
5+
<version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
66
<packaging>jar</packaging>
77
<name>Google Cloud Datastore</name>
88
<url>https://github.com/googleapis/java-datastore</url>
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-datastore-parent</artifactId>
15-
<version>2.12.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
15+
<version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
1616
</parent>
1717
<properties>
1818
<site.installationModule>google-cloud-datastore</site.installationModule>

‎google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/HttpJsonDatastoreAdminStub.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
9797
Map<String, List<String>> fields = new HashMap<>();
9898
ProtoRestSerializer<ExportEntitiesRequest> serializer =
9999
ProtoRestSerializer.create();
100+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
100101
return fields;
101102
})
102103
.setRequestBodyExtractor(
103104
request ->
104105
ProtoRestSerializer.create()
105-
.toBody("*", request.toBuilder().clearProjectId().build(), false))
106+
.toBody("*", request.toBuilder().clearProjectId().build(), true))
106107
.build())
107108
.setResponseParser(
108109
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -136,12 +137,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
136137
Map<String, List<String>> fields = new HashMap<>();
137138
ProtoRestSerializer<ImportEntitiesRequest> serializer =
138139
ProtoRestSerializer.create();
140+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
139141
return fields;
140142
})
141143
.setRequestBodyExtractor(
142144
request ->
143145
ProtoRestSerializer.create()
144-
.toBody("*", request.toBuilder().clearProjectId().build(), false))
146+
.toBody("*", request.toBuilder().clearProjectId().build(), true))
145147
.build())
146148
.setResponseParser(
147149
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -175,12 +177,13 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
175177
Map<String, List<String>> fields = new HashMap<>();
176178
ProtoRestSerializer<CreateIndexRequest> serializer =
177179
ProtoRestSerializer.create();
180+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
178181
return fields;
179182
})
180183
.setRequestBodyExtractor(
181184
request ->
182185
ProtoRestSerializer.create()
183-
.toBody("index", request.getIndex(), false))
186+
.toBody("index", request.getIndex(), true))
184187
.build())
185188
.setResponseParser(
186189
ProtoMessageResponseParser.<Operation>newBuilder()
@@ -215,6 +218,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
215218
Map<String, List<String>> fields = new HashMap<>();
216219
ProtoRestSerializer<DeleteIndexRequest> serializer =
217220
ProtoRestSerializer.create();
221+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
218222
return fields;
219223
})
220224
.setRequestBodyExtractor(request -> null)
@@ -251,6 +255,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
251255
Map<String, List<String>> fields = new HashMap<>();
252256
ProtoRestSerializer<GetIndexRequest> serializer =
253257
ProtoRestSerializer.create();
258+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
254259
return fields;
255260
})
256261
.setRequestBodyExtractor(request -> null)
@@ -287,6 +292,7 @@ public class HttpJsonDatastoreAdminStub extends DatastoreAdminStub {
287292
serializer.putQueryParam(fields, "filter", request.getFilter());
288293
serializer.putQueryParam(fields, "pageSize", request.getPageSize());
289294
serializer.putQueryParam(fields, "pageToken", request.getPageToken());
295+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
290296
return fields;
291297
})
292298
.setRequestBodyExtractor(request -> null)

‎google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.google.cloud.datastore.testing;
1818

19+
import static com.google.common.base.MoreObjects.firstNonNull;
20+
1921
import com.google.api.core.InternalApi;
2022
import com.google.cloud.NoCredentials;
2123
import com.google.cloud.ServiceOptions;
@@ -69,7 +71,9 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper<DatastoreOptions> {
6971

7072
// Common settings
7173
private static final String CONSISTENCY_FLAG = "--consistency=";
74+
private static final String PROJECT_FLAG = "--project=";
7275
private static final double DEFAULT_CONSISTENCY = 0.9;
76+
private static final String DEFAULT_PROJECT_ID = PROJECT_ID_PREFIX + UUID.randomUUID();
7377

7478
private static final Logger LOGGER = Logger.getLogger(LocalDatastoreHelper.class.getName());
7579

@@ -98,6 +102,7 @@ public static class Builder {
98102
private int port;
99103
private Path dataDir;
100104
private boolean storeOnDisk = true;
105+
private String projectId;
101106

102107
private Builder() {}
103108

@@ -117,6 +122,11 @@ public Builder setPort(int port) {
117122
return this;
118123
}
119124

125+
public Builder setProjectId(String projectId) {
126+
this.projectId = projectId;
127+
return this;
128+
}
129+
120130
public Builder setDataDir(Path dataDir) {
121131
this.dataDir = dataDir;
122132
return this;
@@ -137,7 +147,8 @@ private LocalDatastoreHelper(Builder builder) {
137147
super(
138148
"datastore",
139149
builder.port > 0 ? builder.port : BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT),
140-
PROJECT_ID_PREFIX + UUID.randomUUID().toString());
150+
firstNonNull(builder.projectId, DEFAULT_PROJECT_ID));
151+
String projectId = firstNonNull(builder.projectId, DEFAULT_PROJECT_ID);
141152
this.consistency = builder.consistency > 0 ? builder.consistency : DEFAULT_CONSISTENCY;
142153
this.gcdPath = builder.dataDir;
143154
this.storeOnDisk = builder.storeOnDisk;
@@ -148,6 +159,7 @@ private LocalDatastoreHelper(Builder builder) {
148159
List<String> gcloudCommand = new ArrayList<>(Arrays.asList(GCLOUD_CMD_TEXT.split(" ")));
149160
gcloudCommand.add(GCLOUD_CMD_PORT_FLAG + "localhost:" + getPort());
150161
gcloudCommand.add(CONSISTENCY_FLAG + builder.consistency);
162+
gcloudCommand.add(PROJECT_FLAG + projectId);
151163
if (!builder.storeOnDisk) {
152164
gcloudCommand.add("--no-store-on-disk");
153165
}

‎google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,14 @@ public void testCreateWithBuilder() {
8888
assertTrue(incompleteHelper.getProjectId().startsWith(PROJECT_ID_PREFIX));
8989
}
9090

91+
@Test
92+
public void testCreateWithCustomProjectId() {
93+
String customProjectId = "custom-project-id";
94+
LocalDatastoreHelper helper =
95+
LocalDatastoreHelper.newBuilder().setProjectId(customProjectId).build();
96+
assertEquals(customProjectId, helper.getProjectId());
97+
}
98+
9199
@Test
92100
public void testCreateWithToBuilder() throws IOException {
93101
LocalDatastoreHelper helper =

‎grpc-google-cloud-datastore-admin-v1/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
7-
<version>2.12.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
7+
<version>2.13.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
88
<name>grpc-google-cloud-datastore-admin-v1</name>
99
<description>GRPC library for google-cloud-datastore</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-datastore-parent</artifactId>
13-
<version>2.12.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
13+
<version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

0 commit comments

Comments
 (0)