\n\017property_filter\030\002 \001(\0132"
+ + "#.google.datastore.v1.PropertyFilterH\000B\r"
+ + "\n\013filter_type\"\251\001\n\017CompositeFilter\0229\n\002op\030"
+ + "\001 \001(\0162-.google.datastore.v1.CompositeFil"
+ + "ter.Operator\022,\n\007filters\030\002 \003(\0132\033.google.d"
+ + "atastore.v1.Filter\"-\n\010Operator\022\030\n\024OPERAT"
+ + "OR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\352\002\n\016PropertyFi"
+ + "lter\0228\n\010property\030\001 \001(\0132&.google.datastor"
+ + "e.v1.PropertyReference\0228\n\002op\030\002 \001(\0162,.goo"
+ + "gle.datastore.v1.PropertyFilter.Operator"
+ + "\022)\n\005value\030\003 \001(\0132\032.google.datastore.v1.Va"
+ + "lue\"\270\001\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED"
+ + "\020\000\022\r\n\tLESS_THAN\020\001\022\026\n\022LESS_THAN_OR_EQUAL\020"
+ + "\002\022\020\n\014GREATER_THAN\020\003\022\031\n\025GREATER_THAN_OR_E"
+ + "QUAL\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\010GqlQu"
+ + "ery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allow_liter"
+ + "als\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\01320.goog"
+ + "le.datastore.v1.GqlQuery.NamedBindingsEn"
+ + "try\022C\n\023positional_bindings\030\004 \003(\0132&.googl"
+ + "e.datastore.v1.GqlQueryParameter\032\\\n\022Name"
+ + "dBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001"
+ + "(\0132&.google.datastore.v1.GqlQueryParamet"
+ + "er:\0028\001\"d\n\021GqlQueryParameter\022+\n\005value\030\002 \001"
+ + "(\0132\032.google.datastore.v1.ValueH\000\022\020\n\006curs"
+ + "or\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020QueryRe"
+ + "sultBatch\022\027\n\017skipped_results\030\006 \001(\005\022\026\n\016sk"
+ + "ipped_cursor\030\003 \001(\014\022H\n\022entity_result_type"
+ + "\030\001 \001(\0162,.google.datastore.v1.EntityResul"
+ + "t.ResultType\0229\n\016entity_results\030\002 \003(\0132!.g"
+ + "oogle.datastore.v1.EntityResult\022\022\n\nend_c"
+ + "ursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625.goog"
+ + "le.datastore.v1.QueryResultBatch.MoreRes"
+ + "ultsType\022\030\n\020snapshot_version\030\007 \001(\003\022-\n\tre"
+ + "ad_time\030\010 \001(\0132\032.google.protobuf.Timestam"
+ + "p\"\230\001\n\017MoreResultsType\022!\n\035MORE_RESULTS_TY"
+ + "PE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MO"
+ + "RE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS"
+ + "_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\274\001\n"
+ + "\027com.google.datastore.v1B\nQueryProtoP\001Z<"
+ + "google.golang.org/genproto/googleapis/da"
+ + "tastore/v1;datastore\252\002\031Google.Cloud.Data"
+ + "store.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002\034G"
+ + "oogle::Cloud::Datastore::V1b\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
+ com.google.api.FieldBehaviorProto.getDescriptor(),
com.google.datastore.v1.EntityProto.getDescriptor(),
com.google.protobuf.TimestampProto.getDescriptor(),
com.google.protobuf.WrappersProto.getDescriptor(),
@@ -289,6 +290,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
"SnapshotVersion",
"ReadTime",
});
+ com.google.api.FieldBehaviorProto.getDescriptor();
com.google.datastore.v1.EntityProto.getDescriptor();
com.google.protobuf.TimestampProto.getDescriptor();
com.google.protobuf.WrappersProto.getDescriptor();
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 27a8ef8a6..7a8ce32c3 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
@@ -190,7 +190,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -213,7 +215,9 @@ public java.lang.String getDatabaseId() {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -812,7 +816,9 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -834,7 +840,9 @@ public java.lang.String getDatabaseId() {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -856,7 +864,9 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -877,7 +887,9 @@ public Builder setDatabaseId(java.lang.String value) {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -894,7 +906,9 @@ public Builder clearDatabaseId() {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
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 b410d83d6..f48701f72 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
@@ -52,7 +52,9 @@ public interface ReserveIdsRequestOrBuilder
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -64,7 +66,9 @@ public interface ReserveIdsRequestOrBuilder
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
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 75c24d616..f964889bf 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
@@ -39,6 +39,7 @@ private RollbackRequest(com.google.protobuf.GeneratedMessageV3.Builder builde
private RollbackRequest() {
projectId_ = "";
+ databaseId_ = "";
transaction_ = com.google.protobuf.ByteString.EMPTY;
}
@@ -83,6 +84,13 @@ private RollbackRequest(
projectId_ = s;
break;
}
+ case 74:
+ {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ databaseId_ = s;
+ break;
+ }
default:
{
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -168,6 +176,59 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
}
}
+ public static final int DATABASE_ID_FIELD_NUMBER = 9;
+ private volatile java.lang.Object databaseId_;
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ @java.lang.Override
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int TRANSACTION_FIELD_NUMBER = 1;
private com.google.protobuf.ByteString transaction_;
/**
@@ -207,6 +268,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
+ }
unknownFields.writeTo(output);
}
@@ -222,6 +286,9 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -238,6 +305,7 @@ public boolean equals(final java.lang.Object obj) {
com.google.datastore.v1.RollbackRequest other = (com.google.datastore.v1.RollbackRequest) obj;
if (!getProjectId().equals(other.getProjectId())) return false;
+ if (!getDatabaseId().equals(other.getDatabaseId())) return false;
if (!getTransaction().equals(other.getTransaction())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
@@ -252,6 +320,8 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
hash = (53 * hash) + getProjectId().hashCode();
+ hash = (37 * hash) + DATABASE_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getDatabaseId().hashCode();
hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
hash = (53 * hash) + getTransaction().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
@@ -401,6 +471,8 @@ public Builder clear() {
super.clear();
projectId_ = "";
+ databaseId_ = "";
+
transaction_ = com.google.protobuf.ByteString.EMPTY;
return this;
@@ -431,6 +503,7 @@ public com.google.datastore.v1.RollbackRequest buildPartial() {
com.google.datastore.v1.RollbackRequest result =
new com.google.datastore.v1.RollbackRequest(this);
result.projectId_ = projectId_;
+ result.databaseId_ = databaseId_;
result.transaction_ = transaction_;
onBuilt();
return result;
@@ -485,6 +558,10 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackRequest other) {
projectId_ = other.projectId_;
onChanged();
}
+ if (!other.getDatabaseId().isEmpty()) {
+ databaseId_ = other.databaseId_;
+ onChanged();
+ }
if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
setTransaction(other.getTransaction());
}
@@ -623,6 +700,122 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
return this;
}
+ private java.lang.Object databaseId_ = "";
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @param value The databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseId(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearDatabaseId() {
+
+ databaseId_ = getDefaultInstance().getDatabaseId();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @param value The bytes for databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+
private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
/**
*
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 86319d919..7f9bd4385 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
@@ -48,6 +48,35 @@ public interface RollbackRequestOrBuilder
*/
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.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ 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.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ com.google.protobuf.ByteString getDatabaseIdBytes();
+
/**
*
*
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 6da75072d..51999dba5 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
@@ -39,6 +39,7 @@ private RunQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builde
private RunQueryRequest() {
projectId_ = "";
+ databaseId_ = "";
}
@java.lang.Override
@@ -139,6 +140,13 @@ private RunQueryRequest(
projectId_ = s;
break;
}
+ case 74:
+ {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ databaseId_ = s;
+ break;
+ }
default:
{
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -271,6 +279,59 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
}
}
+ public static final int DATABASE_ID_FIELD_NUMBER = 9;
+ private volatile java.lang.Object databaseId_;
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ @java.lang.Override
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int PARTITION_ID_FIELD_NUMBER = 2;
private com.google.datastore.v1.PartitionId partitionId_;
/**
@@ -432,7 +493,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -447,7 +508,7 @@ public boolean hasGqlQuery() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -465,7 +526,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -507,6 +568,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
+ }
unknownFields.writeTo(output);
}
@@ -535,6 +599,9 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -551,6 +618,7 @@ public boolean equals(final java.lang.Object obj) {
com.google.datastore.v1.RunQueryRequest other = (com.google.datastore.v1.RunQueryRequest) obj;
if (!getProjectId().equals(other.getProjectId())) return false;
+ if (!getDatabaseId().equals(other.getDatabaseId())) return false;
if (hasPartitionId() != other.hasPartitionId()) return false;
if (hasPartitionId()) {
if (!getPartitionId().equals(other.getPartitionId())) return false;
@@ -583,6 +651,8 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
hash = (53 * hash) + getProjectId().hashCode();
+ hash = (37 * hash) + DATABASE_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getDatabaseId().hashCode();
if (hasPartitionId()) {
hash = (37 * hash) + PARTITION_ID_FIELD_NUMBER;
hash = (53 * hash) + getPartitionId().hashCode();
@@ -750,6 +820,8 @@ public Builder clear() {
super.clear();
projectId_ = "";
+ databaseId_ = "";
+
if (partitionIdBuilder_ == null) {
partitionId_ = null;
} else {
@@ -792,6 +864,7 @@ public com.google.datastore.v1.RunQueryRequest buildPartial() {
com.google.datastore.v1.RunQueryRequest result =
new com.google.datastore.v1.RunQueryRequest(this);
result.projectId_ = projectId_;
+ result.databaseId_ = databaseId_;
if (partitionIdBuilder_ == null) {
result.partitionId_ = partitionId_;
} else {
@@ -870,6 +943,10 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
projectId_ = other.projectId_;
onChanged();
}
+ if (!other.getDatabaseId().isEmpty()) {
+ databaseId_ = other.databaseId_;
+ onChanged();
+ }
if (other.hasPartitionId()) {
mergePartitionId(other.getPartitionId());
}
@@ -1041,6 +1118,122 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
return this;
}
+ private java.lang.Object databaseId_ = "";
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @param value The databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseId(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearDatabaseId() {
+
+ databaseId_ = getDefaultInstance().getDatabaseId();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @param value The bytes for databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+
private com.google.datastore.v1.PartitionId partitionId_;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.datastore.v1.PartitionId,
@@ -1653,7 +1846,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1668,7 +1861,7 @@ public boolean hasGqlQuery() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1693,7 +1886,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1715,7 +1908,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1734,7 +1927,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForVa
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1766,7 +1959,7 @@ public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1791,7 +1984,7 @@ public Builder clearGqlQuery() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1803,7 +1996,7 @@ public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1823,7 +2016,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
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 3b54516e3..3317e05ca 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
@@ -48,6 +48,35 @@ public interface RunQueryRequestOrBuilder
*/
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.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ 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.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ com.google.protobuf.ByteString getDatabaseIdBytes();
+
/**
*
*
@@ -166,7 +195,7 @@ public interface RunQueryRequestOrBuilder
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -178,7 +207,7 @@ public interface RunQueryRequestOrBuilder
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -190,7 +219,7 @@ public interface RunQueryRequestOrBuilder
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto
index 22d930ad0..6d2437499 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto
@@ -116,6 +116,12 @@ message LookupRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// The options for this lookup request.
ReadOptions read_options = 1;
@@ -149,6 +155,12 @@ message RunQueryRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// Entities are partitioned into subsets, identified by a partition ID.
// Queries are scoped to a single partition.
// This partition ID is normalized with the standard default context
@@ -163,7 +175,7 @@ message RunQueryRequest {
// The query to run.
Query query = 3;
- // The GQL query to run.
+ // The GQL query to run. This query must be a non-aggregation query.
GqlQuery gql_query = 7;
}
}
@@ -182,6 +194,12 @@ message BeginTransactionRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// Options for a new transaction.
TransactionOptions transaction_options = 10;
}
@@ -197,6 +215,12 @@ message RollbackRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// Required. The transaction identifier, returned by a call to
// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
bytes transaction = 1 [(google.api.field_behavior) = REQUIRED];
@@ -227,6 +251,12 @@ message CommitRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// The type of commit to perform. Defaults to `TRANSACTIONAL`.
Mode mode = 5;
@@ -273,6 +303,12 @@ message AllocateIdsRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// Required. A list of keys with incomplete key paths for which to allocate IDs.
// No key may be reserved/read-only.
repeated Key keys = 1 [(google.api.field_behavior) = REQUIRED];
@@ -290,7 +326,10 @@ message ReserveIdsRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
- // If not empty, the ID of the database against which to make the request.
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
string database_id = 9;
// Required. A list of keys with complete key paths whose numeric IDs should not be
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto
index 55d7b64fe..010f1b3af 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto
@@ -51,6 +51,10 @@ message PartitionId {
// The ID of the project to which the entities belong.
string project_id = 2;
+ // If not empty, the ID of the database to which the entities
+ // belong.
+ string database_id = 3;
+
// If not empty, the ID of the namespace to which the entities belong.
string namespace_id = 4;
}
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto
index 00c020021..cbe44932d 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto
@@ -16,6 +16,7 @@ syntax = "proto3";
package google.datastore.v1;
+import "google/api/field_behavior.proto";
import "google/datastore/v1/entity.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";
@@ -184,7 +185,10 @@ message CompositeFilter {
Operator op = 1;
// The list of filters to combine.
- // Must contain at least one filter.
+ //
+ // Requires:
+ //
+ // * At least one filter is present.
repeated Filter filters = 2;
}
From 6caafd854278953de937a4a07c8ef163850ab9b0 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Wed, 27 Jul 2022 21:00:39 +0200
Subject: [PATCH 07/13] deps: update dependency
org.junit.vintage:junit-vintage-engine to v5.9.0 (#804)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[](https://renovatebot.com)
This PR contains the following updates:
| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.junit.vintage:junit-vintage-engine](https://junit.org/junit5/) ([source](https://togithub.com/junit-team/junit5)) | `5.8.2` -> `5.9.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] If you want to rebase/retry this PR, click this checkbox.
---
This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
samples/native-image-sample/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index e2ba60051..9db6cb655 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -80,7 +80,7 @@
org.junit.vintage
junit-vintage-engine
- 5.8.2
+ 5.9.0
test
From e9dbbffb8fe1ae18a5bef7a4bb87eb181f4ec02e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Mon, 1 Aug 2022 18:44:36 +0200
Subject: [PATCH 08/13] chore(deps): update dependency
com.google.cloud:google-cloud-datastore to v2.10.1 (#807)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* chore(deps): update dependency com.google.cloud:google-cloud-datastore to v2.10.1
* 🦉 Updates from OwlBot post-processor
See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
Co-authored-by: Owl Bot
---
README.md | 2 +-
samples/install-without-bom/pom.xml | 2 +-
samples/snapshot/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 49dc759e1..be4234479 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies:
com.google.cloud
google-cloud-datastore
- 2.9.0
+ 2.10.1
```
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 13c7b9ed1..840f30dcc 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-datastore
- 2.9.0
+ 2.10.1
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index ca5261ffe..7f8da2959 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-datastore
- 2.9.0
+ 2.10.1
From 930162a51b79400ce22aa412636a8c610089d425 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Mon, 1 Aug 2022 18:44:56 +0200
Subject: [PATCH 09/13] build(deps): update dependency
com.google.cloud:google-cloud-shared-config to v1.5.3 (#806)
---
google-cloud-datastore-bom/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index b5734fc6c..74d066680 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud
google-cloud-shared-config
- 1.5.1
+ 1.5.3
Google Cloud datastore BOM
diff --git a/pom.xml b/pom.xml
index 6dd887209..f741c9a13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 1.5.1
+ 1.5.3
From ad467ef55696dcb9bb2b340916216000aff6bcc8 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Tue, 2 Aug 2022 22:34:13 +0200
Subject: [PATCH 10/13] deps: update dependency
com.google.cloud:google-cloud-shared-dependencies to v3 (#805)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[](https://renovatebot.com)
This PR contains the following updates:
| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.13.0` -> `3.0.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |
---
### Release Notes
googleapis/java-shared-dependencies
### [`v3.0.1`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#301-httpsgithubcomgoogleapisjava-shared-dependenciescomparev300v301-2022-08-02)
[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.0...v3.0.1)
##### Dependencies
- update dependency com.google.code.gson:gson to v2.9.1 ([#766](https://togithub.com/googleapis/java-shared-dependencies/issues/766)) ([f7b2b06](https://togithub.com/googleapis/java-shared-dependencies/commit/f7b2b06b80e3e95ff8ab9b1d6a2638ef3069298a))
- update gax.version to v2.18.7 ([#767](https://togithub.com/googleapis/java-shared-dependencies/issues/767)) ([9650368](https://togithub.com/googleapis/java-shared-dependencies/commit/96503682e98cdf348ea2c1365a03a60f4322c712))
- update google.core.version to v2.8.6 ([#770](https://togithub.com/googleapis/java-shared-dependencies/issues/770)) ([cfd4377](https://togithub.com/googleapis/java-shared-dependencies/commit/cfd4377dc178cebb4724065d55d185ce03988d55))
### [`v3.0.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#300-httpsgithubcomgoogleapisjava-shared-dependenciescomparev2130v300-2022-07-29)
[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.13.0...v3.0.0)
##### Bug Fixes
- enable longpaths support for windows test ([#1485](https://togithub.com/googleapis/java-shared-dependencies/issues/1485)) ([#738](https://togithub.com/googleapis/java-shared-dependencies/issues/738)) ([11bc8f8](https://togithub.com/googleapis/java-shared-dependencies/commit/11bc8f81f28be88a97fdeafca21724e33638770c))
##### Dependencies
- update dependency com.google.api-client:google-api-client-bom to v1.35.2 ([#729](https://togithub.com/googleapis/java-shared-dependencies/issues/729)) ([1fa59af](https://togithub.com/googleapis/java-shared-dependencies/commit/1fa59af80abb9f278f57658c10158567e825fec6))
- update dependency com.google.api-client:google-api-client-bom to v2 ([#746](https://togithub.com/googleapis/java-shared-dependencies/issues/746)) ([2dcb2e0](https://togithub.com/googleapis/java-shared-dependencies/commit/2dcb2e071e0ba0eea21bb575bd13cd559d4a1ca6))
- update dependency com.google.api.grpc:grpc-google-common-protos to v2.9.2 ([#741](https://togithub.com/googleapis/java-shared-dependencies/issues/741)) ([3352d6c](https://togithub.com/googleapis/java-shared-dependencies/commit/3352d6c36111c04e3f6f3e6360470fa3efb10d8f))
- update dependency com.google.auth:google-auth-library-bom to v1.8.0 ([#726](https://togithub.com/googleapis/java-shared-dependencies/issues/726)) ([2c5d64c](https://togithub.com/googleapis/java-shared-dependencies/commit/2c5d64c127db8384e49113acfeac6928716a2d7f))
- update dependency com.google.auth:google-auth-library-bom to v1.8.1 ([#742](https://togithub.com/googleapis/java-shared-dependencies/issues/742)) ([4f53527](https://togithub.com/googleapis/java-shared-dependencies/commit/4f53527bda7f40896711b7c1d1c02453321ffbc8))
- update dependency com.google.cloud:first-party-dependencies to v2 ([#747](https://togithub.com/googleapis/java-shared-dependencies/issues/747)) ([e970ac0](https://togithub.com/googleapis/java-shared-dependencies/commit/e970ac0599941c825dc2516146a7c6673e68a9b9))
- update dependency com.google.cloud:grpc-gcp to v1.2.1 ([#751](https://togithub.com/googleapis/java-shared-dependencies/issues/751)) ([b3284b6](https://togithub.com/googleapis/java-shared-dependencies/commit/b3284b6ee52a96a6ea8696a05a94443df9ee5b9f))
- update dependency com.google.cloud:third-party-dependencies to v2 ([#748](https://togithub.com/googleapis/java-shared-dependencies/issues/748)) ([573b41a](https://togithub.com/googleapis/java-shared-dependencies/commit/573b41a69504372741cbeb01dd200e7c71967186))
- update dependency com.google.http-client:google-http-client-bom to v1.42.1 ([#730](https://togithub.com/googleapis/java-shared-dependencies/issues/730)) ([6b47126](https://togithub.com/googleapis/java-shared-dependencies/commit/6b47126686b603a5d112e097ce6aa3a1880daf6f))
- update dependency com.google.http-client:google-http-client-bom to v1.42.2 ([#749](https://togithub.com/googleapis/java-shared-dependencies/issues/749)) ([299d7b0](https://togithub.com/googleapis/java-shared-dependencies/commit/299d7b0d4920644e2c3070d12dd1d97da17a5e88))
- update dependency com.google.protobuf:protobuf-bom to v3.21.2 ([#722](https://togithub.com/googleapis/java-shared-dependencies/issues/722)) ([7a96b12](https://togithub.com/googleapis/java-shared-dependencies/commit/7a96b1259a526b63e9376fd6cc18b27cddeb5f0f))
- update dependency com.google.protobuf:protobuf-bom to v3.21.3 ([#756](https://togithub.com/googleapis/java-shared-dependencies/issues/756)) ([3d0bac2](https://togithub.com/googleapis/java-shared-dependencies/commit/3d0bac23487aebb94267c0708f41ff6c02a028a4))
- update dependency com.google.protobuf:protobuf-bom to v3.21.4 ([#759](https://togithub.com/googleapis/java-shared-dependencies/issues/759)) ([5a54ef1](https://togithub.com/googleapis/java-shared-dependencies/commit/5a54ef1a2d56244166d4fcc46041d62c0dc4b411))
- update dependency io.grpc:grpc-bom to v1.48.0 ([#752](https://togithub.com/googleapis/java-shared-dependencies/issues/752)) ([20ac908](https://togithub.com/googleapis/java-shared-dependencies/commit/20ac908932a5e7c8e581bdfcd68579d7e1cedd5f))
- update dependency org.checkerframework:checker-qual to v3.23.0 ([#736](https://togithub.com/googleapis/java-shared-dependencies/issues/736)) ([fc01d8f](https://togithub.com/googleapis/java-shared-dependencies/commit/fc01d8f93f391f12fdb800d5006f0b4505832eeb))
- update gax.version to v2.18.3 ([#731](https://togithub.com/googleapis/java-shared-dependencies/issues/731)) ([e8ee554](https://togithub.com/googleapis/java-shared-dependencies/commit/e8ee554707acb2f71c739d08e2ff02fbe43ffa52))
- update gax.version to v2.18.4 ([#735](https://togithub.com/googleapis/java-shared-dependencies/issues/735)) ([11c7415](https://togithub.com/googleapis/java-shared-dependencies/commit/11c74152a84697924de3a0e838b05f606c3098f7))
- update gax.version to v2.18.5 ([#758](https://togithub.com/googleapis/java-shared-dependencies/issues/758)) ([7469fc1](https://togithub.com/googleapis/java-shared-dependencies/commit/7469fc1cc5095b39a5738e60156711a268f6e052))
- update gax.version to v2.18.6 ([#763](https://togithub.com/googleapis/java-shared-dependencies/issues/763)) ([b5ca2f7](https://togithub.com/googleapis/java-shared-dependencies/commit/b5ca2f7b4d81c705823253f4f03363a32d2be48b))
- update google.common-protos.version to v2.9.1 ([#724](https://togithub.com/googleapis/java-shared-dependencies/issues/724)) ([5213dbb](https://togithub.com/googleapis/java-shared-dependencies/commit/5213dbbfa9c9b73d2420ec2be7782f16c9c4955f))
- update google.core.version to v2.8.1 ([#725](https://togithub.com/googleapis/java-shared-dependencies/issues/725)) ([575858a](https://togithub.com/googleapis/java-shared-dependencies/commit/575858a60f76e46bbc2a2435c2b6c01c8f4ab681))
- update google.core.version to v2.8.3 ([#760](https://togithub.com/googleapis/java-shared-dependencies/issues/760)) ([cb10ae4](https://togithub.com/googleapis/java-shared-dependencies/commit/cb10ae4b76939215ea465af74163b3d4ad65a548))
- update google.core.version to v2.8.4 ([#762](https://togithub.com/googleapis/java-shared-dependencies/issues/762)) ([821daaf](https://togithub.com/googleapis/java-shared-dependencies/commit/821daafefdbcfdfe6e363e580747538096a562ef))
- update google.core.version to v2.8.5 ([#764](https://togithub.com/googleapis/java-shared-dependencies/issues/764)) ([a1f8f50](https://togithub.com/googleapis/java-shared-dependencies/commit/a1f8f501b54143a2cec8e72efd4ceb3ce47f13ae))
- update iam.version to v1.5.0 ([#732](https://togithub.com/googleapis/java-shared-dependencies/issues/732)) ([9dce0e5](https://togithub.com/googleapis/java-shared-dependencies/commit/9dce0e5199c1e425119adc804304958f58003a27))
- update iam.version to v1.5.1 ([#737](https://togithub.com/googleapis/java-shared-dependencies/issues/737)) ([df39168](https://togithub.com/googleapis/java-shared-dependencies/commit/df391685d42fcb1b04f03ab1380a594893bdce37))
- update iam.version to v1.5.2 ([#743](https://togithub.com/googleapis/java-shared-dependencies/issues/743)) ([cdde697](https://togithub.com/googleapis/java-shared-dependencies/commit/cdde697f25a89fc8c2ec7eae6b7c54f69977bb1c))
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] If you want to rebase/retry this PR, click this checkbox.
---
This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f741c9a13..8acf79cae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
com.google.cloud
google-cloud-shared-dependencies
- 2.13.0
+ 3.0.1
pom
import
From 5e4e732481e81b5d991c465504160ed5a3d74dc9 Mon Sep 17 00:00:00 2001
From: Nathan Herring
Date: Wed, 3 Aug 2022 07:30:58 -0700
Subject: [PATCH 11/13] style: Fix 2 ErrorProneStyle findings (#591)
* Constructors and methods with the same name should appear sequentially with no other code in between.
* This catch block catches an exception and re-throws another, but swallows the caught exception rather than setting it as a cause. This can make debugging harder.
Courtesy of clshepherd/clrobot in the monorepo.
Fixes #590.
---
.../datastore/v1/client/DatastoreHelper.java | 23 ++++++++++---------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java
index 0a8bba8c5..da10978cd 100644
--- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java
+++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java
@@ -483,6 +483,16 @@ public static Value.Builder makeValue(Date date) {
return Value.newBuilder().setTimestampValue(toTimestamp(date.getTime() * 1000L));
}
+ /** Makes a GeoPoint value. */
+ public static Value.Builder makeValue(LatLng value) {
+ return Value.newBuilder().setGeoPointValue(value);
+ }
+
+ /** Makes a GeoPoint value. */
+ public static Value.Builder makeValue(LatLng.Builder value) {
+ return makeValue(value.build());
+ }
+
private static Timestamp.Builder toTimestamp(long microseconds) {
long seconds = microseconds / MICROSECONDS_PER_SECOND;
long microsecondsRemainder = microseconds % MICROSECONDS_PER_SECOND;
@@ -497,16 +507,6 @@ private static Timestamp.Builder toTimestamp(long microseconds) {
.setNanos((int) microsecondsRemainder * NANOSECONDS_PER_MICROSECOND);
}
- /** Makes a GeoPoint value. */
- public static Value.Builder makeValue(LatLng value) {
- return Value.newBuilder().setGeoPointValue(value);
- }
-
- /** Makes a GeoPoint value. */
- public static Value.Builder makeValue(LatLng.Builder value) {
- return makeValue(value.build());
- }
-
/**
* Make a key from the specified path of kind/id-or-name pairs and/or Keys.
*
@@ -545,7 +545,8 @@ public static Key.Builder makeKey(Object... elements) {
try {
kind = (String) element;
} catch (ClassCastException e) {
- throw new IllegalArgumentException("Expected string or Key, got: " + element.getClass());
+ throw new IllegalArgumentException(
+ "Expected string or Key, got: " + element.getClass(), e);
}
pathElement.setKind(kind);
if (pathIndex + 1 < elements.length) {
From fc8cd15a72a80109a519b0dcc1236a2606b41264 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Thu, 4 Aug 2022 07:06:36 +0200
Subject: [PATCH 12/13] deps: update dependency
com.google.errorprone:error_prone_core to v2.15.0 (#810)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[](https://renovatebot.com)
This PR contains the following updates:
| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.errorprone:error_prone_core](https://errorprone.info) ([source](https://togithub.com/google/error-prone)) | `2.14.0` -> `2.15.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |
---
### Release Notes
google/error-prone
### [`v2.15.0`](https://togithub.com/google/error-prone/releases/tag/v2.15.0)
[Compare Source](https://togithub.com/google/error-prone/compare/v2.14.0...v2.15.0)
New Checkers:
- [`BuilderReturnThis`](https://errorprone.info/bugpattern/BuilderReturnThis)
- [`CanIgnoreReturnValueSuggester`](https://errorprone.info/bugpattern/CanIgnoreReturnValueSuggester)
- [`CannotMockFinalClass`](https://errorprone.info/bugpattern/CannotMockFinalClass)
- [`CannotMockFinalMethod`](https://errorprone.info/bugpattern/CannotMockFinalMethod)
- [`DirectInvocationOnMock`](https://errorprone.info/bugpattern/DirectInvocationOnMock)
- [`ExtendsObject`](https://errorprone.info/bugpattern/ExtendsObject)
- [`MockNotUsedInProduction`](https://errorprone.info/bugpattern/MockNotUsedInProduction)
- [`NoCanIgnoreReturnValueOnClasses`](https://errorprone.info/bugpattern/NoCanIgnoreReturnValueOnClasses)
- [`NullArgumentForNonNullParameter`](https://errorprone.info/bugpattern/NullArgumentForNonNullParameter)
- [`SelfAlwaysReturnsThis`](https://errorprone.info/bugpattern/SelfAlwaysReturnsThis)
- [`UnsafeWildcard`](https://errorprone.info/bugpattern/UnsafeWildcard)
- [`UnusedTypeParameter`](https://errorprone.info/bugpattern/UnusedTypeParameter)
Fixed issues: [#1562](https://togithub.com/google/error-prone/issues/1562), [#3236](https://togithub.com/google/error-prone/issues/3236), [#3245](https://togithub.com/google/error-prone/issues/3245), [#3321](https://togithub.com/google/error-prone/issues/3321)
**Full Changelog**: https://github.com/google/error-prone/compare/v2.14.0...v2.15.0
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] If you want to rebase/retry this PR, click this checkbox.
---
This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datastore).
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8acf79cae..6fc408415 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
github
google-cloud-datastore-parent
https://googleapis.dev/java/google-api-grpc/latest
- 2.14.0
+ 2.15.0