This second example shows how to get and update a Datastore entity if it exists. For the * complete source code see + * href="https://github.com/googleapis/google-cloud-java/blob/4f9e98b21264028901878b8a11204868eca858ce/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java"> * UpdateEntity.java. * *
{@code diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 723047e68..1b321111a 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.14.0 +2.14.1 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent -2.14.0 +2.14.1 diff --git a/pom.xml b/pom.xml index d37c75682..061acf53a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom -2.14.0 +2.14.1 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -151,7 +151,7 @@ @@ -159,27 +159,27 @@ com.google.cloud google-cloud-shared-dependencies -3.4.0 +3.5.0 pom import com.google.api.grpc proto-google-cloud-datastore-admin-v1 -2.14.0 +2.14.1 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 -2.14.0 +2.14.1 com.google.cloud google-cloud-datastore -2.14.0 +2.14.1 com.google.api.grpc proto-google-cloud-datastore-v1 -0.105.0 +0.105.1 com.google.cloud.datastore datastore-v1-proto-client -2.14.0 +2.14.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 a3de14a29..c53f5bbf8 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.14.0 +2.14.1 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent -2.14.0 +2.14.1 diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 31d143ac2..f313978ec 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.105.0 +0.105.1 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent -2.14.0 +2.14.1 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index bcfc25e97..55263138e 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 4b6a7c126..057a2e472 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore -2.13.6 +2.14.0 @@ -97,7 +97,7 @@ com.google.cloud libraries-bom -26.9.0 +26.10.0 pom import org.apache.maven.plugins maven-surefire-plugin -2.22.2 +3.0.0 **/IT* diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index a17839a06..023a84abe 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@com.google.cloud google-cloud-datastore -2.13.6 +2.14.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index dd85dbe71..1929a106a 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ 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 4013dbe04..1397728ba 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 @@ -34,6 +34,7 @@ import com.google.cloud.datastore.IncompleteKey; import com.google.cloud.datastore.Key; import com.google.cloud.datastore.KeyFactory; +import com.google.cloud.datastore.KeyQuery; import com.google.cloud.datastore.ListValue; import com.google.cloud.datastore.PathElement; import com.google.cloud.datastore.ProjectionEntity; @@ -65,7 +66,9 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; +import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -129,6 +132,13 @@ public void setUp() { datastoreRealBackend = DatastoreOptions.getDefaultInstance().getService(); } + @After + public void tearDown() throws Exception { + KeyQuery taskQuery = Query.newKeyQueryBuilder().setKind("Task").build(); + Key[] taskKeysToDelete = Iterators.toArray(datastoreRealBackend.run(taskQuery), Key.class); + datastoreRealBackend.delete(taskKeysToDelete); + } + /** * Stops the local Datastore emulator. * @@ -1147,8 +1157,10 @@ public void testInQuerySorted() { } @Test - public void testStaleReads() { + public void testStaleReads() throws InterruptedException { setUpQueryTestsRealBackend(); + // waiting for 6 seconds, so that we can query with read time of 5 seconds ago + TimeUnit.SECONDS.sleep(6); Datastore datastoreClient = datastoreRealBackend; // [START datastore_stale_read] Key taskKey = @@ -1158,10 +1170,10 @@ public void testStaleReads() { .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); + Timestamp fiveSecondsAgo = + Timestamp.ofTimeSecondsAndNanos(Timestamp.now().getSeconds() - 5L, 0); + // Create a readOption with read time fiveSecondsAgo + ReadOption readOption = ReadOption.readTime(fiveSecondsAgo); // Use the readOption to Fetch entity Entity entity = datastoreClient.get(taskKey, readOption); diff --git a/versions.txt b/versions.txt index c7c734107..1cb3f4435 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.14.0:2.14.0 -google-cloud-datastore-bom:2.14.0:2.14.0 -proto-google-cloud-datastore-v1:0.105.0:0.105.0 -datastore-v1-proto-client:2.14.0:2.14.0 -proto-google-cloud-datastore-admin-v1:2.14.0:2.14.0 -grpc-google-cloud-datastore-admin-v1:2.14.0:2.14.0 +google-cloud-datastore:2.14.1:2.14.1 +google-cloud-datastore-bom:2.14.1:2.14.1 +proto-google-cloud-datastore-v1:0.105.1:0.105.1 +datastore-v1-proto-client:2.14.1:2.14.1 +proto-google-cloud-datastore-admin-v1:2.14.1:2.14.1 +grpc-google-cloud-datastore-admin-v1:2.14.1:2.14.1 com.google.cloud libraries-bom -26.9.0 +26.10.0 pom import