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