diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 459487d38..cb4ea018e 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:ae72564aa9c368b9ccd96f4af21f87889fd83b9e60635b80844deb5a2ccd08aa + digest: sha256:bd316b9a591c45264775ecaba72e37d65905925c323b68e51a08c4126e4b6d0a diff --git a/CHANGELOG.md b/CHANGELOG.md index d9b3bc40c..1bbdd2523 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.12.4](https://github.com/googleapis/java-datastore/compare/v2.12.3...v2.12.4) (2022-11-07) + + +### Dependencies + +* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.17 ([#906](https://github.com/googleapis/java-datastore/issues/906)) ([294e6a8](https://github.com/googleapis/java-datastore/commit/294e6a86ff653d6f3f77369f408c970c4a236f96)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.17 ([#907](https://github.com/googleapis/java-datastore/issues/907)) ([6f8a518](https://github.com/googleapis/java-datastore/commit/6f8a5184c04e9499c02e5589d73fc492bc980213)) + ## [2.12.3](https://github.com/googleapis/java-datastore/compare/v2.12.2...v2.12.3) (2022-10-24) diff --git a/README.md b/README.md index a2b026bb6..79d0d0170 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.1.3 + 26.1.4 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.12.1 + 2.12.3 ``` @@ -49,20 +49,20 @@ If you are using Maven without 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.1.3') +implementation platform('com.google.cloud:libraries-bom:26.1.4') 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.12.2' +implementation 'com.google.cloud:google-cloud-datastore:2.12.3' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.2" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.12.3" ``` ## Authentication diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 58ac1e772..30a138cc3 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.12.3 + 2.12.4 com.google.cloud google-cloud-datastore-parent - 2.12.3 + 2.12.4 jar diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 7f94e2b5b..ee7e1a56c 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.12.3 + 2.12.4 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.12.3 + 2.12.4 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.12.3 + 2.12.4 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.103.3 + 0.103.4 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.12.3 + 2.12.4 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index f0d6425ba..537a0214c 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.12.3 + 2.12.4 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.12.3 + 2.12.4 google-cloud-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 30669e338..ce6c39fac 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 @@ -192,10 +192,7 @@ * // - 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 datastoreAdminSettings = - * DatastoreAdminSettings.newBuilder() - * .setTransportChannelProvider( - * DatastoreAdminSettings.defaultHttpJsonTransportProviderBuilder().build()) - * .build(); + * DatastoreAdminSettings.newHttpJsonBuilder().build(); * DatastoreAdminClient datastoreAdminClient = DatastoreAdminClient.create(datastoreAdminSettings); * } * diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 7f8643198..5b1a25205 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.12.3 + 2.12.4 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.12.3 + 2.12.4 diff --git a/pom.xml b/pom.xml index 31656d64c..cf3c16146 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.12.3 + 2.12.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.12.3 + 2.12.4 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.12.3 + 2.12.4 com.google.cloud google-cloud-datastore - 2.12.3 + 2.12.4 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.103.3 + 0.103.4 com.google.cloud.datastore datastore-v1-proto-client - 2.12.3 + 2.12.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 a5dce64ad..29d351453 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.12.3 + 2.12.4 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.12.3 + 2.12.4 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 06db222b0..f4ef6c20e 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.103.3 + 0.103.4 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.12.3 + 2.12.4 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index dd883c592..218386b7d 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.12.1 + 2.12.3 diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index e92360721..b9f22b24e 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.1.3 + 26.1.4 pom import @@ -86,7 +86,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.16 + 0.9.17 test @@ -107,7 +107,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.16 + 0.9.17 true com.example.datastore.NativeImageDatastoreSample diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c00f576d5..8932b2941 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.12.1 + 2.12.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 995c8800b..c8d008cfd 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.1.3 + 26.1.4 pom import 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 b22efc6fb..4013dbe04 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 @@ -1145,4 +1145,31 @@ public void testInQuerySorted() { // [END datastore_in_query_sorted] assertValidQueryRealBackend(query); } + + @Test + public void testStaleReads() { + setUpQueryTestsRealBackend(); + Datastore datastoreClient = datastoreRealBackend; + // [START datastore_stale_read] + Key taskKey = + datastoreClient + .newKeyFactory() + .setKind("Task") + .addAncestors(PathElement.of("TaskList", "default")) + .newKey("someTask"); + + Timestamp fifteenSecondsAgo = + Timestamp.ofTimeSecondsAndNanos(Timestamp.now().getSeconds() - 15L, 0); + // Create a readOption with read time fifteenSecondsAgo + ReadOption readOption = ReadOption.readTime(fifteenSecondsAgo); + // Use the readOption to Fetch entity + Entity entity = datastoreClient.get(taskKey, readOption); + + // Use the readOption to Query kind Task + Query query = Query.newEntityQueryBuilder().setKind("Task").setLimit(10).build(); + QueryResults results = datastoreClient.run(query, readOption); + Entity result = results.next(); + // [END datastore_stale_read] + assertValidQueryRealBackend(query); + } } diff --git a/versions.txt b/versions.txt index cd8731ba8..22f2d207b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.12.3:2.12.3 -google-cloud-datastore-bom:2.12.3:2.12.3 -proto-google-cloud-datastore-v1:0.103.3:0.103.3 -datastore-v1-proto-client:2.12.3:2.12.3 -proto-google-cloud-datastore-admin-v1:2.12.3:2.12.3 -grpc-google-cloud-datastore-admin-v1:2.12.3:2.12.3 +google-cloud-datastore:2.12.4:2.12.4 +google-cloud-datastore-bom:2.12.4:2.12.4 +proto-google-cloud-datastore-v1:0.103.4:0.103.4 +datastore-v1-proto-client:2.12.4:2.12.4 +proto-google-cloud-datastore-admin-v1:2.12.4:2.12.4 +grpc-google-cloud-datastore-admin-v1:2.12.4:2.12.4