diff --git a/CHANGELOG.md b/CHANGELOG.md
index a67e99388..025ff011e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## [2.14.5](https://github.com/googleapis/java-datastore/compare/v2.14.4...v2.14.5) (2023-04-27)
+
+
+### Bug Fixes
+
+* Using namespace from DatastoreOptions if aggregation query is not configured with one. ([#1055](https://github.com/googleapis/java-datastore/issues/1055)) ([ac21ef6](https://github.com/googleapis/java-datastore/commit/ac21ef6cff5308fb17990a768100d1b2ee4c3654)), closes [#1054](https://github.com/googleapis/java-datastore/issues/1054)
+
## [2.14.4](https://github.com/googleapis/java-datastore/compare/v2.14.3...v2.14.4) (2023-04-26)
diff --git a/README.md b/README.md
index 6b61cb06f..de738f5ac 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
com.google.cloud
google-cloud-datastore
- 2.14.3
+ 2.14.4
```
@@ -57,13 +57,13 @@ 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.14.3'
+implementation 'com.google.cloud:google-cloud-datastore:2.14.4'
```
If you are using SBT, add this to your dependencies:
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.14.4"
```
@@ -370,7 +370,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.14.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.14.4
[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 e2dd4f8c8..a9baa799f 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.14.4
+ 2.14.5
com.google.cloud
google-cloud-datastore-parent
- 2.14.4
+ 2.14.5
jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 0a3870c06..817aa3fc2 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.14.4
+ 2.14.5
pom
com.google.cloud
@@ -52,22 +52,22 @@
com.google.cloud
google-cloud-datastore
- 2.14.4
+ 2.14.5
com.google.api.grpc
grpc-google-cloud-datastore-admin-v1
- 2.14.4
+ 2.14.5
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.105.4
+ 0.105.5
com.google.api.grpc
proto-google-cloud-datastore-admin-v1
- 2.14.4
+ 2.14.5
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9727c3f75..57c8aad65 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
4.0.0
google-cloud-datastore
- 2.14.4
+ 2.14.5
jar
Google Cloud Datastore
https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
com.google.cloud
google-cloud-datastore-parent
- 2.14.4
+ 2.14.5
google-cloud-datastore
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java
index b5da8d9fe..8f4e51d6e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparer.java
@@ -26,6 +26,7 @@
import com.google.cloud.datastore.ReadOptionProtoPreparer;
import com.google.cloud.datastore.StructuredQueryProtoPreparer;
import com.google.cloud.datastore.aggregation.Aggregation;
+import com.google.common.base.MoreObjects;
import com.google.datastore.v1.GqlQuery;
import com.google.datastore.v1.PartitionId;
import com.google.datastore.v1.Query;
@@ -92,9 +93,9 @@ private com.google.datastore.v1.AggregationQuery getAggregationQuery(
private PartitionId getPartitionId(AggregationQuery aggregationQuery) {
PartitionId.Builder builder =
PartitionId.newBuilder().setProjectId(datastoreOptions.getProjectId());
- if (aggregationQuery.getNamespace() != null) {
- builder.setNamespaceId(aggregationQuery.getNamespace());
- }
+ String namespace =
+ MoreObjects.firstNonNull(aggregationQuery.getNamespace(), datastoreOptions.getNamespace());
+ builder.setNamespaceId(namespace);
return builder.build();
}
}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
index 6301ebeff..934e3a4c7 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/execution/request/AggregationQueryRequestProtoPreparerTest.java
@@ -154,7 +154,7 @@ public void shouldPrepareReadOptionsWithGivenGqlQuery() {
}
@Test
- public void shouldPrepareAggregationQueryWithoutNamespace() {
+ public void shouldPrepareAggregationQueryWithNamespaceFromDatastoreOptions() {
AggregationQuery structuredQueryWithoutNamespace =
Query.newAggregationQueryBuilder()
.addAggregation(count().as("total"))
@@ -169,8 +169,9 @@ public void shouldPrepareAggregationQueryWithoutNamespace() {
protoPreparer.prepare(QueryAndReadOptions.create(gqlQueryWithoutNamespace));
assertThat(runAggregationQueryFromStructuredQuery.getPartitionId().getNamespaceId())
- .isEqualTo("");
- assertThat(runAggregationQueryFromGqlQuery.getPartitionId().getNamespaceId()).isEqualTo("");
+ .isEqualTo(NAMESPACE);
+ assertThat(runAggregationQueryFromGqlQuery.getPartitionId().getNamespaceId())
+ .isEqualTo(NAMESPACE);
}
private RunAggregationQueryRequest prepareQuery(AggregationQuery query, ReadOption readOption) {
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 8ef18c2d1..cb7a0f106 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.4
+ 2.14.5
grpc-google-cloud-datastore-admin-v1
GRPC library for google-cloud-datastore
com.google.cloud
google-cloud-datastore-parent
- 2.14.4
+ 2.14.5
diff --git a/pom.xml b/pom.xml
index 1239c79e4..8d79f932e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-datastore-parent
pom
- 2.14.4
+ 2.14.5
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.14.4
+ 2.14.5
com.google.api.grpc
grpc-google-cloud-datastore-admin-v1
- 2.14.4
+ 2.14.5
com.google.cloud
google-cloud-datastore
- 2.14.4
+ 2.14.5
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.105.4
+ 0.105.5
com.google.cloud.datastore
datastore-v1-proto-client
- 2.14.4
+ 2.14.5
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 2a7e48bed..d8068d89a 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.4
+ 2.14.5
proto-google-cloud-datastore-admin-v1
Proto library for google-cloud-datastore
com.google.cloud
google-cloud-datastore-parent
- 2.14.4
+ 2.14.5
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 442dea975..8d4fd2ea8 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.4
+ 0.105.5
proto-google-cloud-datastore-v1
PROTO library for proto-google-cloud-datastore-v1
com.google.cloud
google-cloud-datastore-parent
- 2.14.4
+ 2.14.5
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index f2714fa75..60c4f8c4c 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.14.3
+ 2.14.4
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 21bcd42bd..f9a103611 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-datastore
- 2.14.3
+ 2.14.4
diff --git a/versions.txt b/versions.txt
index 92b496b15..e16e306bb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
# Format:
# module:released-version:current-version
-google-cloud-datastore:2.14.4:2.14.4
-google-cloud-datastore-bom:2.14.4:2.14.4
-proto-google-cloud-datastore-v1:0.105.4:0.105.4
-datastore-v1-proto-client:2.14.4:2.14.4
-proto-google-cloud-datastore-admin-v1:2.14.4:2.14.4
-grpc-google-cloud-datastore-admin-v1:2.14.4:2.14.4
+google-cloud-datastore:2.14.5:2.14.5
+google-cloud-datastore-bom:2.14.5:2.14.5
+proto-google-cloud-datastore-v1:0.105.5:0.105.5
+datastore-v1-proto-client:2.14.5:2.14.5
+proto-google-cloud-datastore-admin-v1:2.14.5:2.14.5
+grpc-google-cloud-datastore-admin-v1:2.14.5:2.14.5