Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

<!-- {x-version-update-start:google-cloud-datastore:released} -->

```xml
<dependency>
Expand All @@ -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"
```
<!-- {x-version-update-end} -->

## Authentication

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions datastore-v1-proto-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud.datastore</groupId>
<artifactId>datastore-v1-proto-client</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
<version>2.23.0</version><!-- {x-version-update:datastore-v1-proto-client:current} -->

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.23.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
</parent>

<packaging>jar</packaging>
Expand Down
10 changes: 5 additions & 5 deletions google-cloud-datastore-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-bom</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore-bom:current} -->
<version>2.23.0</version><!-- {x-version-update:google-cloud-datastore-bom:current} -->
<packaging>pom</packaging>
<parent>
<groupId>com.google.cloud</groupId>
Expand Down Expand Up @@ -52,22 +52,22 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.23.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
<version>2.23.0</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-v1</artifactId>
<version>0.113.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
<version>0.114.0</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
<version>2.23.0</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-datastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-datastore</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.23.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
<packaging>jar</packaging>
<name>Google Cloud Datastore</name>
<url>https://github.com/googleapis/java-datastore</url>
Expand All @@ -12,7 +12,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.23.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-datastore</site.installationModule>
Expand Down
4 changes: 2 additions & 2 deletions grpc-google-cloud-datastore-admin-v1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
<version>2.23.0</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
<name>grpc-google-cloud-datastore-admin-v1</name>
<description>GRPC library for google-cloud-datastore</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.23.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<packaging>pom</packaging>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.23.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
<name>Google Cloud Datastore Parent</name>
<url>https://github.com/googleapis/java-datastore</url>
<description>
Expand Down Expand Up @@ -159,27 +159,27 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
<version>2.23.0</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
<version>2.23.0</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.23.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-v1</artifactId>
<version>0.113.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
<version>0.114.0</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud.datastore</groupId>
<artifactId>datastore-v1-proto-client</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
<version>2.23.0</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
<exclusions>
<exclusion>
<groupId>com.google.api.grpc</groupId>
Expand Down
4 changes: 2 additions & 2 deletions proto-google-cloud-datastore-admin-v1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
<version>2.23.0</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
<name>proto-google-cloud-datastore-admin-v1</name>
<description>Proto library for google-cloud-datastore</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.23.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions proto-google-cloud-datastore-v1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-v1</artifactId>
<version>0.113.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
<version>0.114.0</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
<name>proto-google-cloud-datastore-v1</name>
<description>PROTO library for proto-google-cloud-datastore-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<version>2.22.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.23.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/snapshot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>2.22.1-SNAPSHOT</version>
<version>2.23.0</version>
</dependency>
<!-- {x-version-update-end} -->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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<Entity> query = Query.newEntityQueryBuilder()
Query<Entity> 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();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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<Entity> 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<Entity> results = datastore.run(query);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions versions.txt
Original file line number Diff line number Diff line change
@@ -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
Loading