* Metadata for Datastore to Firestore migration operations.
+ *
* The DatastoreFirestoreMigration operation is not started by the end-user via
* an explicit "creation" method. This is an intentional deviation from the LRO
* design pattern.
+ *
* This singleton resource can be accessed at:
* "projects/{project_id}/operations/datastore-firestore-migration"
*
@@ -55,11 +57,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new DatastoreFirestoreMigrationMetadata();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_descriptor;
@@ -328,9 +325,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
*
*
* Metadata for Datastore to Firestore migration operations.
+ *
* The DatastoreFirestoreMigration operation is not started by the end-user via
* an explicit "creation" method. This is an intentional deviation from the LRO
* design pattern.
+ *
* This singleton resource can be accessed at:
* "projects/{project_id}/operations/datastore-firestore-migration"
*
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java
index 44a18f714..a9362246b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new DeleteIndexRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_DeleteIndexRequest_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java
index 4dfe2cd45..cff74d17f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java
@@ -26,14 +26,19 @@
* combinations of kinds and namespaces (either or both of which may be all, as
* described in the following examples).
* Example usage:
+ *
* Entire project:
* kinds=[], namespace_ids=[]
+ *
* Kinds Foo and Bar in all namespaces:
* kinds=['Foo', 'Bar'], namespace_ids=[]
+ *
* Kinds Foo and Bar only in the default namespace:
* kinds=['Foo', 'Bar'], namespace_ids=['']
+ *
* Kinds Foo and Bar in both the default and Baz namespaces:
* kinds=['Foo', 'Bar'], namespace_ids=['', 'Baz']
+ *
* The entire Baz namespace:
* kinds=[], namespace_ids=['Baz']
*
@@ -51,8 +56,8 @@ private EntityFilter(com.google.protobuf.GeneratedMessageV3.Builder builder)
}
private EntityFilter() {
- kinds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- namespaceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ kinds_ = com.google.protobuf.LazyStringArrayList.emptyList();
+ namespaceIds_ = com.google.protobuf.LazyStringArrayList.emptyList();
}
@java.lang.Override
@@ -61,11 +66,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new EntityFilter();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_EntityFilter_descriptor;
@@ -84,7 +84,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
public static final int KINDS_FIELD_NUMBER = 1;
@SuppressWarnings("serial")
- private com.google.protobuf.LazyStringList kinds_;
+ private com.google.protobuf.LazyStringArrayList kinds_ =
+ com.google.protobuf.LazyStringArrayList.emptyList();
/**
*
*
@@ -147,13 +148,15 @@ public com.google.protobuf.ByteString getKindsBytes(int index) {
public static final int NAMESPACE_IDS_FIELD_NUMBER = 2;
@SuppressWarnings("serial")
- private com.google.protobuf.LazyStringList namespaceIds_;
+ private com.google.protobuf.LazyStringArrayList namespaceIds_ =
+ com.google.protobuf.LazyStringArrayList.emptyList();
/**
*
*
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -173,6 +176,7 @@ public com.google.protobuf.ProtocolStringList getNamespaceIdsList() {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -192,6 +196,7 @@ public int getNamespaceIdsCount() {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -212,6 +217,7 @@ public java.lang.String getNamespaceIds(int index) {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -417,14 +423,19 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
* combinations of kinds and namespaces (either or both of which may be all, as
* described in the following examples).
* Example usage:
+ *
* Entire project:
* kinds=[], namespace_ids=[]
+ *
* Kinds Foo and Bar in all namespaces:
* kinds=['Foo', 'Bar'], namespace_ids=[]
+ *
* Kinds Foo and Bar only in the default namespace:
* kinds=['Foo', 'Bar'], namespace_ids=['']
+ *
* Kinds Foo and Bar in both the default and Baz namespaces:
* kinds=['Foo', 'Bar'], namespace_ids=['', 'Baz']
+ *
* The entire Baz namespace:
* kinds=[], namespace_ids=['Baz']
*
@@ -461,10 +472,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
public Builder clear() {
super.clear();
bitField0_ = 0;
- kinds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000001);
- namespaceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000002);
+ kinds_ = com.google.protobuf.LazyStringArrayList.emptyList();
+ namespaceIds_ = com.google.protobuf.LazyStringArrayList.emptyList();
return this;
}
@@ -492,7 +501,6 @@ public com.google.datastore.admin.v1.EntityFilter build() {
public com.google.datastore.admin.v1.EntityFilter buildPartial() {
com.google.datastore.admin.v1.EntityFilter result =
new com.google.datastore.admin.v1.EntityFilter(this);
- buildPartialRepeatedFields(result);
if (bitField0_ != 0) {
buildPartial0(result);
}
@@ -500,21 +508,16 @@ public com.google.datastore.admin.v1.EntityFilter buildPartial() {
return result;
}
- private void buildPartialRepeatedFields(com.google.datastore.admin.v1.EntityFilter result) {
- if (((bitField0_ & 0x00000001) != 0)) {
- kinds_ = kinds_.getUnmodifiableView();
- bitField0_ = (bitField0_ & ~0x00000001);
- }
- result.kinds_ = kinds_;
- if (((bitField0_ & 0x00000002) != 0)) {
- namespaceIds_ = namespaceIds_.getUnmodifiableView();
- bitField0_ = (bitField0_ & ~0x00000002);
- }
- result.namespaceIds_ = namespaceIds_;
- }
-
private void buildPartial0(com.google.datastore.admin.v1.EntityFilter result) {
int from_bitField0_ = bitField0_;
+ if (((from_bitField0_ & 0x00000001) != 0)) {
+ kinds_.makeImmutable();
+ result.kinds_ = kinds_;
+ }
+ if (((from_bitField0_ & 0x00000002) != 0)) {
+ namespaceIds_.makeImmutable();
+ result.namespaceIds_ = namespaceIds_;
+ }
}
@java.lang.Override
@@ -565,7 +568,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.EntityFilter other) {
if (!other.kinds_.isEmpty()) {
if (kinds_.isEmpty()) {
kinds_ = other.kinds_;
- bitField0_ = (bitField0_ & ~0x00000001);
+ bitField0_ |= 0x00000001;
} else {
ensureKindsIsMutable();
kinds_.addAll(other.kinds_);
@@ -575,7 +578,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.EntityFilter other) {
if (!other.namespaceIds_.isEmpty()) {
if (namespaceIds_.isEmpty()) {
namespaceIds_ = other.namespaceIds_;
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ |= 0x00000002;
} else {
ensureNamespaceIdsIsMutable();
namespaceIds_.addAll(other.namespaceIds_);
@@ -641,14 +644,14 @@ public Builder mergeFrom(
private int bitField0_;
- private com.google.protobuf.LazyStringList kinds_ =
- com.google.protobuf.LazyStringArrayList.EMPTY;
+ private com.google.protobuf.LazyStringArrayList kinds_ =
+ com.google.protobuf.LazyStringArrayList.emptyList();
private void ensureKindsIsMutable() {
- if (!((bitField0_ & 0x00000001) != 0)) {
+ if (!kinds_.isModifiable()) {
kinds_ = new com.google.protobuf.LazyStringArrayList(kinds_);
- bitField0_ |= 0x00000001;
}
+ bitField0_ |= 0x00000001;
}
/**
*
@@ -662,7 +665,8 @@ private void ensureKindsIsMutable() {
* @return A list containing the kinds.
*/
public com.google.protobuf.ProtocolStringList getKindsList() {
- return kinds_.getUnmodifiableView();
+ kinds_.makeImmutable();
+ return kinds_;
}
/**
*
@@ -727,6 +731,7 @@ public Builder setKinds(int index, java.lang.String value) {
}
ensureKindsIsMutable();
kinds_.set(index, value);
+ bitField0_ |= 0x00000001;
onChanged();
return this;
}
@@ -748,6 +753,7 @@ public Builder addKinds(java.lang.String value) {
}
ensureKindsIsMutable();
kinds_.add(value);
+ bitField0_ |= 0x00000001;
onChanged();
return this;
}
@@ -766,6 +772,7 @@ public Builder addKinds(java.lang.String value) {
public Builder addAllKinds(java.lang.Iterable values) {
ensureKindsIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(values, kinds_);
+ bitField0_ |= 0x00000001;
onChanged();
return this;
}
@@ -781,8 +788,9 @@ public Builder addAllKinds(java.lang.Iterable values) {
* @return This builder for chaining.
*/
public Builder clearKinds() {
- kinds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ kinds_ = com.google.protobuf.LazyStringArrayList.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
+ ;
onChanged();
return this;
}
@@ -805,18 +813,19 @@ public Builder addKindsBytes(com.google.protobuf.ByteString value) {
checkByteStringIsUtf8(value);
ensureKindsIsMutable();
kinds_.add(value);
+ bitField0_ |= 0x00000001;
onChanged();
return this;
}
- private com.google.protobuf.LazyStringList namespaceIds_ =
- com.google.protobuf.LazyStringArrayList.EMPTY;
+ private com.google.protobuf.LazyStringArrayList namespaceIds_ =
+ com.google.protobuf.LazyStringArrayList.emptyList();
private void ensureNamespaceIdsIsMutable() {
- if (!((bitField0_ & 0x00000002) != 0)) {
+ if (!namespaceIds_.isModifiable()) {
namespaceIds_ = new com.google.protobuf.LazyStringArrayList(namespaceIds_);
- bitField0_ |= 0x00000002;
}
+ bitField0_ |= 0x00000002;
}
/**
*
@@ -824,6 +833,7 @@ private void ensureNamespaceIdsIsMutable() {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -835,7 +845,8 @@ private void ensureNamespaceIdsIsMutable() {
* @return A list containing the namespaceIds.
*/
public com.google.protobuf.ProtocolStringList getNamespaceIdsList() {
- return namespaceIds_.getUnmodifiableView();
+ namespaceIds_.makeImmutable();
+ return namespaceIds_;
}
/**
*
@@ -843,6 +854,7 @@ public com.google.protobuf.ProtocolStringList getNamespaceIdsList() {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -862,6 +874,7 @@ public int getNamespaceIdsCount() {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -882,6 +895,7 @@ public java.lang.String getNamespaceIds(int index) {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -902,6 +916,7 @@ public com.google.protobuf.ByteString getNamespaceIdsBytes(int index) {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -920,6 +935,7 @@ public Builder setNamespaceIds(int index, java.lang.String value) {
}
ensureNamespaceIdsIsMutable();
namespaceIds_.set(index, value);
+ bitField0_ |= 0x00000002;
onChanged();
return this;
}
@@ -929,6 +945,7 @@ public Builder setNamespaceIds(int index, java.lang.String value) {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -946,6 +963,7 @@ public Builder addNamespaceIds(java.lang.String value) {
}
ensureNamespaceIdsIsMutable();
namespaceIds_.add(value);
+ bitField0_ |= 0x00000002;
onChanged();
return this;
}
@@ -955,6 +973,7 @@ public Builder addNamespaceIds(java.lang.String value) {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -969,6 +988,7 @@ public Builder addNamespaceIds(java.lang.String value) {
public Builder addAllNamespaceIds(java.lang.Iterable values) {
ensureNamespaceIdsIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(values, namespaceIds_);
+ bitField0_ |= 0x00000002;
onChanged();
return this;
}
@@ -978,6 +998,7 @@ public Builder addAllNamespaceIds(java.lang.Iterable values) {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -989,8 +1010,9 @@ public Builder addAllNamespaceIds(java.lang.Iterable values) {
* @return This builder for chaining.
*/
public Builder clearNamespaceIds() {
- namespaceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ namespaceIds_ = com.google.protobuf.LazyStringArrayList.emptyList();
bitField0_ = (bitField0_ & ~0x00000002);
+ ;
onChanged();
return this;
}
@@ -1000,6 +1022,7 @@ public Builder clearNamespaceIds() {
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -1018,6 +1041,7 @@ public Builder addNamespaceIdsBytes(com.google.protobuf.ByteString value) {
checkByteStringIsUtf8(value);
ensureNamespaceIdsIsMutable();
namespaceIds_.add(value);
+ bitField0_ |= 0x00000002;
onChanged();
return this;
}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java
index b39e13297..3e80e0185 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java
@@ -80,6 +80,7 @@ public interface EntityFilterOrBuilder
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -97,6 +98,7 @@ public interface EntityFilterOrBuilder
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -114,6 +116,7 @@ public interface EntityFilterOrBuilder
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
@@ -132,6 +135,7 @@ public interface EntityFilterOrBuilder
*
* An empty list represents all namespaces. This is the preferred
* usage for projects that don't use namespaces.
+ *
* An empty string element represents the default namespace. This should be
* used if the project has data in non-default namespaces, but doesn't want to
* include them.
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java
index 5982b68d1..4836be0ba 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ExportEntitiesMetadata();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java
index c817e37d2..5de54a564 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ExportEntitiesRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_ExportEntitiesRequest_descriptor;
@@ -292,6 +287,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
*
*
* Required. Location for the export metadata and data files.
+ *
* The full resource URL of the external storage location. Currently, only
* Google Cloud Storage is supported. So output_url_prefix should be of the
* form: `gs://BUCKET_NAME[/NAMESPACE_PATH]`, where `BUCKET_NAME` is the
@@ -300,10 +296,12 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
* information about Cloud Storage namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* The resulting files will be nested deeper than the specified URL prefix.
* The final output URL will be provided in the
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field. That
* value should be used for subsequent ImportEntities operations.
+ *
* By nesting the data files deeper, the same Cloud Storage bucket can be used
* in multiple ExportEntities operations without conflict.
*
@@ -329,6 +327,7 @@ public java.lang.String getOutputUrlPrefix() {
*
*
* Required. Location for the export metadata and data files.
+ *
* The full resource URL of the external storage location. Currently, only
* Google Cloud Storage is supported. So output_url_prefix should be of the
* form: `gs://BUCKET_NAME[/NAMESPACE_PATH]`, where `BUCKET_NAME` is the
@@ -337,10 +336,12 @@ public java.lang.String getOutputUrlPrefix() {
* information about Cloud Storage namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* The resulting files will be nested deeper than the specified URL prefix.
* The final output URL will be provided in the
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field. That
* value should be used for subsequent ImportEntities operations.
+ *
* By nesting the data files deeper, the same Cloud Storage bucket can be used
* in multiple ExportEntities operations without conflict.
*
@@ -1276,6 +1277,7 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
*
*
* Required. Location for the export metadata and data files.
+ *
* The full resource URL of the external storage location. Currently, only
* Google Cloud Storage is supported. So output_url_prefix should be of the
* form: `gs://BUCKET_NAME[/NAMESPACE_PATH]`, where `BUCKET_NAME` is the
@@ -1284,10 +1286,12 @@ public com.google.datastore.admin.v1.EntityFilterOrBuilder getEntityFilterOrBuil
* information about Cloud Storage namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* The resulting files will be nested deeper than the specified URL prefix.
* The final output URL will be provided in the
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field. That
* value should be used for subsequent ImportEntities operations.
+ *
* By nesting the data files deeper, the same Cloud Storage bucket can be used
* in multiple ExportEntities operations without conflict.
*
@@ -1312,6 +1316,7 @@ public java.lang.String getOutputUrlPrefix() {
*
*
* Required. Location for the export metadata and data files.
+ *
* The full resource URL of the external storage location. Currently, only
* Google Cloud Storage is supported. So output_url_prefix should be of the
* form: `gs://BUCKET_NAME[/NAMESPACE_PATH]`, where `BUCKET_NAME` is the
@@ -1320,10 +1325,12 @@ public java.lang.String getOutputUrlPrefix() {
* information about Cloud Storage namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* The resulting files will be nested deeper than the specified URL prefix.
* The final output URL will be provided in the
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field. That
* value should be used for subsequent ImportEntities operations.
+ *
* By nesting the data files deeper, the same Cloud Storage bucket can be used
* in multiple ExportEntities operations without conflict.
*
@@ -1348,6 +1355,7 @@ public com.google.protobuf.ByteString getOutputUrlPrefixBytes() {
*
*
* Required. Location for the export metadata and data files.
+ *
* The full resource URL of the external storage location. Currently, only
* Google Cloud Storage is supported. So output_url_prefix should be of the
* form: `gs://BUCKET_NAME[/NAMESPACE_PATH]`, where `BUCKET_NAME` is the
@@ -1356,10 +1364,12 @@ public com.google.protobuf.ByteString getOutputUrlPrefixBytes() {
* information about Cloud Storage namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* The resulting files will be nested deeper than the specified URL prefix.
* The final output URL will be provided in the
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field. That
* value should be used for subsequent ImportEntities operations.
+ *
* By nesting the data files deeper, the same Cloud Storage bucket can be used
* in multiple ExportEntities operations without conflict.
*
@@ -1383,6 +1393,7 @@ public Builder setOutputUrlPrefix(java.lang.String value) {
*
*
* Required. Location for the export metadata and data files.
+ *
* The full resource URL of the external storage location. Currently, only
* Google Cloud Storage is supported. So output_url_prefix should be of the
* form: `gs://BUCKET_NAME[/NAMESPACE_PATH]`, where `BUCKET_NAME` is the
@@ -1391,10 +1402,12 @@ public Builder setOutputUrlPrefix(java.lang.String value) {
* information about Cloud Storage namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* The resulting files will be nested deeper than the specified URL prefix.
* The final output URL will be provided in the
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field. That
* value should be used for subsequent ImportEntities operations.
+ *
* By nesting the data files deeper, the same Cloud Storage bucket can be used
* in multiple ExportEntities operations without conflict.
*
@@ -1414,6 +1427,7 @@ public Builder clearOutputUrlPrefix() {
*
*
* Required. Location for the export metadata and data files.
+ *
* The full resource URL of the external storage location. Currently, only
* Google Cloud Storage is supported. So output_url_prefix should be of the
* form: `gs://BUCKET_NAME[/NAMESPACE_PATH]`, where `BUCKET_NAME` is the
@@ -1422,10 +1436,12 @@ public Builder clearOutputUrlPrefix() {
* information about Cloud Storage namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* The resulting files will be nested deeper than the specified URL prefix.
* The final output URL will be provided in the
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field. That
* value should be used for subsequent ImportEntities operations.
+ *
* By nesting the data files deeper, the same Cloud Storage bucket can be used
* in multiple ExportEntities operations without conflict.
*
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java
index 4e57c8f09..93d655c76 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java
@@ -146,6 +146,7 @@ java.lang.String getLabelsOrDefault(
*
*
* Required. Location for the export metadata and data files.
+ *
* The full resource URL of the external storage location. Currently, only
* Google Cloud Storage is supported. So output_url_prefix should be of the
* form: `gs://BUCKET_NAME[/NAMESPACE_PATH]`, where `BUCKET_NAME` is the
@@ -154,10 +155,12 @@ java.lang.String getLabelsOrDefault(
* information about Cloud Storage namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* The resulting files will be nested deeper than the specified URL prefix.
* The final output URL will be provided in the
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field. That
* value should be used for subsequent ImportEntities operations.
+ *
* By nesting the data files deeper, the same Cloud Storage bucket can be used
* in multiple ExportEntities operations without conflict.
*
@@ -172,6 +175,7 @@ java.lang.String getLabelsOrDefault(
*
*
* Required. Location for the export metadata and data files.
+ *
* The full resource URL of the external storage location. Currently, only
* Google Cloud Storage is supported. So output_url_prefix should be of the
* form: `gs://BUCKET_NAME[/NAMESPACE_PATH]`, where `BUCKET_NAME` is the
@@ -180,10 +184,12 @@ java.lang.String getLabelsOrDefault(
* information about Cloud Storage namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* The resulting files will be nested deeper than the specified URL prefix.
* The final output URL will be provided in the
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url] field. That
* value should be used for subsequent ImportEntities operations.
+ *
* By nesting the data files deeper, the same Cloud Storage bucket can be used
* in multiple ExportEntities operations without conflict.
*
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java
index 6ddcdd71f..be5e66c5e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ExportEntitiesResponse();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_ExportEntitiesResponse_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java
index 6216d5e79..ca2b4846a 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new GetIndexRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_GetIndexRequest_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java
index 3d678697c..19302e6a5 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ImportEntitiesMetadata();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java
index 0643500b6..43319379b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ImportEntitiesRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_ImportEntitiesRequest_descriptor;
@@ -251,6 +246,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
* namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* For more information, see
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
*
@@ -285,6 +281,7 @@ public java.lang.String getInputUrl() {
* namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* For more information, see
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
*
@@ -1104,6 +1101,7 @@ public Builder putAllLabels(java.util.Map va
* namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* For more information, see
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
*
@@ -1137,6 +1135,7 @@ public java.lang.String getInputUrl() {
* namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* For more information, see
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
*
@@ -1170,6 +1169,7 @@ public com.google.protobuf.ByteString getInputUrlBytes() {
* namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* For more information, see
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
*
@@ -1202,6 +1202,7 @@ public Builder setInputUrl(java.lang.String value) {
* namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* For more information, see
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
*
@@ -1230,6 +1231,7 @@ public Builder clearInputUrl() {
* namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* For more information, see
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
*
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java
index 500706047..093f4c6e2 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java
@@ -120,6 +120,7 @@ java.lang.String getLabelsOrDefault(
* namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* For more information, see
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
*
@@ -143,6 +144,7 @@ java.lang.String getLabelsOrDefault(
* namespace paths, see
* [Object name
* considerations](https://cloud.google.com/storage/docs/naming#object-considerations).
+ *
* For more information, see
* [google.datastore.admin.v1.ExportEntitiesResponse.output_url][google.datastore.admin.v1.ExportEntitiesResponse.output_url].
*
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java
index b9a123e56..45d25cd44 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java
@@ -52,11 +52,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Index();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.IndexProto
.internal_static_google_datastore_admin_v1_Index_descriptor;
@@ -707,11 +702,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new IndexedProperty();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.IndexProto
.internal_static_google_datastore_admin_v1_Index_IndexedProperty_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java
index 36464b158..48e6b0fc5 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new IndexOperationMetadata();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_IndexOperationMetadata_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java
index ff612c3e2..cc0b3577b 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java
@@ -46,28 +46,28 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
java.lang.String[] descriptorData = {
"\n%google/datastore/admin/v1/index.proto\022"
+ "\031google.datastore.admin.v1\032\037google/api/f"
- + "ield_behavior.proto\"\346\004\n\005Index\022\027\n\nproject"
- + "_id\030\001 \001(\tB\003\340A\003\022\025\n\010index_id\030\003 \001(\tB\003\340A\003\022\021\n"
- + "\004kind\030\004 \001(\tB\003\340A\002\022D\n\010ancestor\030\005 \001(\0162-.goo"
- + "gle.datastore.admin.v1.Index.AncestorMod"
- + "eB\003\340A\002\022I\n\nproperties\030\006 \003(\01320.google.data"
- + "store.admin.v1.Index.IndexedPropertyB\003\340A"
- + "\002\022:\n\005state\030\007 \001(\0162&.google.datastore.admi"
- + "n.v1.Index.StateB\003\340A\003\032h\n\017IndexedProperty"
- + "\022\021\n\004name\030\001 \001(\tB\003\340A\002\022B\n\tdirection\030\002 \001(\0162*"
- + ".google.datastore.admin.v1.Index.Directi"
- + "onB\003\340A\002\"J\n\014AncestorMode\022\035\n\031ANCESTOR_MODE"
- + "_UNSPECIFIED\020\000\022\010\n\004NONE\020\001\022\021\n\rALL_ANCESTOR"
- + "S\020\002\"E\n\tDirection\022\031\n\025DIRECTION_UNSPECIFIE"
- + "D\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020\002\"P\n\005St"
- + "ate\022\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010CREATING\020\001"
- + "\022\t\n\005READY\020\002\022\014\n\010DELETING\020\003\022\t\n\005ERROR\020\004B\322\001\n"
- + "\035com.google.datastore.admin.v1B\nIndexPro"
- + "toP\001Z9cloud.google.com/go/datastore/admi"
- + "n/apiv1/adminpb;adminpb\252\002\037Google.Cloud.D"
- + "atastore.Admin.V1\312\002\037Google\\Cloud\\Datasto"
- + "re\\Admin\\V1\352\002#Google::Cloud::Datastore::"
- + "Admin::V1b\006proto3"
+ + "ield_behavior.proto\"\356\004\n\005Index\022\030\n\nproject"
+ + "_id\030\001 \001(\tB\004\342A\001\003\022\026\n\010index_id\030\003 \001(\tB\004\342A\001\003\022"
+ + "\022\n\004kind\030\004 \001(\tB\004\342A\001\002\022E\n\010ancestor\030\005 \001(\0162-."
+ + "google.datastore.admin.v1.Index.Ancestor"
+ + "ModeB\004\342A\001\002\022J\n\nproperties\030\006 \003(\01320.google."
+ + "datastore.admin.v1.Index.IndexedProperty"
+ + "B\004\342A\001\002\022;\n\005state\030\007 \001(\0162&.google.datastore"
+ + ".admin.v1.Index.StateB\004\342A\001\003\032j\n\017IndexedPr"
+ + "operty\022\022\n\004name\030\001 \001(\tB\004\342A\001\002\022C\n\tdirection\030"
+ + "\002 \001(\0162*.google.datastore.admin.v1.Index."
+ + "DirectionB\004\342A\001\002\"J\n\014AncestorMode\022\035\n\031ANCES"
+ + "TOR_MODE_UNSPECIFIED\020\000\022\010\n\004NONE\020\001\022\021\n\rALL_"
+ + "ANCESTORS\020\002\"E\n\tDirection\022\031\n\025DIRECTION_UN"
+ + "SPECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING"
+ + "\020\002\"P\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010CR"
+ + "EATING\020\001\022\t\n\005READY\020\002\022\014\n\010DELETING\020\003\022\t\n\005ERR"
+ + "OR\020\004B\322\001\n\035com.google.datastore.admin.v1B\n"
+ + "IndexProtoP\001Z9cloud.google.com/go/datast"
+ + "ore/admin/apiv1/adminpb;adminpb\252\002\037Google"
+ + ".Cloud.Datastore.Admin.V1\312\002\037Google\\Cloud"
+ + "\\Datastore\\Admin\\V1\352\002#Google::Cloud::Dat"
+ + "astore::Admin::V1b\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java
index 921c6b5f2..8e4891704 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java
@@ -50,11 +50,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ListIndexesRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_ListIndexesRequest_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java
index 9c0375992..9ed672c16 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ListIndexesResponse();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_ListIndexesResponse_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java
index 611d90c94..8a3e730c4 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new MigrationProgressEvent();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.MigrationProto
.internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor;
@@ -315,11 +310,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new PrepareStepDetails();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.MigrationProto
.internal_static_google_datastore_admin_v1_MigrationProgressEvent_PrepareStepDetails_descriptor;
@@ -983,11 +973,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new RedirectWritesStepDetails();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.MigrationProto
.internal_static_google_datastore_admin_v1_MigrationProgressEvent_RedirectWritesStepDetails_descriptor;
@@ -1596,6 +1581,8 @@ public com.google.protobuf.Parser getParserForType()
}
private int stepDetailsCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object stepDetails_;
public enum StepDetailsCase
@@ -1649,6 +1636,7 @@ public StepDetailsCase getStepDetailsCase() {
*
*
* The step that is starting.
+ *
* An event with step set to `START` indicates that the migration
* has been reverted back to the initial pre-migration state.
*
@@ -1666,6 +1654,7 @@ public int getStepValue() {
*
*
* The step that is starting.
+ *
* An event with step set to `START` indicates that the migration
* has been reverted back to the initial pre-migration state.
*
@@ -2268,6 +2257,7 @@ public Builder clearStepDetails() {
*
*
* The step that is starting.
+ *
* An event with step set to `START` indicates that the migration
* has been reverted back to the initial pre-migration state.
*
@@ -2285,6 +2275,7 @@ public int getStepValue() {
*
*
* The step that is starting.
+ *
* An event with step set to `START` indicates that the migration
* has been reverted back to the initial pre-migration state.
*
@@ -2305,6 +2296,7 @@ public Builder setStepValue(int value) {
*
*
* The step that is starting.
+ *
* An event with step set to `START` indicates that the migration
* has been reverted back to the initial pre-migration state.
*
@@ -2324,6 +2316,7 @@ public com.google.datastore.admin.v1.MigrationStep getStep() {
*
*
* The step that is starting.
+ *
* An event with step set to `START` indicates that the migration
* has been reverted back to the initial pre-migration state.
*
@@ -2347,6 +2340,7 @@ public Builder setStep(com.google.datastore.admin.v1.MigrationStep value) {
*
*
* The step that is starting.
+ *
* An event with step set to `START` indicates that the migration
* has been reverted back to the initial pre-migration state.
*
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java
index 4660304ea..07b7d82a4 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java
@@ -28,6 +28,7 @@ public interface MigrationProgressEventOrBuilder
*
*
* The step that is starting.
+ *
* An event with step set to `START` indicates that the migration
* has been reverted back to the initial pre-migration state.
*
@@ -42,6 +43,7 @@ public interface MigrationProgressEventOrBuilder
*
*
* The step that is starting.
+ *
* An event with step set to `START` indicates that the migration
* has been reverted back to the initial pre-migration state.
*
@@ -137,5 +139,5 @@ public interface MigrationProgressEventOrBuilder
com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetailsOrBuilder
getRedirectWritesStepDetailsOrBuilder();
- public com.google.datastore.admin.v1.MigrationProgressEvent.StepDetailsCase getStepDetailsCase();
+ com.google.datastore.admin.v1.MigrationProgressEvent.StepDetailsCase getStepDetailsCase();
}
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java
index e39101f4c..b2e653e4e 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new MigrationStateEvent();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.MigrationProto
.internal_static_google_datastore_admin_v1_MigrationStateEvent_descriptor;
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java
index 1b70d7be3..4f5126203 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java
@@ -45,11 +45,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Progress();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.admin.v1.DatastoreAdminProto
.internal_static_google_datastore_admin_v1_Progress_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java
index 5311d1a45..2f9f11739 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new AggregationQuery();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_AggregationQuery_descriptor;
@@ -114,8 +109,10 @@ public interface AggregationOrBuilder
*
* Optional. Optional name of the property to store the result of the
* aggregation.
+ *
* If not provided, Datastore will pick a default name following the format
* `property_<incremental_id++>`. For example:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -126,7 +123,9 @@ public interface AggregationOrBuilder
* ...
* );
* ```
+ *
* becomes:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -137,7 +136,9 @@ public interface AggregationOrBuilder
* ...
* );
* ```
+ *
* Requires:
+ *
* * Must be unique across all aggregation aliases.
* * Conform to [entity property
* name][google.datastore.v1.Entity.properties] limitations.
@@ -154,8 +155,10 @@ public interface AggregationOrBuilder
*
* Optional. Optional name of the property to store the result of the
* aggregation.
+ *
* If not provided, Datastore will pick a default name following the format
* `property_<incremental_id++>`. For example:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -166,7 +169,9 @@ public interface AggregationOrBuilder
* ...
* );
* ```
+ *
* becomes:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -177,7 +182,9 @@ public interface AggregationOrBuilder
* ...
* );
* ```
+ *
* Requires:
+ *
* * Must be unique across all aggregation aliases.
* * Conform to [entity property
* name][google.datastore.v1.Entity.properties] limitations.
@@ -189,7 +196,7 @@ public interface AggregationOrBuilder
*/
com.google.protobuf.ByteString getAliasBytes();
- public com.google.datastore.v1.AggregationQuery.Aggregation.OperatorCase getOperatorCase();
+ com.google.datastore.v1.AggregationQuery.Aggregation.OperatorCase getOperatorCase();
}
/**
*
@@ -220,11 +227,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Aggregation();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor;
@@ -251,16 +253,23 @@ public interface CountOrBuilder
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -276,16 +285,23 @@ public interface CountOrBuilder
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -301,16 +317,23 @@ public interface CountOrBuilder
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -324,6 +347,7 @@ public interface CountOrBuilder
*
*
* Count of entities that match the query.
+ *
* The `COUNT(*)` aggregation function operates on the entire entity
* so it does not require a field reference.
*
@@ -348,11 +372,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Count();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor;
@@ -376,16 +395,23 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -404,16 +430,23 @@ public boolean hasUpTo() {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -432,16 +465,23 @@ public com.google.protobuf.Int64Value getUpTo() {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -624,6 +664,7 @@ protected Builder newBuilderForType(
*
*
* Count of entities that match the query.
+ *
* The `COUNT(*)` aggregation function operates on the entire entity
* so it does not require a field reference.
*
@@ -824,16 +865,23 @@ public Builder mergeFrom(
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -851,16 +899,23 @@ public boolean hasUpTo() {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -882,16 +937,23 @@ public com.google.protobuf.Int64Value getUpTo() {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -917,16 +979,23 @@ public Builder setUpTo(com.google.protobuf.Int64Value value) {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -949,16 +1018,23 @@ public Builder setUpTo(com.google.protobuf.Int64Value.Builder builderForValue) {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -987,16 +1063,23 @@ public Builder mergeUpTo(com.google.protobuf.Int64Value value) {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -1019,16 +1102,23 @@ public Builder clearUpTo() {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -1046,16 +1136,23 @@ public com.google.protobuf.Int64Value.Builder getUpToBuilder() {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -1075,16 +1172,23 @@ public com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder() {
*
* Optional. Optional constraint on the maximum number of entities to
* count.
+ *
* This provides a way to set an upper bound on the number of entities
* to scan, limiting latency, and cost.
+ *
* Unspecified is interpreted as no bound.
+ *
* If a zero value is provided, a count result of zero should always be
* expected.
+ *
* High-Level Example:
+ *
* ```
* AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
* ```
+ *
* Requires:
+ *
* * Must be non-negative when present.
*
*
@@ -1176,6 +1280,8 @@ public com.google.protobuf.Parser getParserForType() {
}
private int operatorCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object operator_;
public enum OperatorCase
@@ -1280,8 +1386,10 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
*
* Optional. Optional name of the property to store the result of the
* aggregation.
+ *
* If not provided, Datastore will pick a default name following the format
* `property_<incremental_id++>`. For example:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -1292,7 +1400,9 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
* ...
* );
* ```
+ *
* becomes:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -1303,7 +1413,9 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
* ...
* );
* ```
+ *
* Requires:
+ *
* * Must be unique across all aggregation aliases.
* * Conform to [entity property
* name][google.datastore.v1.Entity.properties] limitations.
@@ -1331,8 +1443,10 @@ public java.lang.String getAlias() {
*
* Optional. Optional name of the property to store the result of the
* aggregation.
+ *
* If not provided, Datastore will pick a default name following the format
* `property_<incremental_id++>`. For example:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -1343,7 +1457,9 @@ public java.lang.String getAlias() {
* ...
* );
* ```
+ *
* becomes:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -1354,7 +1470,9 @@ public java.lang.String getAlias() {
* ...
* );
* ```
+ *
* Requires:
+ *
* * Must be unique across all aggregation aliases.
* * Conform to [entity property
* name][google.datastore.v1.Entity.properties] limitations.
@@ -2014,8 +2132,10 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
*
* Optional. Optional name of the property to store the result of the
* aggregation.
+ *
* If not provided, Datastore will pick a default name following the format
* `property_<incremental_id++>`. For example:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -2026,7 +2146,9 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
* ...
* );
* ```
+ *
* becomes:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -2037,7 +2159,9 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
* ...
* );
* ```
+ *
* Requires:
+ *
* * Must be unique across all aggregation aliases.
* * Conform to [entity property
* name][google.datastore.v1.Entity.properties] limitations.
@@ -2064,8 +2188,10 @@ public java.lang.String getAlias() {
*
* Optional. Optional name of the property to store the result of the
* aggregation.
+ *
* If not provided, Datastore will pick a default name following the format
* `property_<incremental_id++>`. For example:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -2076,7 +2202,9 @@ public java.lang.String getAlias() {
* ...
* );
* ```
+ *
* becomes:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -2087,7 +2215,9 @@ public java.lang.String getAlias() {
* ...
* );
* ```
+ *
* Requires:
+ *
* * Must be unique across all aggregation aliases.
* * Conform to [entity property
* name][google.datastore.v1.Entity.properties] limitations.
@@ -2114,8 +2244,10 @@ public com.google.protobuf.ByteString getAliasBytes() {
*
* Optional. Optional name of the property to store the result of the
* aggregation.
+ *
* If not provided, Datastore will pick a default name following the format
* `property_<incremental_id++>`. For example:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -2126,7 +2258,9 @@ public com.google.protobuf.ByteString getAliasBytes() {
* ...
* );
* ```
+ *
* becomes:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -2137,7 +2271,9 @@ public com.google.protobuf.ByteString getAliasBytes() {
* ...
* );
* ```
+ *
* Requires:
+ *
* * Must be unique across all aggregation aliases.
* * Conform to [entity property
* name][google.datastore.v1.Entity.properties] limitations.
@@ -2163,8 +2299,10 @@ public Builder setAlias(java.lang.String value) {
*
* Optional. Optional name of the property to store the result of the
* aggregation.
+ *
* If not provided, Datastore will pick a default name following the format
* `property_<incremental_id++>`. For example:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -2175,7 +2313,9 @@ public Builder setAlias(java.lang.String value) {
* ...
* );
* ```
+ *
* becomes:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -2186,7 +2326,9 @@ public Builder setAlias(java.lang.String value) {
* ...
* );
* ```
+ *
* Requires:
+ *
* * Must be unique across all aggregation aliases.
* * Conform to [entity property
* name][google.datastore.v1.Entity.properties] limitations.
@@ -2208,8 +2350,10 @@ public Builder clearAlias() {
*
* Optional. Optional name of the property to store the result of the
* aggregation.
+ *
* If not provided, Datastore will pick a default name following the format
* `property_<incremental_id++>`. For example:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -2220,7 +2364,9 @@ public Builder clearAlias() {
* ...
* );
* ```
+ *
* becomes:
+ *
* ```
* AGGREGATE
* COUNT_UP_TO(1) AS count_up_to_1,
@@ -2231,7 +2377,9 @@ public Builder clearAlias() {
* ...
* );
* ```
+ *
* Requires:
+ *
* * Must be unique across all aggregation aliases.
* * Conform to [entity property
* name][google.datastore.v1.Entity.properties] limitations.
@@ -2318,6 +2466,8 @@ public com.google.datastore.v1.AggregationQuery.Aggregation getDefaultInstanceFo
}
private int queryTypeCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object queryType_;
public enum QueryTypeCase
@@ -2422,7 +2572,9 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -2441,7 +2593,9 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -2460,7 +2614,9 @@ public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() {
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -2478,7 +2634,9 @@ public int getAggregationsCount() {
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -2496,7 +2654,9 @@ public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3197,7 +3357,9 @@ private void ensureAggregationsIsMutable() {
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3219,7 +3381,9 @@ private void ensureAggregationsIsMutable() {
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3240,7 +3404,9 @@ public int getAggregationsCount() {
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3261,7 +3427,9 @@ public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3289,7 +3457,9 @@ public Builder setAggregations(
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3314,7 +3484,9 @@ public Builder setAggregations(
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3341,7 +3513,9 @@ public Builder addAggregations(com.google.datastore.v1.AggregationQuery.Aggregat
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3369,7 +3543,9 @@ public Builder addAggregations(
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3394,7 +3570,9 @@ public Builder addAggregations(
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3419,7 +3597,9 @@ public Builder addAggregations(
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3444,7 +3624,9 @@ public Builder addAllAggregations(
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3468,7 +3650,9 @@ public Builder clearAggregations() {
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3492,7 +3676,9 @@ public Builder removeAggregations(int index) {
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3510,7 +3696,9 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder getAggregati
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3532,7 +3720,9 @@ public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregat
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3554,7 +3744,9 @@ public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregat
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3572,7 +3764,9 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregati
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -3592,7 +3786,9 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregati
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java
index 675424777..053017203 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java
@@ -64,7 +64,9 @@ public interface AggregationQueryOrBuilder
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -79,7 +81,9 @@ public interface AggregationQueryOrBuilder
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -94,7 +98,9 @@ public interface AggregationQueryOrBuilder
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -109,7 +115,9 @@ public interface AggregationQueryOrBuilder
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -125,7 +133,9 @@ public interface AggregationQueryOrBuilder
*
* Optional. Series of aggregations to apply over the results of the
* `nested_query`.
+ *
* Requires:
+ *
* * A minimum of one and maximum of five aggregations per query.
*
*
@@ -135,5 +145,5 @@ public interface AggregationQueryOrBuilder
*/
com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregationsOrBuilder(int index);
- public com.google.datastore.v1.AggregationQuery.QueryTypeCase getQueryTypeCase();
+ com.google.datastore.v1.AggregationQuery.QueryTypeCase getQueryTypeCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java
index cb3969718..b181d4f12 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java
@@ -23,6 +23,7 @@
*
*
* The result of a single bucket from a Datastore aggregation query.
+ *
* The keys of `aggregate_properties` are the same for all results in an
* aggregation query, unlike entity queries which can have different fields
* present for each result.
@@ -48,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new AggregationResult();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.AggregationResultProto
.internal_static_google_datastore_v1_AggregationResult_descriptor;
@@ -115,6 +111,7 @@ public int getAggregatePropertiesCount() {
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -141,6 +138,7 @@ public java.util.Map getAggrega
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -159,6 +157,7 @@ public java.util.Map getAggrega
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -184,6 +183,7 @@ public java.util.Map getAggrega
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -382,6 +382,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
*
*
* The result of a single bucket from a Datastore aggregation query.
+ *
* The keys of `aggregate_properties` are the same for all results in an
* aggregation query, unlike entity queries which can have different fields
* present for each result.
@@ -622,6 +623,7 @@ public int getAggregatePropertiesCount() {
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -648,6 +650,7 @@ public java.util.Map getAggrega
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -666,6 +669,7 @@ public java.util.Map getAggrega
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -691,6 +695,7 @@ public java.util.Map getAggrega
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -722,6 +727,7 @@ public Builder clearAggregateProperties() {
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -749,6 +755,7 @@ public Builder removeAggregateProperties(java.lang.String key) {
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -774,6 +781,7 @@ public Builder putAggregateProperties(
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java
index e041913ca..194710d50 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new AggregationResultBatch();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.AggregationResultProto
.internal_static_google_datastore_v1_AggregationResultBatch_descriptor;
@@ -188,6 +183,7 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -206,6 +202,7 @@ public boolean hasReadTime() {
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -224,6 +221,7 @@ public com.google.protobuf.Timestamp getReadTime() {
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -1154,6 +1152,7 @@ public Builder clearMoreResults() {
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -1171,6 +1170,7 @@ public boolean hasReadTime() {
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -1192,6 +1192,7 @@ public com.google.protobuf.Timestamp getReadTime() {
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -1217,6 +1218,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -1239,6 +1241,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -1267,6 +1270,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -1289,6 +1293,7 @@ public Builder clearReadTime() {
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -1306,6 +1311,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -1325,6 +1331,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java
index e104e9556..818b32c1a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java
@@ -109,6 +109,7 @@ public interface AggregationResultBatchOrBuilder
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -124,6 +125,7 @@ public interface AggregationResultBatchOrBuilder
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
@@ -139,6 +141,7 @@ public interface AggregationResultBatchOrBuilder
*
*
* Read timestamp this batch was returned from.
+ *
* In a single transaction, subsequent query result batches for the same query
* can have a greater timestamp. Each batch's read timestamp
* is valid for all preceding batches.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java
index fc9f0ab9a..fc6a3cddd 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java
@@ -28,6 +28,7 @@ public interface AggregationResultOrBuilder
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -42,6 +43,7 @@ public interface AggregationResultOrBuilder
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -59,6 +61,7 @@ public interface AggregationResultOrBuilder
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -73,6 +76,7 @@ public interface AggregationResultOrBuilder
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
@@ -91,6 +95,7 @@ com.google.datastore.v1.Value getAggregatePropertiesOrDefault(
*
*
* The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+ *
* The key is the
* [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] assigned to
* the aggregation function on input and the size of this map equals the
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java
index 206fd62ff..f78c17c53 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java
@@ -50,11 +50,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new AllocateIdsRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
@@ -130,6 +125,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -155,6 +151,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -804,6 +801,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -828,6 +826,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -852,6 +851,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -875,6 +875,7 @@ public Builder setDatabaseId(java.lang.String value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -894,6 +895,7 @@ public Builder clearDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java
index 070e273c6..5daea7f12 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java
@@ -53,6 +53,7 @@ public interface AllocateIdsRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -67,6 +68,7 @@ public interface AllocateIdsRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java
index 617896631..7fecd70bf 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new AllocateIdsResponse();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
index c8ca14ce3..742bbcd4f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ArrayValue();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.EntityProto
.internal_static_google_datastore_v1_ArrayValue_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
index e194f4bc1..79260cf33 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new BeginTransactionRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
@@ -129,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -154,6 +150,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -739,6 +736,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -763,6 +761,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -787,6 +786,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -810,6 +810,7 @@ public Builder setDatabaseId(java.lang.String value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -829,6 +830,7 @@ public Builder clearDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java
index bfe6db93d..e65a6c5c6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java
@@ -53,6 +53,7 @@ public interface BeginTransactionRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -67,6 +68,7 @@ public interface BeginTransactionRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
index 04be1060d..bf6116f00 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new BeginTransactionResponse();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
index fd4933272..21a4502ab 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
@@ -50,11 +50,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new CommitRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_CommitRequest_descriptor;
@@ -232,6 +227,8 @@ private Mode(int value) {
}
private int transactionSelectorCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object transactionSelector_;
public enum TransactionSelectorCase
@@ -338,6 +335,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -363,6 +361,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -527,13 +526,16 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getSingleUseTransacti
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -549,13 +551,16 @@ public java.util.List getMutationsList() {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -572,13 +577,16 @@ public java.util.List getMutationsList() {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -594,13 +602,16 @@ public int getMutationsCount() {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -616,13 +627,16 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -1297,6 +1311,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1321,6 +1336,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1345,6 +1361,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1368,6 +1385,7 @@ public Builder setDatabaseId(java.lang.String value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1387,6 +1405,7 @@ public Builder clearDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1835,13 +1854,16 @@ private void ensureMutationsIsMutable() {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -1860,13 +1882,16 @@ public java.util.List getMutationsList() {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -1885,13 +1910,16 @@ public int getMutationsCount() {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -1910,13 +1938,16 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -1941,13 +1972,16 @@ public Builder setMutations(int index, com.google.datastore.v1.Mutation value) {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -1970,13 +2004,16 @@ public Builder setMutations(
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2001,13 +2038,16 @@ public Builder addMutations(com.google.datastore.v1.Mutation value) {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2032,13 +2072,16 @@ public Builder addMutations(int index, com.google.datastore.v1.Mutation value) {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2060,13 +2103,16 @@ public Builder addMutations(com.google.datastore.v1.Mutation.Builder builderForV
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2089,13 +2135,16 @@ public Builder addMutations(
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2118,13 +2167,16 @@ public Builder addAllMutations(
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2146,13 +2198,16 @@ public Builder clearMutations() {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2174,13 +2229,16 @@ public Builder removeMutations(int index) {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2195,13 +2253,16 @@ public com.google.datastore.v1.Mutation.Builder getMutationsBuilder(int index) {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2220,13 +2281,16 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2246,13 +2310,16 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2268,13 +2335,16 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder() {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -2290,13 +2360,16 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(int index) {
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java
index 3e4dcb9f4..9ccd59cee 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java
@@ -53,6 +53,7 @@ public interface CommitRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -67,6 +68,7 @@ public interface CommitRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -180,13 +182,16 @@ public interface CommitRequestOrBuilder
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -199,13 +204,16 @@ public interface CommitRequestOrBuilder
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -218,13 +226,16 @@ public interface CommitRequestOrBuilder
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -237,13 +248,16 @@ public interface CommitRequestOrBuilder
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -256,13 +270,16 @@ public interface CommitRequestOrBuilder
*
*
* The mutations to perform.
+ *
* When mode is `TRANSACTIONAL`, mutations affecting a single entity are
* applied in order. The following sequences of mutations affecting a single
* entity are not permitted in a single `Commit` request:
+ *
* - `insert` followed by `insert`
* - `update` followed by `insert`
* - `upsert` followed by `insert`
* - `delete` followed by `update`
+ *
* When mode is `NON_TRANSACTIONAL`, no two mutations may affect a single
* entity.
*
@@ -271,5 +288,5 @@ public interface CommitRequestOrBuilder
*/
com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index);
- public com.google.datastore.v1.CommitRequest.TransactionSelectorCase getTransactionSelectorCase();
+ com.google.datastore.v1.CommitRequest.TransactionSelectorCase getTransactionSelectorCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
index 9c58e7843..8b626e297 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new CommitResponse();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_CommitResponse_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
index 9393d2440..6deeaa460 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new CompositeFilter();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_CompositeFilter_descriptor;
@@ -269,7 +264,9 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -284,7 +281,9 @@ public java.util.List getFiltersList() {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -300,7 +299,9 @@ public java.util.List getFiltersList() {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -315,7 +316,9 @@ public int getFiltersCount() {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -330,7 +333,9 @@ public com.google.datastore.v1.Filter getFilters(int index) {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -862,7 +867,9 @@ private void ensureFiltersIsMutable() {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -880,7 +887,9 @@ public java.util.List getFiltersList() {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -898,7 +907,9 @@ public int getFiltersCount() {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -916,7 +927,9 @@ public com.google.datastore.v1.Filter getFilters(int index) {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -940,7 +953,9 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter value) {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -961,7 +976,9 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter.Builder buil
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -985,7 +1002,9 @@ public Builder addFilters(com.google.datastore.v1.Filter value) {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1009,7 +1028,9 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter value) {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1030,7 +1051,9 @@ public Builder addFilters(com.google.datastore.v1.Filter.Builder builderForValue
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1051,7 +1074,9 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter.Builder buil
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1073,7 +1098,9 @@ public Builder addAllFilters(
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1094,7 +1121,9 @@ public Builder clearFilters() {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1115,7 +1144,9 @@ public Builder removeFilters(int index) {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1129,7 +1160,9 @@ public com.google.datastore.v1.Filter.Builder getFiltersBuilder(int index) {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1147,7 +1180,9 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1166,7 +1201,9 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1181,7 +1218,9 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder() {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -1196,7 +1235,9 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder(int index) {
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java
index 6dc33de5d..0248e6d6a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java
@@ -53,7 +53,9 @@ public interface CompositeFilterOrBuilder
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -65,7 +67,9 @@ public interface CompositeFilterOrBuilder
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -77,7 +81,9 @@ public interface CompositeFilterOrBuilder
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -89,7 +95,9 @@ public interface CompositeFilterOrBuilder
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
@@ -101,7 +109,9 @@ public interface CompositeFilterOrBuilder
*
*
* The list of filters to combine.
+ *
* Requires:
+ *
* * At least one filter is present.
*
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
index e1286f3eb..105929eb8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
@@ -131,146 +131,146 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "outing.proto\032,google/datastore/v1/aggreg"
+ "ation_result.proto\032 google/datastore/v1/"
+ "entity.proto\032\037google/datastore/v1/query."
- + "proto\032\037google/protobuf/timestamp.proto\"\242"
- + "\001\n\rLookupRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A"
- + "\002\022\023\n\013database_id\030\t \001(\t\0226\n\014read_options\030\001"
- + " \001(\0132 .google.datastore.v1.ReadOptions\022+"
- + "\n\004keys\030\003 \003(\0132\030.google.datastore.v1.KeyB\003"
- + "\340A\002\"\346\001\n\016LookupResponse\0220\n\005found\030\001 \003(\0132!."
- + "google.datastore.v1.EntityResult\0222\n\007miss"
- + "ing\030\002 \003(\0132!.google.datastore.v1.EntityRe"
- + "sult\022*\n\010deferred\030\003 \003(\0132\030.google.datastor"
- + "e.v1.Key\022\023\n\013transaction\030\005 \001(\014\022-\n\tread_ti"
- + "me\030\007 \001(\0132\032.google.protobuf.Timestamp\"\236\002\n"
- + "\017RunQueryRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A"
- + "\002\022\023\n\013database_id\030\t \001(\t\0226\n\014partition_id\030\002"
- + " \001(\0132 .google.datastore.v1.PartitionId\0226"
- + "\n\014read_options\030\001 \001(\0132 .google.datastore."
- + "v1.ReadOptions\022+\n\005query\030\003 \001(\0132\032.google.d"
- + "atastore.v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035"
- + ".google.datastore.v1.GqlQueryH\000B\014\n\nquery"
- + "_type\"\210\001\n\020RunQueryResponse\0224\n\005batch\030\001 \001("
- + "\0132%.google.datastore.v1.QueryResultBatch"
- + "\022)\n\005query\030\002 \001(\0132\032.google.datastore.v1.Qu"
- + "ery\022\023\n\013transaction\030\005 \001(\014\"\300\002\n\032RunAggregat"
- + "ionQueryRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002"
- + "\022\023\n\013database_id\030\t \001(\t\0226\n\014partition_id\030\002 "
- + "\001(\0132 .google.datastore.v1.PartitionId\0226\n"
- + "\014read_options\030\001 \001(\0132 .google.datastore.v"
- + "1.ReadOptions\022B\n\021aggregation_query\030\003 \001(\013"
- + "2%.google.datastore.v1.AggregationQueryH"
- + "\000\0222\n\tgql_query\030\007 \001(\0132\035.google.datastore."
- + "v1.GqlQueryH\000B\014\n\nquery_type\"\244\001\n\033RunAggre"
- + "gationQueryResponse\022:\n\005batch\030\001 \001(\0132+.goo"
- + "gle.datastore.v1.AggregationResultBatch\022"
- + "4\n\005query\030\002 \001(\0132%.google.datastore.v1.Agg"
- + "regationQuery\022\023\n\013transaction\030\005 \001(\014\"\215\001\n\027B"
- + "eginTransactionRequest\022\027\n\nproject_id\030\010 \001"
- + "(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\022D\n\023transact"
- + "ion_options\030\n \001(\0132\'.google.datastore.v1."
- + "TransactionOptions\"/\n\030BeginTransactionRe"
- + "sponse\022\023\n\013transaction\030\001 \001(\014\"Y\n\017RollbackR"
- + "equest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013datab"
- + "ase_id\030\t \001(\t\022\030\n\013transaction\030\001 \001(\014B\003\340A\002\"\022"
- + "\n\020RollbackResponse\"\350\002\n\rCommitRequest\022\027\n\n"
- + "project_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001"
- + "(\t\0225\n\004mode\030\005 \001(\0162\'.google.datastore.v1.C"
- + "ommitRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000"
- + "\022I\n\026single_use_transaction\030\n \001(\0132\'.googl"
- + "e.datastore.v1.TransactionOptionsH\000\0220\n\tm"
- + "utations\030\006 \003(\0132\035.google.datastore.v1.Mut"
- + "ation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\rT"
- + "RANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026\n"
- + "\024transaction_selector\"\227\001\n\016CommitResponse"
- + "\022=\n\020mutation_results\030\003 \003(\0132#.google.data"
- + "store.v1.MutationResult\022\025\n\rindex_updates"
- + "\030\004 \001(\005\022/\n\013commit_time\030\010 \001(\0132\032.google.pro"
- + "tobuf.Timestamp\"o\n\022AllocateIdsRequest\022\027\n"
- + "\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t "
- + "\001(\t\022+\n\004keys\030\001 \003(\0132\030.google.datastore.v1."
- + "KeyB\003\340A\002\"=\n\023AllocateIdsResponse\022&\n\004keys\030"
- + "\001 \003(\0132\030.google.datastore.v1.Key\"n\n\021Reser"
- + "veIdsRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n"
- + "\013database_id\030\t \001(\t\022+\n\004keys\030\001 \003(\0132\030.googl"
- + "e.datastore.v1.KeyB\003\340A\002\"\024\n\022ReserveIdsRes"
- + "ponse\"\272\002\n\010Mutation\022-\n\006insert\030\004 \001(\0132\033.goo"
- + "gle.datastore.v1.EntityH\000\022-\n\006update\030\005 \001("
- + "\0132\033.google.datastore.v1.EntityH\000\022-\n\006upse"
- + "rt\030\006 \001(\0132\033.google.datastore.v1.EntityH\000\022"
- + "*\n\006delete\030\007 \001(\0132\030.google.datastore.v1.Ke"
- + "yH\000\022\026\n\014base_version\030\010 \001(\003H\001\0221\n\013update_ti"
- + "me\030\013 \001(\0132\032.google.protobuf.TimestampH\001B\013"
- + "\n\toperationB\035\n\033conflict_detection_strate"
- + "gy\"\305\001\n\016MutationResult\022%\n\003key\030\003 \001(\0132\030.goo"
- + "gle.datastore.v1.Key\022\017\n\007version\030\004 \001(\003\022/\n"
- + "\013create_time\030\007 \001(\0132\032.google.protobuf.Tim"
- + "estamp\022/\n\013update_time\030\006 \001(\0132\032.google.pro"
- + "tobuf.Timestamp\022\031\n\021conflict_detected\030\005 \001"
- + "(\010\"\312\002\n\013ReadOptions\022L\n\020read_consistency\030\001"
- + " \001(\01620.google.datastore.v1.ReadOptions.R"
- + "eadConsistencyH\000\022\025\n\013transaction\030\002 \001(\014H\000\022"
- + "B\n\017new_transaction\030\003 \001(\0132\'.google.datast"
- + "ore.v1.TransactionOptionsH\000\022/\n\tread_time"
- + "\030\004 \001(\0132\032.google.protobuf.TimestampH\000\"M\n\017"
- + "ReadConsistency\022 \n\034READ_CONSISTENCY_UNSP"
- + "ECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020c"
- + "onsistency_type\"\222\002\n\022TransactionOptions\022G"
- + "\n\nread_write\030\001 \001(\01321.google.datastore.v1"
- + ".TransactionOptions.ReadWriteH\000\022E\n\tread_"
- + "only\030\002 \001(\01320.google.datastore.v1.Transac"
- + "tionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034\n\024p"
- + "revious_transaction\030\001 \001(\014\0329\n\010ReadOnly\022-\n"
- + "\tread_time\030\001 \001(\0132\032.google.protobuf.Times"
- + "tampB\006\n\004mode2\341\r\n\tDatastore\022\300\001\n\006Lookup\022\"."
- + "google.datastore.v1.LookupRequest\032#.goog"
- + "le.datastore.v1.LookupResponse\"m\202\323\344\223\002%\" "
- + "/v1/projects/{project_id}:lookup:\001*\212\323\344\223\002"
- + "\035\022\014\n\nproject_id\022\r\n\013database_id\332A\034project"
- + "_id,read_options,keys\022\251\001\n\010RunQuery\022$.goo"
- + "gle.datastore.v1.RunQueryRequest\032%.googl"
- + "e.datastore.v1.RunQueryResponse\"P\202\323\344\223\002\'\""
- + "\"/v1/projects/{project_id}:runQuery:\001*\212\323"
- + "\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\325\001\n\023Ru"
- + "nAggregationQuery\022/.google.datastore.v1."
- + "RunAggregationQueryRequest\0320.google.data"
- + "store.v1.RunAggregationQueryResponse\"[\202\323"
- + "\344\223\0022\"-/v1/projects/{project_id}:runAggre"
- + "gationQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013da"
- + "tabase_id\022\326\001\n\020BeginTransaction\022,.google."
- + "datastore.v1.BeginTransactionRequest\032-.g"
- + "oogle.datastore.v1.BeginTransactionRespo"
- + "nse\"e\202\323\344\223\002/\"*/v1/projects/{project_id}:b"
- + "eginTransaction:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r"
- + "\n\013database_id\332A\nproject_id\022\346\001\n\006Commit\022\"."
- + "google.datastore.v1.CommitRequest\032#.goog"
- + "le.datastore.v1.CommitResponse\"\222\001\202\323\344\223\002%\""
+ + "proto\032\037google/protobuf/timestamp.proto\"\244"
+ + "\001\n\rLookupRequest\022\030\n\nproject_id\030\010 \001(\tB\004\342A"
+ + "\001\002\022\023\n\013database_id\030\t \001(\t\0226\n\014read_options\030"
+ + "\001 \001(\0132 .google.datastore.v1.ReadOptions\022"
+ + ",\n\004keys\030\003 \003(\0132\030.google.datastore.v1.KeyB"
+ + "\004\342A\001\002\"\346\001\n\016LookupResponse\0220\n\005found\030\001 \003(\0132"
+ + "!.google.datastore.v1.EntityResult\0222\n\007mi"
+ + "ssing\030\002 \003(\0132!.google.datastore.v1.Entity"
+ + "Result\022*\n\010deferred\030\003 \003(\0132\030.google.datast"
+ + "ore.v1.Key\022\023\n\013transaction\030\005 \001(\014\022-\n\tread_"
+ + "time\030\007 \001(\0132\032.google.protobuf.Timestamp\"\237"
+ + "\002\n\017RunQueryRequest\022\030\n\nproject_id\030\010 \001(\tB\004"
+ + "\342A\001\002\022\023\n\013database_id\030\t \001(\t\0226\n\014partition_i"
+ + "d\030\002 \001(\0132 .google.datastore.v1.PartitionI"
+ + "d\0226\n\014read_options\030\001 \001(\0132 .google.datasto"
+ + "re.v1.ReadOptions\022+\n\005query\030\003 \001(\0132\032.googl"
+ + "e.datastore.v1.QueryH\000\0222\n\tgql_query\030\007 \001("
+ + "\0132\035.google.datastore.v1.GqlQueryH\000B\014\n\nqu"
+ + "ery_type\"\210\001\n\020RunQueryResponse\0224\n\005batch\030\001"
+ + " \001(\0132%.google.datastore.v1.QueryResultBa"
+ + "tch\022)\n\005query\030\002 \001(\0132\032.google.datastore.v1"
+ + ".Query\022\023\n\013transaction\030\005 \001(\014\"\301\002\n\032RunAggre"
+ + "gationQueryRequest\022\030\n\nproject_id\030\010 \001(\tB\004"
+ + "\342A\001\002\022\023\n\013database_id\030\t \001(\t\0226\n\014partition_i"
+ + "d\030\002 \001(\0132 .google.datastore.v1.PartitionI"
+ + "d\0226\n\014read_options\030\001 \001(\0132 .google.datasto"
+ + "re.v1.ReadOptions\022B\n\021aggregation_query\030\003"
+ + " \001(\0132%.google.datastore.v1.AggregationQu"
+ + "eryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google.datast"
+ + "ore.v1.GqlQueryH\000B\014\n\nquery_type\"\244\001\n\033RunA"
+ + "ggregationQueryResponse\022:\n\005batch\030\001 \001(\0132+"
+ + ".google.datastore.v1.AggregationResultBa"
+ + "tch\0224\n\005query\030\002 \001(\0132%.google.datastore.v1"
+ + ".AggregationQuery\022\023\n\013transaction\030\005 \001(\014\"\216"
+ + "\001\n\027BeginTransactionRequest\022\030\n\nproject_id"
+ + "\030\010 \001(\tB\004\342A\001\002\022\023\n\013database_id\030\t \001(\t\022D\n\023tra"
+ + "nsaction_options\030\n \001(\0132\'.google.datastor"
+ + "e.v1.TransactionOptions\"/\n\030BeginTransact"
+ + "ionResponse\022\023\n\013transaction\030\001 \001(\014\"[\n\017Roll"
+ + "backRequest\022\030\n\nproject_id\030\010 \001(\tB\004\342A\001\002\022\023\n"
+ + "\013database_id\030\t \001(\t\022\031\n\013transaction\030\001 \001(\014B"
+ + "\004\342A\001\002\"\022\n\020RollbackResponse\"\351\002\n\rCommitRequ"
+ + "est\022\030\n\nproject_id\030\010 \001(\tB\004\342A\001\002\022\023\n\013databas"
+ + "e_id\030\t \001(\t\0225\n\004mode\030\005 \001(\0162\'.google.datast"
+ + "ore.v1.CommitRequest.Mode\022\025\n\013transaction"
+ + "\030\001 \001(\014H\000\022I\n\026single_use_transaction\030\n \001(\013"
+ + "2\'.google.datastore.v1.TransactionOption"
+ + "sH\000\0220\n\tmutations\030\006 \003(\0132\035.google.datastor"
+ + "e.v1.Mutation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIE"
+ + "D\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIO"
+ + "NAL\020\002B\026\n\024transaction_selector\"\227\001\n\016Commit"
+ + "Response\022=\n\020mutation_results\030\003 \003(\0132#.goo"
+ + "gle.datastore.v1.MutationResult\022\025\n\rindex"
+ + "_updates\030\004 \001(\005\022/\n\013commit_time\030\010 \001(\0132\032.go"
+ + "ogle.protobuf.Timestamp\"q\n\022AllocateIdsRe"
+ + "quest\022\030\n\nproject_id\030\010 \001(\tB\004\342A\001\002\022\023\n\013datab"
+ + "ase_id\030\t \001(\t\022,\n\004keys\030\001 \003(\0132\030.google.data"
+ + "store.v1.KeyB\004\342A\001\002\"=\n\023AllocateIdsRespons"
+ + "e\022&\n\004keys\030\001 \003(\0132\030.google.datastore.v1.Ke"
+ + "y\"p\n\021ReserveIdsRequest\022\030\n\nproject_id\030\010 \001"
+ + "(\tB\004\342A\001\002\022\023\n\013database_id\030\t \001(\t\022,\n\004keys\030\001 "
+ + "\003(\0132\030.google.datastore.v1.KeyB\004\342A\001\002\"\024\n\022R"
+ + "eserveIdsResponse\"\272\002\n\010Mutation\022-\n\006insert"
+ + "\030\004 \001(\0132\033.google.datastore.v1.EntityH\000\022-\n"
+ + "\006update\030\005 \001(\0132\033.google.datastore.v1.Enti"
+ + "tyH\000\022-\n\006upsert\030\006 \001(\0132\033.google.datastore."
+ + "v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030.google.dat"
+ + "astore.v1.KeyH\000\022\026\n\014base_version\030\010 \001(\003H\001\022"
+ + "1\n\013update_time\030\013 \001(\0132\032.google.protobuf.T"
+ + "imestampH\001B\013\n\toperationB\035\n\033conflict_dete"
+ + "ction_strategy\"\305\001\n\016MutationResult\022%\n\003key"
+ + "\030\003 \001(\0132\030.google.datastore.v1.Key\022\017\n\007vers"
+ + "ion\030\004 \001(\003\022/\n\013create_time\030\007 \001(\0132\032.google."
+ + "protobuf.Timestamp\022/\n\013update_time\030\006 \001(\0132"
+ + "\032.google.protobuf.Timestamp\022\031\n\021conflict_"
+ + "detected\030\005 \001(\010\"\312\002\n\013ReadOptions\022L\n\020read_c"
+ + "onsistency\030\001 \001(\01620.google.datastore.v1.R"
+ + "eadOptions.ReadConsistencyH\000\022\025\n\013transact"
+ + "ion\030\002 \001(\014H\000\022B\n\017new_transaction\030\003 \001(\0132\'.g"
+ + "oogle.datastore.v1.TransactionOptionsH\000\022"
+ + "/\n\tread_time\030\004 \001(\0132\032.google.protobuf.Tim"
+ + "estampH\000\"M\n\017ReadConsistency\022 \n\034READ_CONS"
+ + "ISTENCY_UNSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVE"
+ + "NTUAL\020\002B\022\n\020consistency_type\"\222\002\n\022Transact"
+ + "ionOptions\022G\n\nread_write\030\001 \001(\01321.google."
+ + "datastore.v1.TransactionOptions.ReadWrit"
+ + "eH\000\022E\n\tread_only\030\002 \001(\01320.google.datastor"
+ + "e.v1.TransactionOptions.ReadOnlyH\000\032)\n\tRe"
+ + "adWrite\022\034\n\024previous_transaction\030\001 \001(\014\0329\n"
+ + "\010ReadOnly\022-\n\tread_time\030\001 \001(\0132\032.google.pr"
+ + "otobuf.TimestampB\006\n\004mode2\341\r\n\tDatastore\022\300"
+ + "\001\n\006Lookup\022\".google.datastore.v1.LookupRe"
+ + "quest\032#.google.datastore.v1.LookupRespon"
+ + "se\"m\332A\034project_id,read_options,keys\202\323\344\223\002"
+ + "%\" /v1/projects/{project_id}:lookup:\001*\212\323"
+ + "\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\251\001\n\010Ru"
+ + "nQuery\022$.google.datastore.v1.RunQueryReq"
+ + "uest\032%.google.datastore.v1.RunQueryRespo"
+ + "nse\"P\202\323\344\223\002\'\"\"/v1/projects/{project_id}:r"
+ + "unQuery:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013databa"
+ + "se_id\022\325\001\n\023RunAggregationQuery\022/.google.d"
+ + "atastore.v1.RunAggregationQueryRequest\0320"
+ + ".google.datastore.v1.RunAggregationQuery"
+ + "Response\"[\202\323\344\223\0022\"-/v1/projects/{project_"
+ + "id}:runAggregationQuery:\001*\212\323\344\223\002\035\022\014\n\nproj"
+ + "ect_id\022\r\n\013database_id\022\326\001\n\020BeginTransacti"
+ + "on\022,.google.datastore.v1.BeginTransactio"
+ + "nRequest\032-.google.datastore.v1.BeginTran"
+ + "sactionResponse\"e\332A\nproject_id\202\323\344\223\002/\"*/v"
+ + "1/projects/{project_id}:beginTransaction"
+ + ":\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\022\346"
+ + "\001\n\006Commit\022\".google.datastore.v1.CommitRe"
+ + "quest\032#.google.datastore.v1.CommitRespon"
+ + "se\"\222\001\332A%project_id,mode,transaction,muta"
+ + "tions\332A\031project_id,mode,mutations\202\323\344\223\002%\""
+ " /v1/projects/{project_id}:commit:\001*\212\323\344\223"
- + "\002\035\022\014\n\nproject_id\022\r\n\013database_id\332A%projec"
- + "t_id,mode,transaction,mutations\332A\031projec"
- + "t_id,mode,mutations\022\302\001\n\010Rollback\022$.googl"
- + "e.datastore.v1.RollbackRequest\032%.google."
- + "datastore.v1.RollbackResponse\"i\202\323\344\223\002\'\"\"/"
- + "v1/projects/{project_id}:rollback:\001*\212\323\344\223"
- + "\002\035\022\014\n\nproject_id\022\r\n\013database_id\332A\026projec"
- + "t_id,transaction\022\307\001\n\013AllocateIds\022\'.googl"
- + "e.datastore.v1.AllocateIdsRequest\032(.goog"
- + "le.datastore.v1.AllocateIdsResponse\"e\202\323\344"
- + "\223\002*\"%/v1/projects/{project_id}:allocateI"
- + "ds:\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id"
- + "\332A\017project_id,keys\022\303\001\n\nReserveIds\022&.goog"
- + "le.datastore.v1.ReserveIdsRequest\032\'.goog"
- + "le.datastore.v1.ReserveIdsResponse\"d\202\323\344\223"
- + "\002)\"$/v1/projects/{project_id}:reserveIds"
- + ":\001*\212\323\344\223\002\035\022\014\n\nproject_id\022\r\n\013database_id\332A"
- + "\017project_id,keys\032v\312A\030datastore.googleapi"
- + "s.com\322AXhttps://www.googleapis.com/auth/"
- + "cloud-platform,https://www.googleapis.co"
- + "m/auth/datastoreB\300\001\n\027com.google.datastor"
- + "e.v1B\016DatastoreProtoP\001Z
* A Datastore data object.
+ *
* Must not exceed 1 MiB - 4 bytes.
*
*
@@ -46,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Entity();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.EntityProto
.internal_static_google_datastore_v1_Entity_descriptor;
@@ -83,6 +79,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -102,6 +99,7 @@ public boolean hasKey() {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -121,6 +119,7 @@ public com.google.datastore.v1.Key getKey() {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -445,6 +444,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
*
*
* A Datastore data object.
+ *
* Must not exceed 1 MiB - 4 bytes.
*
*
@@ -674,6 +674,7 @@ public Builder mergeFrom(
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -692,6 +693,7 @@ public boolean hasKey() {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -714,6 +716,7 @@ public com.google.datastore.v1.Key getKey() {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -740,6 +743,7 @@ public Builder setKey(com.google.datastore.v1.Key value) {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -763,6 +767,7 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -792,6 +797,7 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -815,6 +821,7 @@ public Builder clearKey() {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -833,6 +840,7 @@ public com.google.datastore.v1.Key.Builder getKeyBuilder() {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -853,6 +861,7 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java
index d36510825..62fce1317 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java
@@ -28,6 +28,7 @@ public interface EntityOrBuilder
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -44,6 +45,7 @@ public interface EntityOrBuilder
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
@@ -60,6 +62,7 @@ public interface EntityOrBuilder
*
*
* The entity's key.
+ *
* An entity must have a key, unless otherwise documented (for example,
* an entity in `Value.entity_value` may have no key).
* An entity's kind is its key path's last element's kind,
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java
index f6a3f3759..d3faf6a4f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new EntityResult();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_EntityResult_descriptor;
@@ -304,8 +299,10 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
*
* The version of the entity, a strictly positive number that monotonically
* increases with changes to the entity.
+ *
* This field is set for
* [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+ *
* For [missing][google.datastore.v1.LookupResponse.missing] entities in
* `LookupResponse`, this is the version of the snapshot that was used to look
* up the entity, and it is always set except for eventually consistent reads.
@@ -1086,8 +1083,10 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
*
* The version of the entity, a strictly positive number that monotonically
* increases with changes to the entity.
+ *
* This field is set for
* [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+ *
* For [missing][google.datastore.v1.LookupResponse.missing] entities in
* `LookupResponse`, this is the version of the snapshot that was used to look
* up the entity, and it is always set except for eventually consistent reads.
@@ -1107,8 +1106,10 @@ public long getVersion() {
*
* The version of the entity, a strictly positive number that monotonically
* increases with changes to the entity.
+ *
* This field is set for
* [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+ *
* For [missing][google.datastore.v1.LookupResponse.missing] entities in
* `LookupResponse`, this is the version of the snapshot that was used to look
* up the entity, and it is always set except for eventually consistent reads.
@@ -1132,8 +1133,10 @@ public Builder setVersion(long value) {
*
* The version of the entity, a strictly positive number that monotonically
* increases with changes to the entity.
+ *
* This field is set for
* [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+ *
* For [missing][google.datastore.v1.LookupResponse.missing] entities in
* `LookupResponse`, this is the version of the snapshot that was used to look
* up the entity, and it is always set except for eventually consistent reads.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java
index 6b0fc7e3a..29ae719a3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java
@@ -64,8 +64,10 @@ public interface EntityResultOrBuilder
*
* The version of the entity, a strictly positive number that monotonically
* increases with changes to the entity.
+ *
* This field is set for
* [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity results.
+ *
* For [missing][google.datastore.v1.LookupResponse.missing] entities in
* `LookupResponse`, this is the version of the snapshot that was used to look
* up the entity, and it is always set except for eventually consistent reads.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java
index af143908f..757ef1b68 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java
@@ -45,11 +45,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Filter();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
}
@@ -64,6 +59,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
private int filterTypeCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object filterType_;
public enum FilterTypeCase
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java
index 5f51396a7..69eae7c59 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java
@@ -93,5 +93,5 @@ public interface FilterOrBuilder
*/
com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilder();
- public com.google.datastore.v1.Filter.FilterTypeCase getFilterTypeCase();
+ com.google.datastore.v1.Filter.FilterTypeCase getFilterTypeCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java
index fe30bb669..28dec0070 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new GqlQuery();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_GqlQuery_descriptor;
@@ -191,6 +186,7 @@ public int getNamedBindingsCount() {
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -217,6 +213,7 @@ public boolean containsNamedBindings(java.lang.String key) {
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -234,6 +231,7 @@ public boolean containsNamedBindings(java.lang.String key) {
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -258,6 +256,7 @@ public boolean containsNamedBindings(java.lang.String key) {
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -287,6 +286,7 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -303,6 +303,7 @@ public java.util.List getPositionalBi
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -320,6 +321,7 @@ public java.util.List getPositionalBi
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -336,6 +338,7 @@ public int getPositionalBindingsCount() {
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -352,6 +355,7 @@ public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1067,6 +1071,7 @@ public int getNamedBindingsCount() {
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -1093,6 +1098,7 @@ public boolean containsNamedBindings(java.lang.String key) {
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -1110,6 +1116,7 @@ public boolean containsNamedBindings(java.lang.String key) {
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -1134,6 +1141,7 @@ public boolean containsNamedBindings(java.lang.String key) {
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -1164,6 +1172,7 @@ public Builder clearNamedBindings() {
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -1190,6 +1199,7 @@ public Builder removeNamedBindings(java.lang.String key) {
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -1214,6 +1224,7 @@ public Builder putNamedBindings(
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -1250,6 +1261,7 @@ private void ensurePositionalBindingsIsMutable() {
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1269,6 +1281,7 @@ public java.util.List getPositionalBi
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1288,6 +1301,7 @@ public int getPositionalBindingsCount() {
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1307,6 +1321,7 @@ public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1333,6 +1348,7 @@ public Builder setPositionalBindings(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1356,6 +1372,7 @@ public Builder setPositionalBindings(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1381,6 +1398,7 @@ public Builder addPositionalBindings(com.google.datastore.v1.GqlQueryParameter v
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1407,6 +1425,7 @@ public Builder addPositionalBindings(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1430,6 +1449,7 @@ public Builder addPositionalBindings(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1453,6 +1473,7 @@ public Builder addPositionalBindings(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1476,6 +1497,7 @@ public Builder addAllPositionalBindings(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1498,6 +1520,7 @@ public Builder clearPositionalBindings() {
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1520,6 +1543,7 @@ public Builder removePositionalBindings(int index) {
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1536,6 +1560,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder getPositionalBindingsBu
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1556,6 +1581,7 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1576,6 +1602,7 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1592,6 +1619,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -1609,6 +1637,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java
index 8af39544f..2bdd43c55 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java
@@ -72,6 +72,7 @@ public interface GqlQueryOrBuilder
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -85,6 +86,7 @@ public interface GqlQueryOrBuilder
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -101,6 +103,7 @@ public interface GqlQueryOrBuilder
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -114,6 +117,7 @@ public interface GqlQueryOrBuilder
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -131,6 +135,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
*
* For each non-reserved named binding site in the query string, there must be
* a named parameter with that name, but not necessarily the inverse.
+ *
* Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex
* `__.*__`, and must not be `""`.
*
@@ -145,6 +150,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -158,6 +164,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -171,6 +178,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -184,6 +192,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
@@ -198,6 +207,7 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
*
* Numbered binding site @1 references the first numbered parameter,
* effectively using 1-based indexing, rather than the usual 0.
+ *
* For each binding site numbered i in `query_string`, there must be an i-th
* numbered parameter. The inverse must also be true.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java
index 3394490f1..eba9c9083 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java
@@ -45,11 +45,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new GqlQueryParameter();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
@@ -66,6 +61,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
private int parameterTypeCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object parameterType_;
public enum ParameterTypeCase
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java
index 6539bf245..910eab7a2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java
@@ -85,5 +85,5 @@ public interface GqlQueryParameterOrBuilder
*/
com.google.protobuf.ByteString getCursor();
- public com.google.datastore.v1.GqlQueryParameter.ParameterTypeCase getParameterTypeCase();
+ com.google.datastore.v1.GqlQueryParameter.ParameterTypeCase getParameterTypeCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java
index 29f9502c6..5ab6658e3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java
@@ -50,11 +50,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Key();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
}
@@ -78,9 +73,11 @@ public interface PathElementOrBuilder
*
*
* The kind of the entity.
+ *
* A kind matching regex `__.*__` is reserved/read-only.
* A kind must not contain more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -96,9 +93,11 @@ public interface PathElementOrBuilder
*
*
* The kind of the entity.
+ *
* A kind matching regex `__.*__` is reserved/read-only.
* A kind must not contain more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -115,6 +114,7 @@ public interface PathElementOrBuilder
*
*
* The auto-allocated ID of the entity.
+ *
* Never equal to zero. Values less than zero are discouraged and may not
* be supported in the future.
*
@@ -129,6 +129,7 @@ public interface PathElementOrBuilder
*
*
* The auto-allocated ID of the entity.
+ *
* Never equal to zero. Values less than zero are discouraged and may not
* be supported in the future.
*
@@ -144,9 +145,11 @@ public interface PathElementOrBuilder
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -162,9 +165,11 @@ public interface PathElementOrBuilder
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -180,9 +185,11 @@ public interface PathElementOrBuilder
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -194,13 +201,14 @@ public interface PathElementOrBuilder
*/
com.google.protobuf.ByteString getNameBytes();
- public com.google.datastore.v1.Key.PathElement.IdTypeCase getIdTypeCase();
+ com.google.datastore.v1.Key.PathElement.IdTypeCase getIdTypeCase();
}
/**
*
*
*
* A (kind, ID/name) pair used to construct a key path.
+ *
* If either name or ID is set, the element is complete.
* If neither is set, the element is incomplete.
*
@@ -227,11 +235,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new PathElement();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.EntityProto
.internal_static_google_datastore_v1_Key_PathElement_descriptor;
@@ -248,6 +251,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
private int idTypeCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object idType_;
public enum IdTypeCase
@@ -303,9 +308,11 @@ public IdTypeCase getIdTypeCase() {
*
*
* The kind of the entity.
+ *
* A kind matching regex `__.*__` is reserved/read-only.
* A kind must not contain more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -332,9 +339,11 @@ public java.lang.String getKind() {
*
*
* The kind of the entity.
+ *
* A kind matching regex `__.*__` is reserved/read-only.
* A kind must not contain more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -363,6 +372,7 @@ public com.google.protobuf.ByteString getKindBytes() {
*
*
* The auto-allocated ID of the entity.
+ *
* Never equal to zero. Values less than zero are discouraged and may not
* be supported in the future.
*
@@ -380,6 +390,7 @@ public boolean hasId() {
*
*
* The auto-allocated ID of the entity.
+ *
* Never equal to zero. Values less than zero are discouraged and may not
* be supported in the future.
*
@@ -402,9 +413,11 @@ public long getId() {
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -422,9 +435,11 @@ public boolean hasName() {
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -455,9 +470,11 @@ public java.lang.String getName() {
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -685,6 +702,7 @@ protected Builder newBuilderForType(
*
*
* A (kind, ID/name) pair used to construct a key path.
+ *
* If either name or ID is set, the element is complete.
* If neither is set, the element is incomplete.
*
@@ -926,9 +944,11 @@ public Builder clearIdType() {
*
*
* The kind of the entity.
+ *
* A kind matching regex `__.*__` is reserved/read-only.
* A kind must not contain more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -954,9 +974,11 @@ public java.lang.String getKind() {
*
*
* The kind of the entity.
+ *
* A kind matching regex `__.*__` is reserved/read-only.
* A kind must not contain more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -982,9 +1004,11 @@ public com.google.protobuf.ByteString getKindBytes() {
*
*
* The kind of the entity.
+ *
* A kind matching regex `__.*__` is reserved/read-only.
* A kind must not contain more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -1009,9 +1033,11 @@ public Builder setKind(java.lang.String value) {
*
*
* The kind of the entity.
+ *
* A kind matching regex `__.*__` is reserved/read-only.
* A kind must not contain more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -1032,9 +1058,11 @@ public Builder clearKind() {
*
*
* The kind of the entity.
+ *
* A kind matching regex `__.*__` is reserved/read-only.
* A kind must not contain more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -1061,6 +1089,7 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
*
*
* The auto-allocated ID of the entity.
+ *
* Never equal to zero. Values less than zero are discouraged and may not
* be supported in the future.
*
@@ -1077,6 +1106,7 @@ public boolean hasId() {
*
*
* The auto-allocated ID of the entity.
+ *
* Never equal to zero. Values less than zero are discouraged and may not
* be supported in the future.
*
@@ -1096,6 +1126,7 @@ public long getId() {
*
*
* The auto-allocated ID of the entity.
+ *
* Never equal to zero. Values less than zero are discouraged and may not
* be supported in the future.
*
@@ -1117,6 +1148,7 @@ public Builder setId(long value) {
*
*
* The auto-allocated ID of the entity.
+ *
* Never equal to zero. Values less than zero are discouraged and may not
* be supported in the future.
*
@@ -1139,9 +1171,11 @@ public Builder clearId() {
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -1160,9 +1194,11 @@ public boolean hasName() {
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -1194,9 +1230,11 @@ public java.lang.String getName() {
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -1228,9 +1266,11 @@ public com.google.protobuf.ByteString getNameBytes() {
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -1255,9 +1295,11 @@ public Builder setName(java.lang.String value) {
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -1280,9 +1322,11 @@ public Builder clearName() {
*
*
* The name of the entity.
+ *
* A name matching regex `__.*__` is reserved/read-only.
* A name must not be more than 1500 bytes when UTF-8 encoded.
* Cannot be `""`.
+ *
* Must be valid UTF-8 bytes. Legacy values that are not valid UTF-8 are
* encoded as `__bytes<X>__` where `<X>` is the base-64 encoding of the
* bytes.
@@ -1439,12 +1483,14 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -1465,12 +1511,14 @@ public java.util.List getPathList() {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -1492,12 +1540,14 @@ public java.util.List getPathList() {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -1518,12 +1568,14 @@ public int getPathCount() {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -1544,12 +1596,14 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2205,12 +2259,14 @@ private void ensurePathIsMutable() {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2234,12 +2290,14 @@ public java.util.List getPathList() {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2263,12 +2321,14 @@ public int getPathCount() {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2292,12 +2352,14 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2327,12 +2389,14 @@ public Builder setPath(int index, com.google.datastore.v1.Key.PathElement value)
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2360,12 +2424,14 @@ public Builder setPath(
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2395,12 +2461,14 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement value) {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2430,12 +2498,14 @@ public Builder addPath(int index, com.google.datastore.v1.Key.PathElement value)
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2462,12 +2532,14 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement.Builder builderFo
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2495,12 +2567,14 @@ public Builder addPath(
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2528,12 +2602,14 @@ public Builder addAllPath(
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2560,12 +2636,14 @@ public Builder clearPath() {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2592,12 +2670,14 @@ public Builder removePath(int index) {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2617,12 +2697,14 @@ public com.google.datastore.v1.Key.PathElement.Builder getPathBuilder(int index)
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2646,12 +2728,14 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int ind
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2676,12 +2760,14 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int ind
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2702,12 +2788,14 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder() {
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -2728,12 +2816,14 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(int index)
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java
index 37543f602..beb7eefbd 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java
@@ -75,12 +75,14 @@ public interface KeyOrBuilder
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -98,12 +100,14 @@ public interface KeyOrBuilder
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -121,12 +125,14 @@ public interface KeyOrBuilder
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -144,12 +150,14 @@ public interface KeyOrBuilder
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
@@ -167,12 +175,14 @@ public interface KeyOrBuilder
* a _child_ of the root entity, the third element identifies a child of the
* second entity, and so forth. The entities identified by all prefixes of
* the path are called the element's _ancestors_.
+ *
* An entity path is always fully complete: *all* of the entity's ancestors
* are required to be in the path along with the entity identifier itself.
* The only exception is that in some documented cases, the identifier in the
* last path element (for the entity) itself may be omitted. For example,
* the last path element of the key of `Mutation.insert` may have no
* identifier.
+ *
* A path can never be empty, and a path can have at most 100 elements.
*
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java
index a6644c9db..a8add42c4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new KindExpression();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_KindExpression_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java
index 1f9a03c54..8078d725e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new LookupRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_LookupRequest_descriptor;
@@ -129,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -154,6 +150,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -877,6 +874,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -901,6 +899,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -925,6 +924,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -948,6 +948,7 @@ public Builder setDatabaseId(java.lang.String value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -967,6 +968,7 @@ public Builder clearDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java
index 0720a2256..6d55f6ccf 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java
@@ -53,6 +53,7 @@ public interface LookupRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -67,6 +68,7 @@ public interface LookupRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java
index 074cf7ce9..dc8f4ffe6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java
@@ -50,11 +50,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new LookupResponse();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_LookupResponse_descriptor;
@@ -320,6 +315,7 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
*
* The identifier of the transaction that was started as part of this Lookup
* request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
@@ -2110,6 +2106,7 @@ public java.util.List getDeferredBuilderLis
*
* The identifier of the transaction that was started as part of this Lookup
* request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
@@ -2130,6 +2127,7 @@ public com.google.protobuf.ByteString getTransaction() {
*
* The identifier of the transaction that was started as part of this Lookup
* request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
@@ -2156,6 +2154,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
*
* The identifier of the transaction that was started as part of this Lookup
* request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java
index d9ac2be8a..37ad635e2 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java
@@ -212,6 +212,7 @@ public interface LookupResponseOrBuilder
*
* The identifier of the transaction that was started as part of this Lookup
* request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java
index 5b9ce0d3d..3076b9133 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java
@@ -45,11 +45,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Mutation();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_Mutation_descriptor;
@@ -65,6 +60,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
private int operationCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object operation_;
public enum OperationCase
@@ -118,6 +115,8 @@ public OperationCase getOperationCase() {
}
private int conflictDetectionStrategyCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object conflictDetectionStrategy_;
public enum ConflictDetectionStrategyCase
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java
index 3257d3d22..7ef1b2e16 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java
@@ -245,8 +245,7 @@ public interface MutationOrBuilder
*/
com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder();
- public com.google.datastore.v1.Mutation.OperationCase getOperationCase();
+ com.google.datastore.v1.Mutation.OperationCase getOperationCase();
- public com.google.datastore.v1.Mutation.ConflictDetectionStrategyCase
- getConflictDetectionStrategyCase();
+ com.google.datastore.v1.Mutation.ConflictDetectionStrategyCase getConflictDetectionStrategyCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java
index a9048026a..1ea9eeac1 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java
@@ -45,11 +45,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new MutationResult();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_MutationResult_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
index dd0daeac4..c160185ac 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
@@ -24,9 +24,12 @@
*
* A partition ID identifies a grouping of entities. The grouping is always
* by project and namespace, however the namespace ID may be empty.
+ *
* A partition ID contains several dimensions:
* project ID and namespace ID.
+ *
* Partition dimensions:
+ *
* - May be `""`.
* - Must be valid UTF-8 bytes.
* - Must have values that match regex `[A-Za-z\d\.\-_]{1,100}`
@@ -34,6 +37,7 @@
* reserved/read-only.
* A reserved/read-only partition ID is forbidden in certain documented
* contexts.
+ *
* Foreign partition IDs (in which the project ID does
* not match the context project ID ) are discouraged.
* Reads and writes of foreign partition IDs may fail if the project is not in
@@ -64,11 +68,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new PartitionId();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.EntityProto
.internal_static_google_datastore_v1_PartitionId_descriptor;
@@ -420,9 +419,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
*
* A partition ID identifies a grouping of entities. The grouping is always
* by project and namespace, however the namespace ID may be empty.
+ *
* A partition ID contains several dimensions:
* project ID and namespace ID.
+ *
* Partition dimensions:
+ *
* - May be `""`.
* - Must be valid UTF-8 bytes.
* - Must have values that match regex `[A-Za-z\d\.\-_]{1,100}`
@@ -430,6 +432,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
* reserved/read-only.
* A reserved/read-only partition ID is forbidden in certain documented
* contexts.
+ *
* Foreign partition IDs (in which the project ID does
* not match the context project ID ) are discouraged.
* Reads and writes of foreign partition IDs may fail if the project is not in
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java
index f39f017bd..81c1a5e67 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java
@@ -45,11 +45,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Projection();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_Projection_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java
index 042d0487f..610e6d182 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new PropertyFilter();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_PropertyFilter_descriptor;
@@ -92,7 +87,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is less than the given `value`.
+ *
* Requires:
+ *
* * That `property` comes first in `order_by`.
*
*
@@ -104,7 +101,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is less than or equal to the given `value`.
+ *
* Requires:
+ *
* * That `property` comes first in `order_by`.
*
*
@@ -116,7 +115,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is greater than the given `value`.
+ *
* Requires:
+ *
* * That `property` comes first in `order_by`.
*
*
@@ -128,7 +129,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is greater than or equal to the given `value`.
+ *
* Requires:
+ *
* * That `property` comes first in `order_by`.
*
*
@@ -150,7 +153,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is equal to at least one value in the given array.
+ *
* Requires:
+ *
* * That `value` is a non-empty `ArrayValue` with at most 10 values.
* * No other `IN` or `NOT_IN` is in the same query.
*
@@ -163,7 +168,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is not equal to the given `value`.
+ *
* Requires:
+ *
* * No other `NOT_EQUAL` or `NOT_IN` is in the same query.
* * That `property` comes first in the `order_by`.
*
@@ -176,7 +183,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* Limit the result set to the given entity and its descendants.
+ *
* Requires:
+ *
* * That `value` is an entity key.
* * No other `HAS_ANCESTOR` is in the same query.
*
@@ -189,7 +198,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The value of the `property` is not in the given array.
+ *
* Requires:
+ *
* * That `value` is a non-empty `ArrayValue` with at most 10 values.
* * No other `IN`, `NOT_IN`, `NOT_EQUAL` is in the same query.
* * That `field` comes first in the `order_by`.
@@ -216,7 +227,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is less than the given `value`.
+ *
* Requires:
+ *
* * That `property` comes first in `order_by`.
*
*
@@ -228,7 +241,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is less than or equal to the given `value`.
+ *
* Requires:
+ *
* * That `property` comes first in `order_by`.
*
*
@@ -240,7 +255,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is greater than the given `value`.
+ *
* Requires:
+ *
* * That `property` comes first in `order_by`.
*
*
@@ -252,7 +269,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is greater than or equal to the given `value`.
+ *
* Requires:
+ *
* * That `property` comes first in `order_by`.
*
*
@@ -274,7 +293,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is equal to at least one value in the given array.
+ *
* Requires:
+ *
* * That `value` is a non-empty `ArrayValue` with at most 10 values.
* * No other `IN` or `NOT_IN` is in the same query.
*
@@ -287,7 +308,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The given `property` is not equal to the given `value`.
+ *
* Requires:
+ *
* * No other `NOT_EQUAL` or `NOT_IN` is in the same query.
* * That `property` comes first in the `order_by`.
*
@@ -300,7 +323,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* Limit the result set to the given entity and its descendants.
+ *
* Requires:
+ *
* * That `value` is an entity key.
* * No other `HAS_ANCESTOR` is in the same query.
*
@@ -313,7 +338,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
*
* The value of the `property` is not in the given array.
+ *
* Requires:
+ *
* * That `value` is a non-empty `ArrayValue` with at most 10 values.
* * No other `IN`, `NOT_IN`, `NOT_EQUAL` is in the same query.
* * That `field` comes first in the `order_by`.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java
index fb9a0965a..abb0e9550 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new PropertyOrder();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_PropertyOrder_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java
index 2b1cd280f..0e15aaef5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new PropertyReference();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto
.internal_static_google_datastore_v1_PropertyReference_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
index 2b23df9f8..b9faa09a0 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
@@ -52,11 +52,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Query();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
}
@@ -345,7 +340,9 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -363,7 +360,9 @@ public java.util.List getDistinctOnLi
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -382,7 +381,9 @@ public java.util.List getDistinctOnLi
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -400,7 +401,9 @@ public int getDistinctOnCount() {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -418,7 +421,9 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2524,7 +2529,9 @@ private void ensureDistinctOnIsMutable() {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2545,7 +2552,9 @@ public java.util.List getDistinctOnLi
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2566,7 +2575,9 @@ public int getDistinctOnCount() {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2587,7 +2598,9 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2614,7 +2627,9 @@ public Builder setDistinctOn(int index, com.google.datastore.v1.PropertyReferenc
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2639,7 +2654,9 @@ public Builder setDistinctOn(
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2666,7 +2683,9 @@ public Builder addDistinctOn(com.google.datastore.v1.PropertyReference value) {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2693,7 +2712,9 @@ public Builder addDistinctOn(int index, com.google.datastore.v1.PropertyReferenc
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2718,7 +2739,9 @@ public Builder addDistinctOn(
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2743,7 +2766,9 @@ public Builder addDistinctOn(
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2768,7 +2793,9 @@ public Builder addAllDistinctOn(
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2792,7 +2819,9 @@ public Builder clearDistinctOn() {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2816,7 +2845,9 @@ public Builder removeDistinctOn(int index) {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2833,7 +2864,9 @@ public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder(in
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2854,7 +2887,9 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2876,7 +2911,9 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2894,7 +2931,9 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder()
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -2912,7 +2951,9 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java
index 1b2009699..d269dcf6d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java
@@ -224,7 +224,9 @@ public interface QueryOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -239,7 +241,9 @@ public interface QueryOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -254,7 +258,9 @@ public interface QueryOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -269,7 +275,9 @@ public interface QueryOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
@@ -285,7 +293,9 @@ public interface QueryOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ *
* Requires:
+ *
* * If `order` is specified, the set of distinct on properties must appear
* before the non-distinct on properties in `order`.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
index d86241bc7..806bd6837 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
@@ -120,70 +120,70 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "inct_on\030\006 \003(\0132&.google.datastore.v1.Prop"
+ "ertyReference\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\ne"
+ "nd_cursor\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit"
- + "\030\014 \001(\0132\033.google.protobuf.Int32Value\"\326\002\n\020"
+ + "\030\014 \001(\0132\033.google.protobuf.Int32Value\"\331\002\n\020"
+ "AggregationQuery\0222\n\014nested_query\030\001 \001(\0132\032"
- + ".google.datastore.v1.QueryH\000\022L\n\014aggregat"
+ + ".google.datastore.v1.QueryH\000\022M\n\014aggregat"
+ "ions\030\003 \003(\01321.google.datastore.v1.Aggrega"
- + "tionQuery.AggregationB\003\340A\001\032\261\001\n\013Aggregati"
- + "on\022H\n\005count\030\001 \001(\01327.google.datastore.v1."
- + "AggregationQuery.Aggregation.CountH\000\022\022\n\005"
- + "alias\030\007 \001(\tB\003\340A\001\0328\n\005Count\022/\n\005up_to\030\001 \001(\013"
- + "2\033.google.protobuf.Int64ValueB\003\340A\001B\n\n\010op"
- + "eratorB\014\n\nquery_type\"\036\n\016KindExpression\022\014"
- + "\n\004name\030\001 \001(\t\"!\n\021PropertyReference\022\014\n\004nam"
- + "e\030\002 \001(\t\"F\n\nProjection\0228\n\010property\030\001 \001(\0132"
- + "&.google.datastore.v1.PropertyReference\""
- + "\321\001\n\rPropertyOrder\0228\n\010property\030\001 \001(\0132&.go"
- + "ogle.datastore.v1.PropertyReference\022?\n\td"
- + "irection\030\002 \001(\0162,.google.datastore.v1.Pro"
- + "pertyOrder.Direction\"E\n\tDirection\022\031\n\025DIR"
- + "ECTION_UNSPECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nD"
- + "ESCENDING\020\002\"\231\001\n\006Filter\022@\n\020composite_filt"
- + "er\030\001 \001(\0132$.google.datastore.v1.Composite"
- + "FilterH\000\022>\n\017property_filter\030\002 \001(\0132#.goog"
- + "le.datastore.v1.PropertyFilterH\000B\r\n\013filt"
- + "er_type\"\261\001\n\017CompositeFilter\0229\n\002op\030\001 \001(\0162"
- + "-.google.datastore.v1.CompositeFilter.Op"
- + "erator\022,\n\007filters\030\002 \003(\0132\033.google.datasto"
- + "re.v1.Filter\"5\n\010Operator\022\030\n\024OPERATOR_UNS"
- + "PECIFIED\020\000\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352\002\n\016Property"
- + "Filter\0228\n\010property\030\001 \001(\0132&.google.datast"
- + "ore.v1.PropertyReference\0228\n\002op\030\002 \001(\0162,.g"
- + "oogle.datastore.v1.PropertyFilter.Operat"
- + "or\022)\n\005value\030\003 \001(\0132\032.google.datastore.v1."
- + "Value\"\270\001\n\010Operator\022\030\n\024OPERATOR_UNSPECIFI"
- + "ED\020\000\022\r\n\tLESS_THAN\020\001\022\026\n\022LESS_THAN_OR_EQUA"
- + "L\020\002\022\020\n\014GREATER_THAN\020\003\022\031\n\025GREATER_THAN_OR"
- + "_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r\n\tNOT_EQUAL"
- + "\020\t\022\020\n\014HAS_ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010Gql"
- + "Query\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allow_lit"
- + "erals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\01320.go"
- + "ogle.datastore.v1.GqlQuery.NamedBindings"
- + "Entry\022C\n\023positional_bindings\030\004 \003(\0132&.goo"
- + "gle.datastore.v1.GqlQueryParameter\032\\\n\022Na"
- + "medBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002"
- + " \001(\0132&.google.datastore.v1.GqlQueryParam"
- + "eter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005value\030\002"
- + " \001(\0132\032.google.datastore.v1.ValueH\000\022\020\n\006cu"
- + "rsor\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020Query"
- + "ResultBatch\022\027\n\017skipped_results\030\006 \001(\005\022\026\n\016"
- + "skipped_cursor\030\003 \001(\014\022H\n\022entity_result_ty"
- + "pe\030\001 \001(\0162,.google.datastore.v1.EntityRes"
- + "ult.ResultType\0229\n\016entity_results\030\002 \003(\0132!"
- + ".google.datastore.v1.EntityResult\022\022\n\nend"
- + "_cursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625.go"
- + "ogle.datastore.v1.QueryResultBatch.MoreR"
- + "esultsType\022\030\n\020snapshot_version\030\007 \001(\003\022-\n\t"
- + "read_time\030\010 \001(\0132\032.google.protobuf.Timest"
- + "amp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RESULTS_"
- + "TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030"
- + "MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESUL"
- + "TS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\274"
- + "\001\n\027com.google.datastore.v1B\nQueryProtoP\001"
- + "Z\n\017property_filter\030\002 \001(\0132#.g"
+ + "oogle.datastore.v1.PropertyFilterH\000B\r\n\013f"
+ + "ilter_type\"\261\001\n\017CompositeFilter\0229\n\002op\030\001 \001"
+ + "(\0162-.google.datastore.v1.CompositeFilter"
+ + ".Operator\022,\n\007filters\030\002 \003(\0132\033.google.data"
+ + "store.v1.Filter\"5\n\010Operator\022\030\n\024OPERATOR_"
+ + "UNSPECIFIED\020\000\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352\002\n\016Prope"
+ + "rtyFilter\0228\n\010property\030\001 \001(\0132&.google.dat"
+ + "astore.v1.PropertyReference\0228\n\002op\030\002 \001(\0162"
+ + ",.google.datastore.v1.PropertyFilter.Ope"
+ + "rator\022)\n\005value\030\003 \001(\0132\032.google.datastore."
+ + "v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATOR_UNSPEC"
+ + "IFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026\n\022LESS_THAN_OR_E"
+ + "QUAL\020\002\022\020\n\014GREATER_THAN\020\003\022\031\n\025GREATER_THAN"
+ + "_OR_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r\n\tNOT_EQ"
+ + "UAL\020\t\022\020\n\014HAS_ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010"
+ + "GqlQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allow_"
+ + "literals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\01320"
+ + ".google.datastore.v1.GqlQuery.NamedBindi"
+ + "ngsEntry\022C\n\023positional_bindings\030\004 \003(\0132&."
+ + "google.datastore.v1.GqlQueryParameter\032\\\n"
+ + "\022NamedBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005valu"
+ + "e\030\002 \001(\0132&.google.datastore.v1.GqlQueryPa"
+ + "rameter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005valu"
+ + "e\030\002 \001(\0132\032.google.datastore.v1.ValueH\000\022\020\n"
+ + "\006cursor\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020Qu"
+ + "eryResultBatch\022\027\n\017skipped_results\030\006 \001(\005\022"
+ + "\026\n\016skipped_cursor\030\003 \001(\014\022H\n\022entity_result"
+ + "_type\030\001 \001(\0162,.google.datastore.v1.Entity"
+ + "Result.ResultType\0229\n\016entity_results\030\002 \003("
+ + "\0132!.google.datastore.v1.EntityResult\022\022\n\n"
+ + "end_cursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625"
+ + ".google.datastore.v1.QueryResultBatch.Mo"
+ + "reResultsType\022\030\n\020snapshot_version\030\007 \001(\003\022"
+ + "-\n\tread_time\030\010 \001(\0132\032.google.protobuf.Tim"
+ + "estamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RESUL"
+ + "TS_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022"
+ + "\034\n\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RE"
+ + "SULTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020"
+ + "\003B\274\001\n\027com.google.datastore.v1B\nQueryProt"
+ + "oP\001Z
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -397,6 +395,7 @@ public boolean hasNewTransaction() {
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -420,6 +419,7 @@ public com.google.datastore.v1.TransactionOptions getNewTransaction() {
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -1167,6 +1167,7 @@ public Builder clearTransaction() {
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -1187,6 +1188,7 @@ public boolean hasNewTransaction() {
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -1217,6 +1219,7 @@ public com.google.datastore.v1.TransactionOptions getNewTransaction() {
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -1244,6 +1247,7 @@ public Builder setNewTransaction(com.google.datastore.v1.TransactionOptions valu
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -1269,6 +1273,7 @@ public Builder setNewTransaction(
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -1307,6 +1312,7 @@ public Builder mergeNewTransaction(com.google.datastore.v1.TransactionOptions va
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -1337,6 +1343,7 @@ public Builder clearNewTransaction() {
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -1354,6 +1361,7 @@ public com.google.datastore.v1.TransactionOptions.Builder getNewTransactionBuild
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -1379,6 +1387,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getNewTransactionOrBu
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java
index c5294cc4a..12701c6eb 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java
@@ -94,6 +94,7 @@ public interface ReadOptionsOrBuilder
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -111,6 +112,7 @@ public interface ReadOptionsOrBuilder
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -128,6 +130,7 @@ public interface ReadOptionsOrBuilder
*
*
* Options for beginning a new transaction for this request.
+ *
* The new transaction identifier will be returned in the corresponding
* response as either
* [LookupResponse.transaction][google.datastore.v1.LookupResponse.transaction]
@@ -180,5 +183,5 @@ public interface ReadOptionsOrBuilder
*/
com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder();
- public com.google.datastore.v1.ReadOptions.ConsistencyTypeCase getConsistencyTypeCase();
+ com.google.datastore.v1.ReadOptions.ConsistencyTypeCase getConsistencyTypeCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
index 2636e5e56..e737bbf64 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
@@ -50,11 +50,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ReserveIdsRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
@@ -130,6 +125,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -155,6 +151,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -804,6 +801,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -828,6 +826,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -852,6 +851,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -875,6 +875,7 @@ public Builder setDatabaseId(java.lang.String value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -894,6 +895,7 @@ public Builder clearDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java
index 1fcfbaa39..a659711fb 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java
@@ -53,6 +53,7 @@ public interface ReserveIdsRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -67,6 +68,7 @@ public interface ReserveIdsRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
index 50b3ccd69..c1079132c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
@@ -46,11 +46,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ReserveIdsResponse();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
index 77b523871..57e61ba2e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new RollbackRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_RollbackRequest_descriptor;
@@ -129,6 +124,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -154,6 +150,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -692,6 +689,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -716,6 +714,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -740,6 +739,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -763,6 +763,7 @@ public Builder setDatabaseId(java.lang.String value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -782,6 +783,7 @@ public Builder clearDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java
index 7f9bd4385..c741d9f09 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java
@@ -53,6 +53,7 @@ public interface RollbackRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -67,6 +68,7 @@ public interface RollbackRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
index e1d82c4bf..c7d22d65a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
@@ -47,11 +47,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new RollbackResponse();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_RollbackResponse_descriptor;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java
index 88fd4fdc4..552351a41 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java
@@ -49,11 +49,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new RunAggregationQueryRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_RunAggregationQueryRequest_descriptor;
@@ -70,6 +65,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
private int queryTypeCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object queryType_;
public enum QueryTypeCase
@@ -176,6 +173,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -201,6 +199,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1078,6 +1077,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1102,6 +1102,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1126,6 +1127,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1149,6 +1151,7 @@ public Builder setDatabaseId(java.lang.String value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1168,6 +1171,7 @@ public Builder clearDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java
index 63ace7ed3..28d7ec6c6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java
@@ -53,6 +53,7 @@ public interface RunAggregationQueryRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -67,6 +68,7 @@ public interface RunAggregationQueryRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -226,5 +228,5 @@ public interface RunAggregationQueryRequestOrBuilder
*/
com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
- public com.google.datastore.v1.RunAggregationQueryRequest.QueryTypeCase getQueryTypeCase();
+ com.google.datastore.v1.RunAggregationQueryRequest.QueryTypeCase getQueryTypeCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java
index 9dc65c46b..36673a39e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new RunAggregationQueryResponse();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_RunAggregationQueryResponse_descriptor;
@@ -172,6 +167,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() {
*
* The identifier of the transaction that was started as part of this
* RunAggregationQuery request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
@@ -964,6 +960,7 @@ public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() {
*
* The identifier of the transaction that was started as part of this
* RunAggregationQuery request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
@@ -984,6 +981,7 @@ public com.google.protobuf.ByteString getTransaction() {
*
* The identifier of the transaction that was started as part of this
* RunAggregationQuery request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
@@ -1010,6 +1008,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
*
* The identifier of the transaction that was started as part of this
* RunAggregationQuery request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java
index 4cd5e5a6d..de184cdbe 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java
@@ -99,6 +99,7 @@ public interface RunAggregationQueryResponseOrBuilder
*
* The identifier of the transaction that was started as part of this
* RunAggregationQuery request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
index b26ac2633..e54e3199f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new RunQueryRequest();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_RunQueryRequest_descriptor;
@@ -69,6 +64,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
private int queryTypeCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object queryType_;
public enum QueryTypeCase
@@ -175,6 +172,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -200,6 +198,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1073,6 +1072,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1097,6 +1097,7 @@ public java.lang.String getDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1121,6 +1122,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1144,6 +1146,7 @@ public Builder setDatabaseId(java.lang.String value) {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -1163,6 +1166,7 @@ public Builder clearDatabaseId() {
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java
index 3317e05ca..a2daba8d3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java
@@ -53,6 +53,7 @@ public interface RunQueryRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -67,6 +68,7 @@ public interface RunQueryRequestOrBuilder
*
*
* The ID of the database against which to make the request.
+ *
* '(default)' is not allowed; please use empty string '' to refer the default
* database.
*
@@ -226,5 +228,5 @@ public interface RunQueryRequestOrBuilder
*/
com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
- public com.google.datastore.v1.RunQueryRequest.QueryTypeCase getQueryTypeCase();
+ com.google.datastore.v1.RunQueryRequest.QueryTypeCase getQueryTypeCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
index 7104cd3ae..90a858f1c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
@@ -48,11 +48,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new RunQueryResponse();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_RunQueryResponse_descriptor;
@@ -168,6 +163,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
*
* The identifier of the transaction that was started as part of this
* RunQuery request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
@@ -953,6 +949,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
*
* The identifier of the transaction that was started as part of this
* RunQuery request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
@@ -973,6 +970,7 @@ public com.google.protobuf.ByteString getTransaction() {
*
* The identifier of the transaction that was started as part of this
* RunQuery request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
@@ -999,6 +997,7 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
*
* The identifier of the transaction that was started as part of this
* RunQuery request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java
index 4486a75a0..401c3f93d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java
@@ -99,6 +99,7 @@ public interface RunQueryResponseOrBuilder
*
* The identifier of the transaction that was started as part of this
* RunQuery request.
+ *
* Set only when
* [ReadOptions.new_transaction][google.datastore.v1.ReadOptions.new_transaction]
* was set in
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
index 64f56408d..031a46914 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
@@ -23,6 +23,7 @@
*
*
* Options for beginning a new transaction.
+ *
* Transactions can be created explicitly with calls to
* [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]
* or implicitly by setting
@@ -50,11 +51,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new TransactionOptions();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_TransactionOptions_descriptor;
@@ -117,11 +113,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ReadWrite();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
@@ -691,11 +682,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new ReadOnly();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.DatastoreProto
.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
@@ -1367,6 +1353,8 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceFor
}
private int modeCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object mode_;
public enum ModeCase
@@ -1709,6 +1697,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
*
*
* Options for beginning a new transaction.
+ *
* Transactions can be created explicitly with calls to
* [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]
* or implicitly by setting
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java
index a716d733f..1ffba1fbf 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java
@@ -93,5 +93,5 @@ public interface TransactionOptionsOrBuilder
*/
com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder();
- public com.google.datastore.v1.TransactionOptions.ModeCase getModeCase();
+ com.google.datastore.v1.TransactionOptions.ModeCase getModeCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
index 4d2b24215..5a74da363 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
@@ -46,11 +46,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Value();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return this.unknownFields;
- }
-
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
}
@@ -65,6 +60,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
private int valueTypeCase_ = 0;
+
+ @SuppressWarnings("serial")
private java.lang.Object valueType_;
public enum ValueTypeCase
@@ -577,6 +574,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -595,6 +593,7 @@ public boolean hasEntityValue() {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -616,6 +615,7 @@ public com.google.datastore.v1.Entity getEntityValue() {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -2634,6 +2634,7 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -2652,6 +2653,7 @@ public boolean hasEntityValue() {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -2680,6 +2682,7 @@ public com.google.datastore.v1.Entity getEntityValue() {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -2705,6 +2708,7 @@ public Builder setEntityValue(com.google.datastore.v1.Entity value) {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -2727,6 +2731,7 @@ public Builder setEntityValue(com.google.datastore.v1.Entity.Builder builderForV
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -2761,6 +2766,7 @@ public Builder mergeEntityValue(com.google.datastore.v1.Entity value) {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -2789,6 +2795,7 @@ public Builder clearEntityValue() {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -2804,6 +2811,7 @@ public com.google.datastore.v1.Entity.Builder getEntityValueBuilder() {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -2827,6 +2835,7 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java
index 9cd695209..29622ac51 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java
@@ -325,6 +325,7 @@ public interface ValueOrBuilder
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -340,6 +341,7 @@ public interface ValueOrBuilder
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -355,6 +357,7 @@ public interface ValueOrBuilder
*
*
* An entity value.
+ *
* - May have no key.
* - May have a key with an incomplete key path.
* - May have a reserved/read-only key.
@@ -435,5 +438,5 @@ public interface ValueOrBuilder
*/
boolean getExcludeFromIndexes();
- public com.google.datastore.v1.Value.ValueTypeCase getValueTypeCase();
+ com.google.datastore.v1.Value.ValueTypeCase getValueTypeCase();
}
From 7887f3255cba4dedd7b4f369d77a3279d903127f Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Thu, 8 Jun 2023 15:34:12 +0000
Subject: [PATCH 09/11] feat: multiple dbs support (#1102)
This PR consists of cherry picks from the https://togithub.com/googleapis/java-datastore/tree/multi-db branch. They include:
#928
#940
#942
This also enables parameterized testing for ITDatastoreTest.
---
.kokoro/nightly/integration.cfg | 5 +
.kokoro/nightly/java11-integration.cfg | 5 +
.kokoro/presubmit/graalvm-native-17.cfg | 5 +
.kokoro/presubmit/graalvm-native.cfg | 5 +
.kokoro/presubmit/integration.cfg | 5 +
.../google/datastore/v1/client/Datastore.java | 26 +-
.../datastore/v1/client/DatastoreOptions.java | 16 +
.../v1/client/QuerySplitterImpl.java | 2 +
.../google/datastore/v1/client/RemoteRpc.java | 19 +-
.../v1/client/DatastoreClientTest.java | 12 +
.../v1/client/QuerySplitterTest.java | 56 +++
.../datastore/v1/client/RemoteRpcTest.java | 45 +-
.../client/it/ITDatastoreProtoClientTest.java | 94 ++++
.../com/google/cloud/datastore/BaseKey.java | 31 +-
.../com/google/cloud/datastore/BatchImpl.java | 2 +
.../cloud/datastore/DatastoreHelper.java | 2 +-
.../google/cloud/datastore/DatastoreImpl.java | 24 +-
.../cloud/datastore/DatastoreOptions.java | 18 +-
.../google/cloud/datastore/IncompleteKey.java | 26 +-
.../java/com/google/cloud/datastore/Key.java | 34 +-
.../google/cloud/datastore/KeyFactory.java | 28 +-
.../cloud/datastore/QueryResultsImpl.java | 3 +
.../cloud/datastore/TransactionImpl.java | 5 +
.../com/google/cloud/datastore/Validator.java | 2 +-
.../AggregationQueryRequestProtoPreparer.java | 7 +-
.../datastore/spi/v1/HttpDatastoreRpc.java | 1 +
.../testing/LocalDatastoreHelper.java | 25 +-
.../testing/RemoteDatastoreHelper.java | 8 +
.../google/cloud/datastore/BaseKeyTest.java | 30 +-
.../cloud/datastore/DatastoreHelperTest.java | 2 +
.../cloud/datastore/DatastoreOptionsTest.java | 8 +
.../google/cloud/datastore/DatastoreTest.java | 54 +-
.../cloud/datastore/IncompleteKeyTest.java | 12 +-
.../cloud/datastore/KeyFactoryTest.java | 54 +-
.../com/google/cloud/datastore/KeyTest.java | 10 +
...regationQueryRequestProtoPreparerTest.java | 10 +-
.../cloud/datastore/it/ITDatastoreTest.java | 466 +++++++++++-------
.../testing/ITLocalDatastoreHelperTest.java | 16 +-
owlbot.py | 8 +-
39 files changed, 908 insertions(+), 273 deletions(-)
create mode 100644 datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/it/ITDatastoreProtoClientTest.java
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index a2907a257..418983013 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -21,6 +21,11 @@ env_vars: {
value: "java-docs-samples-testing"
}
+env_vars: {
+ key: "DATASTORE_PROJECT_ID"
+ value: "java-docs-samples-testing"
+}
+
env_vars: {
key: "ENABLE_FLAKYBOT"
value: "true"
diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg
index 58049cc38..5929bb204 100644
--- a/.kokoro/nightly/java11-integration.cfg
+++ b/.kokoro/nightly/java11-integration.cfg
@@ -21,6 +21,11 @@ env_vars: {
value: "gcloud-devel"
}
+env_vars: {
+ key: "DATASTORE_PROJECT_ID"
+ value: "gcloud-devel"
+}
+
env_vars: {
key: "ENABLE_FLAKYBOT"
value: "true"
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index f52533545..798e390bd 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -30,4 +30,9 @@ env_vars: {
env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-it-service-account"
+}
+
+env_vars: {
+ key: "DATASTORE_PROJECT_ID"
+ value: "gcloud-devel"
}
\ No newline at end of file
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 44b100487..c85858306 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -31,3 +31,8 @@ env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-it-service-account"
}
+
+env_vars: {
+ key: "DATASTORE_PROJECT_ID"
+ value: "gcloud-devel"
+}
\ No newline at end of file
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
index dded67a9d..fd5cd6689 100644
--- a/.kokoro/presubmit/integration.cfg
+++ b/.kokoro/presubmit/integration.cfg
@@ -22,6 +22,11 @@ env_vars: {
value: "gcloud-devel"
}
+env_vars: {
+ key: "DATASTORE_PROJECT_ID"
+ value: "gcloud-devel"
+}
+
env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-it-service-account"
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java
index 09101c94b..6b886aef0 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/Datastore.java
@@ -67,7 +67,8 @@ private DatastoreException invalidResponseException(String method, IOException e
}
public AllocateIdsResponse allocateIds(AllocateIdsRequest request) throws DatastoreException {
- try (InputStream is = remoteRpc.call("allocateIds", request)) {
+ try (InputStream is =
+ remoteRpc.call("allocateIds", request, request.getProjectId(), request.getDatabaseId())) {
return AllocateIdsResponse.parseFrom(is);
} catch (IOException exception) {
throw invalidResponseException("allocateIds", exception);
@@ -76,7 +77,9 @@ public AllocateIdsResponse allocateIds(AllocateIdsRequest request) throws Datast
public BeginTransactionResponse beginTransaction(BeginTransactionRequest request)
throws DatastoreException {
- try (InputStream is = remoteRpc.call("beginTransaction", request)) {
+ try (InputStream is =
+ remoteRpc.call(
+ "beginTransaction", request, request.getProjectId(), request.getDatabaseId())) {
return BeginTransactionResponse.parseFrom(is);
} catch (IOException exception) {
throw invalidResponseException("beginTransaction", exception);
@@ -84,7 +87,8 @@ public BeginTransactionResponse beginTransaction(BeginTransactionRequest request
}
public CommitResponse commit(CommitRequest request) throws DatastoreException {
- try (InputStream is = remoteRpc.call("commit", request)) {
+ try (InputStream is =
+ remoteRpc.call("commit", request, request.getProjectId(), request.getDatabaseId())) {
return CommitResponse.parseFrom(is);
} catch (IOException exception) {
throw invalidResponseException("commit", exception);
@@ -92,7 +96,8 @@ public CommitResponse commit(CommitRequest request) throws DatastoreException {
}
public LookupResponse lookup(LookupRequest request) throws DatastoreException {
- try (InputStream is = remoteRpc.call("lookup", request)) {
+ try (InputStream is =
+ remoteRpc.call("lookup", request, request.getProjectId(), request.getDatabaseId())) {
return LookupResponse.parseFrom(is);
} catch (IOException exception) {
throw invalidResponseException("lookup", exception);
@@ -100,7 +105,8 @@ public LookupResponse lookup(LookupRequest request) throws DatastoreException {
}
public ReserveIdsResponse reserveIds(ReserveIdsRequest request) throws DatastoreException {
- try (InputStream is = remoteRpc.call("reserveIds", request)) {
+ try (InputStream is =
+ remoteRpc.call("reserveIds", request, request.getProjectId(), request.getDatabaseId())) {
return ReserveIdsResponse.parseFrom(is);
} catch (IOException exception) {
throw invalidResponseException("reserveIds", exception);
@@ -108,7 +114,8 @@ public ReserveIdsResponse reserveIds(ReserveIdsRequest request) throws Datastore
}
public RollbackResponse rollback(RollbackRequest request) throws DatastoreException {
- try (InputStream is = remoteRpc.call("rollback", request)) {
+ try (InputStream is =
+ remoteRpc.call("rollback", request, request.getProjectId(), request.getDatabaseId())) {
return RollbackResponse.parseFrom(is);
} catch (IOException exception) {
throw invalidResponseException("rollback", exception);
@@ -116,7 +123,8 @@ public RollbackResponse rollback(RollbackRequest request) throws DatastoreExcept
}
public RunQueryResponse runQuery(RunQueryRequest request) throws DatastoreException {
- try (InputStream is = remoteRpc.call("runQuery", request)) {
+ try (InputStream is =
+ remoteRpc.call("runQuery", request, request.getProjectId(), request.getDatabaseId())) {
return RunQueryResponse.parseFrom(is);
} catch (IOException exception) {
throw invalidResponseException("runQuery", exception);
@@ -125,7 +133,9 @@ public RunQueryResponse runQuery(RunQueryRequest request) throws DatastoreExcept
public RunAggregationQueryResponse runAggregationQuery(RunAggregationQueryRequest request)
throws DatastoreException {
- try (InputStream is = remoteRpc.call("runAggregationQuery", request)) {
+ try (InputStream is =
+ remoteRpc.call(
+ "runAggregationQuery", request, request.getProjectId(), request.getDatabaseId())) {
return RunAggregationQueryResponse.parseFrom(is);
} catch (IOException exception) {
throw invalidResponseException("runAggregationQuery", exception);
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
index 8da86dc41..e097dc7d7 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
@@ -20,6 +20,7 @@
import com.google.api.client.auth.oauth2.Credential;
import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.http.HttpTransport;
+import com.google.api.core.BetaApi;
import java.util.Arrays;
import java.util.List;
@@ -40,6 +41,7 @@
*/
public class DatastoreOptions {
private final String projectId;
+ private final String databaseId;
private final String projectEndpoint;
private final String host;
private final String localHost;
@@ -56,6 +58,7 @@ public class DatastoreOptions {
b.projectId != null || b.projectEndpoint != null,
"Either project ID or project endpoint must be provided.");
this.projectId = b.projectId;
+ this.databaseId = b.databaseId;
this.projectEndpoint = b.projectEndpoint;
this.host = b.host;
this.localHost = b.localHost;
@@ -72,6 +75,7 @@ public static class Builder {
"Can set at most one of project endpoint, host, and local host.";
private String projectId;
+ private String databaseId;
private String projectEndpoint;
private String host;
private String localHost;
@@ -83,6 +87,7 @@ public Builder() {}
public Builder(DatastoreOptions options) {
this.projectId = options.projectId;
+ this.databaseId = options.databaseId;
this.projectEndpoint = options.projectEndpoint;
this.host = options.host;
this.localHost = options.localHost;
@@ -102,6 +107,13 @@ public Builder projectId(String projectId) {
return this;
}
+ /** Sets the database ID used to access Cloud Datastore. */
+ @BetaApi
+ public Builder databaseId(String databaseId) {
+ this.databaseId = databaseId;
+ return this;
+ }
+
/**
* Sets the host used to access Cloud Datastore. To connect to the Cloud Datastore Emulator, use
* {@link #localHost} instead.
@@ -176,6 +188,10 @@ public String getProjectId() {
return projectId;
}
+ public String getDatabaseId() {
+ return databaseId;
+ }
+
public String getProjectEndpoint() {
return projectEndpoint;
}
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java
index 6143bdd59..8952111ec 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/QuerySplitterImpl.java
@@ -221,6 +221,8 @@ private List getScatterKeys(
do {
RunQueryRequest.Builder scatterRequest =
RunQueryRequest.newBuilder().setPartitionId(partition).setQuery(scatterPointQuery);
+ scatterRequest.setProjectId(partition.getProjectId());
+ scatterRequest.setDatabaseId(partition.getDatabaseId());
if (readTime != null) {
scatterRequest.setReadOptions(ReadOptions.newBuilder().setReadTime(readTime).build());
}
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java
index 321eea72a..b0b47c505 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/RemoteRpc.java
@@ -24,6 +24,7 @@
import com.google.api.client.http.protobuf.ProtoHttpContent;
import com.google.api.client.util.IOUtils;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Strings;
import com.google.protobuf.MessageLite;
import com.google.rpc.Code;
import com.google.rpc.Status;
@@ -46,6 +47,8 @@ class RemoteRpc {
@VisibleForTesting static final String API_FORMAT_VERSION_HEADER = "X-Goog-Api-Format-Version";
private static final String API_FORMAT_VERSION = "2";
+ @VisibleForTesting static final String X_GOOG_REQUEST_PARAMS_HEADER = "x-goog-request-params";
+
private final HttpRequestFactory client;
private final HttpRequestInitializer initializer;
private final String url;
@@ -74,7 +77,9 @@ class RemoteRpc {
*
* @throws DatastoreException if the RPC fails.
*/
- public InputStream call(String methodName, MessageLite request) throws DatastoreException {
+ public InputStream call(
+ String methodName, MessageLite request, String projectId, String databaseId)
+ throws DatastoreException {
logger.fine("remote datastore call " + methodName);
long startTime = System.currentTimeMillis();
@@ -84,7 +89,7 @@ public InputStream call(String methodName, MessageLite request) throws Datastore
rpcCount.incrementAndGet();
ProtoHttpContent payload = new ProtoHttpContent(request);
HttpRequest httpRequest = client.buildPostRequest(resolveURL(methodName), payload);
- setHeaders(request, httpRequest);
+ setHeaders(request, httpRequest, projectId, databaseId);
// Don't throw an HTTPResponseException on error. It converts the response to a String and
// throws away the original, whereas we need the raw bytes to parse it as a proto.
httpRequest.setThrowExceptionOnExecuteError(false);
@@ -123,8 +128,16 @@ public InputStream call(String methodName, MessageLite request) throws Datastore
}
@VisibleForTesting
- void setHeaders(MessageLite request, HttpRequest httpRequest) {
+ void setHeaders(
+ MessageLite request, HttpRequest httpRequest, String projectId, String databaseId) {
httpRequest.getHeaders().put(API_FORMAT_VERSION_HEADER, API_FORMAT_VERSION);
+ StringBuilder builder = new StringBuilder("project_id=");
+ builder.append(projectId);
+ if (!Strings.isNullOrEmpty(databaseId)) {
+ builder.append("&database_id=");
+ builder.append(databaseId);
+ }
+ httpRequest.getHeaders().put(X_GOOG_REQUEST_PARAMS_HEADER, builder.toString());
if (enableE2EChecksum && request != null) {
String checksum = EndToEndChecksumHandler.computeChecksum(request.toByteArray());
if (checksum != null) {
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java
index 16a6303bb..3eb7a66de 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/DatastoreClientTest.java
@@ -215,6 +215,18 @@ public void create_LocalHost() {
.isEqualTo("http://localhost:8080/v1/projects/project-id");
}
+ @Test
+ public void setDatabaseId() {
+ DatastoreOptions options =
+ new DatastoreOptions.Builder()
+ .projectId(PROJECT_ID)
+ .databaseId("test-db")
+ .localHost("localhost:8080")
+ .build();
+ assertThat(options.getProjectId()).isEqualTo(PROJECT_ID);
+ assertThat(options.getDatabaseId()).isEqualTo("test-db");
+ }
+
@Test
public void create_LocalHostIp() {
Datastore datastore =
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java
index e86943724..b064e137a 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java
@@ -193,6 +193,60 @@ public void getSplits() throws Exception {
RunQueryRequest expectedSplitQueryRequest =
RunQueryRequest.newBuilder()
.setPartitionId(PARTITION)
+ .setProjectId(PROJECT_ID)
+ .setQuery(
+ splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(2 * 32).build()))
+ .build();
+
+ assertArrayEquals(expectedSplitQueryRequest.toByteArray(), mockClient.getLastBody());
+ }
+
+ @Test
+ public void getSplitsWithDatabaseId() throws Exception {
+ Datastore datastore = factory.create(options.build());
+ MockDatastoreFactory mockClient = (MockDatastoreFactory) factory;
+
+ PartitionId partition =
+ PartitionId.newBuilder().setProjectId(PROJECT_ID).setDatabaseId("test-database").build();
+
+ RunQueryResponse splitQueryResponse =
+ RunQueryResponse.newBuilder()
+ .setQuery(splitQuery)
+ .setBatch(
+ QueryResultBatch.newBuilder()
+ .setEntityResultType(ResultType.KEY_ONLY)
+ .setMoreResults(MoreResultsType.NO_MORE_RESULTS)
+ .addEntityResults(makeKeyOnlyEntity(splitKey0))
+ .addEntityResults(makeKeyOnlyEntity(splitKey1))
+ .addEntityResults(makeKeyOnlyEntity(splitKey2))
+ .addEntityResults(makeKeyOnlyEntity(splitKey3))
+ .build())
+ .build();
+
+ mockClient.setNextResponse(splitQueryResponse);
+
+ List splitQueries = QuerySplitterImpl.INSTANCE.getSplits(query, partition, 3, datastore);
+
+ assertThat(splitQueries)
+ .containsExactly(
+ query
+ .toBuilder()
+ .setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1))
+ .build(),
+ query
+ .toBuilder()
+ .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3))
+ .build(),
+ query
+ .toBuilder()
+ .setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null))
+ .build());
+
+ RunQueryRequest expectedSplitQueryRequest =
+ RunQueryRequest.newBuilder()
+ .setPartitionId(partition)
+ .setProjectId(PROJECT_ID)
+ .setDatabaseId("test-database")
.setQuery(
splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(2 * 32).build()))
.build();
@@ -235,6 +289,7 @@ public void notEnoughSplits() throws Exception {
RunQueryRequest expectedSplitQueryRequest =
RunQueryRequest.newBuilder()
.setPartitionId(PARTITION)
+ .setProjectId(PROJECT_ID)
.setQuery(
splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(99 * 32).build()))
.build();
@@ -286,6 +341,7 @@ public void getSplits_withReadTime() throws Exception {
RunQueryRequest expectedSplitQueryRequest =
RunQueryRequest.newBuilder()
.setPartitionId(PARTITION)
+ .setProjectId(PROJECT_ID)
.setQuery(
splitQuery.toBuilder().setLimit(Int32Value.newBuilder().setValue(2 * 32).build()))
.setReadOptions(ReadOptions.newBuilder().setReadTime(readTime))
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java
index ebcb12396..281e92f04 100644
--- a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/RemoteRpcTest.java
@@ -146,7 +146,8 @@ public void testGzip() throws IOException, DatastoreException {
new InjectedTestValues(gzip(response), new byte[1], true);
RemoteRpc rpc = newRemoteRpc(injectedTestValues);
- InputStream is = rpc.call("beginTransaction", BeginTransactionResponse.getDefaultInstance());
+ InputStream is =
+ rpc.call("beginTransaction", BeginTransactionResponse.getDefaultInstance(), "", "");
BeginTransactionResponse parsedResponse = BeginTransactionResponse.parseFrom(is);
is.close();
@@ -159,14 +160,15 @@ public void testGzip() throws IOException, DatastoreException {
public void testHttpHeaders_expectE2eChecksumHeader() throws IOException {
// Enable E2E-Checksum system env variable
RemoteRpc.setSystemEnvE2EChecksum(true);
+ String projectId = "project-id";
MessageLite request =
- RollbackRequest.newBuilder().setTransaction(ByteString.copyFromUtf8("project-id")).build();
+ RollbackRequest.newBuilder().setTransaction(ByteString.copyFromUtf8(projectId)).build();
RemoteRpc rpc =
newRemoteRpc(
new InjectedTestValues(gzip(newBeginTransactionResponse()), new byte[1], true));
HttpRequest httpRequest =
rpc.getClient().buildPostRequest(rpc.resolveURL("blah"), new ProtoHttpContent(request));
- rpc.setHeaders(request, httpRequest);
+ rpc.setHeaders(request, httpRequest, projectId, "");
assertNotNull(
httpRequest.getHeaders().getFirstHeaderStringValue(RemoteRpc.API_FORMAT_VERSION_HEADER));
// Expect to find e2e-checksum header
@@ -181,14 +183,15 @@ public void testHttpHeaders_expectE2eChecksumHeader() throws IOException {
public void testHttpHeaders_doNotExpectE2eChecksumHeader() throws IOException {
// disable E2E-Checksum system env variable
RemoteRpc.setSystemEnvE2EChecksum(false);
+ String projectId = "project-id";
MessageLite request =
- RollbackRequest.newBuilder().setTransaction(ByteString.copyFromUtf8("project-id")).build();
+ RollbackRequest.newBuilder().setTransaction(ByteString.copyFromUtf8(projectId)).build();
RemoteRpc rpc =
newRemoteRpc(
new InjectedTestValues(gzip(newBeginTransactionResponse()), new byte[1], true));
HttpRequest httpRequest =
rpc.getClient().buildPostRequest(rpc.resolveURL("blah"), new ProtoHttpContent(request));
- rpc.setHeaders(request, httpRequest);
+ rpc.setHeaders(request, httpRequest, projectId, "");
assertNotNull(
httpRequest.getHeaders().getFirstHeaderStringValue(RemoteRpc.API_FORMAT_VERSION_HEADER));
// Do not expect to find e2e-checksum header
@@ -198,6 +201,38 @@ public void testHttpHeaders_doNotExpectE2eChecksumHeader() throws IOException {
.getFirstHeaderStringValue(EndToEndChecksumHandler.HTTP_REQUEST_CHECKSUM_HEADER));
}
+ @Test
+ public void testHttpHeaders_prefixHeader() throws IOException {
+ String projectId = "my-project";
+ String databaseId = "my-db";
+ MessageLite request =
+ RollbackRequest.newBuilder()
+ .setTransaction(ByteString.copyFromUtf8(projectId))
+ .setDatabaseId(databaseId)
+ .build();
+ RemoteRpc rpc =
+ newRemoteRpc(
+ new InjectedTestValues(gzip(newBeginTransactionResponse()), new byte[1], true));
+ HttpRequest httpRequest =
+ rpc.getClient().buildPostRequest(rpc.resolveURL("blah"), new ProtoHttpContent(request));
+ rpc.setHeaders(request, httpRequest, projectId, databaseId);
+ assertEquals(
+ "project_id=my-project&database_id=my-db",
+ httpRequest.getHeaders().get(RemoteRpc.X_GOOG_REQUEST_PARAMS_HEADER));
+
+ MessageLite request2 =
+ RollbackRequest.newBuilder().setTransaction(ByteString.copyFromUtf8(projectId)).build();
+ RemoteRpc rpc2 =
+ newRemoteRpc(
+ new InjectedTestValues(gzip(newBeginTransactionResponse()), new byte[1], true));
+ HttpRequest httpRequest2 =
+ rpc2.getClient().buildPostRequest(rpc2.resolveURL("blah"), new ProtoHttpContent(request2));
+ rpc2.setHeaders(request, httpRequest2, projectId, "");
+ assertEquals(
+ "project_id=my-project",
+ httpRequest2.getHeaders().get(RemoteRpc.X_GOOG_REQUEST_PARAMS_HEADER));
+ }
+
private static BeginTransactionResponse newBeginTransactionResponse() {
return BeginTransactionResponse.newBuilder()
.setTransaction(ByteString.copyFromUtf8("blah-blah-blah"))
diff --git a/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/it/ITDatastoreProtoClientTest.java b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/it/ITDatastoreProtoClientTest.java
new file mode 100644
index 000000000..3e6cf025e
--- /dev/null
+++ b/datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/it/ITDatastoreProtoClientTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.datastore.v1.client.it;
+
+import static com.google.datastore.v1.client.DatastoreHelper.makeFilter;
+import static com.google.datastore.v1.client.DatastoreHelper.makeValue;
+
+import com.google.common.truth.Truth;
+import com.google.datastore.v1.Filter;
+import com.google.datastore.v1.KindExpression;
+import com.google.datastore.v1.PartitionId;
+import com.google.datastore.v1.PropertyFilter;
+import com.google.datastore.v1.Query;
+import com.google.datastore.v1.client.Datastore;
+import com.google.datastore.v1.client.DatastoreException;
+import com.google.datastore.v1.client.DatastoreHelper;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ITDatastoreProtoClientTest {
+
+ private static Datastore DATASTORE;
+
+ private static PartitionId PARTITION;
+
+ private static final String KIND = "test-kind";
+ private static final String PROJECT_ID = System.getenv(DatastoreHelper.PROJECT_ID_ENV_VAR);
+
+ @Before
+ public void setUp() throws GeneralSecurityException, IOException {
+ DATASTORE = DatastoreHelper.getDatastoreFromEnv();
+ }
+
+ @Test
+ public void testQuerySplitterWithDefaultDb() throws DatastoreException {
+ Filter propertyFilter =
+ makeFilter("foo", PropertyFilter.Operator.EQUAL, makeValue("value")).build();
+ Query query =
+ Query.newBuilder()
+ .addKind(KindExpression.newBuilder().setName(KIND).build())
+ .setFilter(propertyFilter)
+ .build();
+
+ PARTITION = PartitionId.newBuilder().setProjectId(PROJECT_ID).build();
+
+ List splits =
+ DatastoreHelper.getQuerySplitter().getSplits(query, PARTITION, 2, DATASTORE);
+ Truth.assertThat(splits).isNotEmpty();
+ splits.forEach(
+ split -> {
+ Truth.assertThat(split.getKind(0).getName()).isEqualTo(KIND);
+ Truth.assertThat(split.getFilter()).isEqualTo(propertyFilter);
+ });
+ }
+
+ @Test
+ public void testQuerySplitterWithDb() throws DatastoreException {
+ Filter propertyFilter =
+ makeFilter("foo", PropertyFilter.Operator.EQUAL, makeValue("value")).build();
+ Query query =
+ Query.newBuilder()
+ .addKind(KindExpression.newBuilder().setName(KIND).build())
+ .setFilter(propertyFilter)
+ .build();
+
+ PARTITION = PartitionId.newBuilder().setProjectId(PROJECT_ID).setDatabaseId("test-db").build();
+
+ List splits =
+ DatastoreHelper.getQuerySplitter().getSplits(query, PARTITION, 2, DATASTORE);
+
+ Truth.assertThat(splits).isNotEmpty();
+ splits.forEach(
+ split -> {
+ Truth.assertThat(split.getKind(0).getName()).isEqualTo(KIND);
+ Truth.assertThat(split.getFilter()).isEqualTo(propertyFilter);
+ });
+ }
+}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
index 553a12bb3..8734efe33 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
@@ -16,10 +16,11 @@
package com.google.cloud.datastore;
-import static com.google.cloud.datastore.Validator.validateDatabase;
import static com.google.cloud.datastore.Validator.validateKind;
import static com.google.cloud.datastore.Validator.validateNamespace;
+import static com.google.cloud.datastore.Validator.validateProjectId;
+import com.google.api.core.BetaApi;
import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
@@ -35,6 +36,7 @@ public abstract class BaseKey implements Serializable {
private final String projectId;
private final String namespace;
+ private final String databaseId;
private final ImmutableList path;
/**
@@ -46,13 +48,14 @@ public abstract static class Builder> {
String projectId = "";
String namespace = "";
+ String databaseId = "";
String kind;
final List ancestors;
private static final int MAX_PATH = 100;
Builder(String projectId) {
- this.projectId = validateDatabase(projectId);
+ this.projectId = validateProjectId(projectId);
ancestors = new LinkedList<>();
}
@@ -64,6 +67,7 @@ public abstract static class Builder> {
Builder(BaseKey copyFrom) {
projectId = copyFrom.getProjectId();
namespace = copyFrom.getNamespace();
+ databaseId = copyFrom.getDatabaseId();
ancestors = new LinkedList<>(copyFrom.getAncestors());
kind = copyFrom.getKind();
}
@@ -102,7 +106,7 @@ public B setKind(String kind) {
/** Sets the project ID of the key. */
public B setProjectId(String projectId) {
- this.projectId = validateDatabase(projectId);
+ this.projectId = validateProjectId(projectId);
return self();
}
@@ -112,13 +116,25 @@ public B setNamespace(String namespace) {
return self();
}
+ /** Sets the database id of the key. */
+ @BetaApi
+ public B setDatabaseId(String databaseId) {
+ this.databaseId = databaseId;
+ return self();
+ }
+
protected abstract BaseKey build();
}
BaseKey(String projectId, String namespace, ImmutableList path) {
+ this(projectId, namespace, "", path);
+ }
+
+ BaseKey(String projectId, String namespace, String databaseId, ImmutableList path) {
Preconditions.checkArgument(!path.isEmpty(), "Path must not be empty");
this.projectId = projectId;
this.namespace = namespace;
+ this.databaseId = databaseId;
this.path = path;
}
@@ -132,6 +148,10 @@ public String getNamespace() {
return namespace;
}
+ public String getDatabaseId() {
+ return databaseId;
+ }
+
/** Returns an immutable list with the key's ancestors. */
public List getAncestors() {
return getPath().subList(0, getPath().size() - 1);
@@ -158,13 +178,14 @@ public String toString() {
return MoreObjects.toStringHelper(this)
.add("projectId", projectId)
.add("namespace", namespace)
+ .add("databaseId", databaseId)
.add("path", path)
.toString();
}
@Override
public int hashCode() {
- return Objects.hash(getProjectId(), getNamespace(), getPath());
+ return Objects.hash(getProjectId(), getNamespace(), getDatabaseId(), getPath());
}
@Override
@@ -178,6 +199,7 @@ public boolean equals(Object obj) {
BaseKey other = (BaseKey) obj;
return Objects.equals(getProjectId(), other.getProjectId())
&& Objects.equals(getNamespace(), other.getNamespace())
+ && Objects.equals(getDatabaseId(), other.getDatabaseId())
&& Objects.equals(getPath(), other.getPath());
}
@@ -186,6 +208,7 @@ com.google.datastore.v1.Key toPb() {
com.google.datastore.v1.PartitionId.Builder partitionIdPb =
com.google.datastore.v1.PartitionId.newBuilder();
partitionIdPb.setProjectId(projectId);
+ partitionIdPb.setDatabaseId(databaseId);
partitionIdPb.setNamespaceId(namespace);
keyPb.setPartitionId(partitionIdPb.build());
for (PathElement pathEntry : path) {
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java
index 5fc0bcd8a..f1647cac7 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java
@@ -59,6 +59,8 @@ public Batch.Response submit() {
com.google.datastore.v1.CommitRequest.newBuilder();
requestPb.setMode(com.google.datastore.v1.CommitRequest.Mode.NON_TRANSACTIONAL);
requestPb.addAllMutations(mutationsPb);
+ requestPb.setProjectId(datastore.getOptions().getProjectId());
+ requestPb.setDatabaseId(datastore.getOptions().getDatabaseId());
com.google.datastore.v1.CommitResponse responsePb = datastore.commit(requestPb.build());
deactivate();
return new ResponseImpl(responsePb, toAddAutoId().size());
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java
index 985b76a7c..33e90a66e 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java
@@ -54,7 +54,7 @@ static Entity put(DatastoreWriter writer, FullEntity entity) {
}
static KeyFactory newKeyFactory(DatastoreOptions options) {
- return new KeyFactory(options.getProjectId(), options.getNamespace());
+ return new KeyFactory(options.getProjectId(), options.getNamespace(), options.getDatabaseId());
}
/**
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
index 248323150..a1b337c05 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
@@ -211,12 +211,7 @@ com.google.datastore.v1.RunQueryResponse runQuery(
Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_RUNQUERY);
try (Scope scope = traceUtil.getTracer().withSpan(span)) {
return RetryHelper.runWithRetries(
- new Callable() {
- @Override
- public com.google.datastore.v1.RunQueryResponse call() throws DatastoreException {
- return datastoreRpc.runQuery(requestPb);
- }
- },
+ () -> datastoreRpc.runQuery(requestPb),
retrySettings,
requestPb.getReadOptions().getTransaction().isEmpty()
? EXCEPTION_HANDLER
@@ -256,6 +251,8 @@ public List allocateId(IncompleteKey... keys) {
for (IncompleteKey key : keys) {
requestPb.addKeys(trimNameOrId(key).toPb());
}
+ requestPb.setProjectId(getOptions().getProjectId());
+ requestPb.setDatabaseId(getOptions().getDatabaseId());
com.google.datastore.v1.AllocateIdsResponse responsePb = allocateIds(requestPb.build());
ImmutableList.Builder keyList = ImmutableList.builder();
for (com.google.datastore.v1.Key keyPb : responsePb.getKeysList()) {
@@ -386,6 +383,8 @@ Iterator get(Optional readOptionsPb, final Key... keys) {
for (Key k : Sets.newLinkedHashSet(Arrays.asList(keys))) {
requestPb.addKeys(k.toPb());
}
+ requestPb.setProjectId(getOptions().getProjectId());
+ requestPb.setDatabaseId(getOptions().getDatabaseId());
return new ResultsIterator(requestPb);
}
@@ -451,6 +450,8 @@ public List reserveIds(Key... keys) {
for (Key key : keys) {
requestPb.addKeys(key.toPb());
}
+ requestPb.setProjectId(getOptions().getProjectId());
+ requestPb.setDatabaseId(getOptions().getDatabaseId());
com.google.datastore.v1.ReserveIdsResponse responsePb = reserveIds(requestPb.build());
ImmutableList.Builder keyList = ImmutableList.builder();
if (responsePb.isInitialized()) {
@@ -565,6 +566,8 @@ private com.google.datastore.v1.CommitResponse commitMutation(
com.google.datastore.v1.CommitRequest.Builder requestPb =
com.google.datastore.v1.CommitRequest.newBuilder();
requestPb.setMode(com.google.datastore.v1.CommitRequest.Mode.NON_TRANSACTIONAL);
+ requestPb.setProjectId(getOptions().getProjectId());
+ requestPb.setDatabaseId(getOptions().getDatabaseId());
requestPb.addAllMutations(mutationsPb);
return commit(requestPb.build());
}
@@ -574,12 +577,7 @@ com.google.datastore.v1.CommitResponse commit(
Span span = traceUtil.startSpan(TraceUtil.SPAN_NAME_COMMIT);
try (Scope scope = traceUtil.getTracer().withSpan(span)) {
return RetryHelper.runWithRetries(
- new Callable() {
- @Override
- public com.google.datastore.v1.CommitResponse call() throws DatastoreException {
- return datastoreRpc.commit(requestPb);
- }
- },
+ () -> datastoreRpc.commit(requestPb),
retrySettings,
requestPb.getTransaction().isEmpty()
? EXCEPTION_HANDLER
@@ -625,6 +623,8 @@ void rollbackTransaction(ByteString transaction) {
com.google.datastore.v1.RollbackRequest.Builder requestPb =
com.google.datastore.v1.RollbackRequest.newBuilder();
requestPb.setTransaction(transaction);
+ requestPb.setProjectId(getOptions().getProjectId());
+ requestPb.setDatabaseId(getOptions().getDatabaseId());
rollback(requestPb.build());
}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
index f754866a9..03621502c 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
@@ -18,6 +18,7 @@
import static com.google.cloud.datastore.Validator.validateNamespace;
+import com.google.api.core.BetaApi;
import com.google.cloud.ServiceDefaults;
import com.google.cloud.ServiceOptions;
import com.google.cloud.ServiceRpc;
@@ -38,8 +39,10 @@ public class DatastoreOptions extends ServiceOptions SCOPES = ImmutableSet.of(DATASTORE_SCOPE);
+ private static final String DEFAULT_DATABASE_ID = "";
private final String namespace;
+ private final String databaseId;
public static class DefaultDatastoreFactory implements DatastoreFactory {
@@ -64,12 +67,14 @@ public ServiceRpc create(DatastoreOptions options) {
public static class Builder extends ServiceOptions.Builder {
private String namespace;
+ private String databaseId;
private Builder() {}
private Builder(DatastoreOptions options) {
super(options);
namespace = options.namespace;
+ databaseId = options.databaseId;
}
@Override
@@ -91,11 +96,18 @@ public Builder setNamespace(String namespace) {
this.namespace = validateNamespace(namespace);
return this;
}
+
+ @BetaApi
+ public Builder setDatabaseId(String databaseId) {
+ this.databaseId = databaseId;
+ return this;
+ }
}
private DatastoreOptions(Builder builder) {
super(DatastoreFactory.class, DatastoreRpcFactory.class, builder, new DatastoreDefaults());
- namespace = builder.namespace != null ? builder.namespace : defaultNamespace();
+ namespace = MoreObjects.firstNonNull(builder.namespace, defaultNamespace());
+ databaseId = MoreObjects.firstNonNull(builder.databaseId, DEFAULT_DATABASE_ID);
}
@Override
@@ -143,6 +155,10 @@ public String getNamespace() {
return namespace;
}
+ public String getDatabaseId() {
+ return this.databaseId;
+ }
+
/** Returns a default {@code DatastoreOptions} instance. */
public static DatastoreOptions getDefaultInstance() {
return newBuilder().build();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java
index afabadba2..c1f7118e5 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java
@@ -16,6 +16,7 @@
package com.google.cloud.datastore;
+import com.google.api.core.BetaApi;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import java.util.List;
@@ -31,6 +32,11 @@ private Builder(String projectId, String kind) {
super(projectId, kind);
}
+ private Builder(String projectId, String kind, String databaseId) {
+ super(projectId, kind);
+ this.databaseId = databaseId;
+ }
+
private Builder(IncompleteKey copyFrom) {
super(copyFrom);
}
@@ -39,7 +45,7 @@ private Builder(IncompleteKey copyFrom) {
public IncompleteKey build() {
ImmutableList path =
ImmutableList.builder().addAll(ancestors).add(PathElement.of(kind)).build();
- return new IncompleteKey(projectId, namespace, path);
+ return new IncompleteKey(projectId, namespace, databaseId, path);
}
}
@@ -47,13 +53,20 @@ public IncompleteKey build() {
super(projectId, namespace, path);
}
+ IncompleteKey(
+ String projectId, String namespace, String databaseId, ImmutableList path) {
+ super(projectId, namespace, databaseId, path);
+ }
+
static IncompleteKey fromPb(com.google.datastore.v1.Key keyPb) {
String projectId = "";
String namespace = "";
+ String databaseId = "";
if (keyPb.hasPartitionId()) {
com.google.datastore.v1.PartitionId partitionIdPb = keyPb.getPartitionId();
projectId = partitionIdPb.getProjectId();
namespace = partitionIdPb.getNamespaceId();
+ databaseId = partitionIdPb.getDatabaseId();
}
List pathElementsPb = keyPb.getPathList();
Preconditions.checkArgument(!pathElementsPb.isEmpty(), "Path must not be empty");
@@ -64,9 +77,9 @@ static IncompleteKey fromPb(com.google.datastore.v1.Key keyPb) {
ImmutableList path = pathBuilder.build();
PathElement leaf = path.get(path.size() - 1);
if (leaf.getNameOrId() != null) {
- return new Key(projectId, namespace, path);
+ return new Key(projectId, namespace, databaseId, path);
}
- return new IncompleteKey(projectId, namespace, path);
+ return new IncompleteKey(projectId, namespace, databaseId, path);
}
/** Returns the key's parent. */
@@ -94,12 +107,17 @@ public static Builder newBuilder(String projectId, String kind) {
return new Builder(projectId, kind);
}
+ @BetaApi
+ public static Builder newBuilderWithDatabaseId(String projectId, String kind, String databaseId) {
+ return new Builder(projectId, kind, databaseId);
+ }
+
public static Builder newBuilder(IncompleteKey copyFrom) {
return new Builder(copyFrom);
}
public static Builder newBuilder(Key parent, String kind) {
- return newBuilder(parent.getProjectId(), kind)
+ return newBuilderWithDatabaseId(parent.getProjectId(), kind, parent.getDatabaseId())
.setNamespace(parent.getNamespace())
.addAncestors(parent.getPath());
}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java
index 785d3592f..bfd9dd7d3 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java
@@ -18,6 +18,7 @@
import static java.nio.charset.StandardCharsets.UTF_8;
+import com.google.api.core.BetaApi;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.protobuf.TextFormat;
@@ -51,6 +52,18 @@ private Builder(String projectId, String kind, long id) {
this.id = id;
}
+ private Builder(String projectId, String kind, long id, String databaseId) {
+ super(projectId, kind);
+ this.id = id;
+ this.databaseId = databaseId;
+ }
+
+ private Builder(String projectId, String kind, String name, String databaseId) {
+ super(projectId, kind);
+ this.name = name;
+ this.databaseId = databaseId;
+ }
+
private Builder(IncompleteKey copyFrom, String name) {
super(copyFrom);
this.name = name;
@@ -93,7 +106,7 @@ public Key build() {
} else {
pathBuilder.add(PathElement.of(kind, id));
}
- return new Key(projectId, namespace, pathBuilder.build());
+ return new Key(projectId, namespace, databaseId, pathBuilder.build());
}
}
@@ -102,6 +115,11 @@ public Key build() {
Preconditions.checkArgument(getNameOrId() != null);
}
+ Key(String projectId, String namespace, String databaseId, ImmutableList path) {
+ super(projectId, namespace, databaseId, path);
+ Preconditions.checkArgument(getNameOrId() != null);
+ }
+
public boolean hasId() {
return getLeaf().hasId();
}
@@ -162,10 +180,20 @@ public static Builder newBuilder(String projectId, String kind, String name) {
return new Builder(projectId, kind, name);
}
+ @BetaApi
+ public static Builder newBuilder(String projectId, String kind, String name, String databaseId) {
+ return new Builder(projectId, kind, name, databaseId);
+ }
+
public static Builder newBuilder(String projectId, String kind, long id) {
return new Builder(projectId, kind, id);
}
+ @BetaApi
+ public static Builder newBuilder(String projectId, String kind, long id, String databaseId) {
+ return new Builder(projectId, kind, id, databaseId);
+ }
+
public static Builder newBuilder(Key copyFrom) {
return new Builder(copyFrom);
}
@@ -179,13 +207,13 @@ public static Builder newBuilder(IncompleteKey copyFrom, long id) {
}
public static Builder newBuilder(Key parent, String kind, String name) {
- Builder builder = newBuilder(parent.getProjectId(), kind, name);
+ Builder builder = newBuilder(parent.getProjectId(), kind, name, parent.getDatabaseId());
addParentToBuilder(parent, builder);
return builder;
}
public static Builder newBuilder(Key parent, String kind, long id) {
- Builder builder = newBuilder(parent.getProjectId(), kind, id);
+ Builder builder = newBuilder(parent.getProjectId(), kind, id, parent.getDatabaseId());
addParentToBuilder(parent, builder);
return builder;
}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java
index 7c6b07347..f8c3c93f6 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java
@@ -16,6 +16,7 @@
package com.google.cloud.datastore;
+import com.google.api.core.BetaApi;
import com.google.common.collect.ImmutableList;
/**
@@ -24,24 +25,32 @@
*/
public final class KeyFactory extends BaseKey.Builder {
- private final String pi;
- private final String ns;
+ private final String initialProjectId;
+ private final String initialNamespace;
+ private final String initialDatabaseId;
public KeyFactory(String projectId) {
this(projectId, "");
}
public KeyFactory(String projectId, String namespace) {
+ this(projectId, namespace, "");
+ }
+
+ @BetaApi
+ public KeyFactory(String projectId, String namespace, String databaseId) {
super(projectId);
setNamespace(namespace);
- this.pi = projectId;
- this.ns = namespace;
+ setDatabaseId(databaseId);
+ this.initialProjectId = projectId;
+ this.initialNamespace = namespace;
+ this.initialDatabaseId = databaseId;
}
public IncompleteKey newKey() {
ImmutableList path =
ImmutableList.builder().addAll(ancestors).add(PathElement.of(kind)).build();
- return new IncompleteKey(projectId, namespace, path);
+ return new IncompleteKey(projectId, namespace, databaseId, path);
}
public Key newKey(String name) {
@@ -50,7 +59,7 @@ public Key newKey(String name) {
.addAll(ancestors)
.add(PathElement.of(kind, name))
.build();
- return new Key(projectId, namespace, path);
+ return new Key(projectId, namespace, databaseId, path);
}
public Key newKey(long id) {
@@ -59,7 +68,7 @@ public Key newKey(long id) {
.addAll(ancestors)
.add(PathElement.of(kind, id))
.build();
- return new Key(projectId, namespace, path);
+ return new Key(projectId, namespace, databaseId, path);
}
/**
@@ -68,8 +77,9 @@ public Key newKey(long id) {
* @return {@code this} for chaining
*/
public KeyFactory reset() {
- setProjectId(pi);
- setNamespace(ns);
+ setProjectId(initialProjectId);
+ setNamespace(initialNamespace);
+ setDatabaseId(initialDatabaseId);
kind = null;
ancestors.clear();
return this;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
index 6170c0b8b..8fc731ace 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
@@ -53,6 +53,7 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults
com.google.datastore.v1.PartitionId.Builder pbBuilder =
com.google.datastore.v1.PartitionId.newBuilder();
pbBuilder.setProjectId(datastore.getOptions().getProjectId());
+ pbBuilder.setDatabaseId(datastore.getOptions().getDatabaseId());
if (namespace != null) {
pbBuilder.setNamespaceId(namespace);
} else if (datastore.getOptions().getNamespace() != null) {
@@ -72,6 +73,8 @@ private void sendRequest() {
com.google.datastore.v1.RunQueryRequest.newBuilder();
readOptionsPb.ifPresent(requestPb::setReadOptions);
requestPb.setPartitionId(partitionIdPb);
+ requestPb.setProjectId(datastore.getOptions().getProjectId());
+ requestPb.setDatabaseId(datastore.getOptions().getDatabaseId());
query.populatePb(requestPb);
runQueryResponsePb = datastore.runQuery(requestPb.build());
mostRecentQueryPb = requestPb.getQuery();
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java
index fc6c5e944..3b5e5e4e8 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java
@@ -67,6 +67,9 @@ public List getGeneratedKeys() {
com.google.datastore.v1.BeginTransactionRequest.Builder requestPb =
com.google.datastore.v1.BeginTransactionRequest.newBuilder();
+ requestPb.setProjectId(this.datastore.getOptions().getProjectId());
+ requestPb.setDatabaseId(this.datastore.getOptions().getDatabaseId());
+
if (options != null) {
requestPb.setTransactionOptions(options);
}
@@ -116,6 +119,8 @@ public Transaction.Response commit() {
requestPb.setMode(com.google.datastore.v1.CommitRequest.Mode.TRANSACTIONAL);
requestPb.setTransaction(transactionId);
requestPb.addAllMutations(mutationsPb);
+ requestPb.setProjectId(datastore.getOptions().getProjectId());
+ requestPb.setDatabaseId(datastore.getOptions().getDatabaseId());
com.google.datastore.v1.CommitResponse responsePb = datastore.commit(requestPb.build());
deactivate();
return new ResponseImpl(responsePb, toAddAutoId().size());
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java
index 4a6d99d54..f1c19d155 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java
@@ -35,7 +35,7 @@ private Validator() {
// utility class
}
- static String validateDatabase(String projectId) {
+ static String validateProjectId(String projectId) {
checkArgument(!Strings.isNullOrEmpty(projectId), "projectId can't be empty or null");
checkArgument(
PROJECT_ID_PATTERN.matcher(projectId).matches(),
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 8f4e51d6e..5c4fb3e5f 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
@@ -60,7 +60,8 @@ public RunAggregationQueryRequest prepare(
RunAggregationQueryRequest.Builder aggregationQueryRequestBuilder =
RunAggregationQueryRequest.newBuilder()
.setPartitionId(partitionId)
- .setProjectId(datastoreOptions.getProjectId());
+ .setProjectId(datastoreOptions.getProjectId())
+ .setDatabaseId(datastoreOptions.getDatabaseId());
if (aggregationQuery.getMode() == GQL) {
aggregationQueryRequestBuilder.setGqlQuery(buildGqlQuery(aggregationQuery));
@@ -92,7 +93,9 @@ private com.google.datastore.v1.AggregationQuery getAggregationQuery(
private PartitionId getPartitionId(AggregationQuery aggregationQuery) {
PartitionId.Builder builder =
- PartitionId.newBuilder().setProjectId(datastoreOptions.getProjectId());
+ PartitionId.newBuilder()
+ .setProjectId(datastoreOptions.getProjectId())
+ .setDatabaseId(datastoreOptions.getDatabaseId());
String namespace =
MoreObjects.firstNonNull(aggregationQuery.getNamespace(), datastoreOptions.getNamespace());
builder.setNamespaceId(namespace);
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java
index fd3cdc658..cfbbaa7df 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java
@@ -55,6 +55,7 @@ public HttpDatastoreRpc(DatastoreOptions options) {
com.google.datastore.v1.client.DatastoreOptions.Builder clientBuilder =
new com.google.datastore.v1.client.DatastoreOptions.Builder()
.projectId(options.getProjectId())
+ .databaseId(options.getDatabaseId())
.initializer(getHttpRequestInitializer(options, httpTransportOptions))
.transport(transport);
String normalizedHost = options.getHost() != null ? options.getHost().toLowerCase() : "";
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
index db4bd112e..26b892186 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
@@ -88,6 +88,13 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper {
}
}
+ private final DatastoreOptions.Builder optionsBuilder =
+ DatastoreOptions.newBuilder()
+ .setProjectId(getProjectId())
+ .setHost(DEFAULT_HOST + ":" + getPort())
+ .setCredentials(NoCredentials.getInstance())
+ .setRetrySettings(ServiceOptions.getNoRetrySettings());
+
/** A builder for {@code LocalDatastoreHelper} objects. */
public static class Builder {
private double consistency;
@@ -189,29 +196,27 @@ protected Logger getLogger() {
return LOGGER;
}
- private DatastoreOptions.Builder optionsBuilder() {
- return DatastoreOptions.newBuilder()
- .setProjectId(getProjectId())
- .setHost(DEFAULT_HOST + ":" + Integer.toString(getPort()))
- .setCredentials(NoCredentials.getInstance())
- .setRetrySettings(ServiceOptions.getNoRetrySettings());
- }
-
/**
* Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator on
* localhost.
*/
@Override
public DatastoreOptions getOptions() {
- return optionsBuilder().build();
+ return optionsBuilder.build();
}
/**
* Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator on
* localhost. The default namespace is set to {@code namespace}.
+ *
+ * Please use setNamespace and then build() instead.
*/
public DatastoreOptions getOptions(String namespace) {
- return optionsBuilder().setNamespace(namespace).build();
+ return optionsBuilder.setNamespace(namespace).build();
+ }
+
+ public DatastoreOptions.Builder setNamespace(String namespace) {
+ return optionsBuilder.setNamespace(namespace);
}
/** Returns the consistency setting for the local Datastore emulator. */
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
index 803400ea1..d8b5ad932 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
@@ -16,6 +16,7 @@
package com.google.cloud.datastore.testing;
+import com.google.api.core.BetaApi;
import com.google.api.core.InternalApi;
import com.google.api.gax.retrying.RetrySettings;
import com.google.cloud.datastore.Datastore;
@@ -74,11 +75,18 @@ public void deleteNamespace() {
/** Creates a {@code RemoteStorageHelper} object. */
public static RemoteDatastoreHelper create() {
+ return create("");
+ }
+
+ /** Creates a {@code RemoteStorageHelper} object. */
+ @BetaApi
+ public static RemoteDatastoreHelper create(String databaseId) {
HttpTransportOptions transportOptions = DatastoreOptions.getDefaultHttpTransportOptions();
transportOptions =
transportOptions.toBuilder().setConnectTimeout(60000).setReadTimeout(60000).build();
DatastoreOptions datastoreOption =
DatastoreOptions.newBuilder()
+ .setDatabaseId(databaseId)
.setNamespace(UUID.randomUUID().toString())
.setRetrySettings(retrySettings())
.setTransportOptions(transportOptions)
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
index ffa54970d..08b65bdc7 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
@@ -36,12 +36,16 @@ private class Builder extends BaseKey.Builder {
super(projectId, kind);
}
+ Builder(BaseKey copyFrom) {
+ super(copyFrom);
+ }
+
@Override
protected BaseKey build() {
ImmutableList.Builder path = ImmutableList.builder();
path.addAll(ancestors);
path.add(PathElement.of(kind));
- return new BaseKey(projectId, namespace, path.build()) {
+ return new BaseKey(projectId, namespace, databaseId, path.build()) {
@Override
protected BaseKey getParent() {
@@ -58,6 +62,17 @@ public void testProjectId() {
assertEquals("ds1", key.getProjectId());
key = builder.setProjectId("ds2").build();
assertEquals("ds2", key.getProjectId());
+ assertEquals("", key.getDatabaseId());
+ }
+
+ @Test
+ public void testDatabaseId() {
+ Builder builder = new Builder("ds1", "k").setDatabaseId("test-db");
+ BaseKey key = builder.build();
+ assertEquals("ds1", key.getProjectId());
+ key = builder.setProjectId("ds2").build();
+ assertEquals("ds2", key.getProjectId());
+ assertEquals("test-db", key.getDatabaseId());
}
@Test(expected = IllegalArgumentException.class)
@@ -120,4 +135,17 @@ public void testAncestors() throws Exception {
key = builder.addAncestor(path.get(1)).build();
assertEquals(path, key.getAncestors());
}
+
+ @Test
+ public void testCopyFrom() {
+ Builder copyFrom = new Builder("test-project", "kind").setDatabaseId("test-db");
+ Builder builder = new Builder(copyFrom.build());
+ BaseKey baseKey = builder.build();
+ assertEquals("test-project", baseKey.getProjectId());
+ assertEquals("test-db", baseKey.getDatabaseId());
+ assertEquals("kind", baseKey.getKind());
+ assertEquals("", baseKey.getNamespace());
+ assertEquals(new ArrayList<>(), baseKey.getAncestors());
+ assertEquals(PathElement.of("kind"), baseKey.getLeaf());
+ }
}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java
index 576ad74cd..010a892ae 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java
@@ -37,6 +37,7 @@ public void testNewKeyFactory() {
DatastoreOptions options = createMock(DatastoreOptions.class);
expect(options.getProjectId()).andReturn("ds1").once();
expect(options.getNamespace()).andReturn("ns1").once();
+ expect(options.getDatabaseId()).andReturn("test-db").once();
replay(options);
KeyFactory keyFactory = DatastoreHelper.newKeyFactory(options);
Key key = keyFactory.setKind("k").newKey("bla");
@@ -44,6 +45,7 @@ public void testNewKeyFactory() {
assertEquals("ns1", key.getNamespace());
assertEquals("k", key.getKind());
assertEquals("bla", key.getName());
+ assertEquals("test-db", key.getDatabaseId());
verify(options);
}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
index aabdc7af3..19dd3f0c0 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
@@ -32,11 +32,13 @@
public class DatastoreOptionsTest {
private static final String PROJECT_ID = "project-id";
+ private static final String DATABASE_ID = "database-id";
private static final int PORT = 8080;
private DatastoreRpcFactory datastoreRpcFactory;
private DatastoreRpc datastoreRpc;
private DatastoreOptions.Builder options;
+ // todo parameterize
@Before
public void setUp() {
datastoreRpcFactory = EasyMock.createMock(DatastoreRpcFactory.class);
@@ -45,6 +47,7 @@ public void setUp() {
DatastoreOptions.newBuilder()
.setServiceRpcFactory(datastoreRpcFactory)
.setProjectId(PROJECT_ID)
+ .setDatabaseId(DATABASE_ID)
.setHost("http://localhost/" + PORT);
EasyMock.expect(datastoreRpcFactory.create(EasyMock.anyObject(DatastoreOptions.class)))
.andReturn(datastoreRpc)
@@ -57,6 +60,11 @@ public void testProjectId() {
assertEquals(PROJECT_ID, options.build().getProjectId());
}
+ @Test
+ public void testDatabaseId() {
+ assertEquals(DATABASE_ID, options.build().getDatabaseId());
+ }
+
@Test
public void testHost() {
assertEquals("http://localhost/" + PORT, options.build().getHost());
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
index 7dc625bad..d0f00d79b 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
@@ -812,6 +812,7 @@ public void testEventualConsistencyQuery() {
RunQueryRequest.newBuilder()
.setReadOptions(readOption)
.setGqlQuery(query)
+ .setProjectId(PROJECT_ID)
.setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID).build());
EasyMock.expect(rpcMock.runQuery(expectedRequest.build()))
.andReturn(RunQueryResponse.newBuilder().build());
@@ -832,6 +833,7 @@ public void testReadTimeQuery() {
RunQueryRequest.newBuilder()
.setReadOptions(readOption)
.setGqlQuery(query)
+ .setProjectId(PROJECT_ID)
.setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID).build());
EasyMock.expect(rpcMock.runQuery(expectedRequest.build()))
.andReturn(RunQueryResponse.newBuilder().build());
@@ -902,7 +904,7 @@ public void testAllocateIdArray() {
@Test
public void testReserveIds() {
ReserveIdsRequest reserveIdsRequest =
- ReserveIdsRequest.newBuilder().addKeys(KEY1.toPb()).build();
+ ReserveIdsRequest.newBuilder().setProjectId(PROJECT_ID).addKeys(KEY1.toPb()).build();
EasyMock.expect(rpcMock.reserveIds(reserveIdsRequest))
.andReturn(ReserveIdsResponse.newBuilder().build())
.times(1);
@@ -962,7 +964,11 @@ public void testLookupEventualConsistency() {
.build())
.build();
LookupRequest lookupRequest =
- LookupRequest.newBuilder().setReadOptions(readOption).addKeys(key).build();
+ LookupRequest.newBuilder()
+ .setProjectId(PROJECT_ID)
+ .setReadOptions(readOption)
+ .addKeys(key)
+ .build();
EasyMock.expect(rpcMock.lookup(lookupRequest))
.andReturn(LookupResponse.newBuilder().build())
.times(3);
@@ -988,7 +994,11 @@ public void testLookupReadTime() {
.build())
.build();
LookupRequest lookupRequest =
- LookupRequest.newBuilder().setReadOptions(readOption).addKeys(key).build();
+ LookupRequest.newBuilder()
+ .setProjectId(PROJECT_ID)
+ .setReadOptions(readOption)
+ .addKeys(key)
+ .build();
EasyMock.expect(rpcMock.lookup(lookupRequest))
.andReturn(LookupResponse.newBuilder().build())
.times(3);
@@ -1069,14 +1079,17 @@ private Datastore createDatastoreForDeferredLookup() throws DatastoreException {
keysPb.add(KEY4.toPb());
keysPb.add(KEY5.toPb());
List lookupRequests = new ArrayList<>();
- lookupRequests.add(LookupRequest.newBuilder().addAllKeys(keysPb).build());
+ lookupRequests.add(
+ LookupRequest.newBuilder().setProjectId(PROJECT_ID).addAllKeys(keysPb).build());
lookupRequests.add(
LookupRequest.newBuilder()
+ .setProjectId(PROJECT_ID)
.addKeys(keysPb.get(1))
.addKeys(keysPb.get(2))
.addKeys(keysPb.get(4))
.build());
- lookupRequests.add(LookupRequest.newBuilder().addKeys(keysPb.get(4)).build());
+ lookupRequests.add(
+ LookupRequest.newBuilder().setProjectId(PROJECT_ID).addKeys(keysPb.get(4)).build());
Entity entity4 = Entity.newBuilder(KEY4).set("value", StringValue.of("value")).build();
Entity entity5 = Entity.newBuilder(KEY5).set("value", "value").build();
List lookupResponses = new ArrayList<>();
@@ -1201,7 +1214,8 @@ public void testKeyFactory() {
@Test
public void testRetryableException() {
- LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build();
+ LookupRequest requestPb =
+ LookupRequest.newBuilder().setProjectId(PROJECT_ID).addKeys(KEY1.toPb()).build();
LookupResponse responsePb =
LookupResponse.newBuilder()
.addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb()))
@@ -1221,6 +1235,7 @@ public void testRetryableExceptionForOperationWithTxn() {
ByteString txnBytes = ByteString.copyFromUtf8("txn1");
LookupRequest requestPb =
LookupRequest.newBuilder()
+ .setProjectId(PROJECT_ID)
.addKeys(KEY1.toPb())
.setReadOptions(ReadOptions.newBuilder().setTransaction(txnBytes).build())
.build();
@@ -1246,6 +1261,7 @@ public void testNonRetryableExceptionForOperationWithTxn() {
ByteString txnBytes = ByteString.copyFromUtf8("txn1");
LookupRequest requestPb =
LookupRequest.newBuilder()
+ .setProjectId(PROJECT_ID)
.addKeys(KEY1.toPb())
.setReadOptions(ReadOptions.newBuilder().setTransaction(txnBytes).build())
.build();
@@ -1268,7 +1284,8 @@ public void testNonRetryableExceptionForOperationWithTxn() {
@Test
public void testNonRetryableException() {
- LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build();
+ LookupRequest requestPb =
+ LookupRequest.newBuilder().setProjectId(PROJECT_ID).addKeys(KEY1.toPb()).build();
EasyMock.expect(rpcMock.lookup(requestPb))
.andThrow(
new DatastoreException(DatastoreException.UNKNOWN_CODE, "denied", "PERMISSION_DENIED"))
@@ -1286,7 +1303,8 @@ public void testNonRetryableException() {
@Test
public void testRuntimeException() {
- LookupRequest requestPb = LookupRequest.newBuilder().addKeys(KEY1.toPb()).build();
+ LookupRequest requestPb =
+ LookupRequest.newBuilder().setProjectId(PROJECT_ID).addKeys(KEY1.toPb()).build();
String exceptionMessage = "Artificial runtime exception";
EasyMock.expect(rpcMock.lookup(requestPb)).andThrow(new RuntimeException(exceptionMessage));
EasyMock.replay(rpcFactoryMock, rpcMock);
@@ -1345,6 +1363,26 @@ public void testQueryWithStartCursor() {
datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
}
+ @Test
+ public void testDatabaseIdKeyFactory() {
+ KeyFactory keyFactory = datastore.newKeyFactory().setKind(KIND1);
+
+ Key key1 = keyFactory.newKey("key1");
+ checkKeyProperties(key1);
+
+ Key key2 = keyFactory.newKey(123);
+ checkKeyProperties(key2);
+
+ IncompleteKey incompleteKey = keyFactory.newKey();
+ checkKeyProperties(incompleteKey);
+ }
+
+ private void checkKeyProperties(BaseKey key) {
+ assertEquals(options.getDatabaseId(), key.getDatabaseId());
+ assertEquals(options.getProjectId(), key.getProjectId());
+ assertEquals(options.getNamespace(), key.getNamespace());
+ }
+
private RunAggregationQueryResponse placeholderAggregationQueryResponse() {
Map result1 =
new HashMap<>(ImmutableMap.of("total_count", intValue(209)));
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java
index c3396a286..a1f8956b5 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java
@@ -25,8 +25,7 @@
public class IncompleteKeyTest {
- private static IncompleteKey pk1, pk2;
- private static IncompleteKey deprecatedPk1, deprecatedPk2;
+ private static IncompleteKey pk1, pk2, pk4;
private static Key parent1;
@Before
@@ -34,23 +33,32 @@ public void setUp() {
pk1 = IncompleteKey.newBuilder("ds", "kind1").build();
parent1 = Key.newBuilder("ds", "kind2", 10).setNamespace("ns").build();
pk2 = IncompleteKey.newBuilder(parent1, "kind3").build();
+ pk4 = IncompleteKey.newBuilderWithDatabaseId("ds", "kind3", "test-db").build();
}
@Test
public void testBuilders() {
assertEquals("ds", pk1.getProjectId());
+ assertEquals("", pk1.getDatabaseId());
assertEquals("kind1", pk1.getKind());
assertTrue(pk1.getAncestors().isEmpty());
assertEquals("ds", pk2.getProjectId());
+ assertEquals("", pk2.getDatabaseId());
assertEquals("kind3", pk2.getKind());
assertEquals(parent1.getPath(), pk2.getAncestors());
assertEquals(pk2, IncompleteKey.newBuilder(pk2).build());
IncompleteKey pk3 = IncompleteKey.newBuilder(pk2).setKind("kind4").build();
assertEquals("ds", pk3.getProjectId());
+ assertEquals("", pk3.getDatabaseId());
assertEquals("kind4", pk3.getKind());
assertEquals(parent1.getPath(), pk3.getAncestors());
+
+ assertEquals("ds", pk4.getProjectId());
+ assertEquals("test-db", pk4.getDatabaseId());
+ assertEquals("kind3", pk4.getKind());
+ assertTrue(pk4.getAncestors().isEmpty());
}
@Test
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java
index 26c922e5a..37017c28e 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java
@@ -26,13 +26,13 @@
public class KeyFactoryTest {
private static final String PROJECT_ID = "projectid";
+ private static final String DATABASE_ID = "database-id";
private KeyFactory keyFactory;
- private KeyFactory deprecatedKeyFactory;
@Before
public void setUp() {
- keyFactory = new KeyFactory(PROJECT_ID).setKind("k");
+ keyFactory = new KeyFactory(PROJECT_ID).setDatabaseId(DATABASE_ID).setKind("k");
}
@Test
@@ -40,11 +40,13 @@ public void testReset() {
IncompleteKey key =
keyFactory
.setProjectId("ds1")
+ .setDatabaseId("db")
.setNamespace("ns1")
.addAncestor(PathElement.of("p", 1))
.build();
assertEquals("k", key.getKind());
assertEquals("ds1", key.getProjectId());
+ assertEquals("db", key.getDatabaseId());
assertEquals("ns1", key.getNamespace());
assertEquals(1, key.getAncestors().size());
@@ -58,12 +60,59 @@ public void testReset() {
key = keyFactory.newKey();
assertEquals("k1", key.getKind());
assertEquals(PROJECT_ID, key.getProjectId());
+ assertEquals("", key.getDatabaseId());
assertTrue(key.getNamespace().isEmpty());
assertTrue(key.getAncestors().isEmpty());
keyFactory = new KeyFactory(PROJECT_ID, "ns1").setKind("k");
key = keyFactory.newKey();
assertEquals(PROJECT_ID, key.getProjectId());
+ assertEquals("", key.getDatabaseId());
+ assertEquals("ns1", key.getNamespace());
+ key = keyFactory.setProjectId("bla1").setNamespace("bla2").build();
+ assertEquals("bla1", key.getProjectId());
+ assertEquals("bla2", key.getNamespace());
+ keyFactory.reset().setKind("kind");
+ key = keyFactory.newKey();
+ assertEquals(PROJECT_ID, key.getProjectId());
+ assertEquals("ns1", key.getNamespace());
+ assertEquals("kind", key.getKind());
+ }
+
+ @Test
+ public void testCreatedWithDbId() {
+ KeyFactory keyFactory = new KeyFactory(PROJECT_ID, "namespace", DATABASE_ID).setKind("k");
+ IncompleteKey key =
+ keyFactory
+ .setProjectId("ds1")
+ .setDatabaseId("db")
+ .setNamespace("ns1")
+ .addAncestor(PathElement.of("p", 1))
+ .build();
+ assertEquals("k", key.getKind());
+ assertEquals("ds1", key.getProjectId());
+ assertEquals("db", key.getDatabaseId());
+ assertEquals("ns1", key.getNamespace());
+ assertEquals(1, key.getAncestors().size());
+
+ keyFactory.reset();
+ try {
+ keyFactory.newKey(1);
+ } catch (NullPointerException ex) {
+ assertEquals("kind must not be null", ex.getMessage());
+ }
+ keyFactory.setKind("k1");
+ key = keyFactory.newKey();
+ assertEquals("k1", key.getKind());
+ assertEquals(PROJECT_ID, key.getProjectId());
+ assertEquals(DATABASE_ID, key.getDatabaseId());
+ assertEquals("namespace", key.getNamespace());
+ assertTrue(key.getAncestors().isEmpty());
+
+ keyFactory = new KeyFactory(PROJECT_ID, "ns1").setKind("k");
+ key = keyFactory.newKey();
+ assertEquals(PROJECT_ID, key.getProjectId());
+ assertEquals("", key.getDatabaseId());
assertEquals("ns1", key.getNamespace());
key = keyFactory.setProjectId("bla1").setNamespace("bla2").build();
assertEquals("bla1", key.getProjectId());
@@ -115,6 +164,7 @@ private void verifyKey(Key key, Long id, String namespace, PathElement... ancest
private void verifyIncompleteKey(IncompleteKey key, String namespace, PathElement... ancestors) {
assertEquals("k", key.getKind());
assertEquals(PROJECT_ID, key.getProjectId());
+ assertEquals(DATABASE_ID, key.getDatabaseId());
assertEquals(namespace, key.getNamespace());
assertEquals(ancestors.length, key.getAncestors().size());
Iterator iter = key.getAncestors().iterator();
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java
index d6e3b4d8f..cb3d13fdb 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java
@@ -76,4 +76,14 @@ public void testToAndFromUrlSafe() {
Key copy = Key.fromUrlSafe(urlSafe);
assertEquals(key, copy);
}
+
+ @Test
+ public void testDatabaseId() {
+ Key.Builder builder = Key.newBuilder("project-id", "kind", "name", "database-id");
+ Key key = builder.build();
+ assertEquals("database-id", key.getDatabaseId());
+ assertEquals("project-id", key.getProjectId());
+ assertEquals("name", key.getName());
+ assertEquals("kind", key.getKind());
+ }
}
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 934e3a4c7..5fbb35b6e 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
@@ -49,8 +49,13 @@ public class AggregationQueryRequestProtoPreparerTest {
private static final String KIND = "Task";
private static final String NAMESPACE = "ns";
private static final String PROJECT_ID = "project-id";
+ private static final String DATABASE_ID = "database-id";
private static final DatastoreOptions DATASTORE_OPTIONS =
- DatastoreOptions.newBuilder().setProjectId(PROJECT_ID).setNamespace(NAMESPACE).build();
+ DatastoreOptions.newBuilder()
+ .setProjectId(PROJECT_ID)
+ .setDatabaseId(DATABASE_ID)
+ .setNamespace(NAMESPACE)
+ .build();
private static final EntityQuery COMPLETED_TASK_STRUCTURED_QUERY =
Query.newEntityQueryBuilder()
.setNamespace(NAMESPACE)
@@ -89,6 +94,7 @@ public void shouldPrepareAggregationQueryRequestWithGivenStructuredQuery() {
protoPreparer.prepare(QueryAndReadOptions.create(AGGREGATION_OVER_STRUCTURED_QUERY));
assertThat(runAggregationQueryRequest.getProjectId()).isEqualTo(PROJECT_ID);
+ assertThat(runAggregationQueryRequest.getDatabaseId()).isEqualTo(DATABASE_ID);
assertThat(runAggregationQueryRequest.getPartitionId().getProjectId()).isEqualTo(PROJECT_ID);
assertThat(runAggregationQueryRequest.getPartitionId().getNamespaceId()).isEqualTo(NAMESPACE);
@@ -111,8 +117,10 @@ public void shouldPrepareAggregationQueryRequestWithGivenGqlQuery() {
protoPreparer.prepare(QueryAndReadOptions.create(AGGREGATION_OVER_GQL_QUERY));
assertThat(runAggregationQueryRequest.getProjectId()).isEqualTo(PROJECT_ID);
+ assertThat(runAggregationQueryRequest.getDatabaseId()).isEqualTo(DATABASE_ID);
assertThat(runAggregationQueryRequest.getPartitionId().getProjectId()).isEqualTo(PROJECT_ID);
+ assertThat(runAggregationQueryRequest.getPartitionId().getDatabaseId()).isEqualTo(DATABASE_ID);
assertThat(runAggregationQueryRequest.getPartitionId().getNamespaceId()).isEqualTo(NAMESPACE);
com.google.datastore.v1.GqlQuery gqlQueryProto = runAggregationQueryRequest.getGqlQuery();
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
index 3a5ccabac..e66e8d91c 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
@@ -65,7 +65,6 @@
import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
import com.google.cloud.datastore.TimestampValue;
import com.google.cloud.datastore.Transaction;
-import com.google.cloud.datastore.Value;
import com.google.cloud.datastore.ValueType;
import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
import com.google.common.base.Preconditions;
@@ -73,6 +72,7 @@
import com.google.datastore.v1.TransactionOptions;
import com.google.datastore.v1.TransactionOptions.ReadOnly;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
@@ -89,14 +89,26 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.Timeout;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+@RunWith(Parameterized.class)
public class ITDatastoreTest {
private static final RemoteDatastoreHelper HELPER = RemoteDatastoreHelper.create();
- private static final DatastoreOptions OPTIONS = HELPER.getOptions();
- private static final Datastore DATASTORE = OPTIONS.getService();
- private static final String PROJECT_ID = OPTIONS.getProjectId();
- private static final String NAMESPACE = OPTIONS.getNamespace();
+ private static final DatastoreOptions OPTIONS_1 = HELPER.getOptions();
+ private static final Datastore DATASTORE_1 = OPTIONS_1.getService();
+
+ private static final String CUSTOM_DB_ID = "test-db";
+ private static final RemoteDatastoreHelper HELPER2 = RemoteDatastoreHelper.create(CUSTOM_DB_ID);
+ private static final DatastoreOptions OPTIONS_2 = HELPER2.getOptions();
+ private static final Datastore DATASTORE_2 = OPTIONS_2.getService();
+
+ private final DatastoreOptions options;
+ private final Datastore datastore;
+
+ private static String PROJECT_ID;
+ private static String NAMESPACE;
private static final String KIND1 = "kind1";
private static final String KIND2 = "kind2";
private static final String KIND3 = "kind3";
@@ -104,70 +116,27 @@ public class ITDatastoreTest {
private static final StringValue STR_VALUE = StringValue.of("str");
private static final BooleanValue BOOL_VALUE =
BooleanValue.newBuilder(false).setExcludeFromIndexes(true).build();
- private static final Key ROOT_KEY =
- Key.newBuilder(PROJECT_ID, "rootkey", "default").setNamespace(NAMESPACE).build();
- private static final IncompleteKey INCOMPLETE_KEY1 =
- IncompleteKey.newBuilder(ROOT_KEY, KIND1).setNamespace(NAMESPACE).build();
- private static final IncompleteKey INCOMPLETE_KEY2 =
- IncompleteKey.newBuilder(PROJECT_ID, KIND2).setNamespace(NAMESPACE).build();
- private static final Key KEY1 = Key.newBuilder(INCOMPLETE_KEY1, "name").build();
- private static final Key KEY2 = Key.newBuilder(KEY1, KIND2, 1).build();
- private static final Key KEY3 =
- Key.newBuilder(KEY2).setName("bla").setNamespace(NAMESPACE).build();
- private static final Key KEY4 =
- Key.newBuilder(KEY2).setName("newName1").setNamespace(NAMESPACE).build();
- private static final Key KEY5 =
- Key.newBuilder(KEY2).setName("newName2").setNamespace(NAMESPACE).build();
- private static final KeyValue KEY_VALUE = KeyValue.of(KEY1);
+ private static final ListValue EMPTY_LIST_VALUE = ListValue.of(Collections.emptyList());
private static final ListValue LIST_VALUE1 =
ListValue.newBuilder().addValue(NULL_VALUE).addValue(STR_VALUE, BOOL_VALUE).build();
- private static final ListValue LIST_VALUE2 = ListValue.of(Collections.singletonList(KEY_VALUE));
- private static final ListValue EMPTY_LIST_VALUE = ListValue.of(Collections.>emptyList());
private static final TimestampValue TIMESTAMP_VALUE = new TimestampValue(Timestamp.now());
private static final LatLngValue LAT_LNG_VALUE =
new LatLngValue(LatLng.of(37.422035, -122.084124));
- private static final FullEntity PARTIAL_ENTITY1 =
- FullEntity.newBuilder(INCOMPLETE_KEY2)
- .set("str", STR_VALUE)
- .set("bool", BOOL_VALUE)
- .set("list", LIST_VALUE1)
- .build();
- private static final FullEntity PARTIAL_ENTITY2 =
- FullEntity.newBuilder(PARTIAL_ENTITY1)
- .remove("str")
- .set("bool", true)
- .set("list", LIST_VALUE1.get())
- .build();
- private static final FullEntity PARTIAL_ENTITY3 =
- FullEntity.newBuilder(PARTIAL_ENTITY1)
- .setKey(IncompleteKey.newBuilder(PROJECT_ID, KIND3).build())
- .build();
- private static final Entity ENTITY1 =
- Entity.newBuilder(KEY1)
- .set("str", STR_VALUE)
- .set("date", TIMESTAMP_VALUE)
- .set("latLng", LAT_LNG_VALUE)
- .set("bool", BOOL_VALUE)
- .set("partial1", EntityValue.of(PARTIAL_ENTITY1))
- .set("list", LIST_VALUE2)
- .set("emptyList", EMPTY_LIST_VALUE)
- .build();
- private static final Entity ENTITY2 =
- Entity.newBuilder(ENTITY1)
- .setKey(KEY2)
- .remove("str")
- .set("name", "Dan")
- .setNull("null")
- .set("age", 20)
- .build();
- private static final Entity ENTITY3 =
- Entity.newBuilder(ENTITY1)
- .setKey(KEY3)
- .remove("str")
- .set("null", NULL_VALUE)
- .set("partial1", PARTIAL_ENTITY2)
- .set("partial2", ENTITY2)
- .build();
+
+ private static Key ROOT_KEY;
+ private static IncompleteKey INCOMPLETE_KEY1;
+ private static ListValue LIST_VALUE2;
+ private static Key KEY1;
+ private static Key KEY2;
+ private static Key KEY3;
+ private static Key KEY4;
+ private static Key KEY5;
+ private static FullEntity PARTIAL_ENTITY1;
+ private static FullEntity PARTIAL_ENTITY2;
+ private static FullEntity PARTIAL_ENTITY3;
+ private static Entity ENTITY1;
+ private static Entity ENTITY2;
+ private static Entity ENTITY3;
@Rule public Timeout globalTimeout = Timeout.seconds(100);
@@ -178,32 +147,116 @@ public static void afterClass() {
HELPER.deleteNamespace();
}
+ public ITDatastoreTest(
+ DatastoreOptions options,
+ Datastore datastore,
+ // databaseType is unused as a variable, but used as a parameterized label when running tests
+ String databaseType) {
+ this.options = options;
+ this.datastore = datastore;
+
+ PROJECT_ID = this.options.getProjectId();
+ NAMESPACE = this.options.getNamespace();
+
+ ROOT_KEY =
+ Key.newBuilder(PROJECT_ID, "rootkey", "default", options.getDatabaseId())
+ .setNamespace(NAMESPACE)
+ .build();
+ INCOMPLETE_KEY1 = IncompleteKey.newBuilder(ROOT_KEY, KIND1).setNamespace(NAMESPACE).build();
+
+ IncompleteKey INCOMPLETE_KEY2 =
+ IncompleteKey.newBuilder(PROJECT_ID, KIND2)
+ .setDatabaseId(options.getDatabaseId())
+ .setNamespace(NAMESPACE)
+ .build();
+
+ KEY1 = Key.newBuilder(INCOMPLETE_KEY1, "name").build();
+ KEY2 = Key.newBuilder(KEY1, KIND2, 1).build();
+ KEY3 = Key.newBuilder(KEY2).setName("bla").setNamespace(NAMESPACE).build();
+ KEY4 = Key.newBuilder(KEY2).setName("newName1").setNamespace(NAMESPACE).build();
+ KEY5 = Key.newBuilder(KEY2).setName("newName2").setNamespace(NAMESPACE).build();
+
+ LIST_VALUE2 = ListValue.of(Collections.singletonList(KeyValue.of(KEY1)));
+
+ PARTIAL_ENTITY1 =
+ FullEntity.newBuilder(INCOMPLETE_KEY2)
+ .set("str", STR_VALUE)
+ .set("bool", BOOL_VALUE)
+ .set("list", LIST_VALUE1)
+ .build();
+ PARTIAL_ENTITY2 =
+ FullEntity.newBuilder(PARTIAL_ENTITY1)
+ .remove("str")
+ .set("bool", true)
+ .set("list", LIST_VALUE1.get())
+ .build();
+ PARTIAL_ENTITY3 =
+ FullEntity.newBuilder(PARTIAL_ENTITY1)
+ .setKey(
+ IncompleteKey.newBuilder(PROJECT_ID, KIND3)
+ .setDatabaseId(options.getDatabaseId())
+ .build())
+ .build();
+ ENTITY1 =
+ Entity.newBuilder(KEY1)
+ .set("str", STR_VALUE)
+ .set("date", TIMESTAMP_VALUE)
+ .set("latLng", LAT_LNG_VALUE)
+ .set("bool", BOOL_VALUE)
+ .set("partial1", EntityValue.of(PARTIAL_ENTITY1))
+ .set("list", LIST_VALUE2)
+ .set("emptyList", EMPTY_LIST_VALUE)
+ .build();
+ ENTITY2 =
+ Entity.newBuilder(ENTITY1)
+ .setKey(KEY2)
+ .remove("str")
+ .set("name", "Dan")
+ .setNull("null")
+ .set("age", 20)
+ .build();
+ ENTITY3 =
+ Entity.newBuilder(ENTITY1)
+ .setKey(KEY3)
+ .remove("str")
+ .set("null", NULL_VALUE)
+ .set("partial1", PARTIAL_ENTITY2)
+ .set("partial2", ENTITY2)
+ .build();
+ }
+
@Before
public void setUp() {
- DATASTORE.put(ENTITY1, ENTITY2);
+ datastore.put(ENTITY1, ENTITY2);
}
@After
public void tearDown() {
EntityQuery allEntitiesQuery = Query.newEntityQueryBuilder().build();
- QueryResults allEntities = DATASTORE.run(allEntitiesQuery);
+ QueryResults allEntities = datastore.run(allEntitiesQuery);
Key[] keysToDelete =
ImmutableList.copyOf(allEntities).stream().map(Entity::getKey).toArray(Key[]::new);
- DATASTORE.delete(keysToDelete);
+ datastore.delete(keysToDelete);
+ }
+
+ @Parameterized.Parameters(name = "database: {2}")
+ public static Iterable data() {
+ return Arrays.asList(
+ new Object[][] {{OPTIONS_1, DATASTORE_1, "default"}, {OPTIONS_2, DATASTORE_2, "test-db"}});
}
private Iterator getStronglyConsistentResults(Query scQuery, Query query)
throws InterruptedException {
// scQuery is equivalent to query, but with an ancestor filter in it
// this makes scQuery strongly consistent
- QueryResults scResults = DATASTORE.run(scQuery);
+ QueryResults scResults = datastore.run(scQuery);
List scResultsCopy = makeResultsCopy(scResults);
Set scResultsSet = new HashSet<>(scResultsCopy);
int maxAttempts = 20;
while (maxAttempts > 0) {
--maxAttempts;
- QueryResults results = DATASTORE.run(query);
+ QueryResults results = datastore.run(query);
List resultsCopy = makeResultsCopy(results);
Set resultsSet = new HashSet<>(resultsCopy);
if (scResultsSet.size() == resultsSet.size() && scResultsSet.containsAll(resultsSet)) {
@@ -236,7 +289,7 @@ public void orQuery() {
.setNull("null")
.set("age", 19)
.build();
- DATASTORE.put(entity3);
+ datastore.put(entity3);
// age == 19 || age == 20
CompositeFilter orFilter =
@@ -247,7 +300,7 @@ public void orQuery() {
.setKind(KIND2)
.setFilter(orFilter)
.build();
- QueryResults results = DATASTORE.run(simpleOrQuery);
+ QueryResults results = datastore.run(simpleOrQuery);
assertTrue(results.hasNext());
assertEquals(ENTITY2, results.next());
assertTrue(results.hasNext());
@@ -262,7 +315,7 @@ public void orQuery() {
.setFilter(orFilter)
.setLimit(1)
.build();
- QueryResults results2 = DATASTORE.run(simpleOrQueryLimit);
+ QueryResults results2 = datastore.run(simpleOrQueryLimit);
assertTrue(results2.hasNext());
assertEquals(ENTITY2, results2.next());
assertFalse(results2.hasNext());
@@ -280,7 +333,7 @@ public void orQuery() {
.setKind(KIND2)
.setFilter(compositeFilter)
.build();
- QueryResults results3 = DATASTORE.run(orQueryNested);
+ QueryResults results3 = datastore.run(orQueryNested);
assertTrue(results3.hasNext());
assertEquals(ENTITY2, results3.next());
assertFalse(results3.hasNext());
@@ -298,7 +351,7 @@ public void orQuery() {
.setFilter(ancestorAndFilter)
.setLimit(1)
.build();
- QueryResults results4 = DATASTORE.run(orQueryNested2);
+ QueryResults results4 = datastore.run(orQueryNested2);
assertTrue(results4.hasNext());
assertEquals(ENTITY2, results4.next());
assertFalse(results4.hasNext());
@@ -306,7 +359,7 @@ public void orQuery() {
@Test
public void testNewTransactionCommit() {
- Transaction transaction = DATASTORE.newTransaction();
+ Transaction transaction = datastore.newTransaction();
transaction.add(ENTITY3);
Entity entity2 = Entity.newBuilder(ENTITY2).clear().setNull("bla").build();
transaction.update(entity2);
@@ -314,7 +367,7 @@ public void testNewTransactionCommit() {
transaction.commit();
assertFalse(transaction.isActive());
- List list = DATASTORE.fetch(KEY1, KEY2, KEY3);
+ List list = datastore.fetch(KEY1, KEY2, KEY3);
assertNull(list.get(0));
assertEquals(entity2, list.get(1));
assertEquals(ENTITY3, list.get(2));
@@ -338,20 +391,20 @@ public void testNewTransactionCommit() {
@Test
public void testTransactionWithRead() throws Exception {
StatementExecutor statementExecutor = new StatementExecutor();
- Transaction baseTransaction = DATASTORE.newTransaction();
+ Transaction baseTransaction = datastore.newTransaction();
assertNull(baseTransaction.get(KEY3));
baseTransaction.add(ENTITY3);
baseTransaction.commit();
- assertEquals(ENTITY3, DATASTORE.get(KEY3));
+ assertEquals(ENTITY3, datastore.get(KEY3));
- Transaction transaction = DATASTORE.newTransaction();
+ Transaction transaction = datastore.newTransaction();
statementExecutor.execute(
Tuple.of("T1", () -> assertEquals(ENTITY3, transaction.get(KEY3))),
// update entity3 during the transaction, will be blocked in case of pessimistic concurrency
Tuple.of(
"T2",
() ->
- DATASTORE.put(Entity.newBuilder(ENTITY3).clear().set("from", "datastore").build())),
+ datastore.put(Entity.newBuilder(ENTITY3).clear().set("from", "datastore").build())),
Tuple.of(
"T1",
() ->
@@ -379,16 +432,16 @@ public void testTransactionWithQuery() throws Exception {
.setFilter(PropertyFilter.hasAncestor(KEY2))
.setNamespace(NAMESPACE)
.build();
- Transaction baseTransaction = DATASTORE.newTransaction();
+ Transaction baseTransaction = datastore.newTransaction();
QueryResults baseResults = baseTransaction.run(query);
assertTrue(baseResults.hasNext());
assertEquals(ENTITY2, baseResults.next());
assertFalse(baseResults.hasNext());
baseTransaction.add(ENTITY3);
baseTransaction.commit();
- assertEquals(ENTITY3, DATASTORE.get(KEY3));
+ assertEquals(ENTITY3, datastore.get(KEY3));
- Transaction transaction = DATASTORE.newTransaction();
+ Transaction transaction = datastore.newTransaction();
statementExecutor.execute(
Tuple.of(
"T1",
@@ -400,7 +453,7 @@ public void testTransactionWithQuery() throws Exception {
}),
Tuple.of("T1", () -> transaction.delete(ENTITY3.getKey())),
// update entity2 during the transaction, will be blocked in case of pessimistic concurrency
- Tuple.of("T2", () -> DATASTORE.put(Entity.newBuilder(ENTITY2).clear().build())),
+ Tuple.of("T2", () -> datastore.put(Entity.newBuilder(ENTITY2).clear().build())),
Tuple.of("T1", transaction::commit) // T1 will throw error in case of optimistic concurrency
);
@@ -416,7 +469,7 @@ public void testTransactionWithQuery() throws Exception {
@Test
public void testNewTransactionRollback() {
- Transaction transaction = DATASTORE.newTransaction();
+ Transaction transaction = datastore.newTransaction();
transaction.add(ENTITY3);
Entity entity2 =
Entity.newBuilder(ENTITY2)
@@ -436,7 +489,7 @@ public void testNewTransactionRollback() {
assertEquals("FAILED_PRECONDITION", expected.getReason());
}
- List list = DATASTORE.fetch(KEY1, KEY2, KEY3);
+ List list = datastore.fetch(KEY1, KEY2, KEY3);
assertEquals(ENTITY1, list.get(0));
assertEquals(ENTITY2, list.get(1));
assertNull(list.get(2));
@@ -445,7 +498,7 @@ public void testNewTransactionRollback() {
@Test
public void testNewBatch() {
- Batch batch = DATASTORE.newBatch();
+ Batch batch = datastore.newBatch();
Entity entity1 = Entity.newBuilder(ENTITY1).clear().build();
Entity entity2 = Entity.newBuilder(ENTITY2).clear().setNull("bla").build();
Entity entity4 = Entity.newBuilder(KEY4).set("value", StringValue.of("value")).build();
@@ -468,7 +521,7 @@ public void testNewBatch() {
Batch.Response response = batch.submit();
entities =
- DATASTORE.fetch(KEY1, KEY2, KEY3, entity4.getKey(), entity5.getKey(), entity6.getKey());
+ datastore.fetch(KEY1, KEY2, KEY3, entity4.getKey(), entity5.getKey(), entity6.getKey());
assertEquals(entity1, entities.get(0));
assertEquals(entity2, entities.get(1));
assertEquals(ENTITY3, entities.get(2));
@@ -478,7 +531,7 @@ public void testNewBatch() {
assertEquals(6, entities.size());
List generatedKeys = response.getGeneratedKeys();
assertEquals(1, generatedKeys.size());
- assertEquals(PARTIAL_ENTITY3.getNames(), DATASTORE.get(generatedKeys.get(0)).getNames());
+ assertEquals(PARTIAL_ENTITY3.getNames(), datastore.get(generatedKeys.get(0)).getNames());
assertEquals(PARTIAL_ENTITY3.getKey(), IncompleteKey.newBuilder(generatedKeys.get(0)).build());
try {
@@ -488,12 +541,12 @@ public void testNewBatch() {
assertEquals("FAILED_PRECONDITION", expected.getReason());
}
- batch = DATASTORE.newBatch();
+ batch = datastore.newBatch();
batch.delete(entity4.getKey(), entity5.getKey(), entity6.getKey());
batch.update(ENTITY1, ENTITY2, ENTITY3);
batch.submit();
entities =
- DATASTORE.fetch(KEY1, KEY2, KEY3, entity4.getKey(), entity5.getKey(), entity6.getKey());
+ datastore.fetch(KEY1, KEY2, KEY3, entity4.getKey(), entity5.getKey(), entity6.getKey());
assertEquals(ENTITY1, entities.get(0));
assertEquals(ENTITY2, entities.get(1));
assertEquals(ENTITY3, entities.get(2));
@@ -522,7 +575,7 @@ public void testRunGqlQueryNoCasting() throws InterruptedException {
assertEquals(ENTITY1, results1.next());
assertFalse(results1.hasNext());
- DATASTORE.put(ENTITY3);
+ datastore.put(ENTITY3);
Query query2 =
Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from " + KIND2 + " order by __key__")
.setNamespace(NAMESPACE)
@@ -589,7 +642,7 @@ public void testRunGqlQueryNoCasting() throws InterruptedException {
assertEquals(KEY1, projectionEntity.getKey());
assertTrue(projectionEntity.getNames().isEmpty());
assertFalse(keyProjectionResult.hasNext());
- DATASTORE.delete(ENTITY3.getKey());
+ datastore.delete(ENTITY3.getKey());
}
@Test
@@ -612,7 +665,7 @@ public void testRunGqlQueryWithCasting() throws InterruptedException {
Query query2 =
Query.newGqlQueryBuilder("select * from " + KIND1).setNamespace(NAMESPACE).build();
- QueryResults results2 = DATASTORE.run(query2);
+ QueryResults results2 = datastore.run(query2);
assertSame(Entity.class, results2.getResultClass());
@@ -767,11 +820,11 @@ public void testRunAggregationQueryInTransactionShouldReturnAConsistentSnapshot(
.build();
// original entity count is 2
- assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get("count"))
+ assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).get("count"))
.isEqualTo(2L);
// FIRST TRANSACTION
- DATASTORE.runInTransaction(
+ datastore.runInTransaction(
(TransactionCallable)
inFirstTransaction -> {
// creating a new entity
@@ -784,16 +837,16 @@ public void testRunAggregationQueryInTransactionShouldReturnAConsistentSnapshot(
getOnlyElement(inFirstTransaction.runAggregation(aggregationQuery))
.get("count"))
.isEqualTo(2L);
- assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get("count"))
+ assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).get("count"))
.isEqualTo(2L);
return null;
});
// after first transaction is committed, count is updated to 3 now.
- assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get("count"))
+ assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).get("count"))
.isEqualTo(3L);
// SECOND TRANSACTION
- DATASTORE.runInTransaction(
+ datastore.runInTransaction(
(TransactionCallable)
inSecondTransaction -> {
// deleting ENTITY2
@@ -804,14 +857,14 @@ public void testRunAggregationQueryInTransactionShouldReturnAConsistentSnapshot(
getOnlyElement(inSecondTransaction.runAggregation(aggregationQuery))
.get("count"))
.isEqualTo(3L);
- assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get("count"))
+ assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).get("count"))
.isEqualTo(3L);
return null;
});
// after second transaction is committed, count is updated to 2 now.
- assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get("count"))
+ assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).get("count"))
.isEqualTo(2L);
- DATASTORE.delete(newEntityKey);
+ datastore.delete(newEntityKey);
}
@Test
@@ -832,7 +885,7 @@ public void testRunAggregationQueryInAReadOnlyTransactionShouldNotLockTheCounted
TransactionOptions transactionOptions =
TransactionOptions.newBuilder().setReadOnly(ReadOnly.newBuilder().build()).build();
- Transaction readOnlyTransaction = DATASTORE.newTransaction(transactionOptions);
+ Transaction readOnlyTransaction = datastore.newTransaction(transactionOptions);
// Executing query in transaction
assertThat(getOnlyElement(readOnlyTransaction.runAggregation(aggregationQuery)).get("count"))
@@ -847,7 +900,7 @@ public void testRunAggregationQueryInAReadOnlyTransactionShouldNotLockTheCounted
.setKey(Key.newBuilder(KEY1, "newKind", "name-01").build())
.set("v_int", 10)
.build();
- DATASTORE.put(aNewEntity);
+ datastore.put(aNewEntity);
return null;
});
@@ -858,7 +911,7 @@ public void testRunAggregationQueryInAReadOnlyTransactionShouldNotLockTheCounted
readOnlyTransaction.commit();
executor.shutdownNow();
- assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get("count"))
+ assertThat(getOnlyElement(datastore.runAggregation(aggregationQuery)).get("count"))
.isEqualTo(3L);
}
@@ -991,7 +1044,7 @@ public void testInNotInNeqFilters() throws InterruptedException {
.setKey(Key.newBuilder(INCOMPLETE_KEY1, "e2").build())
.set("v_int", 20)
.build();
- DATASTORE.put(e1, e2);
+ datastore.put(e1, e2);
Query queryIn =
Query.newEntityQueryBuilder()
@@ -1061,21 +1114,21 @@ public void testInNotInNeqFilters() throws InterruptedException {
PropertyFilter.eq("v_int", 10000)))
.build();
- QueryResults run = DATASTORE.run(scQueryInEqOr);
+ QueryResults run = datastore.run(scQueryInEqOr);
assertTrue(run.hasNext());
assertEquals(e1, run.next());
assertFalse(run.hasNext());
- DATASTORE.delete(e1.getKey());
- DATASTORE.delete(e2.getKey());
+ datastore.delete(e1.getKey());
+ datastore.delete(e2.getKey());
}
@Test
public void testAllocateId() {
- KeyFactory keyFactory = DATASTORE.newKeyFactory().setKind(KIND1);
+ KeyFactory keyFactory = datastore.newKeyFactory().setKind(KIND1);
IncompleteKey pk1 = keyFactory.newKey();
- Key key1 = DATASTORE.allocateId(pk1);
+ Key key1 = datastore.allocateId(pk1);
assertEquals(key1.getProjectId(), pk1.getProjectId());
assertEquals(key1.getNamespace(), pk1.getNamespace());
assertEquals(key1.getAncestors(), pk1.getAncestors());
@@ -1084,27 +1137,31 @@ public void testAllocateId() {
assertFalse(key1.hasName());
assertEquals(Key.newBuilder(pk1, key1.getId()).build(), key1);
- Key key2 = DATASTORE.allocateId(pk1);
+ Key key2 = datastore.allocateId(pk1);
assertNotEquals(key1, key2);
assertEquals(Key.newBuilder(pk1, key2.getId()).build(), key2);
}
@Test
public void testReserveIds() {
- KeyFactory keyFactory = DATASTORE.newKeyFactory().setKind("MyKind");
+ KeyFactory keyFactory = datastore.newKeyFactory().setKind("MyKind");
Key key1 = keyFactory.newKey(10);
Key key2 = keyFactory.newKey("name");
- List keyList = DATASTORE.reserveIds(key1, key2);
+ List keyList = datastore.reserveIds(key1, key2);
assertEquals(2, keyList.size());
}
@Test
public void testAllocateIdArray() {
- KeyFactory keyFactory = DATASTORE.newKeyFactory().setKind(KIND1);
+ KeyFactory keyFactory = datastore.newKeyFactory().setKind(KIND1);
IncompleteKey incompleteKey1 = keyFactory.newKey();
IncompleteKey incompleteKey2 =
- keyFactory.setKind(KIND2).addAncestors(PathElement.of(KIND1, 10)).newKey();
- List result = DATASTORE.allocateId(incompleteKey1, incompleteKey2, incompleteKey1);
+ keyFactory
+ .setKind(KIND2)
+ .setDatabaseId(options.getDatabaseId())
+ .addAncestors(PathElement.of(KIND1, 10))
+ .newKey();
+ List result = datastore.allocateId(incompleteKey1, incompleteKey2, incompleteKey1);
assertEquals(3, result.size());
assertEquals(Key.newBuilder(incompleteKey1, result.get(0).getId()).build(), result.get(0));
assertEquals(Key.newBuilder(incompleteKey1, result.get(2).getId()).build(), result.get(2));
@@ -1113,10 +1170,10 @@ public void testAllocateIdArray() {
@Test
public void testGet() {
- Entity entity = DATASTORE.get(KEY3);
+ Entity entity = datastore.get(KEY3);
assertNull(entity);
- entity = DATASTORE.get(KEY1);
+ entity = datastore.get(KEY1);
assertEquals(ENTITY1, entity);
StringValue value1 = entity.getValue("str");
assertEquals(STR_VALUE, value1);
@@ -1138,34 +1195,37 @@ public void testGet() {
@Test
public void testGetWithReadTime() throws InterruptedException {
- Key key = Key.newBuilder(PROJECT_ID, "new_kind", "name").setNamespace(NAMESPACE).build();
+ Key key =
+ Key.newBuilder(PROJECT_ID, "new_kind", "name", options.getDatabaseId())
+ .setNamespace(NAMESPACE)
+ .build();
try {
- DATASTORE.put(Entity.newBuilder(key).set("str", "old_str_value").build());
+ datastore.put(Entity.newBuilder(key).set("str", "old_str_value").build());
Thread.sleep(1000);
Timestamp now = Timestamp.now();
Thread.sleep(1000);
- DATASTORE.put(Entity.newBuilder(key).set("str", "new_str_value").build());
+ datastore.put(Entity.newBuilder(key).set("str", "new_str_value").build());
- Entity entity = DATASTORE.get(key);
+ Entity entity = datastore.get(key);
StringValue value1 = entity.getValue("str");
assertEquals(StringValue.of("new_str_value"), value1);
- entity = DATASTORE.get(key, ReadOption.readTime(now));
+ entity = datastore.get(key, ReadOption.readTime(now));
value1 = entity.getValue("str");
assertEquals(StringValue.of("old_str_value"), value1);
} finally {
- DATASTORE.delete(key);
+ datastore.delete(key);
}
}
@Test
public void testGetArrayNoDeferredResults() {
- DATASTORE.put(ENTITY3);
+ datastore.put(ENTITY3);
Iterator result =
- DATASTORE.fetch(KEY1, Key.newBuilder(KEY1).setName("bla").build(), KEY2, KEY3).iterator();
+ datastore.fetch(KEY1, Key.newBuilder(KEY1).setName("bla").build(), KEY2, KEY3).iterator();
assertEquals(ENTITY1, result.next());
assertNull(result.next());
assertEquals(ENTITY2, result.next());
@@ -1190,93 +1250,93 @@ public void testGetArrayNoDeferredResults() {
// expected - no such property
}
assertFalse(result.hasNext());
- DATASTORE.delete(ENTITY3.getKey());
+ datastore.delete(ENTITY3.getKey());
}
@Test
public void testAddEntity() {
- List keys = DATASTORE.fetch(ENTITY1.getKey(), ENTITY3.getKey());
+ List keys = datastore.fetch(ENTITY1.getKey(), ENTITY3.getKey());
assertEquals(ENTITY1, keys.get(0));
assertNull(keys.get(1));
assertEquals(2, keys.size());
try {
- DATASTORE.add(ENTITY1);
+ datastore.add(ENTITY1);
fail("Expecting a failure");
} catch (DatastoreException expected) {
// expected;
}
- List entities = DATASTORE.add(ENTITY3, PARTIAL_ENTITY1, PARTIAL_ENTITY2);
- assertEquals(ENTITY3, DATASTORE.get(ENTITY3.getKey()));
+ List entities = datastore.add(ENTITY3, PARTIAL_ENTITY1, PARTIAL_ENTITY2);
+ assertEquals(ENTITY3, datastore.get(ENTITY3.getKey()));
assertEquals(ENTITY3, entities.get(0));
assertEquals(PARTIAL_ENTITY1.getNames(), entities.get(1).getNames());
assertEquals(PARTIAL_ENTITY1.getKey().getAncestors(), entities.get(1).getKey().getAncestors());
- assertNotNull(DATASTORE.get(entities.get(1).getKey()));
+ assertNotNull(datastore.get(entities.get(1).getKey()));
assertEquals(PARTIAL_ENTITY2.getNames(), entities.get(2).getNames());
assertEquals(PARTIAL_ENTITY2.getKey().getAncestors(), entities.get(2).getKey().getAncestors());
- assertNotNull(DATASTORE.get(entities.get(2).getKey()));
+ assertNotNull(datastore.get(entities.get(2).getKey()));
for (Entity entity : entities) {
- DATASTORE.delete(entity.getKey());
+ datastore.delete(entity.getKey());
}
}
@Test
public void testUpdate() {
- List keys = DATASTORE.fetch(ENTITY1.getKey(), ENTITY3.getKey());
+ List keys = datastore.fetch(ENTITY1.getKey(), ENTITY3.getKey());
assertEquals(ENTITY1, keys.get(0));
assertNull(keys.get(1));
assertEquals(2, keys.size());
try {
- DATASTORE.update(ENTITY3);
+ datastore.update(ENTITY3);
fail("Expecting a failure");
} catch (DatastoreException expected) {
// expected;
}
- DATASTORE.add(ENTITY3);
- assertEquals(ENTITY3, DATASTORE.get(ENTITY3.getKey()));
+ datastore.add(ENTITY3);
+ assertEquals(ENTITY3, datastore.get(ENTITY3.getKey()));
Entity entity3 = Entity.newBuilder(ENTITY3).clear().set("bla", new NullValue()).build();
assertNotEquals(ENTITY3, entity3);
- DATASTORE.update(entity3);
- assertEquals(entity3, DATASTORE.get(ENTITY3.getKey()));
- DATASTORE.delete(ENTITY3.getKey());
+ datastore.update(entity3);
+ assertEquals(entity3, datastore.get(ENTITY3.getKey()));
+ datastore.delete(ENTITY3.getKey());
}
@Test
public void testPut() {
Entity updatedEntity = Entity.newBuilder(ENTITY1).set("new_property", 42L).build();
- assertEquals(updatedEntity, DATASTORE.put(updatedEntity));
- assertEquals(updatedEntity, DATASTORE.get(updatedEntity.getKey()));
+ assertEquals(updatedEntity, datastore.put(updatedEntity));
+ assertEquals(updatedEntity, datastore.get(updatedEntity.getKey()));
Entity entity2 = Entity.newBuilder(ENTITY2).clear().set("bla", new NullValue()).build();
assertNotEquals(ENTITY2, entity2);
- List entities = DATASTORE.put(ENTITY1, entity2, ENTITY3, PARTIAL_ENTITY1);
+ List entities = datastore.put(ENTITY1, entity2, ENTITY3, PARTIAL_ENTITY1);
assertEquals(ENTITY1, entities.get(0));
assertEquals(entity2, entities.get(1));
assertEquals(ENTITY3, entities.get(2));
assertEquals(PARTIAL_ENTITY1.getNames(), entities.get(3).getNames());
assertEquals(PARTIAL_ENTITY1.getKey().getAncestors(), entities.get(3).getKey().getAncestors());
- assertEquals(ENTITY1, DATASTORE.get(ENTITY1.getKey()));
- assertEquals(entity2, DATASTORE.get(entity2.getKey()));
- assertEquals(ENTITY3, DATASTORE.get(ENTITY3.getKey()));
- Entity entity = DATASTORE.get(entities.get(3).getKey());
+ assertEquals(ENTITY1, datastore.get(ENTITY1.getKey()));
+ assertEquals(entity2, datastore.get(entity2.getKey()));
+ assertEquals(ENTITY3, datastore.get(ENTITY3.getKey()));
+ Entity entity = datastore.get(entities.get(3).getKey());
assertEquals(entities.get(3), entity);
for (Entity entityToDelete : entities) {
- DATASTORE.delete(entityToDelete.getKey());
+ datastore.delete(entityToDelete.getKey());
}
}
@Test
public void testDelete() {
Iterator keys =
- DATASTORE.fetch(ENTITY1.getKey(), ENTITY2.getKey(), ENTITY3.getKey()).iterator();
+ datastore.fetch(ENTITY1.getKey(), ENTITY2.getKey(), ENTITY3.getKey()).iterator();
assertEquals(ENTITY1, keys.next());
assertEquals(ENTITY2, keys.next());
assertNull(keys.next());
assertFalse(keys.hasNext());
- DATASTORE.delete(ENTITY1.getKey(), ENTITY2.getKey(), ENTITY3.getKey());
- keys = DATASTORE.fetch(ENTITY1.getKey(), ENTITY2.getKey(), ENTITY3.getKey()).iterator();
+ datastore.delete(ENTITY1.getKey(), ENTITY2.getKey(), ENTITY3.getKey());
+ keys = datastore.fetch(ENTITY1.getKey(), ENTITY2.getKey(), ENTITY3.getKey()).iterator();
assertNull(keys.next());
assertNull(keys.next());
assertNull(keys.next());
@@ -1301,7 +1361,7 @@ public Integer run(DatastoreReaderWriter transaction) {
}
};
- int result = DATASTORE.runInTransaction(callable1);
+ int result = datastore.runInTransaction(callable1);
assertEquals(result, 2);
Datastore.TransactionCallable callable2 =
@@ -1320,7 +1380,7 @@ public Integer run(DatastoreReaderWriter transaction) {
};
try {
- DATASTORE.runInTransaction(callable2);
+ datastore.runInTransaction(callable2);
fail("Expecting a failure");
} catch (DatastoreException expected) {
assertEquals(4, ((DatastoreException) expected.getCause()).getCode());
@@ -1348,7 +1408,7 @@ public Integer run(DatastoreReaderWriter transaction) {
}
};
- int result = DATASTORE.runInTransaction(callable1);
+ int result = datastore.runInTransaction(callable1);
assertEquals(result, 2);
final Entity entity2 = Entity.newBuilder(ENTITY2).clear().setNull("bla").build();
@@ -1374,7 +1434,7 @@ public Integer run(DatastoreReaderWriter transaction) {
.build();
try {
- DATASTORE.runInTransaction(callable2, readOnlyOptions);
+ datastore.runInTransaction(callable2, readOnlyOptions);
fail("Expecting a failure");
} catch (DatastoreException expected) {
assertEquals(3, ((DatastoreException) expected.getCause()).getCode());
@@ -1384,20 +1444,20 @@ public Integer run(DatastoreReaderWriter transaction) {
@Test
public void testSkippedResults() {
Query query = Query.newKeyQueryBuilder().setOffset(Integer.MAX_VALUE).build();
- int numberOfEntities = DATASTORE.run(query).getSkippedResults();
+ int numberOfEntities = datastore.run(query).getSkippedResults();
assertEquals(2, numberOfEntities);
}
@Test
public void testSetLimit() {
- DATASTORE.put(ENTITY1);
+ datastore.put(ENTITY1);
Query keyQuery = Query.newKeyQueryBuilder().setLimit(1).build();
- QueryResults queryResults = DATASTORE.run(keyQuery);
+ QueryResults queryResults = datastore.run(keyQuery);
assertTrue(queryResults.hasNext());
assertEquals(KEY1, queryResults.next());
Query query = Query.newEntityQueryBuilder().setLimit(0).build();
- QueryResults results = DATASTORE.run(query);
+ QueryResults results = datastore.run(query);
assertFalse(results.hasNext());
}
@@ -1408,7 +1468,7 @@ public void testGqlQueryWithNullBinding() {
.setNamespace(NAMESPACE)
.setNullBinding("name")
.build();
- Iterator results = DATASTORE.run(query);
+ Iterator results = datastore.run(query);
assertTrue(results.hasNext());
assertEquals(ENTITY1, results.next());
assertFalse(results.hasNext());
@@ -1417,49 +1477,64 @@ public void testGqlQueryWithNullBinding() {
@Test
public void testQueryWithStartCursor() {
Entity entity1 =
- Entity.newBuilder(Key.newBuilder(PROJECT_ID, KIND1, "name-01").build()).build();
+ Entity.newBuilder(
+ Key.newBuilder(PROJECT_ID, KIND1, "name-01", options.getDatabaseId()).build())
+ .build();
Entity entity2 =
- Entity.newBuilder(Key.newBuilder(PROJECT_ID, KIND1, "name-02").build()).build();
+ Entity.newBuilder(
+ Key.newBuilder(PROJECT_ID, KIND1, "name-02", options.getDatabaseId()).build())
+ .build();
Entity entity3 =
- Entity.newBuilder(Key.newBuilder(PROJECT_ID, KIND1, "name-03").build()).build();
- DATASTORE.put(entity1, entity2, entity3);
- QueryResults run1 = DATASTORE.run(Query.newEntityQueryBuilder().setKind(KIND1).build());
+ Entity.newBuilder(
+ Key.newBuilder(PROJECT_ID, KIND1, "name-03", options.getDatabaseId()).build())
+ .build();
+ datastore.put(entity1, entity2, entity3);
+ QueryResults run1 = datastore.run(Query.newEntityQueryBuilder().setKind(KIND1).build());
run1.next();
Cursor cursor1 = run1.getCursorAfter();
assertNotNull(cursor1);
QueryResults run2 =
- DATASTORE.run(Query.newEntityQueryBuilder().setKind(KIND1).setStartCursor(cursor1).build());
+ datastore.run(Query.newEntityQueryBuilder().setKind(KIND1).setStartCursor(cursor1).build());
Cursor cursor2 = run2.getCursorAfter();
assertNotNull(cursor2);
assertEquals(cursor2, cursor1);
- DATASTORE.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
+ datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
}
@Test
public void testQueryWithReadTime() throws InterruptedException {
Entity entity1 =
Entity.newBuilder(
- Key.newBuilder(PROJECT_ID, "new_kind", "name-01").setNamespace(NAMESPACE).build())
+ Key.newBuilder(PROJECT_ID, "new_kind", "name-01")
+ .setDatabaseId(options.getDatabaseId())
+ .setNamespace(NAMESPACE)
+ .build())
.build();
Entity entity2 =
Entity.newBuilder(
- Key.newBuilder(PROJECT_ID, "new_kind", "name-02").setNamespace(NAMESPACE).build())
+ Key.newBuilder(PROJECT_ID, "new_kind", "name-02")
+ .setDatabaseId(options.getDatabaseId())
+ .setNamespace(NAMESPACE)
+ .build())
.build();
Entity entity3 =
Entity.newBuilder(
- Key.newBuilder(PROJECT_ID, "new_kind", "name-03").setNamespace(NAMESPACE).build())
+ Key.newBuilder(PROJECT_ID, "new_kind", "name-03")
+ .setDatabaseId(options.getDatabaseId())
+ .setNamespace(NAMESPACE)
+ .build())
.build();
- DATASTORE.put(entity1, entity2);
+ datastore.put(entity1, entity2);
Thread.sleep(1000);
Timestamp now = Timestamp.now();
Thread.sleep(1000);
- DATASTORE.put(entity3);
+ datastore.put(entity3);
try {
Query query = Query.newEntityQueryBuilder().setKind("new_kind").build();
- QueryResults withoutReadTime = DATASTORE.run(query);
+ QueryResults withoutReadTime = datastore.run(query);
assertTrue(withoutReadTime.hasNext());
assertEquals(entity1, withoutReadTime.next());
assertTrue(withoutReadTime.hasNext());
@@ -1468,14 +1543,14 @@ public void testQueryWithReadTime() throws InterruptedException {
assertEquals(entity3, withoutReadTime.next());
assertFalse(withoutReadTime.hasNext());
- QueryResults withReadTime = DATASTORE.run(query, ReadOption.readTime(now));
+ QueryResults withReadTime = datastore.run(query, ReadOption.readTime(now));
assertTrue(withReadTime.hasNext());
assertEquals(entity1, withReadTime.next());
assertTrue(withReadTime.hasNext());
assertEquals(entity2, withReadTime.next());
assertFalse(withReadTime.hasNext());
} finally {
- DATASTORE.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
+ datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
}
}
@@ -1485,7 +1560,7 @@ private void testCountAggregationWith(Consumer configu
AggregationQuery aggregationQuery = builder.build();
String alias = "total_count";
- Long countBeforeAdd = getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get(alias);
+ Long countBeforeAdd = getOnlyElement(datastore.runAggregation(aggregationQuery)).get(alias);
long expectedCount = countBeforeAdd + 1;
Entity newEntity =
@@ -1495,12 +1570,12 @@ private void testCountAggregationWith(Consumer configu
.set("partial1", PARTIAL_ENTITY2)
.set("partial2", ENTITY2)
.build();
- DATASTORE.put(newEntity);
+ datastore.put(newEntity);
- Long countAfterAdd = getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).get(alias);
+ Long countAfterAdd = getOnlyElement(datastore.runAggregation(aggregationQuery)).get(alias);
assertThat(countAfterAdd).isEqualTo(expectedCount);
- DATASTORE.delete(newEntity.getKey());
+ datastore.delete(newEntity.getKey());
}
private void testCountAggregationWithLimit(
@@ -1513,7 +1588,7 @@ private void testCountAggregationWithLimit(
withoutLimitConfigurer.accept(withoutLimitBuilder);
Long currentCount =
- getOnlyElement(DATASTORE.runAggregation(withoutLimitBuilder.build())).get(alias);
+ getOnlyElement(datastore.runAggregation(withoutLimitBuilder.build())).get(alias);
long limit = currentCount - 1;
AggregationQuery.Builder withLimitBuilder =
@@ -1521,7 +1596,7 @@ private void testCountAggregationWithLimit(
withLimitConfigurer.accept(withLimitBuilder, limit);
Long countWithLimit =
- getOnlyElement(DATASTORE.runAggregation(withLimitBuilder.build())).get(alias);
+ getOnlyElement(datastore.runAggregation(withLimitBuilder.build())).get(alias);
assertThat(countWithLimit).isEqualTo(limit);
}
@@ -1529,25 +1604,34 @@ private void testCountAggregationReadTimeWith(Consumer
throws InterruptedException {
Entity entity1 =
Entity.newBuilder(
- Key.newBuilder(PROJECT_ID, "new_kind", "name-01").setNamespace(NAMESPACE).build())
+ Key.newBuilder(PROJECT_ID, "new_kind", "name-01")
+ .setDatabaseId(options.getDatabaseId())
+ .setNamespace(NAMESPACE)
+ .build())
.set("name", "Tyrion Lannister")
.build();
Entity entity2 =
Entity.newBuilder(
- Key.newBuilder(PROJECT_ID, "new_kind", "name-02").setNamespace(NAMESPACE).build())
+ Key.newBuilder(PROJECT_ID, "new_kind", "name-02")
+ .setDatabaseId(options.getDatabaseId())
+ .setNamespace(NAMESPACE)
+ .build())
.set("name", "Jaime Lannister")
.build();
Entity entity3 =
Entity.newBuilder(
- Key.newBuilder(PROJECT_ID, "new_kind", "name-03").setNamespace(NAMESPACE).build())
+ Key.newBuilder(PROJECT_ID, "new_kind", "name-03")
+ .setDatabaseId(options.getDatabaseId())
+ .setNamespace(NAMESPACE)
+ .build())
.set("name", "Cersei Lannister")
.build();
- DATASTORE.put(entity1, entity2);
+ datastore.put(entity1, entity2);
Thread.sleep(1000);
Timestamp now = Timestamp.now();
Thread.sleep(1000);
- DATASTORE.put(entity3);
+ datastore.put(entity3);
try {
AggregationQuery.Builder builder = Query.newAggregationQueryBuilder().setNamespace(NAMESPACE);
@@ -1555,15 +1639,15 @@ private void testCountAggregationReadTimeWith(Consumer
AggregationQuery countAggregationQuery = builder.build();
Long latestCount =
- getOnlyElement(DATASTORE.runAggregation(countAggregationQuery)).get("total_count");
+ getOnlyElement(datastore.runAggregation(countAggregationQuery)).get("total_count");
assertThat(latestCount).isEqualTo(3L);
Long oldCount =
- getOnlyElement(DATASTORE.runAggregation(countAggregationQuery, ReadOption.readTime(now)))
+ getOnlyElement(datastore.runAggregation(countAggregationQuery, ReadOption.readTime(now)))
.get("total_count");
assertThat(oldCount).isEqualTo(2L);
} finally {
- DATASTORE.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
+ datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
}
}
}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java
index 8a7fd88b0..3ebd3ef4a 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/ITLocalDatastoreHelperTest.java
@@ -131,20 +131,28 @@ public void testCreateWithToBuilder() throws IOException {
@Test
public void testCreatePort() {
LocalDatastoreHelper helper = LocalDatastoreHelper.create(0.75, 8888);
- DatastoreOptions options = helper.getOptions(NAMESPACE);
+ DatastoreOptions options = helper.setNamespace(NAMESPACE).build();
assertTrue(options.getHost().endsWith("8888"));
assertTrue(Math.abs(0.75 - helper.getConsistency()) < TOLERANCE);
helper = LocalDatastoreHelper.create();
- options = helper.getOptions(NAMESPACE);
+ options = helper.setNamespace(NAMESPACE).build();
assertTrue(Math.abs(0.9 - helper.getConsistency()) < TOLERANCE);
assertFalse(options.getHost().endsWith("8888"));
assertFalse(options.getHost().endsWith("8080"));
helper = LocalDatastoreHelper.create(9999);
- options = helper.getOptions(NAMESPACE);
+ options = helper.setNamespace(NAMESPACE).build();
assertTrue(Math.abs(0.9 - helper.getConsistency()) < TOLERANCE);
assertTrue(options.getHost().endsWith("9999"));
}
+ @Test
+ public void testSetDatabaseId() {
+ LocalDatastoreHelper helper = LocalDatastoreHelper.create(0.75, 8888);
+ DatastoreOptions options =
+ helper.setNamespace(NAMESPACE).setDatabaseId("new-database-id").build();
+ assertEquals("new-database-id", options.getDatabaseId());
+ }
+
@Test
public void testOptions() {
LocalDatastoreHelper helper = LocalDatastoreHelper.create();
@@ -152,7 +160,7 @@ public void testOptions() {
assertTrue(options.getProjectId().startsWith(PROJECT_ID_PREFIX));
assertTrue(options.getHost().startsWith("localhost:"));
assertSame(NoCredentials.getInstance(), options.getCredentials());
- options = helper.getOptions(NAMESPACE);
+ options = helper.setNamespace(NAMESPACE).build();
assertTrue(options.getProjectId().startsWith(PROJECT_ID_PREFIX));
assertTrue(options.getHost().startsWith("localhost:"));
assertSame(NoCredentials.getInstance(), options.getCredentials());
diff --git a/owlbot.py b/owlbot.py
index 784f35a40..f96943ca5 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -45,4 +45,10 @@
s.move(library)
s.remove_staging_dirs()
-java.common_templates()
+java.common_templates(excludes=[
+ '.kokoro/presubmit/integration.cfg',
+ '.kokoro/presubmit/graalvm-native.cfg',
+ '.kokoro/presubmit/graalvm-native-17.cfg',
+ '.kokoro/nightly/integration.cfg',
+ '.kokoro/nightly/java11-integration.cfg',
+])
From c4a79effa83c5fdb7ad8db15ae52e2c70db238bc Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Fri, 9 Jun 2023 13:48:36 +0000
Subject: [PATCH 10/11] fix: add some missing annotations and fix
equals/hashcode for DatastoreOptions (#1106)
* chore(multi db): add some missing annotations and fix equals/hashcode on DatastoreOptions
* add some tests
---
.../com/google/datastore/v1/client/DatastoreOptions.java | 1 +
.../src/main/java/com/google/cloud/datastore/BaseKey.java | 1 +
.../java/com/google/cloud/datastore/DatastoreOptions.java | 7 +++++--
.../com/google/cloud/datastore/DatastoreOptionsTest.java | 8 +++++++-
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
index e097dc7d7..eefd629ec 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
@@ -188,6 +188,7 @@ public String getProjectId() {
return projectId;
}
+ @BetaApi
public String getDatabaseId() {
return databaseId;
}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
index 8734efe33..6a015e388 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
@@ -148,6 +148,7 @@ public String getNamespace() {
return namespace;
}
+ @BetaApi
public String getDatabaseId() {
return databaseId;
}
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
index 03621502c..d4f3be3c2 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
@@ -155,6 +155,7 @@ public String getNamespace() {
return namespace;
}
+ @BetaApi
public String getDatabaseId() {
return this.databaseId;
}
@@ -193,7 +194,7 @@ public Builder toBuilder() {
@Override
public int hashCode() {
- return Objects.hash(baseHashCode(), namespace);
+ return Objects.hash(baseHashCode(), namespace, databaseId);
}
@Override
@@ -202,7 +203,9 @@ public boolean equals(Object obj) {
return false;
}
DatastoreOptions other = (DatastoreOptions) obj;
- return baseEquals(other) && Objects.equals(namespace, other.namespace);
+ return baseEquals(other)
+ && Objects.equals(namespace, other.namespace)
+ && Objects.equals(databaseId, other.databaseId);
}
public static Builder newBuilder() {
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
index 19dd3f0c0..a545580e2 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
@@ -17,6 +17,7 @@
package com.google.cloud.datastore;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -38,7 +39,6 @@ public class DatastoreOptionsTest {
private DatastoreRpc datastoreRpc;
private DatastoreOptions.Builder options;
- // todo parameterize
@Before
public void setUp() {
datastoreRpcFactory = EasyMock.createMock(DatastoreRpcFactory.class);
@@ -90,6 +90,12 @@ public void testToBuilder() {
assertEquals(original.getHost(), copy.getHost());
assertEquals(original.getRetrySettings(), copy.getRetrySettings());
assertEquals(original.getCredentials(), copy.getCredentials());
+ assertEquals(original, copy);
+ assertEquals(original.hashCode(), copy.hashCode());
+
+ DatastoreOptions newOptions = options.setDatabaseId("new-database-id").build();
+ assertNotEquals(original, newOptions);
+ assertNotEquals(original.hashCode(), newOptions.hashCode());
}
@Test
From 70fc0e3081ea3d2fa67a8a279843d2d8072bda10 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 10:27:17 -0400
Subject: [PATCH 11/11] chore(main): release 2.15.0 (#1105)
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
CHANGELOG.md | 17 +++++++++++++++++
datastore-v1-proto-client/pom.xml | 4 ++--
google-cloud-datastore-bom/pom.xml | 10 +++++-----
google-cloud-datastore/pom.xml | 4 ++--
grpc-google-cloud-datastore-admin-v1/pom.xml | 4 ++--
pom.xml | 12 ++++++------
proto-google-cloud-datastore-admin-v1/pom.xml | 4 ++--
proto-google-cloud-datastore-v1/pom.xml | 4 ++--
versions.txt | 12 ++++++------
9 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c29fa7871..753e0efd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
# Changelog
+## [2.15.0](https://github.com/googleapis/java-datastore/compare/v2.14.7...v2.15.0) (2023-06-09)
+
+
+### Features
+
+* Multiple dbs support ([#1102](https://github.com/googleapis/java-datastore/issues/1102)) ([7887f32](https://github.com/googleapis/java-datastore/commit/7887f3255cba4dedd7b4f369d77a3279d903127f))
+
+
+### Bug Fixes
+
+* Add some missing annotations and fix equals/hashcode for DatastoreOptions ([#1106](https://github.com/googleapis/java-datastore/issues/1106)) ([c4a79ef](https://github.com/googleapis/java-datastore/commit/c4a79effa83c5fdb7ad8db15ae52e2c70db238bc))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.11.0 ([#1104](https://github.com/googleapis/java-datastore/issues/1104)) ([fc9b091](https://github.com/googleapis/java-datastore/commit/fc9b09103a1bfbb238b22102dcf2b889292658ce))
+
## [2.14.7](https://github.com/googleapis/java-datastore/compare/v2.14.6...v2.14.7) (2023-05-29)
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 634f5dfbe..f6ec5c354 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.8-SNAPSHOT
+ 2.15.0
com.google.cloud
google-cloud-datastore-parent
- 2.14.8-SNAPSHOT
+ 2.15.0
jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 50d74c73a..4566b61d4 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.8-SNAPSHOT
+ 2.15.0
pom
com.google.cloud
@@ -52,22 +52,22 @@
com.google.cloud
google-cloud-datastore
- 2.14.8-SNAPSHOT
+ 2.15.0
com.google.api.grpc
grpc-google-cloud-datastore-admin-v1
- 2.14.8-SNAPSHOT
+ 2.15.0
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.105.8-SNAPSHOT
+ 0.106.0
com.google.api.grpc
proto-google-cloud-datastore-admin-v1
- 2.14.8-SNAPSHOT
+ 2.15.0
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index f326f4d62..535843581 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.8-SNAPSHOT
+ 2.15.0
jar
Google Cloud Datastore
https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
com.google.cloud
google-cloud-datastore-parent
- 2.14.8-SNAPSHOT
+ 2.15.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 f722628d9..05d25e35b 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.8-SNAPSHOT
+ 2.15.0
grpc-google-cloud-datastore-admin-v1
GRPC library for google-cloud-datastore
com.google.cloud
google-cloud-datastore-parent
- 2.14.8-SNAPSHOT
+ 2.15.0
diff --git a/pom.xml b/pom.xml
index a96e9ff05..1ad70d16b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-datastore-parent
pom
- 2.14.8-SNAPSHOT
+ 2.15.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.14.8-SNAPSHOT
+ 2.15.0
com.google.api.grpc
grpc-google-cloud-datastore-admin-v1
- 2.14.8-SNAPSHOT
+ 2.15.0
com.google.cloud
google-cloud-datastore
- 2.14.8-SNAPSHOT
+ 2.15.0
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.105.8-SNAPSHOT
+ 0.106.0
com.google.cloud.datastore
datastore-v1-proto-client
- 2.14.8-SNAPSHOT
+ 2.15.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 c55587095..aa40b045c 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.8-SNAPSHOT
+ 2.15.0
proto-google-cloud-datastore-admin-v1
Proto library for google-cloud-datastore
com.google.cloud
google-cloud-datastore-parent
- 2.14.8-SNAPSHOT
+ 2.15.0
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index cb02eeb8f..cdd0d8a83 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.8-SNAPSHOT
+ 0.106.0
proto-google-cloud-datastore-v1
PROTO library for proto-google-cloud-datastore-v1
com.google.cloud
google-cloud-datastore-parent
- 2.14.8-SNAPSHOT
+ 2.15.0
diff --git a/versions.txt b/versions.txt
index 2d4adc276..b568d4eb9 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
# Format:
# module:released-version:current-version
-google-cloud-datastore:2.14.7:2.14.8-SNAPSHOT
-google-cloud-datastore-bom:2.14.7:2.14.8-SNAPSHOT
-proto-google-cloud-datastore-v1:0.105.7:0.105.8-SNAPSHOT
-datastore-v1-proto-client:2.14.7:2.14.8-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.14.7:2.14.8-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.14.7:2.14.8-SNAPSHOT
+google-cloud-datastore:2.15.0:2.15.0
+google-cloud-datastore-bom:2.15.0:2.15.0
+proto-google-cloud-datastore-v1:0.106.0:0.106.0
+datastore-v1-proto-client:2.15.0:2.15.0
+proto-google-cloud-datastore-admin-v1:2.15.0:2.15.0
+grpc-google-cloud-datastore-admin-v1:2.15.0:2.15.0